From owner-svn-ports-head@FreeBSD.ORG Wed Sep 26 08:46:41 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D9E781065688; Wed, 26 Sep 2012 08:46:40 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C49168FC1B; Wed, 26 Sep 2012 08:46:40 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8Q8keXi093170; Wed, 26 Sep 2012 08:46:40 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8Q8keP6093167; Wed, 26 Sep 2012 08:46:40 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201209260846.q8Q8keP6093167@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 26 Sep 2012 08:46:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r304886 - in head/audio: linux-musicipserver osd-lyrics X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Sep 2012 08:46:41 -0000 Author: bapt Date: Wed Sep 26 08:46:40 2012 New Revision: 304886 URL: http://svn.freebsd.org/changeset/ports/304886 Log: Convert to OptionsNG Modified: head/audio/linux-musicipserver/Makefile head/audio/osd-lyrics/Makefile Modified: head/audio/linux-musicipserver/Makefile ============================================================================== --- head/audio/linux-musicipserver/Makefile Wed Sep 26 08:40:40 2012 (r304885) +++ head/audio/linux-musicipserver/Makefile Wed Sep 26 08:46:40 2012 (r304886) @@ -1,9 +1,5 @@ -# New ports collection makefile for: musicipserver -# Date created: 2009-03-24 -# Whom: Christopher Key -# +# Created by: Christopher Key # $FreeBSD$ -# PORTNAME= musicipserver PORTVERSION= 1.8 @@ -30,7 +26,9 @@ RUN_DEPENDS= empty:${PORTSDIR}/net/empt LICENSE_DISTFILES= ${DISTNAME}.tgz -OPTIONS= SPICEFLY_SKIN "Install Spicefly skin" on +OPTIONS_DEFINE= SPICEFLY_SKIN +OPTIONS_DEFAULT= SPICEFLY_SKIN +OPTIONS_DESC= Install Spicefly skin WRKSRC= ${WRKDIR}/MusicIP/MusicMagicMixer/ @@ -59,12 +57,12 @@ PLIST_SUB= MUSICIPSERVERDBDIR=${MUSICIP .include -.if defined(WITH_SPICEFLY_SKIN) && !defined(WITHOUT_SPICEFLY_SKIN) +.if ${PORT_OPTIONS:MSPICEFLY_SKIN} EXTRACT_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip DISTFILES+= index-1.1.zip:spicefly .endif -.if defined(WITH_SPICEFLY_SKIN) && !defined(WITHOUT_SPICEFLY_SKIN) +.if ${PORT_OPTIONS:MSPICEFLY_SKIN} post-extract: @cd ${WRKDIR} && ${UNZIP_CMD} -qo ${_DISTDIR}/index-1.1.zip -d ${WRKDIR}/spicefly .endif @@ -76,7 +74,7 @@ do-install: @${INSTALL_PROGRAM} ${WRKSRC}/MusicMagicServer ${PREFIX}/bin @${MKDIR} ${DATADIR} @${LN} -fhs ${LOCALBASE}/libexec/mipcore ${DATADIR}/mipcore -.if defined(WITH_SPICEFLY_SKIN) && !defined(WITHOUT_SPICEFLY_SKIN) +.if ${PORT_OPTIONS:MSPICEFLY_SKIN} @${MKDIR} ${DATADIR}/server @${INSTALL_DATA} ${WRKDIR}/spicefly/index.html ${DATADIR}/server .else Modified: head/audio/osd-lyrics/Makefile ============================================================================== --- head/audio/osd-lyrics/Makefile Wed Sep 26 08:40:40 2012 (r304885) +++ head/audio/osd-lyrics/Makefile Wed Sep 26 08:46:40 2012 (r304886) @@ -1,9 +1,5 @@ -# New ports collection makefile for: OSD Lyrics -# Date created: 18 Nov 2011 -# Whom: Alexey Dokuchaev -# +# Created by: Alexey Dokuchaev # $FreeBSD$ -# PORTNAME= osdlyrics PORTVERSION= 0.4.3 @@ -32,30 +28,31 @@ USE_SQLITE= yes INSTALLS_ICONS= yes PORTDOCS= AUTHORS ChangeLog NEWS README -OPTIONS= MPD "Enable MPD support" off \ - XMMS2 "Enable XMMS2 support" off \ - AMAROK "Enable Amarok 1.4 support" off +OPTIONS_DEFINE= DOCS MPD XMMS2 AMAROK +MPD_DESC= Enable MPD support +XMMS2_DESC= Enable XMMS2 support +AMAROK_DESC= Enable Amarok 1.4 support .include -.if defined(WITH_MPD) +.if ${PORT_OPTIONS:MMPD} LIB_DEPENDS+= mpd:${PORTSDIR}/audio/libmpd .else CONFIGURE_ARGS+= --disable-mpd .endif -.if defined(WITH_XMMS2) +.if ${PORT_OPTIONS:MXMMS2} LIB_DEPENDS+= xmmsclient:${PORTSDIR}/audio/xmms2 .else CONFIGURE_ARGS+= --disable-xmms2 .endif -.if defined(WITH_AMAROK) +.if ${PORT_OPTIONS:MAMAROK} CONFIGURE_ARGS+= --enable-amarok1 .endif post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} .endif