diff options
46 files changed, 322 insertions, 457 deletions
diff --git a/audio/libumidi/Makefile b/audio/libumidi/Makefile index ee2984f885c8..bcfcff19bbd8 100644 --- a/audio/libumidi/Makefile +++ b/audio/libumidi/Makefile @@ -1,9 +1,5 @@ -# Ports collection makefile for: libumidi -# Date created: 21 June 2011 -# Whom: Hans Petter Selasky <hselasky@FreeBSD.org> -# +# Created by: Hans Petter Selasky <hselasky@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 diff --git a/audio/lingot/Makefile b/audio/lingot/Makefile index 25a2e11082b0..b6a06458acda 100644 --- a/audio/lingot/Makefile +++ b/audio/lingot/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: lingot -# Date created: 2011-10-17 -# Whom: Bartoletti <coder@tuxfamily.org> -# +# Created by: Bartoletti <coder@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 diff --git a/audio/mangler/Makefile b/audio/mangler/Makefile index e63dc456713d..86da8428506f 100644 --- a/audio/mangler/Makefile +++ b/audio/mangler/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: mangler -# Date created: 2010-10-18 -# Whom: Janik Galasso <janik@hikarihq.com> -# +# Created by: Janik Galasso <janik@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> diff --git a/audio/mpdbrowser/Makefile b/audio/mpdbrowser/Makefile index 6ca3e29463c4..ad8b331bf513 100644 --- a/audio/mpdbrowser/Makefile +++ b/audio/mpdbrowser/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: py-mpdbrowser -# Date created: 2008-12-26 -# Whom: Henrik Friedrichsen <hrkfdn@gmail.com> -# +# Created by: Henrik Friedrichsen <hrkfdn@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> diff --git a/audio/snack/Makefile b/audio/snack/Makefile index d6998ad73690..d536f8bdbac8 100644 --- a/audio/snack/Makefile +++ b/audio/snack/Makefile @@ -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=${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> diff --git a/deskutils/cairo-dock-plugins/Makefile b/deskutils/cairo-dock-plugins/Makefile index 07180bcb482f..f520c64d058f 100644 --- a/deskutils/cairo-dock-plugins/Makefile +++ b/deskutils/cairo-dock-plugins/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: cairo-dock-plugins -# Date created: 2010-03-19 -# Whom: Ivan Klymenko <fidaj@ukr.net> -# +# Created by: Ivan Klymenko <fidaj@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:STRING=no 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:STRING=no 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 diff --git a/deskutils/gdesklets/Makefile b/deskutils/gdesklets/Makefile index 63715bcf440f..50e6a4b9f51e 100644 --- a/deskutils/gdesklets/Makefile +++ b/deskutils/gdesklets/Makefile @@ -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> diff --git a/deskutils/global-menu/Makefile b/deskutils/global-menu/Makefile index ccecea2510ec..1eb20290e4d2 100644 --- a/deskutils/global-menu/Makefile +++ b/deskutils/global-menu/Makefile @@ -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 diff --git a/deskutils/moregroupware/Makefile b/deskutils/moregroupware/Makefile index 3627cd77dbdf..67bbcfe6aef3 100644 --- a/deskutils/moregroupware/Makefile +++ b/deskutils/moregroupware/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: deskutils/moregroupware -# Date created: December 30th 2003 -# Whom: Rob Evers <rob@debank.tv> -# +# Created by: Rob Evers <rob@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> diff --git a/deskutils/wyrd/Makefile b/deskutils/wyrd/Makefile index 53653d62fbac..81d014b0ba81 100644 --- a/deskutils/wyrd/Makefile +++ b/deskutils/wyrd/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: wyrd -# Date created: Apr 5 2006 -# Whom: Russell A. Jackson <raj@csub.edu> -# +# Created by: Russell A. Jackson <raj@csub.edu> # $FreeBSD$ -# PORTNAME= wyrd PORTVERSION= 1.4.5 @@ -18,7 +14,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/remind:${PORTSDIR}/deskutils/remind 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> diff --git a/devel/phpsh/Makefile b/devel/phpsh/Makefile index f0bbae35e27d..efaafa645c27 100644 --- a/devel/phpsh/Makefile +++ b/devel/phpsh/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: phpsh -# Date created: 2011-08-22 -# Whom: Ashish SHUKLA <ashish@FreeBSD.org> -# +# Created by: Ashish SHUKLA <ashish@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> diff --git a/graphics/jdraw/Makefile b/graphics/jdraw/Makefile index fc71d4142bf1..deaad307b137 100644 --- a/graphics/jdraw/Makefile +++ b/graphics/jdraw/Makefile @@ -16,7 +16,9 @@ COMMENT= A pixel oriented graphics editor 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> diff --git a/graphics/tgif/Makefile b/graphics/tgif/Makefile index aead77ddd840..c5964ed64e33 100644 --- a/graphics/tgif/Makefile +++ b/graphics/tgif/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: tgif -# Date created: 30 Jan 1999 -# Whom: bmc@WillsCreek.COM -# +# Created by: bmc@WillsCreek.COM # $FreeBSD$ -# PORTNAME= tgif PORTVERSION= 4.2.2 @@ -19,8 +15,8 @@ COMMENT= An Xlib-based two-dimensional drawing tool and hyper-object browser 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> diff --git a/mail/extman/Makefile b/mail/extman/Makefile index 96cd6c3cf263..42658bb75aa5 100644 --- a/mail/extman/Makefile +++ b/mail/extman/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: extman -# Date created: 3 April 2007 -# Whom: Chifeng QU <chifeng@gmail.com> -# +# Created by: Chifeng QU <chifeng@gmail.com> # $FreeBSD$ -# PORTNAME= extman PORTVERSION= 1.1 @@ -20,16 +16,16 @@ RUN_DEPENDS= p5-GD>=0:${PORTSDIR}/graphics/p5-GD 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> diff --git a/math/kash3/Makefile b/math/kash3/Makefile index 5b24daa7a3cd..ba539b230633 100644 --- a/math/kash3/Makefile +++ b/math/kash3/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: kash3 -# Date created: 2006-02-26 -# Whom: Nicola Vitale <nivit@email.it> -# +# Created by: Nicola Vitale <nivit@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 ${INSTALL_DATA} {} ${DATADIR}/{} \; 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> diff --git a/math/parmetis/Makefile b/math/parmetis/Makefile index ce3ee812a496..b342345827ea 100644 --- a/math/parmetis/Makefile +++ b/math/parmetis/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: ParMETIS -# Date created: 19 May 99 -# Whom: Eoin Lawless (eoin@maths.tcd.ie) -# +# Created by: Eoin Lawless (eoin@maths.tcd.ie) # $FreeBSD$ -# PORTNAME= ParMetis PORTVERSION= 4.0 @@ -21,7 +17,8 @@ LICENSE_NAME= University of Minnesota METIS License 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> diff --git a/math/pspp/Makefile b/math/pspp/Makefile index 0966e33dfdf4..39e64483ada8 100644 --- a/math/pspp/Makefile +++ b/math/pspp/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: pspp -# Date created: 22 Apr 2000 -# Whom: Andrew L. Neporada <andrew@chg.ru> -# +# Created by: Andrew L. Neporada <andrew@chg.ru> # $FreeBSD$ -# PORTNAME= pspp PORTVERSION= 0.6.2 @@ -17,8 +13,7 @@ COMMENT= Program for statistical analysis of sampled data 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> diff --git a/net-im/pidgin-sipe/Makefile b/net-im/pidgin-sipe/Makefile index e19113968700..bb0b633301fe 100644 --- a/net-im/pidgin-sipe/Makefile +++ b/net-im/pidgin-sipe/Makefile @@ -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 HACKING INSTALL NEWS README TODO VERSION 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 diff --git a/net-im/zephyr/Makefile b/net-im/zephyr/Makefile index 112f473a8f13..e0aa06e409d0 100644 --- a/net-im/zephyr/Makefile +++ b/net-im/zephyr/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: zephyr -# Date created: 12 November 2009 -# Whom: Ben Kaduk <kaduk@mit.edu> -# +# Created by: Ben Kaduk <kaduk@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) diff --git a/net/apinger/Makefile b/net/apinger/Makefile index cc5a3fa3570e..c22634b48e85 100644 --- a/net/apinger/Makefile +++ b/net/apinger/Makefile @@ -1,10 +1,5 @@ -# ex:ts=8 -# Ports collection makefile for: apinger -# Date created: Tue Jul 17, 2002 -# Whom: Michael L. Hostbaek (mich@freebsdcluster.org) -# +# Created by: Michael L. Hostbaek (mich@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> diff --git a/net/bmon/Makefile b/net/bmon/Makefile index 7aae791a3220..ae7fdf145d72 100644 --- a/net/bmon/Makefile +++ b/net/bmon/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: bmon -# Date created: 21 Feb 2003 -# Whom: Jon Nistor <nistor@snickers.org> -# +# Created by: Jon Nistor <nistor@snickers.org> # $FreeBSD$ -# PORTNAME= bmon PORTVERSION= 2.1.0 @@ -14,8 +10,10 @@ MASTER_SITES= http://people.suug.ch/~tgr/bmon/files/ MAINTAINER= nistor@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> diff --git a/net/echoping/Makefile b/net/echoping/Makefile index 8ecd2a0011c7..1fd3251878ec 100644 --- a/net/echoping/Makefile +++ b/net/echoping/Makefile @@ -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/popt \ 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 +OPTIONS_DEFINE= LDAP PGSQL +OPTIONS_DEFAULT= LDAP -.include <bsd.port.pre.mk> - -.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" -BROKEN= Does not link on ia64 or powerpc -.endif +.include <bsd.port.options.mk> -.if defined(WITH_LDAP) +.if ${PORT_OPTIONS:MLDAP} USE_OPENLDAP= yes MAN1+= echoping_ldap.1 PING_PLUGINS+= ldap @@ -44,7 +37,7 @@ PLIST_SUB= WITH_LDAP="" PLIST_SUB= WITH_LDAP="@comment " .endif -.if defined(WITH_PGSQL) +.if ${PORT_OPTIONS:MPGSQL} USE_PGSQL= yes MAN1+= echoping_postgresql.1 PING_PLUGINS+= postgresql @@ -53,7 +46,11 @@ PLIST_SUB+= WITH_PGSQL="" PLIST_SUB+= WITH_PGSQL="@comment " .endif -CONFIGURE_ARGS+=--enable-plugin="${PING_PLUGINS}" +.include <bsd.port.pre.mk> + +.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" +BROKEN= Does not link on ia64 or powerpc +.endif post-patch: @${FIND} ${WRKSRC} -name configure | ${XARGS} ${REINPLACE_CMD} -e 's|echo aout|echo elf|' diff --git a/net/ifstat/Makefile b/net/ifstat/Makefile index 08fd0a479ed4..e1d13a7e33d3 100644 --- a/net/ifstat/Makefile +++ b/net/ifstat/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: ifstat -# Date created: 30 Mar 2003 -# Whom: spf@xslt.cs.nccu.edu.tw -# +# Created by: spf@xslt.cs.nccu.edu.tw # $FreeBSD$ -# PORTNAME= ifstat PORTVERSION= 1.1 @@ -18,17 +14,17 @@ COMMENT= Network interface statistics monitoring tool GNU_CONFIGURE= yes USE_OPENSSL= yes -OPTIONS= SNMP "SNMP support" off +OPTIONS_DEFINE= SNMP MAN1= ifstat.1 PLIST_FILES= bin/ifstat -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_SNMP) +.if ${PORT_OPTIONS:MSNMP} LIB_DEPENDS+= netsnmp.30:${PORTSDIR}/net-mgmt/net-snmp .else CONFIGURE_ARGS+= --without-snmp .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/ng_mikrotik_eoip/Makefile b/net/ng_mikrotik_eoip/Makefile index 36ec66a97de3..b84903e7fd5e 100644 --- a/net/ng_mikrotik_eoip/Makefile +++ b/net/ng_mikrotik_eoip/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: ng_mikrotik_eoip -# Date created: 19 Dec 2011 -# Whom: Maxim Ignatenko -# +# Created by: Maxim Ignatenko # $FreeBSD$ -# PORTNAME= ng_mikrotik_eoip PORTVERSION= 1.0 @@ -16,7 +12,8 @@ COMMENT= Netgraph node for Mikrotik EoIP tunneling LICENSE= BSD -OPTIONS= PTABLE "Use O(1) lookup for tunnel hooks" OFF +OPTIONS_DEFINE= PTABLE +PTABLE_DESC= Use O(1) lookup for tunnel hooks # This option enables usage of static pointer table to find needed decimal-named hook, # which increases memory usage for each node by 65536*sizeof(hook_p). You probably want # this option if you have many tunnels with single remote IP. @@ -31,7 +28,7 @@ PLIST_SUB+= KMODDIR=${KMODDIR} \ IGNORE= requires kernel source files .endif -.if defined(WITH_PTABLE) +.if ${PORT_OPTIONS:MPTABLE} MAKE_ARGS+= NO_LINEAR_HOOK_LOOKUP=1 .endif diff --git a/net/remmina-applet/Makefile b/net/remmina-applet/Makefile index dafbc8d9dbc7..443f46dadf57 100644 --- a/net/remmina-applet/Makefile +++ b/net/remmina-applet/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: grdc-applet -# Date created: 12 April 2009 -# Whom: Alexander Logvinov <ports@logvinov.com> -# +# Created by: Alexander Logvinov <ports@logvinov.com> # $FreeBSD$ -# PORTNAME= remmina PORTVERSION= 0.8.1 @@ -18,7 +14,7 @@ COMMENT= A GNOME Desktop applet for Remmina RUN_DEPENDS= remmina:${PORTSDIR}/net/remmina -OPTIONS= AVAHI "Build with Avahi support" off +OPTIONS_DEFINE= AVAHI MAKE_JOBS_SAFE= yes GNU_CONFIGURE= yes @@ -30,20 +26,20 @@ LDFLAGS+= -L${LOCALBASE}/lib LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -.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_AVAHI) +.if ${PORT_OPTIONS:MAVAHI} LIB_DEPENDS+= avahi-ui.0:${PORTSDIR}/net/avahi-gtk .else CONFIGURE_ARGS+=--disable-avahi .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/shmux/Makefile b/net/shmux/Makefile index 3af1e252f517..2ead14b6b299 100644 --- a/net/shmux/Makefile +++ b/net/shmux/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: shmux -# Date created: 2 September 2004 -# Whom: jamundsen -# +# Created by: jamundsen # $FreeBSD$ -# PORTNAME= shmux DISTVERSION= 1.0.2 @@ -15,8 +11,9 @@ EXTRACT_SUFX= .tgz MAINTAINER= online@jamundsen.dyndns.org COMMENT= Utility to run commands on multiple hosts using shell commands -OPTIONS= FPING "Use fping utility" on \ - PCRE "Use perl regular expressions library" off +OPTIONS_DEFINE= FPING PCRE +OPTIONS_DEFAULT= FPING +FPING_DESC= Use fping utility GNU_CONFIGURE= yes CONFIGURE_ARGS= --datadir=${PREFIX}/share/examples @@ -26,17 +23,17 @@ ALL_TARGET= ${PORTNAME} MAN1= shmux.1 MANCOMPRESSED= no -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if !defined(WITHOUT_FPING) +.if ${PORT_OPTIONS:MFPING} RUN_DEPENDS+= fping:${PORTSDIR}/net/fping .endif -.if defined(WITH_PCRE) +.if ${PORT_OPTIONS:MPCRE} LIB_DEPENDS+= pcre.3:${PORTSDIR}/devel/pcre CONFIGURE_ARGS+= --with-pcre=${LOCALBASE}/lib .else CONFIGURE_ARGS+= --with-pcre=no .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/sqtop/Makefile b/net/sqtop/Makefile index 9dba70b48805..66dca5e3484a 100644 --- a/net/sqtop/Makefile +++ b/net/sqtop/Makefile @@ -22,12 +22,14 @@ PLIST_FILES= bin/sqtop MAN1= sqtop.1 GNU_CONFIGURE= yes +USE_NCURSES= yes -OPTIONS= NCURSES "Enable ncurses user interface" On +OPTIONS_DEFINE= NCURSES +OPTIONS_DEFAULT= NCURSES .include <bsd.port.options.mk> -.if defined(WITHOUT_NCURSES) +.if ! ${PORT_OPTIONS:MNCURSES} CONFIGURE_ARGS= --disable-ui .endif diff --git a/net/traff/Makefile b/net/traff/Makefile index 80c2e46cc6ad..0b84a89353d3 100644 --- a/net/traff/Makefile +++ b/net/traff/Makefile @@ -23,19 +23,19 @@ CFLAGS+= ${PTHREAD_CFLAGS} -L${LOCALBASE}/lib LFLAGS= ${PTHREAD_LIBS} CONFIGURE_ENV+= "LIBS=-largp" -OPTIONS= MYSQL "Enable MYSQL storage" on \ - PGSQL "Enable PGSQL storage" off +OPTIONS_DEFINE= MYSQL PGSQL +OPTIONS_DEFAULT= MYSQL -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if !defined(WITHOUT_MYSQL) +.if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= yes CFLAGS+= -DwithMYSQL -I${LOCALBASE}/include -L${LOCALBASE}/lib/mysql LFLAGS+= -L${LOCALBASE}/lib/mysql -lmysqlclient_r CONFIGURE_ARGS+=--enable-mysql .endif -.if defined(WITH_PGSQL) +.if ${PORT_OPTIONS:MPGSQL} USE_PGSQL= yes CFLAGS+= -DwithPGSQL -I${LOCALBASE}/include LFLAGS+= -L${LOCALBASE}/lib -lpq @@ -55,4 +55,4 @@ do-install: . endif ${INSTALL_DATA} ${WRKSRC}/traff.conf ${PREFIX}/etc/traff.conf.default -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/trafshow/Makefile b/net/trafshow/Makefile index d869a208f916..a56a4dc57af8 100644 --- a/net/trafshow/Makefile +++ b/net/trafshow/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: trafshow -# Date created: 25 September 1996 -# Whom: igor@zynaps.ru -# +# Created by: igor@zynaps.ru # $FreeBSD$ -# PORTNAME= trafshow PORTVERSION= 5.2.3 @@ -23,9 +19,9 @@ ALL_TARGET= trafshow MAN1= trafshow.1 -OPTIONS= IPV6 "Build with IPv6 support" on +OPTIONS_DEFINE= IPV6 -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> post-patch: @${REINPLACE_CMD} -e 's|-D_THREAD_SAFE||' ${WRKSRC}/configure @@ -35,7 +31,7 @@ post-patch: @${PATCH} -d ${WRKSRC} < ${FILESDIR}/extra-patch-800074+ .endif -.if defined(WITH_IPV6) +.if ${PORT_OPTIONS:MIPV6} CFLAGS+= -DINET6 .endif @@ -47,4 +43,4 @@ do-install: ${CP} -p ${PREFIX}/etc/trafshow.dist ${PREFIX}/etc/trafshow; \ fi -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/tsclient/Makefile b/net/tsclient/Makefile index f34cccbdf4ad..4c59d2b42a4d 100644 --- a/net/tsclient/Makefile +++ b/net/tsclient/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: tsclient -# Date created: 01 Mar 2003 -# Whom: Koop Mast <einekoai@chello.nl> -# +# Created by: Koop Mast <einekoai@chello.nl> # $FreeBSD$ -# PORTNAME= tsclient PORTVERSION= 0.150 @@ -28,23 +24,24 @@ LDFLAGS+= -L${LOCALBASE}/lib MAN1= tsclient.1 PORTDOCS= COPYING NEWS README -OPTIONS= GNOME "Build with gnome support" on \ - TIGHTVNC "vncviewer support" off \ - XNEST "X via Xnest support (experimental)" off +OPTIONS_DEFINE= GNOME TIGHTVNC XNEST DOCS +OPTIONS_DEFAULT= GNOME +TIGHTVNC_DESC= vncviewer support +XNEST_DESC= X via Xnest support .include <bsd.port.options.mk> -.if defined(WITH_GNOME) +.if ${PORT_OPTIONS:MGNOME} USE_GNOME+= gnomeprefix gnomehack gnomepanel libgnomeui .else CONFIGURE_ARGS+= --disable-gnome .endif -.if defined(WITH_TIGHTVNC) +.if ${PORT_OPTIONS:MTIGHTVNC} RUN_DEPENDS+= vncviewer:${PORTSDIR}/net/tightvnc .endif -.if defined(WITH_XNEST) +.if ${PORT_OPTIONS:MXNEST} RUN_DEPENDS+= Xnest:${X_NESTSERVER_PORT} .endif @@ -57,7 +54,7 @@ post-patch: post-install: @${LN} -sf ${PREFIX}/share/pixmaps/tsclient/tsclient.png \ ${PREFIX}/share/pixmaps/tsclient.png -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} . for doc in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR} diff --git a/net/twinkle/Makefile b/net/twinkle/Makefile index 4c33caa9e1b8..ce424087778d 100644 --- a/net/twinkle/Makefile +++ b/net/twinkle/Makefile @@ -1,4 +1,4 @@ -# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org> +# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org> # $FreeBSD$ PORTNAME= twinkle @@ -28,20 +28,20 @@ USE_GNOME= libxml2 USE_PERL5= yes USE_QT_VER= 3 -OPTIONS= KDE "Compile with kde features" off +OPTIONS_DEFINE= KDE +KDE_DESC= Compile with kde3 features -CONFIGURE_ARGS= --with-qt-dir=${QT_PREFIX} QTDIR=${LOCALBASE} \ +CONFIGURE_ARGS= --with-qt-dir=${QT_PREFIX} QTDIR=${LOCALBASE} CONFIGURE_ENV= QMAKESPEC="${QMAKESPEC}" MAKE_ENV= QTDIR=${QT_PREFIX} SUB_FILES= pkg-message QMAKESPEC?= ${LOCALBASE}/share/qt/mkspecs/freebsd-g++ -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_KDE) +.if ${PORT_OPTIONS:MKDE} USE_KDELIBS_VER=3 -.include <${PORTSDIR}/Mk/bsd.kde.mk> .else CONFIGURE_ARGS+=--without-kde .endif @@ -58,4 +58,4 @@ post-configure: post-install: @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/ushare/Makefile b/net/ushare/Makefile index 8589480a4ecb..455d9ce16eb9 100644 --- a/net/ushare/Makefile +++ b/net/ushare/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: ushare -# Date created: 11 December 2006 -# Whom: Volker Theile <votdev@gmx.de> -# +# Created by: Volker Theile <votdev@gmx.de> # $FreeBSD$ -# PORTNAME= ushare PORTVERSION= 1.1a @@ -27,11 +23,12 @@ CFLAGS+= -I${LOCALBASE}/include -I${WRKSRC} MAN1= ${PORTNAME}.1 -OPTIONS= LIBDLNA "Enable DLNA (PS3) support" off +OPTION_DEFINE= LIBDLNA +LIBDLNA_DESC= DLNA (PS3) support .include <bsd.port.options.mk> -.if defined(WITH_LIBDLNA) +.if ${PORT_OPTIONS:MLIBDLNA} LIB_DEPENDS+= dlna:${PORTSDIR}/devel/libdlna CONFIGURE_ARGS= --enable-dlna .endif diff --git a/security/botan/Makefile b/security/botan/Makefile index f767b2520c94..8c2ebe1d5f1c 100644 --- a/security/botan/Makefile +++ b/security/botan/Makefile @@ -1,10 +1,5 @@ -# ex:ts=8 -# New ports collection makefile for: botan -# Date created: Mar 3, 2001 -# Whom: Ying-Chieh Liao <ijliao@FreeBSD.org> -# +# Created by: Ying-Chieh Liao <ijliao@FreeBSD.org> # $FreeBSD$ -# PORTNAME= botan PORTVERSION= 1.8.13 @@ -19,9 +14,9 @@ COMMENT= A portable, easy to use, and efficient C++ crypto library LICENSE= BSD LICENSE_FILE= ${WRKSRC}/doc/license.txt -OPTIONS= SSL "Enable OpenSSL engine" on \ - GMP "Enable GMP engine" on \ - ECC "Enable ECC support" on +OPTIONS_DEFINE= SSL GMP ECC +OPTIONS_DEFAULT= SSL GMP ECC +ECC_DESC= ECC support USE_BZIP2= yes USE_PYTHON_BUILD= yes @@ -38,18 +33,18 @@ PORTDOCS= * .include <bsd.port.options.mk> -.if !defined(WITHOUT_SSL) +.if ${PORT_OPTIONS:MSSL} USE_OPENSSL= yes CONFIGURE_ARGS+=--with-openssl .endif -.if !defined(WITHOUT_GMP) +.if ${PORT_OPTIONS:MGMP} LIB_DEPENDS+= gmp.10:${PORTSDIR}/math/gmp CONFIGURE_ARGS+=--with-gnump MAKE_ARGS+= LDFLAGS="-L${LOCALBASE}/lib" .endif -.if !defined(WITHOUT_ECC) +.if ${PORT_OPTIONS:MECC} BUILD_DEPENDS+= ${LOCALBASE}/include/boost/tr1/memory.hpp:${PORTSDIR}/devel/boost-libs CONFIGURE_ARGS+=--with-tr1-implementation=boost CXXFLAGS+= -I${LOCALBASE}/include @@ -60,7 +55,7 @@ CONFIGURE_ARGS+=--with-tr1-implementation=none post-patch: ${REINPLACE_CMD} -e "s|#!/usr/bin/env python|#!${PYTHON_CMD}|" \ ${WRKSRC}/configure.py -.if defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${REINPLACE_CMD} -e '/$$(MKDIR_INSTALL) $$(DOCDIR)/d' \ -e '/$$(INSTALL_CMD_DATA) $$$$i $$(DOCDIR); /d' \ ${WRKSRC}/src/build-data/makefile/unix_shr.in diff --git a/security/clamassassin/Makefile b/security/clamassassin/Makefile index c29123a6f15b..1fdf3fe0c4ed 100644 --- a/security/clamassassin/Makefile +++ b/security/clamassassin/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: clamassassin -# Date created: 16 October 2004 -# Whom: Matt <matt@xtaz.net> -# +# Created by: Matt <matt@xtaz.net> # $FreeBSD$ -# PORTNAME= clamassassin PORTVERSION= 1.2.4 @@ -22,17 +18,19 @@ PLIST_FILES= bin/clamassassin GNU_CONFIGURE= yes -OPTIONS= CLAMDSCAN "Scanning using clamd" on \ - SUBREWRITE "Mail subject rewriting" off +OPTIONS_DEFINE= CLAMDSCAN SUBREWRITE +OPTIONS_DEFAULT= CLAMDSCAN +CLAMDSCAN_DESC= Scanning using clamd +SUBREWRITE_DESC= Mail subject rewriting -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if !defined (WITHOUT_CLAMDSCAN) +.if ${PORT_OPTIONS:MCLAMDSCAN} CONFIGURE_ARGS+= --enable-clamdscan .endif -.if defined (WITH_SUBREWRITE) +.if ${PORT_OPTIONS:MSUBREWRITE} CONFIGURE_ARGS+= --enable-subject-rewrite .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/cvm/Makefile b/security/cvm/Makefile index fef206b00d5d..4137022d27a8 100644 --- a/security/cvm/Makefile +++ b/security/cvm/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: cvm -# Date created: 2003-12-24 -# Whom: Sergei Kolobov <sergei@FreeBSD.org> -# +# Created by: Sergei Kolobov <sergei@FreeBSD.org> # $FreeBSD$ -# PORTNAME= cvm PORTVERSION= 0.96 @@ -26,13 +22,14 @@ BGLIBS_LIB= ${LOCALBASE}/lib/bglibs DOCS= NEWS README TODO *.html -OPTIONS= VCHKPW "Compile cvm-vchkpw" off +OPTIONS_DEFINE= VCHKPW +VCHKPW_DESC= Compile cvm-vchkpw -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> ALL_TARGET=all -.if defined(WITH_VCHKPW) +.if ${PORT_OPTIONS:MVCHKPW} BUILD_DEPENDS+= ${LOCALBASE}/vpopmail/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail ALL_TARGET+= cvm-vchkpw PLIST_SUB= VCHKPW="" @@ -53,10 +50,10 @@ do-configure: ${ECHO_CMD} "${BGLIBS_INC}" > ${WRKSRC}/conf-bgincs ${ECHO_CMD} "${BGLIBS_LIB}" > ${WRKSRC}/conf-bglibs -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} post-install: @${MKDIR} ${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR} .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/libssh/Makefile b/security/libssh/Makefile index 1f28565cdeee..e492f5dd923b 100644 --- a/security/libssh/Makefile +++ b/security/libssh/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: libssh -# Date created: 12 April 2009 -# Whom: Alexander Logvinov <ports@logvinov.com> -# +# Created by: Alexander Logvinov <ports@logvinov.com> # $FreeBSD$ -# PORTNAME= libssh PORTVERSION= 0.5.2 @@ -14,8 +10,9 @@ MASTER_SITES= http://www.libssh.org/files/0.5/ \ MAINTAINER= fluffy@FreeBSD.org COMMENT= A library implementing the SSH1 and SSH2 protocol -OPTIONS= GCRYPT "Build with libgcrypt" off \ - SSH1 "Build with SSH1 support" off +OPTIONS_DEFINE= GCRYPT SSH1 +GCRYPT_DESC= Build with libgcrypt +SSH1_DESC= Build with SSH1 support MAKE_JOBS_SAFE= yes USE_CMAKE= yes @@ -31,14 +28,14 @@ LICENSE_FILE= ${WRKSRC}/COPYING .include <bsd.port.options.mk> -.if defined(WITH_GCRYPT) +.if ${PORT_OPTIONS:MGCRYPT} LIB_DEPENDS+= gcrypt.18:${PORTSDIR}/security/libgcrypt CMAKE_ARGS+= -DWITH_GCRYPT:BOOL=ON .else USE_OPENSSL= yes .endif -.if defined(WITH_SSH1) +.if ${PORT_OPTIONS:MSSH1} CMAKE_ARGS+= -DWITH_SSH1:BOOL=ON PLIST_SUB+= SSH1="" .else diff --git a/security/webfwlog/Makefile b/security/webfwlog/Makefile index 0f4275c70679..31e6cbb6b225 100644 --- a/security/webfwlog/Makefile +++ b/security/webfwlog/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: webfwlog -# Date created: 21 November 2004 -# Whom: Bob Hockney <zeus@ix.netcom.com> -# +# Created by: Bob Hockney <zeus@ix.netcom.com> # $FreeBSD$ -# PORTNAME= webfwlog PORTVERSION= 0.94 @@ -17,8 +13,8 @@ PATCH_SITES= http://devel.webfwlog.net/download/patches/ MAINTAINER= zeus@ix.netcom.com COMMENT= A web-based firewall log analyzer -OPTIONS= MYSQL "Include MySQL Support" on \ - PGSQL "Include PostgreSQL Support" off +OPTIONS_DEFINE= MYSQL PGSQL EXAMPLES +OPTIONS_DEFAULTS= MYSQL GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-html-doc-root=${PREFIX} @@ -36,13 +32,13 @@ PORTEXAMPLES= * .include <bsd.port.options.mk> -.if defined(WITH_MYSQL) +.if ${PORT_OPTIONS:MMYSQL} USE_PHP+= mysql USE_MYSQL= yes CONFIGURE_ARGS+= --with-mysql .endif -.if defined(WITH_PGSQL) +.if ${PORT_OPTIONS:MPGSQL} USE_PHP+= pgsql USE_PGSQL= yes CONFIGURE_ARGS+= --with-pgsql @@ -61,7 +57,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/webfwlog/index.php ${WWWDIR} post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR}/mysql @${MKDIR} ${DOCSDIR}/pgsql @(cd ${WRKSRC}/mysql/ && ${COPYTREE_SHARE} \* ${DOCSDIR}/mysql/) @@ -71,7 +67,7 @@ post-install: .endfor .endif -.if !defined(NOPORTEXAMPLES) +.if ${PORT_OPTIONS:MEXAMPLES} ${MKDIR} ${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR} .endif diff --git a/www/bacula-web/Makefile b/www/bacula-web/Makefile index 0c5c31c4bdc1..ca9dfdf9b412 100644 --- a/www/bacula-web/Makefile +++ b/www/bacula-web/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: bacula-web -# Date created: 28 April 2006 -# Whom: Dan Langille <dan@langille.org> -# +# Created by: Dan Langille <dan@langille.org> # $FreeBSD$ -# PORTNAME= bacula-web DISTVERSION= 1.38.9 @@ -21,13 +17,14 @@ NO_BUILD= yes USE_PHP= gd WANT_PHP_WEB= yes -OPTIONS= POSTGRESQL "Use PostgreSQL database instead of MySQL" on +OPTIONS_DEFINE= PGSQL +OPTIONS_DEFAULT= PGSQL SUB_FILES= pkg-message -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_POSTGRESQL) +.if ${PORT_OPTIONS:MPGSQL} USE_PGSQL= yes CONFIGURE_ARGS+= --with-postgresql=yes SUB_LIST+= REQ_PGSQL=postgresql @@ -57,4 +54,4 @@ do-install: post-install: @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/fluxbb/Makefile b/www/fluxbb/Makefile index 780da7d602f5..ad0d66a4c7d1 100644 --- a/www/fluxbb/Makefile +++ b/www/fluxbb/Makefile @@ -17,21 +17,18 @@ SUB_FILES= pkg-message NO_BUILD= yes USE_PHP= yes -OPTIONS= MYSQL "Add support for a MySQL database server" On \ - PGSQL "Add support for a PostgreSQL database server" Off \ - SQLITE "Add support for a SQLite database server" Off +OPTIONS_DEFINE= MYSQL PGSQL SQLITE +OPTIONS_DEFAULT= MYSQL -.include <bsd.port.pre.mk> - -.if defined(WITH_MYSQL) +.if ${PORT_OPTIONS:MMYSQL} USE_PHP+= mysql .endif -.if defined(WITH_PGSQL) +.if ${PORT_OPTIONS:MPGSQL} USE_PHP+= pgsql .endif -.if defined(WITH_SQLITE) +.if ${PORT_OPTIONS:MSQLITE} USE_PHP+= sqlite .endif @@ -47,4 +44,4 @@ do-install: post-install: @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/groupoffice/Makefile b/www/groupoffice/Makefile index 9cbc6e2b68c6..69b430f62851 100644 --- a/www/groupoffice/Makefile +++ b/www/groupoffice/Makefile @@ -1,7 +1,4 @@ -# New ports collection makefile for: www/groupoffice -# Date created: 16 February 2007 -# Whom: Aron Schlesinger <as@bsdgroup.de> -# +# Created by: Aron Schlesinger <as@bsdgroup.de> # $FreeBSD$ PORTNAME= groupoffice @@ -23,26 +20,28 @@ WWWDIR?= ${PREFIX}/www/${PORTNAME}3 SUB_FILES= pkg-message -OPTIONS= IMAP "IMAP support" on \ - GD "Gallery support (GD)" on \ - CALENDAR "Calendar holiday support" on \ - WBXML "Synchronization support" off +OPTIONS_DEFINE= IMAP GD CALENDAR WBXML +OPTIONS_DEFAULT= IMAP GD CALENDAR +CALENDAR_DESC= Calendar holiday support +IMAP_DESC= IMAP support +GD_DESC= Gallery support (GD) +WBXML_DESC= Synchronization Support -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if !defined(WITHOUT_IMAP) +.if ${PORT_OPTIONS:MIMAP} USE_PHP+= imap iconv .endif -.if !defined(WITHOUT_GD) +.if ${PORT_OPTIONS:MGD} USE_PHP+= gd .endif -.if !defined(WITHOUT_CALENDAR) +.if ${PORT_OPTIONS:MCALENDAR} USE_PHP+= calendar .endif -.if !defined(WITHOUT_WBXML) +.if ${PORT_OPTIONS:MWBXML} LIB_DEPENDS= wbxml2:${PORTSDIR}/textproc/wbxml2 .endif @@ -61,4 +60,4 @@ create-plist: @${FIND} -ds ${WRKSRC}/${file} -type d \ | ${SED} -e 's,^${WRKSRC},@dirrm %%WWWDIR%%,' >> ${PLIST} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/mod_clamav/Makefile b/www/mod_clamav/Makefile index b6fc82d1ad86..da4dee889e0e 100644 --- a/www/mod_clamav/Makefile +++ b/www/mod_clamav/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: mod_clamav -# Date created: Sun Oct 19 -# Whom: Clement Laforet <clement@FreeBSD.org> -# +# Created by: Clement Laforet <clement@FreeBSD.org> # $FreeBSD$ -# PORTNAME= mod_clamav PORTVERSION= 0.23 @@ -22,11 +18,12 @@ USE_AUTOTOOLS= libtool USE_APACHE= 22 GNU_CONFIGURE= yes -OPTIONS= CLAMAVDEVEL "Use development version of CLAMAV" off +OPTIONS_DEFINE= CLAMAVDEVEL +CLAMAVDEVEL_DESC= development version of CLAMAV .include <bsd.port.options.mk> -.if defined(WITH_CLAMAVDEVEL) +.if ${PORT_OPTIONS:MCLAMAVDEVEL} LIB_DEPENDS+= clamav.7:${PORTSDIR}/security/clamav-devel .else CLAMAV_PORT= security/clamav diff --git a/www/nibbleblog/Makefile b/www/nibbleblog/Makefile index 90dc34e42ad1..a520fd7b374b 100644 --- a/www/nibbleblog/Makefile +++ b/www/nibbleblog/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: nibbleblog -# Date created: 15 January 2011 -# Whom: Marek Holienka <marekholienka@gmail.com> -# +# Created by: Marek Holienka <marekholienka@gmail.com> # $FreeBSD$ -# PORTNAME= nibbleblog PORTVERSION= 3.0.2 @@ -17,8 +13,8 @@ COMMENT= A lightweight blog system for general use RUN_DEPENDS= pear:${PORTSDIR}/devel/pear -OPTIONS= APACHE "Enable Apache Support" on \ - LIGHTTPD "Enable Lighttpd Support" off +OPTIONS_DEFINE= APACHE LIGHTTPD +OPTIONS_DEFAULT= APACHE USE_ZIP= yes NO_BUILD= yes @@ -28,10 +24,10 @@ SUB_FILES= pkg-message .include <bsd.port.options.mk> -.if defined(WITH_APACHE) +.if ${PORT_OPTIONS:MAPACHE} USE_APACHE_RUN= 22+ .endif -.if defined(WITH_LIGHTTPD) +.if ${PORT_OPTIONS:MLIGHTTPD} RUN_DEPENDS+= lighttpd:${PORTSDIR}/www/lighttpd .endif diff --git a/www/py-django-photologue/Makefile b/www/py-django-photologue/Makefile index 98b596a88be3..65c92aae29e0 100644 --- a/www/py-django-photologue/Makefile +++ b/www/py-django-photologue/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: py-django-photologue -# Date created: 12 January 2012 -# Whom: Kevin Golding <ports@caomhin.org> -# +# Created by: Kevin Golding <ports@caomhin.org> # $FreeBSD$ -# PORTNAME= django-photologue PORTVERSION= 2.2 @@ -25,16 +21,17 @@ USE_ZIP= yes DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} -OPTIONS= TAGGING "Enable tagging" On +OPTIONS_DEFINE= TAGGING DOCS +OPTIONS_DEFAULT= TAGGING .include <bsd.port.options.mk> -.if !defined(WITHOUT_TAGGING) +.if ${PORT_OPTIONS:MTAGGING} RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/tagging/models.py:${PORTSDIR}/www/py-django-tagging .endif post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.txt ${DOCSDIR} .endif diff --git a/www/snownews/Makefile b/www/snownews/Makefile index 0418318c153a..c14463acb802 100644 --- a/www/snownews/Makefile +++ b/www/snownews/Makefile @@ -1,10 +1,5 @@ -# ex:ts=8 -# New ports collection makefile for: snownews -# Date created: Nov 3 2003 -# Whom: Cheng-Lung Sung <clsung@dragon2.net> -# +# Created by: Cheng-Lung Sung <clsung@dragon2.net> # $FreeBSD$ -# PORTNAME= snownews PORTVERSION= 1.5.12 @@ -20,16 +15,18 @@ USE_GMAKE= yes USE_GNOME= libxml2 HAS_CONFIGURE= yes -OPTIONS= OPML "Outline Processor Markup Support" on +OPTIONS_DEFINE= OPML NLS +OPTIONS_DEFAULT= OPML +OPML_DESC= Outline Processor Markup Support -.if !defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes PLIST_SUB+= NLS="" .else PLIST_SUB+= NLS="@comment " .endif -.if defined(WITHOUT_OPML) +.if ! ${PORT_OPTIONS:MOPML} EXTRA_PATCHES= ${FILESDIR}/extra-patch-Makefile PLIST_SUB+= OPML="@comment " .else @@ -48,7 +45,7 @@ post-patch: @${REINPLACE_CMD} -e 's|gcc|${CC}|' ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's|make|${GMAKE}|' ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's|share/man|man|' ${WRKSRC}/Makefile -.if defined(WITHOUT_NLS) +.if ! ${PORT_OPTIONS:MNLS} ${REINPLACE_CMD} -e 's/ install-locales / /g' ${WRKSRC}/Makefile ${REINPLACE_CMD} -e 's/ locales$$//g' ${WRKSRC}/Makefile .endif diff --git a/www/trac-revtree/Makefile b/www/trac-revtree/Makefile index df09e34b93c8..c56c281f8f49 100644 --- a/www/trac-revtree/Makefile +++ b/www/trac-revtree/Makefile @@ -19,8 +19,10 @@ COMMENT= Graphical representation of an SVN repository RUN_DEPENDS+= trac>=0.12:${PORTSDIR}/www/trac \ subversion>=0:${PORTSDIR}/devel/subversion -OPTIONS= MINFOENH "Enable mergeinfo display enhancer" On \ - LOGENH "Enable log message display enhancer" Off +OPTIONS_DEFINE= MINFOENH LOGENH +OPTIONS_DEFAULT= MINFOENH +MINFOENH_DESC= Enable mergeinfo display enhancer +LOGENH_DESC= Enable log message display enhancer USE_ZIP= yes @@ -32,9 +34,9 @@ PYDISTUTILS_PKGVERSION= ${PORTVERSION}dev PLIST_SUB+= EGGVERSION="${PORTVERSION}dev" PYTHONVERSION=${_PYTHON_VERSION} PYDISTUTILS_NOEGGINFO= yes -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_MINFOENH) +.if ${PORT_OPTIONS:MMINFOENH} MINFOENH_VERSION= 0.2.1 PLIST_SUB+= MINFOENH_EGGVERSION="${MINFOENH_VERSION}dev" ENH1="" @@ -43,7 +45,7 @@ ENH1="@comment " .endif PLIST_SUB+= ENH1=${ENH1} -.if defined(WITH_LOGENH) +.if ${PORT_OPTIONS:MLOGENH} LOGENH_VERSION= 0.2.0 PLIST_SUB+= LOGENH_EGGVERSION="${LOGENH_VERSION}dev" ENH2="" @@ -54,14 +56,14 @@ PLIST_SUB+= ENH2=${ENH2} post-install: # Install the selected enhancer plugins -.if defined(WITH_MINFOENH) +.if ${PORT_OPTIONS:MMINFOENH} @( cd ${WRKSRC}/enhancers/mergeinfoenhancer ; \ ${PYEASYINSTALL_CMD} . ) .endif -.if defined(WITH_LOGENH) +.if ${PORT_OPTIONS:MLOGENH} @( cd ${WRKSRC}/enhancers/logenhancer ; \ ${PYEASYINSTALL_CMD} . ) .endif @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/vtiger/Makefile b/www/vtiger/Makefile index 8dc422567d65..ef1d56e6ebe5 100644 --- a/www/vtiger/Makefile +++ b/www/vtiger/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: vtiger -# Date created: Fri Mar 11 20:59:31 EST 2005 -# Whom: Edwin Groothuis <edwin@mavetju.org> -# +# Created by: Edwin Groothuis <edwin@mavetju.org> # $FreeBSD$ -# PORTNAME= vtiger PORTVERSION= 5.0.3 @@ -24,17 +20,17 @@ IGNORE_WITH_PHP= 4 WRKSRC= ${WRKDIR}/vtigercrm -OPTIONS= MYSQLSERVER "Use MySQL-Server on localhost" OFF +OPTIONS_DEFINE= MYSQL .include <bsd.port.pre.mk> CONFLICTS= vtiger-4.* -.if !defined(WITHOUT_MYSQLSERVER) +.if ${PORT_OPTIONS:MMYSQL} RUN_DEPENDS+= ${LOCALBASE}/libexec/mysqld:${PORTSDIR}/databases/mysql${MYSQL_VER}-server .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} PORTDOCS= Release_Notes.html DEPENDENCIES.txt README.txt .endif @@ -78,7 +74,7 @@ post-install: @${CHMOD} u+w ${WWWDIR}/${FILE} . endif .endfor -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} . for FILE in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR} @@ -115,4 +111,4 @@ create-plist: @${FIND} -ds ${WRKSRC} -type d \ | ${SED} -e 's,^${WRKSRC},@dirrm %%WWWDIR%%,' >> ${PLIST} -.include <bsd.port.post.mk> +.include <bsd.port.mk> |