- Convert to Optionsng

- While here trim header

5 files changed, 36 insertions, 48 deletions

diff --git a/sysutils/autojump/Makefile b/sysutils/autojump/Makefile
index 6989ccb7e51a..e045c8f1f226 100644
--- a/sysutils/autojump/Makefile
+++ b/sysutils/autojump/Makefile
@@ -31,11 +31,12 @@ PLIST_FILES=	bin/autojump \
 		share/autojump/icon.png
 MAN1=		autojump.1
 
-OPTIONS=	ZSH "Install zsh version as well." On
+OPTIONS_DEFINE=		ZSH
+OPTIONS_DEFAULT=	ZSH
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_ZSH)
+.if ${PORT_OPTIONS:MZSH}
 RUN_DEPENDS+=	${LOCALBASE}/bin/zsh:${PORTSDIR}/shells/zsh
 PLIST_FILES+=	 share/zsh/site-functions/_j
 .endif
@@ -48,7 +49,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/usr$$|${PREFIX}|' -e 's|/usr/local|${PREFIX}|' -e 's|/bin/zsh|${PREFIX}/bin/zsh|' ${WRKSRC}/install.zsh
 
 do-install:
-.if defined(WITH_ZSH)
+.if ${PORT_OPTIONS:MZSH}
 	@(cd ${INSTALL_WRKSRC} && ${SETENV} PREFIX=${PREFIX} ./install.zsh )
 .else
 	@(cd ${INSTALL_WRKSRC} && ${SETENV} PREFIX=${PREFIX} ./install.sh )
diff --git a/sysutils/hdup/Makefile b/sysutils/hdup/Makefile
index 7047e8b8f30a..c92121c671db 100644
--- a/sysutils/hdup/Makefile
+++ b/sysutils/hdup/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	hdup
-# Date created:				6 March 2005
-# Whom:					Sergey Matveychuk <sem@FreeBSD.org>
-#
+# Created by: Sergey Matveychuk <sem@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	hdup
 PORTVERSION=	2.0.14
@@ -17,7 +13,8 @@ COMMENT=	The little, spiffy, backup tool
 
 #WRKSRC=		${WRKDIR}/hdup2
 
-OPTIONS=	GNUTAR_PORT "Build with the newest GNU tar from ports" no
+OPTIONS_DEFINE=	GNUTAR_PORT DOCS
+GNUTAR_PORT_DESC=	GNU tar from ports
 
 BUILD_DEPENDS=	mcrypt:${PORTSDIR}/security/mcrypt
 RUN_DEPENDS=	mcrypt:${PORTSDIR}/security/mcrypt \
@@ -34,9 +31,9 @@ USE_AUTOTOOLS=	autoconf
 MAN1=		hdup.1
 MAN5=		hdup.conf.5
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_GNUTAR_PORT)
+.if ${PORT_OPTIONS:MGNUTAR_PORT}
 BUILD_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
 RUN_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
 GNUTAR=		${LOCALBASE}/bin/gtar
@@ -49,7 +46,7 @@ post-configure:
 	@${REINPLACE_CMD} -e 's#%%GNUTAR%%#${GNUTAR}#g' ${WRKSRC}/src/hdup.h
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}; \
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}; \
 	${INSTALL_DATA} ${WRKSRC}/doc/FAQ.html ${DOCSDIR}; \
@@ -57,4 +54,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/nvclock/Makefile b/sysutils/nvclock/Makefile
index 28dc922b937d..543258c80c33 100644
--- a/sysutils/nvclock/Makefile
+++ b/sysutils/nvclock/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	NVClock
-# Date created:				August 4, 2003
-# Whom:					Samy Al Bahra <samy@kerneled.com>
-#
+# Created by: Samy Al Bahra <samy@kerneled.com>
 # $FreeBSD$
-#
 
 PORTNAME=	nvclock
 DISTVERSION=	0.8b4
@@ -24,27 +20,28 @@ PLIST_FILES=	bin/nvclock bin/smartdimmer
 MAN1=		nvclock.1
 PORTDOCS=	ABOUT AUTHORS ChangeLog FAQ README
 
-OPTIONS=	NVCONTROL	"Enable NV-CONTROL support"	on \
-		GTK		"Build GTK+ user interface"	on \
-		QT		"Build Qt 3.x user interface"	off
+OPTIONS_DEFINE=	NVCONTROL GTK2 QT
+OPTIONS_DEFAULT=	NVCONTROL GTK2
+NVCONTROL_DESC=		NV-CONTROL support
+QT_DESC=		Qt 3 toolkit
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_NVCONTROL)
+.if ${PORT_OPTIONS:MNVCONTROL}
 USE_XORG=	xext
 USE_GNOME=	pkgconfig
 .else
 CONFIGURE_ARGS+=	--disable-nvcontrol
 .endif
 
-.if defined(WITH_GTK)
+.if ${PORT_OPTIONS:MGTK2}
 USE_GNOME=	gtk20
 PLIST_FILES+=	bin/nvclock_gtk
 .else
 CONFIGURE_ARGS+=	--disable-gtk
 .endif
 
-.if defined(WITH_QT)
+.if ${PORT_OPTIONS:MQT}
 USE_QT_VER=	3
 CONFIGURE_ARGS+=	--enable-qt --with-qtdir=${LOCALBASE}
 PLIST_FILES+=	bin/nvclock_qt
diff --git a/sysutils/pdsh/Makefile b/sysutils/pdsh/Makefile
index 4270fdd8dd59..bb6a40ce5a32 100644
--- a/sysutils/pdsh/Makefile
+++ b/sysutils/pdsh/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	sysutils/pdsh
-# Date created:		2010-03-09
-# Whom:			Mykola Dzham <i@levsha.me>
-#
+# Created by: Mykola Dzham <i@levsha.me>
 # $FreeBSD$
-#
 
 PORTNAME=	pdsh
 PORTVERSION=	2.28
@@ -19,15 +15,15 @@ USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_PERL5_BUILD=yes
 
-OPTIONS=	SSH		"Enable SSH support" On \
-		DSHGROUPS	"Enable DSH groups" On \
-		NETGROUP	"Enable NIS Netgroup support" Off \
-		READLINE	"Enable GNU readline support" Off \
-		RSH		"Enable RSH support" Off
+OPTIONS_DEFINE=		SSH DSHGROUPS NETGROUP READLINE RSH
+OPTIONS_DEFAULT=	SSH DSHGROUPS
+DSHGROUPS_DESC=		DSH groups supprt
+NETGROUP_DESC=		NIS Netgroup support
+RSH_DESC=		RSH support
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_SSH)
+.if ${PORT_OPTIONS:MSSH}
 CONFIGURE_ARGS+=	--with-ssh
 PLIST_SUB+=		SSH=""
 .else
@@ -35,7 +31,7 @@ CONFIGURE_ARGS+=	--without-ssh
 PLIST_SUB+=		SSH="@comment "
 .endif
 
-.if defined(WITH_DSHGROUPS)
+.if ${PORT_OPTIONS:MDSHGROUPS}
 CONFIGURE_ARGS+=	--with-dshgroups
 PLIST_SUB+=		DSH=""
 .else
@@ -43,7 +39,7 @@ CONFIGURE_ARGS+=	--without-dshgroups
 PLIST_SUB+=		DSH="@comment "
 .endif
 
-.if defined(WITH_NETGROUP)
+.if ${PORT_OPTIONS:MNETGROUP}
 CONFIGURE_ARGS+=	--with-netgroup
 PLIST_SUB+=		NETGROUP=""
 .else
@@ -51,14 +47,14 @@ CONFIGURE_ARGS+=	--without-netgroup
 PLIST_SUB+=		NETGROUP="@comment "
 .endif
 
-.if defined(WITH_READLINE)
+.if ${PORT_OPTIONS:MREADLINE}
 CONFIGURE_ARGS+=	--with-readline
 LIB_DEPENDS+=		readline:${PORTSDIR}/devel/readline
 .else
 CONFIGURE_ARGS+=	--without-readline
 .endif
 
-.if defined(WITH_RSH)
+.if ${PORT_OPTIONS:MRSH}
 CONFIGURE_ARGS+=	--with-rsh
 PLIST_SUB+=		RSH=""
 .else
diff --git a/sysutils/volman/Makefile b/sysutils/volman/Makefile
index 6dde95df03c4..30eff9f78d71 100644
--- a/sysutils/volman/Makefile
+++ b/sysutils/volman/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   volman
-# Date created:        2012-01-06
-# Whom:                Aragon Gouveia <aragon@phat.za.net>
-#
+# Created by: Aragon Gouveia <aragon@phat.za.net>
 # $FreeBSD$
-#
 
 PORTNAME=	volman
 PORTVERSION=	0.7
@@ -18,12 +14,13 @@ USE_XZ=		yes
 USE_RC_SUBR=	volmand
 VM_SUB_FILES=	vmount volmand
 
-OPTIONS=	OPENBOX "Install Openbox pipemenu script" off \
-		NTFS3G "Use fusefs-ntfs extensions" off
+OPTIONS_DEFINE=	 OPENBOX NTFS3G
+OPENBOX_DESC=	Openbox pipemenu script
+NTFS3G_DESC=	Use fusefs-ntfs extensions
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_OPENBOX)
+.if ${PORT_OPTIONS:MOPENBOX}
 VM_SUB_FILES+=	obvolman
 RUN_DEPENDS+=	${LOCALBASE}/bin/xmessage:${PORTSDIR}/x11/xmessage
 PLIST_SUB+=	OPENBOX=""
@@ -31,7 +28,7 @@ PLIST_SUB+=	OPENBOX=""
 PLIST_SUB+=	OPENBOX="@comment "
 .endif
 
-.if defined(WITH_NTFS3G)
+.if ${PORT_OPTIONS:MNTFS3G}
 RUN_DEPENDS+=	${LOCALBASE}/bin/ntfs-3g:${PORTSDIR}/sysutils/fusefs-ntfs
 SUB_LIST+=	RCFUSEFS=" fusefs"
 .else