- Convert to OptionsNG

- Trim header

Reviewed by:	bapt

8 files changed, 72 insertions, 95 deletions

diff --git a/dns/credns/Makefile b/dns/credns/Makefile
index 1d270d2f7c53..d2a7b02e8a72 100644
--- a/dns/credns/Makefile
+++ b/dns/credns/Makefile
@@ -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-DATABASE NSD-DIFFFILE \
 		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>
diff --git a/dns/dnrd/Makefile b/dns/dnrd/Makefile
index 6418feee5033..3b3bb64dd928 100644
--- a/dns/dnrd/Makefile
+++ b/dns/dnrd/Makefile
@@ -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 NEWS README
 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>
diff --git a/dns/dnscheckengine/Makefile b/dns/dnscheckengine/Makefile
index c8d92f7ac5b5..9ce9e32b446c 100644
--- a/dns/dnscheckengine/Makefile
+++ b/dns/dnscheckengine/Makefile
@@ -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}
diff --git a/dns/dnstracer/Makefile b/dns/dnstracer/Makefile
index 7dc64d9d1a95..4db2d964d74a 100644
--- a/dns/dnstracer/Makefile
+++ b/dns/dnstracer/Makefile
@@ -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>
diff --git a/dns/mydns-ng/Makefile b/dns/mydns-ng/Makefile
index 9deac51b6e8a..5396dcbe6418 100644
--- a/dns/mydns-ng/Makefile
+++ b/dns/mydns-ng/Makefile
@@ -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.8 mydnsimport.8 mydnsptrconvert.8 mydns-
 
 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>
diff --git a/dns/nss_mdns/Makefile b/dns/nss_mdns/Makefile
index 8b11c2e934d1..f7088b07b917 100644
--- a/dns/nss_mdns/Makefile
+++ b/dns/nss_mdns/Makefile
@@ -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>
diff --git a/dns/pdnsd/Makefile b/dns/pdnsd/Makefile
index acddf460783f..47a9dd000f15 100644
--- a/dns/pdnsd/Makefile
+++ b/dns/pdnsd/Makefile
@@ -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 txt/manual.txt
 
 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>
diff --git a/dns/poweradmin/Makefile b/dns/poweradmin/Makefile
index 7f50c2ab3410..b0a8da8f1660 100644
--- a/dns/poweradmin/Makefile
+++ b/dns/poweradmin/Makefile
@@ -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