svn commit: r313460 - in head: audio/libumidi audio/lingot audio/mangler audio/mpdbrowser audio/snack deskutils/cairo-dock-plugins deskutils/gdesklets deskutils/global-menu deskutils/moregroupware ...
Martin Wilke
miwi at FreeBSD.org
Tue Mar 5 17:07:48 UTC 2013
Author: miwi
Date: Tue Mar 5 17:07:43 2013
New Revision: 313460
URL: http://svnweb.freebsd.org/changeset/ports/313460
Log:
- Convert to OptionsNG
- Trim header
Reviewed by: beat, bapt, kwm
Modified:
head/audio/libumidi/Makefile
head/audio/lingot/Makefile (contents, props changed)
head/audio/mangler/Makefile (contents, props changed)
head/audio/mpdbrowser/Makefile (contents, props changed)
head/audio/snack/Makefile (contents, props changed)
head/deskutils/cairo-dock-plugins/Makefile (contents, props changed)
head/deskutils/gdesklets/Makefile
head/deskutils/global-menu/Makefile (contents, props changed)
head/deskutils/moregroupware/Makefile (contents, props changed)
head/deskutils/wyrd/Makefile (contents, props changed)
head/devel/phpsh/Makefile (contents, props changed)
head/graphics/jdraw/Makefile (contents, props changed)
head/graphics/tgif/Makefile (contents, props changed)
head/mail/extman/Makefile (contents, props changed)
head/math/kash3/Makefile (contents, props changed)
head/math/parmetis/Makefile (contents, props changed)
head/math/pspp/Makefile (contents, props changed)
head/net-im/pidgin-sipe/Makefile (contents, props changed)
head/net-im/zephyr/Makefile (contents, props changed)
head/net/apinger/Makefile (contents, props changed)
head/net/bmon/Makefile (contents, props changed)
head/net/echoping/Makefile (contents, props changed)
head/net/ifstat/Makefile (contents, props changed)
head/net/ng_mikrotik_eoip/Makefile (contents, props changed)
head/net/remmina-applet/Makefile
head/net/shmux/Makefile (contents, props changed)
head/net/sqtop/Makefile (contents, props changed)
head/net/traff/Makefile (contents, props changed)
head/net/trafshow/Makefile (contents, props changed)
head/net/tsclient/Makefile (contents, props changed)
head/net/twinkle/Makefile
head/net/ushare/Makefile (contents, props changed)
head/security/botan/Makefile (contents, props changed)
head/security/clamassassin/Makefile (contents, props changed)
head/security/cvm/Makefile (contents, props changed)
head/security/libssh/Makefile
head/security/webfwlog/Makefile (contents, props changed)
head/www/bacula-web/Makefile (contents, props changed)
head/www/fluxbb/Makefile (contents, props changed)
head/www/groupoffice/Makefile (contents, props changed)
head/www/mod_clamav/Makefile
head/www/nibbleblog/Makefile (contents, props changed)
head/www/py-django-photologue/Makefile (contents, props changed)
head/www/snownews/Makefile (contents, props changed)
head/www/trac-revtree/Makefile (contents, props changed)
head/www/vtiger/Makefile (contents, props changed)
Modified: head/audio/libumidi/Makefile
==============================================================================
--- head/audio/libumidi/Makefile Tue Mar 5 16:47:25 2013 (r313459)
+++ head/audio/libumidi/Makefile Tue Mar 5 17:07:43 2013 (r313460)
@@ -1,9 +1,5 @@
-# Ports collection makefile for: libumidi
-# Date created: 21 June 2011
-# Whom: Hans Petter Selasky <hselasky at FreeBSD.org>
-#
+# Created by: Hans Petter Selasky <hselasky at FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= libumidi
PORTVERSION= 2.0.5
@@ -19,19 +15,17 @@ USE_BZIP2= yes
MAN3= umidi20.3
MANCOMPRESSED= yes
-OPTIONS= DEBUG "Build with debugging support" Off \
- JACK "Build with Jack support" On
-
+OPTIONS_DEFINE= DEBUG JACK
.include <bsd.port.options.mk>
MAKE_ARGS+=" PTHREAD_LIBS=${PTHREAD_LIBS}"
-.if defined(WITH_JACK)
+.if ${PORT_OPTIONS:MJACK}
MAKE_ARGS+=" HAVE_JACK=YES"
LIB_DEPENDS= jack.0:${PORTSDIR}/audio/jack
.endif
-.if defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
MAKE_ARGS+=" HAVE_DEBUG=YES"
.endif
Modified: head/audio/lingot/Makefile
==============================================================================
--- head/audio/lingot/Makefile Tue Mar 5 16:47:25 2013 (r313459)
+++ head/audio/lingot/Makefile Tue Mar 5 17:07:43 2013 (r313460)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: lingot
-# Date created: 2011-10-17
-# Whom: Bartoletti <coder at tuxfamily.org>
-#
+# Created by: Bartoletti <coder at tuxfamily.org>
# $FreeBSD$
-#
PORTNAME= lingot
PORTVERSION= 0.9.1
@@ -25,12 +21,12 @@ USE_GETTEXT= yes
LDFLAGS+= -L${LOCALBASE}/lib
-OPTIONS= JACK "Enable jack plugin" on \
- ALSA "Enable alsa plugin" off
+OPTIONS_DEFINE= JACK ALSA
+OPTIONS_DEFAULT= JACK
.include <bsd.port.options.mk>
-.if defined(WITH_JACK)
+.if ${PORT_OPTIONS:MJACK}
LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack \
samplerate.1:${PORTSDIR}/audio/libsamplerate
CONFIGURE_ARGS+=--enable-jack
@@ -38,7 +34,7 @@ CONFIGURE_ARGS+=--enable-jack
CONFIGURE_ARGS+=--disable-jack
.endif
-.if defined(WITH_ALSA)
+.if ${PORT_OPTIONS:MALSA}
LIB_DEPENDS+= asound.2:${PORTSDIR}/audio/alsa-lib
RUN_DEPENDS+= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins
CONFIGURE_ARGS+=--enable-alsa
Modified: head/audio/mangler/Makefile
==============================================================================
--- head/audio/mangler/Makefile Tue Mar 5 16:47:25 2013 (r313459)
+++ head/audio/mangler/Makefile Tue Mar 5 17:07:43 2013 (r313460)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: mangler
-# Date created: 2010-10-18
-# Whom: Janik Galasso <janik at hikarihq.com>
-#
+# Created by: Janik Galasso <janik at hikarihq.com>
# $FreeBSD$
-#
PORTNAME= mangler
PORTVERSION= 1.2.3
@@ -30,21 +26,17 @@ USE_LDCONFIG= yes
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-OPTIONS= PULSEAUDIO "Adds support for the PulseAudio sound server" off
+OPTIONS_DEFINE= PULSEAUDIO
MAN1= mangler.1
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if ${OSVERSION} < 800000
-BROKEN= does not build
-.endif
-
-.if !defined(WITHOUT_PULSEAUDIO)
+.if ${PORT_OPTIONS:MPULSEAUDIO}
LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio
CONFIGURE_ARGS+=--with-pulseaudio
.else
CONFIGURE_ARGS+=--without-pulseaudio
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/audio/mpdbrowser/Makefile
==============================================================================
--- head/audio/mpdbrowser/Makefile Tue Mar 5 16:47:25 2013 (r313459)
+++ head/audio/mpdbrowser/Makefile Tue Mar 5 17:07:43 2013 (r313460)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: py-mpdbrowser
-# Date created: 2008-12-26
-# Whom: Henrik Friedrichsen <hrkfdn at gmail.com>
-#
+# Created by: Henrik Friedrichsen <hrkfdn at gmail.com>
# $FreeBSD$
-#
PORTNAME= mpdbrowser
PORTVERSION= 0.9.15
@@ -26,12 +22,14 @@ USE_PYTHON= yes
USE_PYDISTUTILS= yes
USE_GNOME= intltool pygtk2
-OPTIONS= MPD "Install Music Player Daemon" on
+OPTIONS_DEFINE= MPD
+OPTIONS_DEFAULT= MPD
+MPD_DESC= Install Music Player Daemon
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if defined (WITH_MPD)
+.if ${PORT_OPTIONS:MMPD}
RUN_DEPENDS+= musicpd:${PORTSDIR}/audio/musicpd
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/audio/snack/Makefile
==============================================================================
--- head/audio/snack/Makefile Tue Mar 5 16:47:25 2013 (r313459)
+++ head/audio/snack/Makefile Tue Mar 5 17:07:43 2013 (r313460)
@@ -1,10 +1,5 @@
-# ex:ts=8
-# New ports collection makefile for: snack
-# Date created: Nov 24, 2001
-# Whom: ijliao
-#
+# Created by: ijliao
# $FreeBSD$
-#
PORTNAME= snack
PORTVERSION= 2.2.10
@@ -20,17 +15,18 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/unix
USE_TK= 84+
-OPTIONS= VORBIS "Support for OGG/Vorbis Audio" off
+OPTIONS_DEFINE= VORBIS DOCS
GNU_CONFIGURE= yes
-.if !defined(NOPORTDOCS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
PORTDOCS= *
.endif
PLIST_SUB= SNACK_VER=${PORTVERSION:R}
-.include <bsd.port.pre.mk>
CONFIGURE_ARGS= --with-tcl=${TCL_LIBDIR} \
--with-tk=${TK_LIBDIR}
MAKE_ENV= prefix=${PREFIX} exec_prefix=${PREFIX}
@@ -38,7 +34,7 @@ MAKE_ENV= prefix=${PREFIX} exec_prefix=$
CFLAGS+= -I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} \
-I${LOCALBASE}/include
-.if defined(WITH_VORBIS)
+.if ${PORT_OPTIONS:MVORBIS}
LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis
CONFIGURE_ARGS+= --with-ogg-include=${LOCALBASE}/include \
--with-ogg-lib=${LOCALBASE}/lib
@@ -49,9 +45,9 @@ PLIST_SUB+= VORBIS="@comment "
.endif
post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/../doc/* ${DOCSDIR}
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/deskutils/cairo-dock-plugins/Makefile
==============================================================================
--- head/deskutils/cairo-dock-plugins/Makefile Tue Mar 5 16:47:25 2013 (r313459)
+++ head/deskutils/cairo-dock-plugins/Makefile Tue Mar 5 17:07:43 2013 (r313460)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: cairo-dock-plugins
-# Date created: 2010-03-19
-# Whom: Ivan Klymenko <fidaj at ukr.net>
-#
+# Created by: Ivan Klymenko <fidaj at ukr.net>
# $FreeBSD$
-#
PORTNAME= cairo-dock-plugins
DISTVERSION= 2.3.0~3
@@ -36,19 +32,24 @@ USE_GCC= 4.6+
MAKE_JOBS_SAFE= YES
PLIST_SUB+= PYVER="${PYTHON_VERSION:S/thon//}"
-OPTIONS= GMENU "Common Applications menu" On \
- KEYBOARD_INDICATOR "Control the keyboard layout" Off \
- TERMINAL "Add a terminal to your dock" On \
- WEBLETS "To show an interactive web page" On \
- XFCE_INTEGRATION "For XFCE environnement" Off \
- ALSA_MIXER "For ALSA compatibility utils" Off
+
+
+OPTIONS_DEFINE= GMENU KEYBOARD_INDICATOR TERMINAL WEBLETS \
+ XFCE_INTEGRATION ALSA_MIXER
+OPTIONS_DEFAULT= GMENU TERMINAL WEBLETS
+GMENU_DESC= Common Applications menu
+KEYBOARD_INDICATOR_DESC= Control the keyboard layout
+TERMINAL_DESC= Add a terminal to your dock
+WEBLETS_DESC= To show an interactive web page
+XFCE_INTEGRATION_DESC= For XFCE environnement
+ALSA_MIXER_DESC= For ALSA compatibility utils
.include <bsd.port.options.mk>
post-patch:
@${CP} -R ${WRKDIR}/${ICONS_PACKAGE}/* ${WRKSRC}
-.if defined(WITH_GMENU)
+.if ${PORT_OPTIONS:MGMENU}
LIB_DEPENDS+= gnome-menu.2:${PORTSDIR}/x11/gnome-menus
CMAKE_ARGS+= -Denable_gmenu:STRING=yes
PLIST_SUB+= GMENU=""
@@ -57,7 +58,7 @@ CMAKE_ARGS+= -Denable_gmenu:STRING=no
PLIST_SUB+= GMENU="@comment "
.endif
-.if defined(WITH_KEYBOARD_INDICATOR)
+.if ${PORT_OPTIONS:MKEYBOARD_INDICATOR}
LIB_DEPENDS+= exif.12:${PORTSDIR}/graphics/libexif \
xklavier.12:${PORTSDIR}/x11/libxklavier
CMAKE_ARGS+= -Denable_keyboard_indicator:STRING=yes
@@ -67,7 +68,7 @@ CMAKE_ARGS+= -Denable_keyboard_indicator
PLIST_SUB+= KEYBOARD_INDICATOR="@comment "
.endif
-.if defined(WITH_TERMINAL)
+.if ${PORT_OPTIONS:MTERMINAL}
LIB_DEPENDS+= vte.9:${PORTSDIR}/x11-toolkits/vte
CMAKE_ARGS+= -Denable_terminal:STRING=yes
PLIST_SUB+= TERMINAL=""
@@ -76,7 +77,7 @@ CMAKE_ARGS+= -Denable_terminal:STRING=no
PLIST_SUB+= TERMINAL="@comment "
.endif
-.if defined(WITH_WEBLETS)
+.if ${PORT_OPTIONS:MWEBLETS}
LIB_DEPENDS+= webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2
CMAKE_ARGS+= -Denable_weblets:STRING=yes
PLIST_SUB+= WEBLETS=""
@@ -85,7 +86,7 @@ CMAKE_ARGS+= -Denable_weblets:STRING=no
PLIST_SUB+= WEBLETS="@comment "
.endif
-.if defined(WITH_XFCE_INTEGRATION)
+.if ${PORT_OPTIONS:MXFCE_INTEGRATION}
LIB_DEPENDS+= thunar-vfs-1.5:${PORTSDIR}/x11-fm/thunar \
exif.12:${PORTSDIR}/graphics/libexif
CMAKE_ARGS+= -Denable_xfce_integration:STRING=yes
@@ -95,7 +96,7 @@ CMAKE_ARGS+= -Denable_xfce_integration:S
PLIST_SUB+= XFCE_INTEGRATION="@comment "
.endif
-.if defined(WITH_ALSA_MIXER)
+.if ${PORT_OPTIONS:MALSA_MIXER}
LIB_DEPENDS+= asound.2:${PORTSDIR}/audio/alsa-lib
RUN_DEPENDS+= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins
CMAKE_ARGS+= -Denable_alsa_mixer:STRING=yes
Modified: head/deskutils/gdesklets/Makefile
==============================================================================
--- head/deskutils/gdesklets/Makefile Tue Mar 5 16:47:25 2013 (r313459)
+++ head/deskutils/gdesklets/Makefile Tue Mar 5 17:07:43 2013 (r313460)
@@ -15,7 +15,7 @@ USE_BZIP2= yes
LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop
-OPTIONS= GDBM "install py-gdbm instead py-bsddb for config storage" off
+OPTIONS_DEFINE= GDBM
WRKSRC= ${WRKDIR}/gDesklets-${PORTVERSION}
@@ -31,9 +31,9 @@ MAN1= ${PORTNAME}.1
CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if defined(WITH_GDBM)
+.if ${PORT_OPTIONS:MGDBM}
RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}gdbm>0:${PORTSDIR}/databases/py-gdbm
.else
RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}bsddb>0:${PORTSDIR}/databases/py-bsddb
@@ -47,4 +47,4 @@ post-install:
@-update-mime-database ${PREFIX}/share/mime
@${CAT} ${PKGMESSAGE}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/deskutils/global-menu/Makefile
==============================================================================
--- head/deskutils/global-menu/Makefile Tue Mar 5 16:47:25 2013 (r313459)
+++ head/deskutils/global-menu/Makefile Tue Mar 5 17:07:43 2013 (r313460)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: gnome-globalmenu
-# Date created: 27 February 2009
-# Whom: Gustavo Perez
-#
+# Created by: Gustavo Perez
# $FreeBSD$
-#
PORTNAME= gnome-globalmenu
PORTVERSION= 0.7.10
@@ -27,11 +23,12 @@ INSTALLS_ICONS= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-OPTIONS= XFCE4_PANEL "Xfce panel applet" Off
+OPTIONS_DEFINE= XFCE4_PANEL NLS
+XFCE4_PANEL_DESC= Xfce panel applet
.include <bsd.port.options.mk>
-.if defined(WITHOUT_XFCE4_PANEL)
+.if ${PORT_OPTIONS:MXFCE4_PANEL}
CONFIGURE_ARGS+= --without-xfce4-panel
PLIST_SUB+= XFCE4_PANEL="@comment "
.else
@@ -40,7 +37,7 @@ CONFIGURE_ARGS+= --with-xfce4-panel
PLIST_SUB+= XFCE4_PANEL=""
.endif
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
USE_GETTEXT= yes
PLIST_SUB+= NLS=""
.else
Modified: head/deskutils/moregroupware/Makefile
==============================================================================
--- head/deskutils/moregroupware/Makefile Tue Mar 5 16:47:25 2013 (r313459)
+++ head/deskutils/moregroupware/Makefile Tue Mar 5 17:07:43 2013 (r313460)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: deskutils/moregroupware
-# Date created: December 30th 2003
-# Whom: Rob Evers <rob at debank.tv>
-#
+# Created by: Rob Evers <rob at debank.tv>
# $FreeBSD$
-#
PORTNAME= moregroupware
PORTVERSION= 0.7.4
@@ -24,22 +20,22 @@ USE_PHP= curl \
WANT_PHP_MOD= yes
-OPTIONS= ADDONS "install additional workgroup features (addons)" off \
- POSTGRESQL "use PostgreSQL instead of MySQL" off
+OPTIONS_DEFINE= ADDONS PGSQL NLS
+ADDONS_DESC= install additional workgroup features (addons)
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
USE_GETTEXT= yes
.endif
-.if defined(WITH_POSTGRESQL)
+.if ${PORT_OPTIONS:MPGSQL}
RUN_DEPENDS+= ${LOCALBASE}/bin/psql:${PORTSDIR}/databases/postgresql74-server
.else
RUN_DEPENDS+= ${LOCALBASE}/bin/mysql:${PORTSDIR}/databases/mysql50-server
.endif
-.if defined (WITH_ADDONS)
+.if ${PORT_OPTIONS:MADDONS}
DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} \
${PORTNAME}-addons-${PORTVERSION}${EXTRACT_SUFX}
PLIST_SUB+= ADDONS=""
@@ -57,4 +53,4 @@ do-install:
post-install:
${CAT} ${PKGMESSAGE}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/deskutils/wyrd/Makefile
==============================================================================
--- head/deskutils/wyrd/Makefile Tue Mar 5 16:47:25 2013 (r313459)
+++ head/deskutils/wyrd/Makefile Tue Mar 5 17:07:43 2013 (r313460)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: wyrd
-# Date created: Apr 5 2006
-# Whom: Russell A. Jackson <raj at csub.edu>
-#
+# Created by: Russell A. Jackson <raj at csub.edu>
# $FreeBSD$
-#
PORTNAME= wyrd
PORTVERSION= 1.4.5
@@ -18,7 +14,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/remind:${P
LICENSE= GPLv2
-OPTIONS= UTF8 "Enable UTF-8 support" off
+OPTIONS_DEFINE= UTF8
GNU_CONFIGURE= yes
USE_GMAKE= yes
@@ -27,9 +23,9 @@ USE_NCURSES= yes
MAN1= wyrd.1
MAN5= wyrdrc.5
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if defined(WITH_UTF8)
+.if ${PORT_OPTIONS:MUTF8}
CONFIGURE_ARGS+=--enable-utf8
.else
CONFIGURE_ARGS+=--disable-utf8
@@ -41,10 +37,10 @@ do-install:
${INSTALL_MAN} ${WRKSRC}/doc/wyrd.1 ${MAN1PREFIX}/man/man1
${INSTALL_MAN} ${WRKSRC}/doc/wyrdrc.5 ${MAN5PREFIX}/man/man5
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/doc/manual.html ${DOCSDIR}/
${INSTALL_DATA} ${WRKSRC}/doc/manual.pdf ${DOCSDIR}/
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/devel/phpsh/Makefile
==============================================================================
--- head/devel/phpsh/Makefile Tue Mar 5 16:47:25 2013 (r313459)
+++ head/devel/phpsh/Makefile Tue Mar 5 17:07:43 2013 (r313460)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: phpsh
-# Date created: 2011-08-22
-# Whom: Ashish SHUKLA <ashish at FreeBSD.org>
-#
+# Created by: Ashish SHUKLA <ashish at FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= phpsh
PORTVERSION= 20110513
@@ -28,16 +24,15 @@ PYDISTUTILS_PKGVERSION= 1.3
MAN1= phpsh.1
-OPTIONS= PCNTL "Fork on every command (requires PHP extension pcntl)" OFF
+OPTIONS_DEFINE= PCNTL
+PCNTL_DESC= Fork on every command (pcntl PHP extension)
.include <bsd.port.options.mk>
-.if defined(WITH_PCNTL)
+.if ${PORT_OPTIONS:MPCNTL}
USE_PHP+= pcntl
.endif
-.include <bsd.port.pre.mk>
-
post-patch:
@${GREP} -Rl '%%PREFIX%%' ${WRKSRC} |${XARGS} ${REINPLACE_CMD} \
-e 's,%%PREFIX%%,${PREFIX},g'
@@ -45,4 +40,4 @@ post-patch:
post-install:
@${CAT} ${PKGMESSAGE}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/graphics/jdraw/Makefile
==============================================================================
--- head/graphics/jdraw/Makefile Tue Mar 5 16:47:25 2013 (r313459)
+++ head/graphics/jdraw/Makefile Tue Mar 5 17:07:43 2013 (r313460)
@@ -16,7 +16,9 @@ COMMENT= A pixel oriented graphics edito
NO_BUILD= yes
USE_JAVA= yes
-OPTIONS= PLASTIC3D "Use Plastic3DLook&Feel" on
+OPTIONS_DEFINE= PLASTIC3D
+OPTIONS_DEFAULT= PLASTIC3D
+PLASTIC3D_DESC= Use Plastic3DLook&Feel
DATADIR= ${JAVASHAREDIR}/${PORTNAME}
SUB_FILES= ${PORTNAME}
@@ -29,12 +31,12 @@ do-install:
${INSTALL_DATA} ${DISTDIR}/${DISTFILES} ${DATADIR}
${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if defined(WITH_PLASTIC3D)
+.if ${PORT_OPTIONS:MPLASTIC3D}
PLASTIC3D= "-Dlf=\"com.jgoodies.looks.plastic.Plastic3DLookAndFeel\""
RUN_DEPENDS+= ${JAVAJARDIR}/looks.jar:${PORTSDIR}/devel/looks
.endif
JAVA_VERSION= 1.6+
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/graphics/tgif/Makefile
==============================================================================
--- head/graphics/tgif/Makefile Tue Mar 5 16:47:25 2013 (r313459)
+++ head/graphics/tgif/Makefile Tue Mar 5 17:07:43 2013 (r313460)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: tgif
-# Date created: 30 Jan 1999
-# Whom: bmc at WillsCreek.COM
-#
+# Created by: bmc at WillsCreek.COM
# $FreeBSD$
-#
PORTNAME= tgif
PORTVERSION= 4.2.2
@@ -19,8 +15,8 @@ COMMENT= An Xlib-based two-dimensional d
RUN_DEPENDS= giftopnm:${PORTSDIR}/graphics/netpbm
-OPTIONS= NLS "Enable native language support" on \
- A4SIZE "Set default paper size to A4" off
+OPTIONS_DEFINE= NLS A4SIZE DOCS
+A4SIZE_DESC= Set default paper size to A4
USE_GCC= any
USE_IMAKE= yes
@@ -31,16 +27,16 @@ CFLAGS+= ${PTHREAD_CFLAGS}
MAN1= tgif.1
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
USE_GETTEXT= yes
IMAKEDEFINES+= WITH_NLS
PLIST_SUB= NLS=""
.else
PLIST_SUB= NLS="@comment "
.endif
-.if defined(WITH_A4SIZE)
+.if ${PORT_OPTIONS:MA4SIZE}
IMAKEDEFINES+= WITH_A4SIZE
.endif
@@ -65,9 +61,9 @@ post-install:
cd ${WRKSRC}/${D:S/demo//} \
&& ${INSTALL_DATA} ${EXAMPLES.${D}} ${EXAMPLESDIR}/${D}
.endfor
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/mail/extman/Makefile
==============================================================================
--- head/mail/extman/Makefile Tue Mar 5 16:47:25 2013 (r313459)
+++ head/mail/extman/Makefile Tue Mar 5 17:07:43 2013 (r313460)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: extman
-# Date created: 3 April 2007
-# Whom: Chifeng QU <chifeng at gmail.com>
-#
+# Created by: Chifeng QU <chifeng at gmail.com>
# $FreeBSD$
-#
PORTNAME= extman
PORTVERSION= 1.1
@@ -20,16 +16,16 @@ RUN_DEPENDS= p5-GD>=0:${PORTSDIR}/graphi
USE_PERL5= yes
NO_BUILD= yes
-OPTIONS= MySQL "Use MySQL support" On \
- LDAP "Use LDAP support" Off
+OPTIONS_DEFINE= MYSQL LDAP
+OPTIONS_DEFAULT= MYSQL
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if defined(WITH_MySQL)
+.if ${PORT_OPTIONS:MMYSQL}
RUN_DEPENDS+= p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
.endif
-.if defined(WITH_LDAP)
+.if ${PORT_OPTIONS:MLDAP}
RUN_DEPENDS+= p5-DBD-LDAP>=0:${PORTSDIR}/databases/p5-DBD-LDAP
.endif
@@ -66,4 +62,4 @@ post-install:
${CHMOD} +w ${WWWDIR}/webman.cf ; \
fi
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/math/kash3/Makefile
==============================================================================
--- head/math/kash3/Makefile Tue Mar 5 16:47:25 2013 (r313459)
+++ head/math/kash3/Makefile Tue Mar 5 17:07:43 2013 (r313460)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: kash3
-# Date created: 2006-02-26
-# Whom: Nicola Vitale <nivit at email.it>
-#
+# Created by: Nicola Vitale <nivit at email.it>
# $FreeBSD$
-#
PORTNAME= kash3
PORTVERSION= 2008.07.31
@@ -20,7 +16,9 @@ RUN_DEPENDS= curl:${PORTSDIR}/ftp/curl
NO_CDROM= not for commercial distribution or use
NO_BUILD= yes
-OPTIONS= OPTLIB "Install optional functions library" on
+OPTIONS_DEFINE= OPTLIB DOCS
+OPTIONS_DEFAULT= OPTLIB
+OPTLIB_DESC= Install optional functions library
PLIST_SUB= OPTLIB=${OPTLIB}
@@ -35,16 +33,16 @@ FIND_DATA= -type f -mindepth 1 -exec ${I
FIND_DIRS= -type d -exec ${MKDIR} ${DATADIR}/{} \;
FIND_HERE= data gap lib
-.if !defined(NOPORTDOCS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
FIND_HERE+= html pdf
.endif
LN_OPTS= -sf
ELFTYPE= Linux
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_OPTLIB)
+.if ${PORT_OPTIONS:MOPTLIB}
DISTFILES+= ${PORTNAME:U}-lib-archindep-${PORTVERSION:S|.|-|g}.tar.bz2
OPTLIB=
.else
@@ -53,7 +51,7 @@ OPTLIB= "@comment "
do-install:
${MKDIR} ${DATADIR};
-.if defined(WITH_OPTLIB)
+.if ${PORT_OPTIONS:MOPTLIB}
cd ${WRKDIR}/${PORTNAME:U}-lib-archindep-${PORTVERSION:S|.|-|g}; \
${COPYTREE_SHARE} . ${DATADIR}
.endif
@@ -63,9 +61,9 @@ do-install:
${BRANDELF} -t ${ELFTYPE} ${PORTNAME}; \
${INSTALL_PROGRAM} ${PORTNAME} ${DATADIR}/${PORTNAME};
${INSTALL_SCRIPT} ${WRKDIR}/${SUB_FILES} ${PREFIX}/bin/${PORTNAME}
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${DOCSDIR}; \
${MV} ${DATADIR}/html ${DATADIR}/pdf ${DOCSDIR}
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/math/parmetis/Makefile
==============================================================================
--- head/math/parmetis/Makefile Tue Mar 5 16:47:25 2013 (r313459)
+++ head/math/parmetis/Makefile Tue Mar 5 17:07:43 2013 (r313460)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: ParMETIS
-# Date created: 19 May 99
-# Whom: Eoin Lawless (eoin at maths.tcd.ie)
-#
+# Created by: Eoin Lawless (eoin at maths.tcd.ie)
# $FreeBSD$
-#
PORTNAME= ParMetis
PORTVERSION= 4.0
@@ -21,7 +17,8 @@ LICENSE_NAME= University of Minnesota ME
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
LICENSE_PERMS= auto-accept
-OPTIONS= OPENMPI "Use openmpi instead of mpich2" off
+OPTIONS_DEFINE= OPENMPI DOCS
+OPENMPI_DESC= Use openmpi instead of mpich2
USE_CMAKE= yes
USE_GMAKE= yes
@@ -31,9 +28,9 @@ PLIST_FILES= include/parmetis/parmetis.h
lib/parmetis/libmetis.a lib/parmetis/libparmetis.a
PLIST_DIRS= include/parmetis lib/parmetis
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if defined(WITH_OPENMPI)
+.if ${PORT_OPTIONS:MOPENMPI}
BUILD_DEPENDS+= ${LOCALBASE}/mpi/openmpi/bin/mpicc:${PORTSDIR}/net/openmpi
RUN_DEPENDS+= ${LOCALBASE}/mpi/openmpi/bin/mpirun:${PORTSDIR}/net/openmpi
MPICC= ${LOCALBASE}/mpi/openmpi/bin/mpicc
@@ -60,9 +57,9 @@ do-install:
@${MKDIR} ${PREFIX}/lib/parmetis
${INSTALL_DATA} ${WRKSRC}/build/libmetis/libmetis.a ${PREFIX}/lib/parmetis
${INSTALL_DATA} ${WRKSRC}/build/libparmetis/libparmetis.a ${PREFIX}/lib/parmetis
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/manual/manual.pdf ${DOCSDIR}
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/math/pspp/Makefile
==============================================================================
--- head/math/pspp/Makefile Tue Mar 5 16:47:25 2013 (r313459)
+++ head/math/pspp/Makefile Tue Mar 5 17:07:43 2013 (r313460)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: pspp
-# Date created: 22 Apr 2000
-# Whom: Andrew L. Neporada <andrew at chg.ru>
-#
+# Created by: Andrew L. Neporada <andrew at chg.ru>
# $FreeBSD$
-#
PORTNAME= pspp
PORTVERSION= 0.6.2
@@ -17,8 +13,7 @@ COMMENT= Program for statistical analysi
LIB_DEPENDS= plot.4:${PORTSDIR}/graphics/plotutils \
gslcblas.0:${PORTSDIR}/math/gsl
-OPTIONS= GUI "Build the PSPPIRE gui" off \
- PGSQL "Compile in PostgreSQL capability" off
+OPTIONS_DEFINE= GUI PGSQL
USE_GNOME= libxml2
USE_PERL5_BUILD=yes
@@ -32,17 +27,17 @@ INFO= pspp pspp-dev
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+= --disable-nls
-PLIST_SUB+= NLS="@comment "
-.else
+.if ${PORT_OPTIONS:MNLS}
USE_GETTEXT= yes
PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS+= --disable-nls
+PLIST_SUB+= NLS="@comment "
.endif
-.if defined(WITH_GUI)
+.if ${PORT_OPTIONS:MGUI}
LIB_DEPENDS+= gladeui-1:${PORTSDIR}/devel/glade3
RUN_DEPENDS+= yelp:${PORTSDIR}/x11/yelp
USE_GNOME+= libglade2
@@ -53,7 +48,7 @@ CONFIGURE_ARGS+= --without-gui
PLIST_SUB+= GUI="@comment "
.endif
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
USE_PGSQL= yes
.else
CONFIGURE_ARGS+= --without-libpq
@@ -65,4 +60,4 @@ post-patch:
post-install:
@${TOUCH} ${PREFIX}/lib/pspp/.keep_me
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/net-im/pidgin-sipe/Makefile
==============================================================================
--- head/net-im/pidgin-sipe/Makefile Tue Mar 5 16:47:25 2013 (r313459)
+++ head/net-im/pidgin-sipe/Makefile Tue Mar 5 17:07:43 2013 (r313460)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: pidgin-sipe
-# Date created: 7 May 2009
-# Whom: John Prather
-#
+# Created by: John Prather
# $FreeBSD$
-#
PORTNAME= pidgin-sipe
PORTVERSION= 1.13.1
@@ -28,19 +24,20 @@ PORTDOCS= AUTHORS ChangeLog COPYING HACK
CFLAGS+= "-I/${LOCALBASE}/include"
LIBS+= "-L/${LOCALBASE}/lib"
-OPTIONS= OSC2005 "Message timeout for OCS2005" off \
- KRB5 "With Kerberos5" off
+OPTIONS_DEFINE= OCS2005 KRB5 DOCS NLS
+OSC2005_DESC= Message timeout for OCS2005
+KRB5_DESC= With Kerberos5
CONFIGURE_ARGS+= --enable-purple \
--disable-telepathy
.include <bsd.port.options.mk>
-.if defined(WITH_OSC2005)
+.if ${PORT_OPTIONS:MOSC2005}
CONFIGURE_ARGS+= --enable-ocs2005-message-hack
.endif
-.if defined(WITHOUT_KRB5)
+.if ${PORT_OPTIONS:MKRB5}
CONFIGURE_ARGS+= --without-krb5
.endif
@@ -48,7 +45,7 @@ CONFIGURE_ENV+= LIBS="${LIBS}" \
COM_ERR_CFLAGS="-I/usr/include" \
COM_ERR_LIBS="-L/usr/lib -lcom_err"
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
post-install:
${MKDIR} ${DOCSDIR}
.for docs in ${PORTDOCS}
@@ -56,7 +53,7 @@ post-install:
.endfor
.endif
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
USE_GETTEXT= yes
PLIST_SUB+= NLS=""
.else
Modified: head/net-im/zephyr/Makefile
==============================================================================
--- head/net-im/zephyr/Makefile Tue Mar 5 16:47:25 2013 (r313459)
+++ head/net-im/zephyr/Makefile Tue Mar 5 17:07:43 2013 (r313460)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: zephyr
-# Date created: 12 November 2009
-# Whom: Ben Kaduk <kaduk at mit.edu>
-#
+# Created by: Ben Kaduk <kaduk at mit.edu>
# $FreeBSD$
-#
PORTNAME= zephyr
DISTVERSION= 3.0.1
@@ -25,11 +21,11 @@ USE_ICONV= yes
MAN1= zephyr.1 zaway.1 zctl.1 zleave.1 zlocate.1 znol.1 zwrite.1 zwgc.1
MAN8= zhm.8 zephyrd.8 zstat.8 zshutdown_notify.8
-OPTIONS= HEIMDAL "Use Heimdal Kerberos for ss/com_err" off
+OPTIONS_DEFINE= HEIMDAL
.include <bsd.port.options.mk>
-.if defined(WITH_HEIMDAL)
+.if ${PORT_OPTIONS:MHEIMDAL}
BROKEN= bad depobj
LIB_DEPENDS+= ss.1:${PORTSDIR}/security/heimdal
.if defined(HEIMDAL_HOME)
Modified: head/net/apinger/Makefile
==============================================================================
--- head/net/apinger/Makefile Tue Mar 5 16:47:25 2013 (r313459)
+++ head/net/apinger/Makefile Tue Mar 5 17:07:43 2013 (r313460)
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for: apinger
-# Date created: Tue Jul 17, 2002
-# Whom: Michael L. Hostbaek (mich at freebsdcluster.org)
-#
+# Created by: Michael L. Hostbaek (mich at freebsdcluster.org)
# $FreeBSD$
-#
PORTNAME= apinger
PORTVERSION= 0.6.1
@@ -20,27 +15,25 @@ GNU_CONFIGURE= yes
USE_RC_SUBR= apinger
SUB_FILES= pkg-message
-OPTIONS= IPV6 "With support for IPv6" on
+OPTIONS_DEFINE= IPV6
.include <bsd.port.options.mk>
-.if !defined(WITH_IPV6)
+.if !${PORT_OPTIONS:MIPV6}
CONFIGURE_ARGS+= --disable-ipv6
.endif
-.include <bsd.port.pre.mk>
-
post-install:
${INSTALL_DATA} ${WRKSRC}/src/apinger.conf ${PREFIX}/etc/apinger.conf.sample
.if !defined(BATCH)
@${CAT} ${PKGMESSAGE}
.endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/README
${INSTALL_DATA} ${WRKSRC}/NEWS ${DOCSDIR}/NEWS
${INSTALL_DATA} ${WRKSRC}/AUTHORS ${DOCSDIR}/AUTHORS
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/net/bmon/Makefile
==============================================================================
--- head/net/bmon/Makefile Tue Mar 5 16:47:25 2013 (r313459)
+++ head/net/bmon/Makefile Tue Mar 5 17:07:43 2013 (r313460)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: bmon
-# Date created: 21 Feb 2003
-# Whom: Jon Nistor <nistor at snickers.org>
-#
+# Created by: Jon Nistor <nistor at snickers.org>
# $FreeBSD$
-#
PORTNAME= bmon
PORTVERSION= 2.1.0
@@ -14,8 +10,10 @@ MASTER_SITES= http://people.suug.ch/~tgr
MAINTAINER= nistor at snickers.org
COMMENT= Portable bandwidth monitor and rate estimator
-OPTIONS= RRDTOOL "Enable RRD support" Off \
- DBI "Enable DBI support" On
+OPTIONS_DEFINE= DBI RRDTOOL
+OPTIONS_DEFAULT= DBI
+DBI_DESC= LibDBI output module for rsyslog
+RRDTOOL_DESC= Usage graphs support
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
@@ -27,15 +25,15 @@ MAKEFILE= GNUmakefile
MAN1= bmon.1
PLIST_FILES= sbin/bmon
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if defined(WITH_RRDTOOL)
+.if ${PORT_OPTIONS:MRRDTOOL}
BUILD_DEPENDS= rrdtool:${PORTSDIR}/databases/rrdtool
.else
CONFIGURE_ARGS+=--disable-rrd
.endif
-.if defined(WITH_DBI)
+.if ${PORT_OPTIONS:MDBI}
LIB_DEPENDS= dbi.1:${PORTSDIR}/databases/libdbi
.else
CONFIGURE_ARGS+=--disable-dbi
@@ -45,4 +43,4 @@ do-install:
${INSTALL_PROGRAM} ${WRKSRC}/src/bmon ${PREFIX}/sbin
${INSTALL_MAN} ${WRKSRC}/man/bmon.1 ${PREFIX}/man/man1/bmon.1
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/net/echoping/Makefile
==============================================================================
--- head/net/echoping/Makefile Tue Mar 5 16:47:25 2013 (r313459)
+++ head/net/echoping/Makefile Tue Mar 5 17:07:43 2013 (r313460)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: echoping
-# Date created: 13 April 1997
-# Whom: peter
-#
+# Created by: peter
# $FreeBSD$
-#
PORTNAME= echoping
PORTVERSION= 6.0.0
@@ -20,22 +16,19 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/po
USE_OPENSSL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-http --enable-icp --enable-smtp --with-ssl \
- --enable-ttcp --enable-tos --with-libidn=${LOCALBASE}
+ --enable-ttcp --enable-tos --with-libidn=${LOCALBASE} \
+ --enable-plugin="${PING_PLUGINS}"
PING_PLUGINS= dns random whois
MAN1= echoping.1 echoping_dns.1 echoping_random.1 echoping_whois.1
-OPTIONS= LDAP "Enable LDAP plug-in" on \
- PGSQL "Enable PostgreSQL plug-in" off
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-head
mailing list