Date: Thu, 7 Mar 2013 16:53:46 +0000 (UTC) From: Martin Wilke <miwi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r313599 - in head: dns/credns dns/dnrd dns/dnscheckengine dns/dnstracer dns/mydns-ng dns/nss_mdns dns/pdnsd dns/poweradmin games/gltron mail/atmail mail/imaputils mail/libsrs_alt mail/n... Message-ID: <201303071653.r27GrktT031082@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: miwi Date: Thu Mar 7 16:53:45 2013 New Revision: 313599 URL: http://svnweb.freebsd.org/changeset/ports/313599 Log: - Convert to OptionsNG - Trim header Reviewed by: bapt Modified: head/dns/credns/Makefile head/dns/dnrd/Makefile head/dns/dnscheckengine/Makefile head/dns/dnstracer/Makefile head/dns/mydns-ng/Makefile head/dns/nss_mdns/Makefile head/dns/pdnsd/Makefile head/dns/poweradmin/Makefile head/games/gltron/Makefile head/mail/atmail/Makefile head/mail/imaputils/Makefile head/mail/libsrs_alt/Makefile head/mail/nmh/Makefile head/mail/osbf-lua/Makefile head/mail/vmailmgr/Makefile head/net-mgmt/p5-FusionInventory-Agent/Makefile head/www/awffull/Makefile head/www/b2evolution/Makefile head/www/claroline/Makefile head/www/drraw/Makefile head/www/eaccelerator/Makefile head/www/encode-explorer/Makefile head/www/gallery2/Makefile head/www/gallery3/Makefile head/www/ilias3/Makefile head/www/lightsquid/Makefile head/www/mod_tsa/Makefile head/www/opera-devel/Makefile head/www/p5-Apache2-SiteControl/Makefile head/www/pound/Makefile head/www/punbb/Makefile head/www/py-dojango/Makefile head/www/sit/Makefile head/www/tinyproxy/Makefile head/www/trac/Makefile head/www/udmsearch/Makefile Modified: head/dns/credns/Makefile ============================================================================== --- head/dns/credns/Makefile Thu Mar 7 16:13:35 2013 (r313598) +++ head/dns/credns/Makefile Thu Mar 7 16:53:45 2013 (r313599) @@ -1,9 +1,5 @@ -# New ports collection makefile for: credns -# Date created: 9 July 2012 -# Whom: jaap -# +# Created by: jaap # $FreeBSD$ -# PORTNAME= credns PORTVERSION= 0.2.10 @@ -45,38 +41,38 @@ PORTDOCS= CREDITS ChangeLog LICENSE NSD- README.icc README.svn RELNOTES REQUIREMENTS TESTPLAN \ TODO UPGRADING coding-style differences.pdf differences.tex -OPTIONS= ROOT_SERVER "Dnssexy as proxy for a (local) root" Off \ - IPV6 "Enable IPv6 support" On \ - CHECKING "Enable internal runtime checks" Off \ - MMAP "Use mmap instead of malloc(experimental)" Off \ - MAXIPS "Raise max-ips from 8 to ${NSDMAX_IPS}" Off +OPTIONS_DEFINE= ROOT_SERVER IPV6 CHECKING MMAP MAXIPS DOCS +ROOT_SERVER_DESC= Dnssexy as proxy for a (local) root +CHECKING_DESC= Internal runtime checks +MMAP_DESC= Use mmap instead of malloc(experimental) +MAXIPS_DESC= Raise max-ips from 8 to ${NSDMAX_IPS} -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_ROOT_SERVER) +.if ${PORT_OPTIONS:MROOT_SERVER} CONFIGURE_ARGS+= --enable-root-server .endif -.if defined(WITHOUT_IPV6) +.if ${PORT_OPTIONS:MIPV6} CONFIGURE_ARGS+= --disable-ipv6 .endif -.if defined(WITH_CHECKING) +.if ${PORT_OPTIONS:MCHECKING} CONFIGURE_ARGS+= --enable-checking .endif -.if defined(WITH_MMAP) +.if ${PORT_OPTIONS:MMMAP} CONFIGURE_ARGS+= --enable-mmap .endif -.if defined(WITH_MAXIPS) +.if ${PORT_OPTIONS:MMAXIPS} CONFIGURE_ARGS+= --with-max-ips=${NSDMAX_IPS} .endif post-install: ${INSTALL_DATA} ${WRKSRC}/credns.conf.sample \ ${PREFIX}/etc/credns/credns.conf.sample -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} .for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR}/${f} @@ -84,4 +80,4 @@ post-install: .endif @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/dns/dnrd/Makefile ============================================================================== --- head/dns/dnrd/Makefile Thu Mar 7 16:13:35 2013 (r313598) +++ head/dns/dnrd/Makefile Thu Mar 7 16:53:45 2013 (r313599) @@ -1,9 +1,5 @@ -# New ports collection makefile for: dnrd -# Date created: 06 January 2001 -# Whom: George Reid <greid@ukug.uk.freebsd.org> -# +# Created by: George Reid <greid@ukug.uk.freebsd.org> # $FreeBSD$ -# PORTNAME= dnrd PORTVERSION= 2.20.3 @@ -22,10 +18,11 @@ DOCS= AUTHORS COPYING ChangeLog INSTALL EXAMPLES= README-cache README-cygwin README-master TODO \ master.sample -OPTIONS= TCP "Enable TCP support" off \ - MASTER "Enable master file support" on \ - DEBUG "Enable debugging" off \ - RANDOM "Enable random source port" off +OPTIONS_DEFINE= TCP MASTER DEBUG RANDOM DOCS +OPTIONS_DEFAULT= MASTER +TCP_DESC= TCP support +MASTER_DESC= Master file support +RANDOM_DESC= Random source port USERS= dnrd GROUPS= dnrd @@ -34,21 +31,21 @@ DNRD_DIR?= ${ETCDIR} SUB_FILES= pkg-install SUB_LIST+= DNRD_DIR=${DNRD_DIR} -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_TCP) +.if ${PORT_OPTIONS:MTCP} CONFIGURE_ARGS+= --enable-tcp .endif -.if !defined(WITH_MASTER) +.if ${PORT_OPTIONS:MMASTER} CONFIGURE_ARGS+= --disable-master .endif -.if defined(WITH_DEBUG) +.if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= --enable-debug .endif -.if defined(WITH_RANDOM) +.if ${PORT_OPTIONS:MRANDOM} CONFIGURE_ARGS+= --enable-random-src .endif @@ -58,11 +55,11 @@ do-install: @${INSTALL_PROGRAM} ${WRKSRC}/src/dnrd ${PREFIX}/sbin/ @${INSTALL_MAN} ${WRKSRC}/doc/dnrd.8 ${MAN8PREFIX}/man/man8/ @${INSTALL_DATA} ${WRKSRC}/doc/master.sample ${ETCDIR}/ -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} @${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/ @${MKDIR} ${EXAMPLESDIR} @${INSTALL_DATA} ${EXAMPLES:S,^,${WRKSRC}/doc/,} ${EXAMPLESDIR}/ .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/dns/dnscheckengine/Makefile ============================================================================== --- head/dns/dnscheckengine/Makefile Thu Mar 7 16:13:35 2013 (r313598) +++ head/dns/dnscheckengine/Makefile Thu Mar 7 16:53:45 2013 (r313599) @@ -1,9 +1,5 @@ -# New ports collection makefile for: dnscheckengine -# Date created: 28 July 2010 -# Whom: dnscheckengine-port@academ.com (Stan Barber) -# +# Created by: dnscheckengine-port@academ.com (Stan Barber) # $FreeBSD$ -# PORTNAME= dnscheckengine PORTVERSION= 1.1 @@ -40,11 +36,11 @@ DOCSDB= indexes.sql schema.sql drop.sql PORTDOCS= ${DOCS} db SUB_FILES= pkg-install pkg-deinstall pkg-message -OPTIONS= MYSQL "Add MySQL Support (needed for webgui)" off +OPTIONS_DEFINE= MYSQL DOCS .include <bsd.port.options.mk> -.if defined(WITH_MYSQL) +.if ${PORT_OPTIONS:MMYSQL} BUILD_DEPENDS+= p5-DBI>=0:${PORTSDIR}/databases/p5-DBI RUN_DEPENDS+= p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql USE_MYSQL= yes @@ -82,7 +78,7 @@ MANCOMPRESSED= no post-patch: @${GREP} -Rl '%%[[:alpha:]]\+%%' ${WRKSRC} |${XARGS} ${REINPLACE_CMD} \ -e 's,%%PREFIX%%,${PREFIX},g' -.if defined(WITH_MYSQL) +.if ${PORT_OPTIONS:MMYSQL} @@${REINPLACE_CMD} -e "s#%%PREFIX%%#${PREFIX}#" ${WRKSRC}/contrib/dnscheck-dispatcher.sh .endif @@ -90,7 +86,7 @@ pre-install: -@${FIND} ${WRKSRC} -name \*.orig -delete post-install: -.if defined(WITH_MYSQL) +.if ${PORT_OPTIONS:MMYSQL} # install startup script (if WITH_MYSQL is defined) @${INSTALL_SCRIPT} ${WRKSRC}/contrib/dnscheck-dispatcher.sh \ ${PREFIX}/etc/rc.d/dnscheck-dispatcher @@ -98,7 +94,7 @@ post-install: @${ECHO} bin/dnscheck-dispatcher >> ${TMPPLIST} .endif @PKG_PREFIX=${PREFIX} BATCH=${BATCH} SU_CMD="${SU_CMD}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} ${DOCSDIR}/db @${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/doc/|} ${DOCSDIR} @${INSTALL_DATA} '${WRKSRC}/doc/DNSCheck Lib Descriptions.pdf' ${DOCSDIR} Modified: head/dns/dnstracer/Makefile ============================================================================== --- head/dns/dnstracer/Makefile Thu Mar 7 16:13:35 2013 (r313598) +++ head/dns/dnstracer/Makefile Thu Mar 7 16:53:45 2013 (r313599) @@ -1,9 +1,5 @@ -# New ports collection makefile for: dnstracer -# Date created: 18 January 2002 -# Whom: Edwin Groothuis <edwin@mavetju.org> -# +# Created by: Edwin Groothuis <edwin@mavetju.org> # $FreeBSD$ -# PORTNAME= dnstracer PORTVERSION= 1.9 @@ -20,12 +16,12 @@ USE_GMAKE= yes MAN8= dnstracer.8 PLIST_FILES= bin/dnstracer -OPTIONS= IPV6 "With IPv6 support" on +OPTIONS_DEFINE= IPV6 -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITHOUT_IPV6) +.if ${PORT_OPTIONS:MIPV6} CONFIGURE_ARGS+=--disable-ipv6 .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/dns/mydns-ng/Makefile ============================================================================== --- head/dns/mydns-ng/Makefile Thu Mar 7 16:13:35 2013 (r313598) +++ head/dns/mydns-ng/Makefile Thu Mar 7 16:53:45 2013 (r313599) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mydns -# Date created: 23 July 2002 -# Whom: Simon Dick <simond@irrelevant.org> -# +# Created by: Simon Dick <simond@irrelevant.org> # $FreeBSD$ -# PORTNAME= mydns-ng PORTVERSION= 1.2.8.31 @@ -15,7 +11,6 @@ DISTNAME= mydns-${PORTVERSION} MAINTAINER= gaod@hychen.org COMMENT= A Next Generation DNS Server for sql based DNS services -#WRKSRC= ${WRKDIR}/mydns-${PORTVERSION:R} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-confdir=${PREFIX}/etc USE_ICONV= yes @@ -31,25 +26,24 @@ MAN8= mydns.8 mydnscheck.8 mydnsexport. DOCS= AUTHORS COPYING ChangeLog NEWS QUICKSTART.mysql QUICKSTART.postgres README TODO -OPTIONS= PGSQL "Build with PostgreSQL backend instead of MySQL" OFF \ - ALIAS "Enable server side aliases" ON \ - OPENSSL "Enable OpenSSL (if MySQL is linked with OpenSSL)" OFF \ - NLS "Native Language Support with gettext" OFF +OPTIONS_DEFINE= PGSQL ALIAS SSL NLS +OPTIONS_DEFAULT= ALIAS +ALIAS_DESC= Server side aliasas -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_ALIAS) +.if ${PORT_OPTIONS:MALIAS} CONFIGURE_ARGS+=--enable-alias .endif -.if defined(WITH_OPENSSL) -.include "${PORTSDIR}/Mk/bsd.openssl.mk" +.if ${PORT_OPTIONS:MSSL} +USE_OPENSSL=yes CONFIGURE_ARGS+=--with-openssl \ --with-openssl-include=${OPENSSLINC} \ --with-openssl-lib=${OPENSSLLIB} .endif -.if defined(WITH_PGSQL) +.if ${PORT_OPTIONS:MPGSQL} USE_PGSQL= yes CONFIGURE_ARGS+=--without-mysql \ --with-pgsql-include=${LOCALBASE}/include \ @@ -63,17 +57,17 @@ PKGNAMESUFFIX= -mysql USE_MYSQL= yes .endif -.if !defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} +CONFIGURE_ARGS+=--disable-nls +PLIST_SUB+= NLS="@comment " +.else CONFIGURE_ARGS+=--with-included-gettext USE_GETTEXT= yes PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " .endif post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR}/contrib .for f in ${DOCS} @${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/ @@ -86,4 +80,4 @@ post-install: @${PREFIX}/sbin/mydns --dump-config >${PREFIX}/etc/mydns.conf.sample @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/dns/nss_mdns/Makefile ============================================================================== --- head/dns/nss_mdns/Makefile Thu Mar 7 16:13:35 2013 (r313598) +++ head/dns/nss_mdns/Makefile Thu Mar 7 16:53:45 2013 (r313599) @@ -22,8 +22,8 @@ AUTOTOOLSFILES= aclocal.m4 LIB_DEPENDS+= avahi-client:${PORTSDIR}/net/avahi-app -OPTIONS= \ - SEARCH_DOMAINS "Honour search domains in resolv.conf" Off +OPTIONS_DEFINE= SEARCH_DOMAINS DOCS +SEARCH_DOMAINS_DESC= Honour search domains in resolv.conf CONFIGURE_ARGS+= \ --sysconfdir=/etc \ @@ -36,6 +36,12 @@ CONFIGURE_ARGS+= \ INSTALLED_MODULES=nss_mdns nss_mdns_minimal +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MSEARCH_DOMAINS} +CONFIGURE_ARGS+= --enable-search-domains +.endif + # # libtool is used, therefore we must perform a GNU make based install, # followed by removal of build rubble; we must create our own .so symlinks; @@ -48,7 +54,7 @@ do-install: ( cd ${PREFIX}/lib ; ${LN} -s ${INSTALLED_MODULE}.so.1 ${INSTALLED_MODULE}.so ) ${RM} ${PREFIX}/lib/${INSTALLED_MODULE}.a ${PREFIX}/lib/${INSTALLED_MODULE}.la .endfor -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR}/ ${INSTALL_DATA} ${INSTALL_WRKSRC}/doc/README ${DOCSDIR} ${INSTALL_DATA} ${INSTALL_WRKSRC}/doc/README.html ${DOCSDIR} @@ -59,14 +65,8 @@ do-install: PLIST_FILES= ${INSTALLED_MODULES:C/^/lib\//:C/$/.so/} ${INSTALLED_MODULES:C/^/lib\//:C/$/.so.1/} PORTDOCS= README README.html -.include <bsd.port.pre.mk> - -.if defined(WITH_SEARCH_DOMAINS) -CONFIGURE_ARGS+= --enable-search-domains -.endif - post-configure: @${FIND} ${WRKSRC} -name Makefile -print | \ ${XARGS} ${REINPLACE_CMD} -e 's|MKDIR_P|mkdir_p|g' -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/dns/pdnsd/Makefile ============================================================================== --- head/dns/pdnsd/Makefile Thu Mar 7 16:13:35 2013 (r313598) +++ head/dns/pdnsd/Makefile Thu Mar 7 16:53:45 2013 (r313599) @@ -24,7 +24,7 @@ USE_RC_SUBR= pdnsd CONFIGURE_ARGS= --with-cachedir=${PDNSDB} \ --disable-src-addr-disc -OPTIONS= IPV6 "Enable IPv6 support" on +OPTIONS_DEFINE= IPV6 DOCS WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} @@ -38,16 +38,14 @@ DOC_FILES+= txt/faq.txt txt/intro.txt tx CFLAGS+= -pthread -OPTIONS= IPV6 "IPv6 support" on +.include <bsd.port.options.mk> -.include <bsd.port.pre.mk> - -.if defined(WITH_IPV6) +.if ${PORT_OPTIONS:MIPV6} CONFIGURE_ARGS+= --enable-ipv6 .endif post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} @${INSTALL_DATA} ${DOC_FILES:S@^@${DOCSRCDIR}/@} ${DOCSDIR} .endif @@ -55,4 +53,4 @@ post-install: ${INSTALL_DATA} ${PREFIX}/etc/pdnsd.conf.sample ${PREFIX}/etc/pdnsd.conf @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/dns/poweradmin/Makefile ============================================================================== --- head/dns/poweradmin/Makefile Thu Mar 7 16:13:35 2013 (r313598) +++ head/dns/poweradmin/Makefile Thu Mar 7 16:53:45 2013 (r313599) @@ -20,8 +20,8 @@ WANT_PHP_WEB= yes NO_BUILD= yes PEARDIR= ${PREFIX}/share/pear -OPTIONS= MYSQL "Use Mysql database support" on \ - PGSQL "Use Pgsql database support" off +OPTIONS_DEFINE= MYSQL PGSQL +OPTIONS_DEFAULT= MYSQL SUB_FILES= pkg-message @@ -32,11 +32,11 @@ PLIST= ${WRKDIR}/plist .include <bsd.port.options.mk> -.if defined(WITH_MYSQL) +.if ${PORT_OPTIONS:MMYSQL} RUN_DEPENDS+= ${PEARDIR}/MDB2/Driver/mysql.php:${PORTSDIR}/databases/pear-MDB2_Driver_mysql .endif -.if defined(WITH_PGSQL) +.if ${PORT_OPTIONS:MPGSQL} RUN_DEPENDS+= ${PEARDIR}/MDB2/Driver/pgsql.php:${PORTSDIR}/databases/pear-MDB2_Driver_pgsql .endif Modified: head/games/gltron/Makefile ============================================================================== --- head/games/gltron/Makefile Thu Mar 7 16:13:35 2013 (r313598) +++ head/games/gltron/Makefile Thu Mar 7 16:53:45 2013 (r313599) @@ -1,9 +1,5 @@ -# New ports collection makefile for: gltron -# Date created: 24 July 1999 -# Whom: Andrey Zakhvatov -# +# Created by: Andrey Zakhvatov # $FreeBSD$ -# PORTNAME= gltron PORTVERSION= 0.70 @@ -26,7 +22,8 @@ CONFIGURE_ARGS= --disable-warn CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -OPTIONS= SDL_NET "With network support" off +OPTIONS_DEFINE= SDL_NET +SDL_NET_DESC= Network Support DESKTOP_ENTRIES= "GLtron" \ "3D lightcycle game" \ @@ -37,7 +34,7 @@ DESKTOP_ENTRIES= "GLtron" \ .include <bsd.port.options.mk> -.if defined(WITH_SDL_NET) +.if ${PORT_OPTIONS:MSDL_NET} USE_SDL+= net CONFIGURE_ARGS+= --enable-network .endif @@ -51,7 +48,7 @@ post-patch: s|-ansi -pedantic||g' post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} .for file in ChangeLog README ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} Modified: head/mail/atmail/Makefile ============================================================================== --- head/mail/atmail/Makefile Thu Mar 7 16:13:35 2013 (r313598) +++ head/mail/atmail/Makefile Thu Mar 7 16:53:45 2013 (r313599) @@ -1,9 +1,5 @@ -# New ports collection makefile for: atmail -# Date created: 18 June 2008 -# Whom: Wen heping <wenheping@gmail.com> -# +# Created by: Wen heping <wenheping@gmail.com> # $FreeBSD$ -# PORTNAME= atmail PORTVERSION= 1.0.4 @@ -20,20 +16,20 @@ WRKSRC= ${WRKDIR}/${DISTNAME} NO_BUILD= yes SUB_FILES= pkg-message -OPTIONS= LDAP "Add support for a LDAP" Off \ - MBSTRING "Add support for UTF8 folder names" Off \ - ICONV "Add support encoding conversion" Off +OPTIONS_DEFINE= LDAP MBSTRING +MBSTRING_DESC= Support for UTF8 folder names -.include <bsd.port.pre.mk> -.if defined(WITH_LDAP) +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MLDAP} USE_PHP+= ldap .endif -.if defined(WITH_MBSTRING) +.if ${PORT_OPTIONS:MMBSTRING} USE_PHP+= mbstring .endif -.if defined(WITH_ICONV) +.if ${PORT_OPTIONS:MICONV} USE_PHP+= iconv .endif @@ -49,4 +45,4 @@ post-install: >> ${TMPPLIST} @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/mail/imaputils/Makefile ============================================================================== --- head/mail/imaputils/Makefile Thu Mar 7 16:13:35 2013 (r313598) +++ head/mail/imaputils/Makefile Thu Mar 7 16:53:45 2013 (r313599) @@ -1,9 +1,5 @@ -# Ports collection Makefile for: mail/imaputils -# Date created: 2012-04-08 -# Whom: Mikhail T. (m.tsatsenko@gmail.com) -# +# Created by: Mikhail T. (m.tsatsenko@gmail.com) # $FreeBSD$ -# PORTNAME= imaputils PORTVERSION= 1.0.2 @@ -20,16 +16,15 @@ USE_PERL5_RUN= yes NO_BUILD= yes PERL_CONFIGURE= yes -OPTIONS= SSL "Enable SSL support" off \ - UNICODE "Adds unicode support" off +OPTIONS_DEFINE= SSL UNICODE .include <bsd.port.options.mk> -.if defined(WITH_SSL) +.if ${PORT_OPTIONS:MSSL} RUN_DEPENDS+= p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL .endif -.if defined(WITH_UNICODE) +.if ${PORT_OPTIONS:MUNICODE} RUN_DEPENDS+= p5-Unicode-IMAPUtf7>=0:${PORTSDIR}/converters/p5-Unicode-IMAPUtf7 .endif Modified: head/mail/libsrs_alt/Makefile ============================================================================== --- head/mail/libsrs_alt/Makefile Thu Mar 7 16:13:35 2013 (r313598) +++ head/mail/libsrs_alt/Makefile Thu Mar 7 16:53:45 2013 (r313599) @@ -1,9 +1,5 @@ -# New ports collection makefile for: libsrs_alt -# Date created: 22 March 2006 -# Whom: Simon Dick <simond@irrelevant.org> -# +# Created by: Simon Dick <simond@irrelevant.org> # $FreeBSD$ -# PORTNAME= libsrs_alt DISTVERSION= 1.0 @@ -21,11 +17,12 @@ GNU_CONFIGURE= yes PLIST_SUB= SHLIB_MAJOR="${SHLIB_MAJOR}" -OPTIONS= COMPAT_BASE64 "Enable MTA Friendly base64 compatibility mode" Off +OPTIONS_DEFINE= COMPAT_BASE64 +COMPAT_BASE64_DESC= MTA Friendly base64 compatibility mode -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_COMPAT_BASE64) +.if ${PORT_OPTIONS:MCOMPAT_BASE64} CONFIGURE_ARGS+= --with-base64compat .endif @@ -33,4 +30,4 @@ post-patch: @${REINPLACE_CMD} -E 's,^(test_LDFLAGS.*$$),\1 -lcompat,' \ ${WRKSRC}/Makefile.in -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/mail/nmh/Makefile ============================================================================== --- head/mail/nmh/Makefile Thu Mar 7 16:13:35 2013 (r313598) +++ head/mail/nmh/Makefile Thu Mar 7 16:53:45 2013 (r313599) @@ -1,7 +1,4 @@ -# New ports collection makefile for: nmh -# Date created: 07 Feb 1999 -# Whom: Scott Blachowicz <scott+ports@sabami.seaslug.org> -# +# Created by: Scott Blachowicz <scott+ports@sabami.seaslug.org> # $FreeBSD$ # # Makefile variables of interest: @@ -94,13 +91,14 @@ CONFIGURE_ARGS+= ${NMH_EXTRA_CONFIGURE_A MAKE_JOBS_UNSAFE= yes CFLAGS+= -D${NMH_LOCKING} -O -OPTIONS= SASL2 "Cyrus SASL2" OFF - -.include <bsd.port.pre.mk> CONFIGURE_ARGS+= --docdir=${DOCSDIR} -.if defined(WITH_SASL2) +OPTIONS_DEFINE= SASL2 +SASL2_DESC= Cyrus SASL2 support +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MSASL2} LIB_DEPENDS+= sasl2:${PORTSDIR}/security/cyrus-sasl2 CONFIGURE_ARGS+= --with-cyrus-sasl CONFIGURE_ENV+= LDFLAGS=-L"${PREFIX}"/lib CPPFLAGS=" -I${PREFIX}/include" @@ -130,4 +128,4 @@ post-patch: post-install: @PKG_PREFIX='${PREFIX}' ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/mail/osbf-lua/Makefile ============================================================================== --- head/mail/osbf-lua/Makefile Thu Mar 7 16:13:35 2013 (r313598) +++ head/mail/osbf-lua/Makefile Thu Mar 7 16:53:45 2013 (r313599) @@ -1,9 +1,5 @@ -# New ports collection makefile for: osbf-lua -# Date created: 2009-01-14 -# Whom: RicardoSSP <ricardo.katz@gmail.com> -# +# Created by: RicardoSSP <ricardo.katz@gmail.com> # $FreeBSD$ -# PORTNAME= osbf-lua PORTVERSION= 2.0.4 @@ -19,11 +15,13 @@ USE_LUA= 5.1+ ALL_TARGET= INSTALL_TARGET= install -OPTIONS= SPAMFILTER_PLUGIN "OSBF Spamfilter Plugin" on +OPTIONS_DEFINE= SPAMFILTER_PLUGIN +OPTIONS_DEFAULT= SPAMFILTER_PLUGIN +SPAMFILTER_PLUGIN_DESC= OSBF Spamfilter Plugin -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_SPAMFILTER_PLUGIN) +.if ${PORT_OPTIONS:MSPAMFILTER_PLUGIN} INSTALL_TARGET+= install_spamfilter PLIST_SUB+= SPAMFILTER="" .else @@ -33,4 +31,4 @@ PLIST_SUB+= SPAMFILTER="@comment " post-patch: .SILENT ${REINPLACE_CMD} '/^CC/s/=/?=/' ${WRKSRC}/config -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/mail/vmailmgr/Makefile ============================================================================== --- head/mail/vmailmgr/Makefile Thu Mar 7 16:13:35 2013 (r313598) +++ head/mail/vmailmgr/Makefile Thu Mar 7 16:53:45 2013 (r313599) @@ -1,9 +1,5 @@ -# New ports collection makefile for: vmailmgr -# Date created: 24 October 2007 -# Whom: Mij <mij@bitchx.it> -# +# Created by: Mij <mij@bitchx.it> # $FreeBSD$ -# PORTNAME= vmailmgr PORTVERSION= 0.97 @@ -31,15 +27,16 @@ USE_PERL5_BUILD= yes AUTOMAKE_ARGS+= --add-missing -Wno-portability MAKE_JOBS_SAFE= yes -OPTIONS= PYTHONLIB "Install the Python API" Off +OPTIONS_DEFINE= PYTHONLIBS +PYTHONLIBS_DESC= Install the Python API -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> .if defined(PREFIX) CONFIGURE_ARGS+= --prefix=${PREFIX} .endif -.if defined(WITH_PYTHONLIB) +.if ${PORT_OPTIONS:MPYTHONLIB} CONFIGURE_ARGS+= --with-pythonapi=${PYTHON_SITELIBDIR} PLIST_SUB+= PYTHON_SITELIBDIR="${PYTHON_SITELIBDIR}" PLIST_SUB+= PYTHON="" @@ -47,4 +44,4 @@ PLIST_SUB+= PYTHON="" PLIST_SUB+= PYTHON="@comment " .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/net-mgmt/p5-FusionInventory-Agent/Makefile ============================================================================== --- head/net-mgmt/p5-FusionInventory-Agent/Makefile Thu Mar 7 16:13:35 2013 (r313598) +++ head/net-mgmt/p5-FusionInventory-Agent/Makefile Thu Mar 7 16:53:45 2013 (r313599) @@ -1,9 +1,5 @@ -# New ports collection makefile for: p5-FusionInventory-Agent -# Date created: 2011-08-18 -# Whom: Gvozdikov Veniamin <g.veniamin@googlemail.com> -# +# Created by: Gvozdikov Veniamin <g.veniamin@googlemail.com> # $FreeBSD$ -# PORTNAME= FusionInventory-Agent PORTVERSION= 2.2.5 @@ -35,13 +31,12 @@ TEST_DEPENDS= p5-Test-Exception>=0:${POR p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \ p5-IO-Capture>=0:${PORTSDIR}/devel/p5-IO-Capture -OPTIONS= CUPS "Enable CUPS" OFF \ - HTTP "Enable HTTP daemon mode" OFF \ - ZLIB "Enable Zlib compression" ON \ - SSL "Enable SSL" OFF \ - DMIDECODE "Enable dmidecode hardware information" ON \ - PCIUTILS "Enable pciutils hardware information" ON \ - NMAP "Enable NMAP network inventory" OFF +OPTIONS_DEFINE= CUPS HTTP ZLIB SSL DMIDECODE PCIUTILS NMAP +OPTIONS_DEFAULT= ZLIB DMIDECODE PCIUTILS +HTTP_DESC= HTTP daemon mode +ZLIB_DESC= Zlib compression +DMIDECODE_DESC= Dmidecode hardware information +PCIUTILS_DESC= Pciutils hardware information PERL_CONFIGURE= yes USE_GMAKE= yes @@ -87,34 +82,34 @@ MAN3= FusionInventory::Agent.3 \ FusionInventory::Agent::XML::Query::Prolog.3 \ FusionInventory::Agent::XML::Response.3 -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_CUPS) +.if ${PORT_OPTIONS:MCUPS} RUN_DEPENDS+= p5-Net-CUPS>=0.6:${PORTSDIR}/print/p5-Net-CUPS .endif -.if defined(WITH_HTTP) +.if ${PORT_OPTIONS:MHTTP} RUN_DEPENDS+= p5-HTTP-Daemon>=0:${PORTSDIR}/www/p5-HTTP-Daemon .endif -.if defined(WITH_ZLIB) +.if ${PORT_OPTIONS:MZLIB} RUN_DEPENDS+= p5-Compress-Raw-Zlib>=0:${PORTSDIR}/archivers/p5-Compress-Raw-Zlib .endif -.if defined(WITH_SSL) +.if ${PORT_OPTIONS:MSSL} RUN_DEPENDS+= p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay \ p5-LWP-Protocol-https>=0:${PORTSDIR}/www/p5-LWP-Protocol-https .endif -.if defined(WITH_DMIDECODE) +.if ${PORT_OPTIONS:MDMIDECODE} RUN_DEPENDS+= dmidecode:${PORTSDIR}/sysutils/dmidecode .endif -.if defined(WITH_PCIUTILS) +.if ${PORT_OPTIONS:MPCIUTILS} RUN_DEPENDS+= lspci:${PORTSDIR}/sysutils/pciutils .endif -.if defined(WITH_NMAP) +.if ${PORT_OPTIONS:MNMAP} RUN_DEPENDS+= nmap:${PORTSDIR}/security/nmap .endif @@ -128,4 +123,4 @@ post-install: ${CP} -p ${PREFIX}/etc/fusioninventory/agent.cfg.sample ${PREFIX}/etc/fusioninventory/agent.cfg ; \ fi -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/www/awffull/Makefile ============================================================================== --- head/www/awffull/Makefile Thu Mar 7 16:13:35 2013 (r313598) +++ head/www/awffull/Makefile Thu Mar 7 16:53:45 2013 (r313599) @@ -1,9 +1,5 @@ -# New ports collection makefile for: awffull -# Date created: 5 Feburary 2008 -# Whom: Chadwick Sorrell chad@wickdev.com -# +# Created by: Chadwick Sorrell chad@wickdev.com # $FreeBSD$ -# PORTNAME= awffull PORTVERSION= 3.10.2 @@ -25,7 +21,7 @@ CONFLICTS?= ja-awffull-[0-9]* FONTDEFAULT?= ${LOCALBASE}/lib/X11/fonts/bitstream-vera/VeraBd.ttf FONTLABEL?= ${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf -OPTIONS= GEOIP "Enable support for GeoIP (Country Detection)" Off +OPTIONS_DEFINE= GEOIP USE_ICONV= yes USE_GETTEXT= yes @@ -41,13 +37,13 @@ LDFLAGS+= -L${LOCALBASE}/lib MAN1= awffull.1 MAN5= awffull.conf.5 -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_GEOIP) +.if ${PORT_OPTIONS:MGEOIP} LIB_DEPENDS+= GeoIP.5:${PORTSDIR}/net/GeoIP CONFIGURE_ARGS+=--enable-geoip .else CONFIGURE_ARGS+=--disable-geoip .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/www/b2evolution/Makefile ============================================================================== --- head/www/b2evolution/Makefile Thu Mar 7 16:13:35 2013 (r313598) +++ head/www/b2evolution/Makefile Thu Mar 7 16:53:45 2013 (r313599) @@ -1,9 +1,5 @@ -# New ports collection makefile for: b2evolution -# Date created: 2005-04-16 -# Whom: chinsan <chinsan@mail20000.com.tw> -# +# Created by: chinsan <chinsan@mail20000.com.tw> # $FreeBSD$ -# PORTNAME= b2evolution PORTVERSION= 4.0.5 @@ -31,11 +27,12 @@ B2EVO_DIR?= www/${B2EVO_URL} PLIST= ${WRKDIR}/pkg-plist WARNING= ${PKGDIR}/pkg-warning -OPTIONS= LOCAL_DB_SERVER "Want to use local MySQL server?" on +OPTIONS_DEFINE= MYSQL +OPTIONS_DEFAULT= MYSQL -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_LOCAL_DB_SERVER) +.if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= server .endif @@ -61,4 +58,4 @@ post-install: -e 's|%%B2EVO_DIR%%|${B2EVO_DIR}|; s|%%B2EVO_URL%%|${B2EVO_URL}|' \ ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/www/claroline/Makefile ============================================================================== --- head/www/claroline/Makefile Thu Mar 7 16:13:35 2013 (r313598) +++ head/www/claroline/Makefile Thu Mar 7 16:53:45 2013 (r313599) @@ -1,9 +1,5 @@ -# New ports collection makefile for: claroline -# Date created: 29 Feb 2008 -# Whom: Wen heping <wenheping@gmail.com> -# +# Created by: Wen heping <wenheping@gmail.com> # $FreeBSD$ -# PORTNAME= claroline PORTVERSION= 1.10.2 @@ -19,21 +15,20 @@ USE_PHP= mysql WRKSRC= ${WRKDIR}/${DISTNAME} SUB_FILES= pkg-message -OPTIONS= LDAP "Add LDAP authentication functionality" Off \ - GD "Add GD functionality" On \ - OPENSSL "Add OpenSSL functionality" Off +OPTIONS_DEFINE= LDAP GD SSL +OPTIONS_DEFAULT= GD -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if !defined(WITHOUT_GD) +.if ${PORT_OPTIONS:MGD} USE_PHP+= gd .endif -.if defined(WITH_OPENSSL) +.if ${PORT_OPTIONS:MSSL} USE_PHP+= openssl .endif -.if defined(WITH_LDAP) +.if ${PORT_OPTIONS:MLDAP} USE_PHP+= ldap .endif @@ -48,4 +43,4 @@ do-install: post-install: @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/www/drraw/Makefile ============================================================================== --- head/www/drraw/Makefile Thu Mar 7 16:13:35 2013 (r313598) +++ head/www/drraw/Makefile Thu Mar 7 16:53:45 2013 (r313599) @@ -1,9 +1,5 @@ -# New ports collection makefile for: drraw -# Date created: 2006-08-08 -# Whom: Jim Riggs <ports@christianserving.org> -# +# Created by: Jim Riggs <ports@christianserving.org> # $FreeBSD$ -# PORTNAME= drraw DISTVERSION= 2.2b2 @@ -17,10 +13,10 @@ COMMENT= A simple web-based presentation RUN_DEPENDS+= rrdtool>=0:${PORTSDIR}/databases/rrdtool -OPTIONS= ZOOM_PATCH "Zoom support using jQuery via external patch" off +OPTIONS_DEFINE= ZOOM_PATCH +ZOOM_PATCH_DESC= Zoom support using jQuery via external patch USE_PERL5_RUN= yes - NO_BUILD= yes PORTDOCS= CHANGES INSTALL LICENSE README.EVENTS @@ -32,9 +28,9 @@ TMPDIR?= /var/db/${PORTNAME}/tmp PLIST_SUB+= CONFDIR=${CONFDIR} -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_ZOOM_PATCH) +.if ${PORT_OPTIONS:MZOOM_PATCH} PATCH_SITES+= http://aprilmayjune.org/wp-content/uploads/2009/09/ PATCHFILES+= drraw.cgi.zoom_patch .endif @@ -60,7 +56,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/icons/${theFile} ${WWWDIR}/icons .endfor -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} . for theFile in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${theFile} ${DOCSDIR} @@ -73,4 +69,4 @@ post-install: ${CP} -p ${PREFIX}/etc/drraw.conf-dist ${PREFIX}/etc/drraw.conf; \ fi -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/www/eaccelerator/Makefile ============================================================================== --- head/www/eaccelerator/Makefile Thu Mar 7 16:13:35 2013 (r313598) +++ head/www/eaccelerator/Makefile Thu Mar 7 16:53:45 2013 (r313599) @@ -1,9 +1,5 @@ -# New ports collection makefile for: eaccelerator -# Date created: Sat Mar 1 13:55:55 CET 2003 -# Whom: Alex Dupre <sysadmin@alexdupre.com> -# +# Created by: Alex Dupre <sysadmin@alexdupre.com> # $FreeBSD$ -# PORTNAME= eaccelerator PORTVERSION= 0.9.6.1 @@ -15,7 +11,8 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME} MAINTAINER= ale@FreeBSD.org COMMENT= A free open-source PHP accelerator & optimizer -OPTIONS= DOCCOMM "Retain doc-comments in internal php structures" off +OPTIONS_DEFINE= DOCCOMM +DOCCOMM_DESC= Retain doc-comments in internal php structures USE_PHP= yes USE_PHPIZE= yes @@ -36,9 +33,9 @@ PKGMESSAGE= ${WRKDIR}/pkg-message PORTDOCS= * -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_DOCCOMM) +.if ${PORT_OPTIONS:MDOCCOMM} CONFIGURE_ARGS+=--with-eaccelerator-doc-comment-inclusion .endif @@ -48,7 +45,7 @@ do-install: ${PREFIX}/lib/php/${PHP_EXT_DIR} post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} .endif @@ -58,4 +55,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/dasm.php ${EXAMPLESDIR} @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/www/encode-explorer/Makefile ============================================================================== --- head/www/encode-explorer/Makefile Thu Mar 7 16:13:35 2013 (r313598) +++ head/www/encode-explorer/Makefile Thu Mar 7 16:53:45 2013 (r313599) @@ -1,9 +1,5 @@ -# New ports collection makefile for: encode-explorer *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303071653.r27GrktT031082>