- Convert to OptionsNG

- Trim header

Reviewed by:	beat, bapt, kwm

13 files changed, 88 insertions, 122 deletions

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