From owner-svn-ports-head@FreeBSD.ORG Fri May 10 16:44:28 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id EB78E95F; Fri, 10 May 2013 16:44:28 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id CD84F867; Fri, 10 May 2013 16:44:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4AGiSRo058099; Fri, 10 May 2013 16:44:28 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4AGiQcB058086; Fri, 10 May 2013 16:44:26 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201305101644.r4AGiQcB058086@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 10 May 2013 16:44:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317828 - in head/net-p2p: azureus2 eiskaltdcpp-daemon eiskaltdcpp-data eiskaltdcpp-gtk eiskaltdcpp-lib eiskaltdcpp-qt lopster museekplus nicotine-plus verlihub-plugins-luascript X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 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: Fri, 10 May 2013 16:44:29 -0000 Author: bapt Date: Fri May 10 16:44:26 2013 New Revision: 317828 URL: http://svnweb.freebsd.org/changeset/ports/317828 Log: Convert to new options framework Modified: head/net-p2p/azureus2/Makefile head/net-p2p/eiskaltdcpp-daemon/Makefile head/net-p2p/eiskaltdcpp-data/Makefile head/net-p2p/eiskaltdcpp-gtk/Makefile head/net-p2p/eiskaltdcpp-lib/Makefile head/net-p2p/eiskaltdcpp-qt/Makefile head/net-p2p/lopster/Makefile head/net-p2p/museekplus/Makefile head/net-p2p/nicotine-plus/Makefile head/net-p2p/verlihub-plugins-luascript/Makefile Modified: head/net-p2p/azureus2/Makefile ============================================================================== --- head/net-p2p/azureus2/Makefile Fri May 10 16:25:43 2013 (r317827) +++ head/net-p2p/azureus2/Makefile Fri May 10 16:44:26 2013 (r317828) @@ -30,7 +30,8 @@ NO_WRKSUBDIR= yes JARFILE= ${PORTNAME}.jar -OPTIONS= SWTDEVEL "Use SWT Development port" off +OPTIONS_DEFINE= SWTDEVEL +SWTDEVEL_DESC= Use SWT Development port # build classpath from BUILD_DEPENDS MAKE_ENV= LANG=C @@ -43,9 +44,9 @@ SUB_FILES= ${PORTNAME} SUB_LIST= LIBDIR="${LOCALBASE}/lib" JARFILE="${JARFILE}" \ SWTJAR="${JAVALIBDIR}/${SWT}.jar" JAVA="${LOCALBASE}/bin/java" -.include +.include -.if defined(WITH_SWTDEVEL) +.if ${PORT_OPTIONS:MSWTDEVEL} SWT= swt-devel .else SWT= swt @@ -71,4 +72,4 @@ do-install: post-install: @${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD} -.include +.include Modified: head/net-p2p/eiskaltdcpp-daemon/Makefile ============================================================================== --- head/net-p2p/eiskaltdcpp-daemon/Makefile Fri May 10 16:25:43 2013 (r317827) +++ head/net-p2p/eiskaltdcpp-daemon/Makefile Fri May 10 16:44:26 2013 (r317828) @@ -1,9 +1,5 @@ -# New ports collection makefile for: net-p2p/eiskaltdc -# Date created: 28 Aug 2009 -# Whom: Stas Timokhin -# +# Created by: Stas Timokhin # $FreeBSD$ -# PORTNAME= eiskaltdcpp-daemon PORTVERSION= 2.2.4 @@ -30,7 +26,9 @@ USES= cmake gettext USE_OPENSSL= yes MAKE_JOBS_SAFE= yes -OPTIONS= XMLRPC "XMLRPC interface support" on +OPTIONS_DEFINE= XMLRPC +OPTIONS_DEFAULT= XMLRPC +XMLRPC_DESC= XMLRPC interface support MAN1= ${PORTNAME}.1 MANCOMPRESSED= yes @@ -53,20 +51,14 @@ INSTALL_WRKSRC= ${WRKSRC}/nasdc .include -.if defined(WITH_XMLRPC) && !defined(WITHOUT_XMLRPC) +.if ${PORT_OPTIONS:MXMLRPC} LIB_DEPENDS+= xmlrpc++:${PORTSDIR}/net/xmlrpc-c-devel CMAKE_ARGS+= -DXMLRPC_DAEMON:BOOL=ON .else CMAKE_ARGS+= -DXMLRPC_DAEMON:BOOL=OFF .endif -.include - -.if ${OSVERSION} < 700024 -USE_OPENSSL_PORT=yes -.endif - post-build: ${LOCALBASE}/bin/chrpath -r "${_GCC_RUNTIME}" "${WRKSRC}/nasdc/${PORTNAME}" -.include +.include Modified: head/net-p2p/eiskaltdcpp-data/Makefile ============================================================================== --- head/net-p2p/eiskaltdcpp-data/Makefile Fri May 10 16:25:43 2013 (r317827) +++ head/net-p2p/eiskaltdcpp-data/Makefile Fri May 10 16:44:26 2013 (r317828) @@ -1,9 +1,5 @@ -# New ports collection makefile for: net-p2p/eiskaltdc -# Date created: 28 Aug 2009 -# Whom: Stas Timokhin -# +# Created by: Stas Timokhin # $FreeBSD$ -# PORTNAME= eiskaltdcpp-data PORTVERSION= 2.2.4 @@ -23,34 +19,36 @@ USE_XZ= yes NO_BUILD= yes INSTALLS_ICONS= yes -OPTIONS= EMOTICONS "Install emoticons" on \ - EXAMPLES "Install script examples" on \ - LUASCRIPTS "Install lua script examples" off \ - SOUNDS "Install sound files" on +OPTIONS_DEFINE= EMOTICONS EXAMPLES LUASCRIPTS SOUND +OPTIONS_DEFAULT= EMOTICONS SOUNDS +EMOTICONS_DESC= Install emoticons +EXAMPLES_DESC= Install script examples +LUASCRIPTS_DESC= Install lua script examples +SOUNDS_DESC= Install sound files .include DATA_DIR= ${PREFIX}/share/eiskaltdcpp -.if defined(WITH_EMOTICONS) +.if ${PORT_OPTIONS:MEMOTICONS} PLIST_SUB+= EMOTICONS="" .else PLIST_SUB+= EMOTICONS="@comment " .endif -.if defined(WITH_EXAMPLES) +.if ${PORT_OPTIONS:MEXAMPLES} PLIST_SUB+= EXAMPLES="" .else PLIST_SUB+= EXAMPLES="@comment " .endif -.if defined(WITH_LUASCRIPTS) +.if ${PORT_OPTIONS:MLUASCRIPTS} PLIST_SUB+= LUASCRIPTS="" .else PLIST_SUB+= LUASCRIPTS="@comment " .endif -.if defined(WITH_SOUNDS) +.if ${PORT_OPTIONS:MSOUNDS} PLIST_SUB+= SOUNDS="" .else PLIST_SUB+= SOUNDS="@comment " @@ -63,17 +61,17 @@ do-install: @${MKDIR} "${LOCALBASE}/share/icons/hicolor/${SIZE}/apps" @${CP} -v "${WRKSRC}/icons/icon_${SIZE}.png" "${LOCALBASE}/share/icons/hicolor/${SIZE}/apps/eiskaltdcpp.png" .endfor -.if defined(WITH_EMOTICONS) +.if ${PORT_OPTIONS:MEMOTICONS} @${CP} -rv ${WRKSRC}/emoticons ${DATA_DIR} .endif -.if defined(WITH_EXAMPLES) +.if ${PORT_OPTIONS:MEXAMPLES} @${MKDIR} ${DATA_DIR}/examples @${INSTALL_SCRIPT} ${WRKSRC}/examples/* ${DATA_DIR}/examples .endif -.if defined(WITH_LUASCRIPTS) +.if ${PORT_OPTIONS:MLUASCRIPTS} @${CP} -rv ${WRKSRC}/luascripts ${DATA_DIR} .endif -.if defined(WITH_SOUNDS) +.if ${PORT_OPTIONS:MSOUNDS} @${CP} -rv ${WRKSRC}/sounds ${DATA_DIR} .endif Modified: head/net-p2p/eiskaltdcpp-gtk/Makefile ============================================================================== --- head/net-p2p/eiskaltdcpp-gtk/Makefile Fri May 10 16:25:43 2013 (r317827) +++ head/net-p2p/eiskaltdcpp-gtk/Makefile Fri May 10 16:44:26 2013 (r317828) @@ -1,9 +1,5 @@ -# New ports collection makefile for: net-p2p/eiskaltdc -# Date created: 28 Aug 2009 -# Whom: Stas Timokhin -# +# Created by: Stas Timokhin # $FreeBSD$ -# PORTNAME= eiskaltdcpp-gtk PORTVERSION= 2.2.4 @@ -35,9 +31,11 @@ MAKE_JOBS_SAFE= yes MAN1= ${PORTNAME}.1 MANCOMPRESSED= yes -OPTIONS= MINIUPNP "UPnP support" on \ - LIBGNOME2 "Sound notification support" off \ - LIBNOTIFY "Popup notification support" on +OPTIONS_DEFINE= MINIUPNP LIBGNOME2 LIBNOTIFY +OPTIONS_DEFAULT= MINIUPNP LIBNOTIFY +MINIUPNP_DESC= UPnP support +LIBGNOME2_DESC= Sound notification support +LIBNOTIFY_DESC= Popup notification support USE_GNOME= pango gtk20 glib20 @@ -51,31 +49,27 @@ CMAKE_ARGS+= -DINSTALL_DATA:BOOL=OFF .include -.if defined(WITH_MINIUPNP) +.if ${PORT_OPTIONS:MMINIUPNP} LIB_DEPENDS+= miniupnpc:${PORTSDIR}/net/miniupnpc CMAKE_ARGS+= -DUSE_MINIUPNP:BOOL=ON -DLOCAL_MINIUPNP:BOOL=OFF .else CMAKE_ARGS+= -DUSE_MINIUPNP:BOOL=OFF .endif -.if defined(WITH_LIBGNOME2) +.if ${PORT_OPTIONS:MLIBGNOME2} USE_GNOME+= libgnome CMAKE_ARGS+= -DUSE_LIBGNOME2:BOOL=ON .else CMAKE_ARGS+= -DUSE_LIBGNOME2:BOOL=OFF .endif -.if defined(WITH_LIBNOTIFY) +.if ${PORT_OPTIONS:MLIBNOTIFY} LIB_DEPENDS+= notify:${PORTSDIR}/devel/libnotify CMAKE_ARGS+= -DUSE_LIBNOTIFY:BOOL=ON .else CMAKE_ARGS+= -DUSE_LIBNOTIFY:BOOL=OFF .endif -.if ${OSVERSION} < 700024 -USE_OPENSSL_PORT=yes -.endif - post-build: ${LOCALBASE}/bin/chrpath -r "${_GCC_RUNTIME}" "${WRKSRC}/${PORTNAME}/${PORTNAME}" Modified: head/net-p2p/eiskaltdcpp-lib/Makefile ============================================================================== --- head/net-p2p/eiskaltdcpp-lib/Makefile Fri May 10 16:25:43 2013 (r317827) +++ head/net-p2p/eiskaltdcpp-lib/Makefile Fri May 10 16:44:26 2013 (r317828) @@ -25,10 +25,9 @@ USE_OPENSSL= yes USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes -OPTIONS= LUA "Lua scripting support" off \ - PCRE "PCRE support in ADL Search" off \ - IDN "IDN support" on \ - DHT "DHT support" on +OPTIONS_DEFINE= LUA PCRE IDN DHT +OPTIONS_DEFAULT= IDN DHT +DHT_DESC= DHT support .include @@ -39,7 +38,7 @@ CMAKE_ARGS+= -DUSE_ASPELL:BOOL=OFF CMAKE_ARGS+= -DUSE_MINIUPNP:BOOL=OFF CMAKE_ARGS+= -DCMAKE_SKIP_RPATH:BOOL=ON -.if defined(WITH_LUA) && !defined(WITHOUT_LUA) +.if ${PORT_OPTIONS:MLUA} USE_LUA= 5.1 CMAKE_ARGS+= -DLUA_SCRIPT:BOOL=ON IGNORE= crashes on connect attempt if built with Lua support @@ -47,33 +46,27 @@ IGNORE= crashes on connect attempt if bu CMAKE_ARGS+= -DLUA_SCRIPT:BOOL=OFF .endif -.if defined(WITH_PCRE) && !defined(WITHOUT_PCRE) +.if ${PORT_OPTIONS:MPCRE} LIB_DEPENDS+= pcre:${PORTSDIR}/devel/pcre CMAKE_ARGS+= -DPERL_REGEX:BOOL=ON .else CMAKE_ARGS+= -DPERL_REGEX:BOOL=OFF .endif -.if defined(WITH_IDN) && !defined(WITHOUT_IDN) +.if ${PORT_OPTIONS:MIDN} LIB_DEPENDS+= idn:${PORTSDIR}/dns/libidn CMAKE_ARGS+= -DUSE_IDNA:BOOL=ON .else CMAKE_ARGS+= -DUSE_IDNA:BOOL=OFF .endif -.if defined(WITH_DHT) && !defined(WITHOUT_DHT) +.if ${PORT_OPTIONS:MDHT} CMAKE_ARGS+= -DWITH_DHT:BOOL=ON .else CMAKE_ARGS+= -DWITH_DHT:BOOL=OFF .endif -.include - -.if ${OSVERSION} < 700024 -USE_OPENSSL_PORT=yes -.endif - post-build: ${LOCALBASE}/bin/chrpath -r "${_GCC_RUNTIME}" "${WRKSRC}/dcpp/libeiskaltdcpp.so.2.2" -.include +.include Modified: head/net-p2p/eiskaltdcpp-qt/Makefile ============================================================================== --- head/net-p2p/eiskaltdcpp-qt/Makefile Fri May 10 16:25:43 2013 (r317827) +++ head/net-p2p/eiskaltdcpp-qt/Makefile Fri May 10 16:44:26 2013 (r317828) @@ -1,9 +1,5 @@ -# New ports collection makefile for: net-p2p/eiskaltdc -# Date created: 28 Aug 2009 -# Whom: Stas Timokhin -# +# Created by: Stas Timokhin # $FreeBSD$ -# PORTNAME= eiskaltdcpp-qt PORTVERSION= 2.2.4 @@ -36,13 +32,14 @@ MAKE_JOBS_SAFE= yes MAN1= ${PORTNAME}.1 MANCOMPRESSED= yes -OPTIONS= ASPELL "Build with aspell support" off \ - FREE_SPACE "Free space bar in status panel" on \ - DBUS_NOTIFY "DBus notification support" on \ - QTSCRIPT "QtScript support" off \ - QML "Qt Declarative ui support" off \ - SQLITE "SQLite support (experimental)" off \ - MINIUPNP "UPnP support" on +OPTIONS_DEFINE= ASPELL FREE_SPACE DBUS_NOTIFY QTSCRIPT QML SQLITE MINIUPNP +OPTIONS_DEFAULT= FREE_SPACE DBUS_NOTIFY MINIUPNP +FREE_SPACE_DESC= Free space bar in status panel +DBUS_NOTIFY_DESC= DBus notification support +QTSCRIPT_DESC= QtScript support +QML_DESC= Qt Declarative ui support +SQLITE_DESC= SQLite support (experimental) +MINIUPNP_DESC= UPnP support USE_QT4= gui xml network qmake_build uic_build \ moc_build rcc_build linguist_build @@ -58,27 +55,27 @@ INSTALL_WRKSRC= ${WRKSRC}/${PORTNAME} .include -.if defined(WITH_ASPELL) && !defined(WITHOUT_ASPELL) +.if ${PORT_OPTIONS:MASPELL} LIB_DEPENDS+= aspell:${PORTSDIR}/textproc/aspell CMAKE_ARGS+= -DUSE_ASPELL:BOOL=on .else CMAKE_ARGS+= -DUSE_ASPELL:BOOL=0 .endif -.if defined(WITH_FREE_SPACE) +.if ${PORT_OPTIONS:MFREE_SPACE} CMAKE_ARGS+= -DFREE_SPACE_BAR_C:BOOL=ON .else CMAKE_ARGS+= -DFREE_SPACE_BAR_C:BOOL=OFF .endif -.if defined(WITH_DBUS_NOTIFY) && !defined(WITHOUT_DBUS) +.if ${PORT_OPTIONS:MDBUS_NOTIFY} CMAKE_ARGS+= -DDBUS_NOTIFY:BOOL=ON USE_QT4+= dbus .else CMAKE_ARGS+= -DDBUS_NOTIFY:BOOL=OFF .endif -.if defined(WITH_QTSCRIPT) +.if ${PORT_OPTIONS:MQTSCRIPT} CMAKE_ARGS+= -DUSE_JS:BOOL=ON USE_QT4+= script RUN_DEPENDS+= ${LOCALBASE}/lib/qt4/plugins/script/libqtscript_core.so:${PORTSDIR}/devel/qtscriptgenerator @@ -88,34 +85,28 @@ CMAKE_ARGS+= -DUSE_JS:BOOL=OFF PLIST_SUB+= QTSCRIPT="@comment " .endif -.if defined(WITH_QML) +.if ${PORT_OPTIONS:MQML} CMAKE_ARGS+= -DUSE_QT_QML:BOOL=ON USE_QT4+= declarative .else CMAKE_ARGS+= -DUSE_QT_QML:BOOL=OFF .endif -.if defined(WITH_SQLITE) && !defined(WITHOUT_SQLITE) +.if ${PORT_OPTIONS:MSQLITE} CMAKE_ARGS+= -DUSE_QT_SQLITE:BOOL=ON USE_QT4+= sql-sqlite3 .else CMAKE_ARGS+= -DUSE_QT_SQLITE:BOOL=OFF .endif -.if defined(WITH_MINIUPNP) +.if ${PORT_OPTIONS:MMINIUPNP} LIB_DEPENDS+= miniupnpc:${PORTSDIR}/net/miniupnpc CMAKE_ARGS+= -DUSE_MINIUPNP:BOOL=ON -DLOCAL_MINIUPNP:BOOL=OFF .else CMAKE_ARGS+= -DUSE_MINIUPNP:BOOL=OFF .endif -.include - -.if ${OSVERSION} < 700024 -USE_OPENSSL_PORT=yes -.endif - post-build: ${LOCALBASE}/bin/chrpath -r "${_GCC_RUNTIME}" "${WRKSRC}/${PORTNAME}/${PORTNAME}" -.include +.include Modified: head/net-p2p/lopster/Makefile ============================================================================== --- head/net-p2p/lopster/Makefile Fri May 10 16:25:43 2013 (r317827) +++ head/net-p2p/lopster/Makefile Fri May 10 16:44:26 2013 (r317828) @@ -1,9 +1,5 @@ -# New ports collection makefile for: lopster -# Date created: 19 Oct 2000 -# Whom: Roman Shterenzon -# +# Created by: Roman Shterenzon # $FreeBSD$ -# PORTNAME= lopster PORTVERSION= 1.2.2 @@ -22,29 +18,27 @@ CONFIGURE_ARGS= --with-pthread=yes LDFLAGS+= -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include -OPTIONS= FLAC "Include FLAC support" On \ - OGG "Include OGG support" On \ - ZLIB "Enable ZLIB compression" On +OPTIONS_DEFINE= FLAC OGG ZLIB +OPTIONS_DEFAULT= FLAC OGG ZLIB -.include .include # --with-flac is on by default -.if defined(WITH_FLAC) +.if ${PORT_OPTIONS:MFLAC} LIB_DEPENDS+= FLAC.10:${PORTSDIR}/audio/flac .else CONFIGURE_ARGS+= --without-flac .endif # --with-ogg is on by default -.if defined(WITH_OGG) +.if ${PORT_OPTIONS:MOGG} LIB_DEPENDS+= ogg:${PORTSDIR}/audio/libogg .else CONFIGURE_ARGS+= --without-ogg .endif # --with-zlib is on by default -.if defined(WITHOUT_ZLIB) +.if ! ${PORT_OPTIONS:MZLIB} CONFIGURE_ARGS+= --without-zlib .endif @@ -54,4 +48,4 @@ post-patch: @${REINPLACE_CMD} -e "s/www.naplist.com/www.gotnap.com/" \ ${WRKSRC}/src/lopster.h -.include +.include Modified: head/net-p2p/museekplus/Makefile ============================================================================== --- head/net-p2p/museekplus/Makefile Fri May 10 16:25:43 2013 (r317827) +++ head/net-p2p/museekplus/Makefile Fri May 10 16:44:26 2013 (r317828) @@ -1,7 +1,4 @@ -# New ports collection makefile for: museekplus -# Date created: 06 Aug 2006 -# Whom: Stefan Walter -# +# Created by: Stefan Walter # $FreeBSD$ PORTNAME= museekplus @@ -25,29 +22,27 @@ SCONS_ARGS= QTDIR=${QT_PREFIX} QT_LIB=qt DATADIR= share/museek MAN1= musetup.1 mulog.1 museekcontrol.1 muscan.1 muscand.1 museekd.1 -OPTIONS= \ - MUSEEQ "Install Museeq (Qt3 client)" On \ - QSA "Build Museeq with Qt Script support" On \ - MUSETUPGTK "Install musetup-gtk" On \ - PYMUCIPHER "Install python bindings for Mucipher" On \ - VORBIS "Enable OGG Vorbis support in muscan" On \ - MURMUR "Install PyGTK client" Off \ - MUCOUS "Install Curses Python client" Off \ - OPTIMIZED_CFLAGS "Build with optmizations" Off \ - DEBUG "Build in debug mode" Off +OPTIONS_DEFINE= MUSEEQ QSA MUSETUPGTK PYMUCIPHER VORBIS MURMUR MUCOUS OPTIMIZED_CFLAGS DEBUG +OPTIONS_DEFAULT= MUSEEQ QSA MUSETUPGTK PYMUCIPHER VORBIS +MUSEEQ_DESC= Install Museeq (Qt3 client) +QSA_DESC= Build Museeq with Qt Script support +MUSETUPGTK_DESC= Install musetup-gtk +PYMUCIPHER_DESC= Install python bindings for Mucipher +MURMUR_DESC= Install PyGTK client +MUCOUS_DESC= Install Curses Python client .include -.if defined(WITH_PYMUCIPHER) || defined(WITH_BINDINGS) || defined(WITH_MURMUR) || defined(WITH_CLIENTS) || defined(WITH_MUCOUS) +.if ${PORT_OPTIONS:MPYMUCIPHER} || ${PORT_OPTIONS:MBINDINGS} || ${PORT_OPTIONS:MMURMUR} || ${PORT_OPTIONS:MCLIENTS} || ${PORT_OPTIONS:MMUCOUS} USE_PYTHON= yes .endif -.ifdef(WITH_MUSEEQ) +.if ${PORT_OPTIONS:MMUSEEQ} USE_QT_VER= 3 SCONS_ARGS+= MUSEEQ=yes MAN1+= museeq.1 PLIST_SUB+= MUSEEQ="" -.ifdef(WITH_QSA) +.if ${PORT_OPTIONS:MQSA} SCONS_ARGS+= QSA=yes LIB_DEPENDS+= qsa:${PORTSDIR}/devel/qsa .else @@ -58,16 +53,14 @@ SCONS_ARGS+= MUSEEQ=no PLIST_SUB+= MUSEEQ="@comment " SCONS_ARGS+= QSA=no .endif -.ifdef(WITH_VORBIS) +.if ${PORT_OPTIONS:MVORBIS} SCONS_ARGS+= VORBIS=yes LIB_DEPENDS+= vorbis:${PORTSDIR}/audio/libvorbis .else SCONS_ARGS+= VORBIS=no .endif -.include - -.ifdef(WITH_MUSETUPGTK) +.if ${PORT_OPTIONS:MMUSETUPGTK} SCONS_ARGS+= MUSETUPGTK=yes MAN1+= musetup-gtk.1 PLIST_SUB+= MUSETUPGTK="" @@ -75,14 +68,14 @@ PLIST_SUB+= MUSETUPGTK="" SCONS_ARGS+= MUSETUPGTK=no PLIST_SUB+= MUSETUPGTK="@comment " .endif -.ifdef(WITH_PYMUCIPHER) +.if ${PORT_OPTIONS:MPYMUCIPHER} SCONS_ARGS+= PYMUCIPHER=yes PLIST_SUB+= PYMUCIPHER="" .else SCONS_ARGS+= PYMUCIPHER=no PLIST_SUB+= PYMUCIPHER="@comment " .endif -.ifdef(WITH_MURMUR) +.if ${PORT_OPTIONS:MMURMUR} SCONS_ARGS+= MURMUR=yes MAN1+= murmur.1 PLIST_SUB+= MURMUR="" @@ -90,7 +83,7 @@ PLIST_SUB+= MURMUR="" SCONS_ARGS+= MURMUR=no PLIST_SUB+= MURMUR="@comment " .endif -.ifdef(WITH_MUCOUS) +.if ${PORT_OPTIONS:MMUCOUS} SCONS_ARGS+= MUCOUS=yes MAN1+= mucous.1 PLIST_SUB+= MUCOUS="" @@ -98,12 +91,12 @@ PLIST_SUB+= MUCOUS="" SCONS_ARGS+= MUCOUS=no PLIST_SUB+= MUCOUS="@comment " .endif -.ifdef(WITH_OPTIMIZED_CFLAGS) +.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} SCONS_ARGS+= RELEASE=yes .else SCONS_ARGS+= RELEASE=no .endif -.ifdef(WITH_DEBUG) +.if ${PORT_OPTIONS:MDEBUG} SCONS_ARGS+= MULOG="cycle,debug" .endif @@ -117,14 +110,14 @@ post-patch: ${WRKSRC}/python-bindings/museek/SConscript post-install: -.ifdef(WITH_MUCOUS) +.if ${PORT_OPTIONS:MMUCOUS} @${REINPLACE_CMD} -i "" -e "s,/usr/bin/python,${PYTHON_CMD},g" ${PREFIX}/bin/mucous .endif -.ifdef(WITH_MUSETUPGTK) +.if ${PORT_OPTIONS:MMUSETUPGTK} @${REINPLACE_CMD} -i "" -e "s,/usr/bin/python,${PYTHON_CMD},g" ${PREFIX}/bin/musetup-gtk .endif @${ECHO_CMD} @${CAT} ${PKGMESSAGE} @${ECHO_CMD} -.include +.include Modified: head/net-p2p/nicotine-plus/Makefile ============================================================================== --- head/net-p2p/nicotine-plus/Makefile Fri May 10 16:25:43 2013 (r317827) +++ head/net-p2p/nicotine-plus/Makefile Fri May 10 16:44:26 2013 (r317828) @@ -27,27 +27,30 @@ DOCSDIR= share/doc/${PKGNAMEPREFIX:S/-// DATADIR= share/${PKGNAMEPREFIX:S/-//} MAN1= nicotine-import-winconfig.1 nicotine.1 -OPTIONS= GEOIP "Enable the GeoIP based country code blocker" on \ - PSYCO "Enable Psyco, the optimizing Python compiler" on \ - MUTAGEN "Enable Mutagen for audio metadata support" on \ - LIBSEXY "Enable libsexy support" on \ - MINIUPNPC "Enable upnp support" on +OPTIONS_DEFINE= GEOIP PSYCO MUTAGEN LIBSEXY MINIUPNPC DOCS +OPTIONS_DEFINE_i386= PSYCO +OPTIONS_DEFAULT= GEOIP PSYCO MUTAGEN LIBSEXY MINIUPNPC +GEOIP_DESC= Enable the GeoIP based country code blocker +PSYCO_DESC= Enable Psyco, the optimizing Python compiler +MUTAGEN_DESC= Enable Mutagen for audio metadata support +LIBSEXY_DESC= Enable libsexy support +MINIUPNPC_DESC= Enable upnp support -.include +.include -.if defined(WITH_GEOIP) +.if ${PORT_OPTIONS:MGEOIP} RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/GeoIP.so:${PORTSDIR}/net/py-GeoIP .endif -.if defined(WITH_PSYCO) && ${ARCH} == "i386" +.if ${PORT_OPTIONS:MPSYCO} RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/psyco/_psyco.so:${PORTSDIR}/devel/py-psyco .endif -.if defined(WITH_MUTAGEN) +.if ${PORT_OPTIONS:MMUTAGEN} RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/mutagen/__init__.py:${PORTSDIR}/audio/py-mutagen .endif -.if defined(WITH_LIBSEXY) +.if ${PORT_OPTIONS:MLIBSEXY} RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/gtk-2.0/sexy.so:${PORTSDIR}/x11-toolkits/py-sexy .endif -.if defined(WITH_MINIUPNPC) +.if ${PORT_OPTIONS:MMINIUPNPC} RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/miniupnpc.so:${PORTSDIR}/net/py-miniupnpc .endif @@ -55,11 +58,11 @@ post-extract: @${MV} ${WRKSRC}/${PKGNAMEPREFIX:S/-//}.py ${WRKSRC}/${PKGNAMEPREFIX:S/-//} post-patch: -.if defined(NOPORTDOCS) +.if ! ${PORT_OPTIONS:MDOCS} @${REINPLACE_CMD} -i "" -e 's|^doc_files.*|doc_files = ""|g' ${WRKSRC}/setup.py .endif @${REINPLACE_CMD} -e \ "s|sys\.prefix|\"${PREFIX}\"|g" -e \ "s|nicotine.py|nicotine|g" ${WRKSRC}/setup.py -.include +.include Modified: head/net-p2p/verlihub-plugins-luascript/Makefile ============================================================================== --- head/net-p2p/verlihub-plugins-luascript/Makefile Fri May 10 16:25:43 2013 (r317827) +++ head/net-p2p/verlihub-plugins-luascript/Makefile Fri May 10 16:44:26 2013 (r317828) @@ -1,9 +1,5 @@ -# New ports collection makefile for: verlihub-plugins-luascript -# Date created: 3 May 2007 -# Whom: Skylord -# +# Created by: Skylord # $FreeBSD$ -# PORTNAME= luascript PORTVERSION= 1.8.1 @@ -23,7 +19,8 @@ CXXFLAGS+= ${LDFLAGS} CPPFLAGS+= -I${LUA_INCDIR} LDFLAGS+= -L${LUA_LIBDIR} -OPTIONS= SOCKET "Build with LuaSocket support" Off +OPTIONS_DEFINE= SOCKET +SOCKET_DESC= Build with LuaSocket support PLIST_FILES= share/verlihub/scripts/ptokax.lua.inc \ share/verlihub/scripts/ptokaxtest.lua \ @@ -32,7 +29,7 @@ PLIST_DIRS= share/verlihub/scripts .include -.if defined(WITH_SOCKET) +.if ${PORT_OPTIONS:MSOCKET} LUA_COMPS+= socket:lib CONFIGURE_ARGS+= --with-luasocket