6 files changed, 56 insertions, 76 deletions

diff --git a/misc/gone/Makefile b/misc/gone/Makefile
index 31768cb69679..acc97b959788 100644
--- a/misc/gone/Makefile
+++ b/misc/gone/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   gone
-# Date created:        19 April 1998
-# Whom:                marcus
-#
+# Created by: marcus
 # $FreeBSD$
-#
 
 PORTNAME=	gone
 PORTVERSION=	1.3.6
@@ -17,8 +13,10 @@ MAN1=		gone.1
 PLIST_FILES=	bin/gone
 GNU_CONFIGURE=	yes
 
-OPTIONS=	SETUID "Install gone setuid root for password support" OFF
+OPTIONS_DEFINE=	SETUID
+SETUID_DESC=	Install gone setuid root for password support
 
+.include <bsd.port.options.mk>
 .include <bsd.port.pre.mk>
 
 #
@@ -26,7 +24,7 @@ OPTIONS=	SETUID "Install gone setuid root for password support" OFF
 # override this with WITH_SETUID=yes in your environment.
 # Be aware that setting gone to suid MAY be a security hole.
 #
-.if defined(WITH_SETUID)
+.if ${PORT_OPTIONS:MSETUID}
 CONFIGURE_ENV=	with_setuid=yes
 .else
 CONFIGURE_ENV=	with_setuid=no
diff --git a/misc/heyu2/Makefile b/misc/heyu2/Makefile
index cf182083d789..659b7652dc78 100644
--- a/misc/heyu2/Makefile
+++ b/misc/heyu2/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	heyu2
-# Date created:		29 March 2004
-# Whom:			mstowe@chicago.us.mensa.org
-#
+# Created by: mstowe@chicago.us.mensa.org
 # $FreeBSD$
-#
 
 PORTNAME=	heyu2
 PORTVERSION=	2.10
@@ -33,36 +29,39 @@ MAN5=		x10aux.5 \
 		x10rfxmeters.5 \
 		x10rfxsensors.5
 
-OPTIONS=	CM17A		"X10 CM17A \"Firecracker\" Support"		on \
-		EXTENDED	"Extended Type 0 (Shutter/Shade) Support"	on \
-		RFXSENS		"RFXSensors (RF) Support"			on \
-		RFXMETER	"RFXMeter (RF) Support"				on \
-		DMX		"Digimax Thermostat Support"			on \
-		OREGON	 	"Oregon Support"				on
+OPTIONS_DEFINE=	CM17A EXTENDED RFXSENS RFXMETER DMX OREGON
+CM17A_DESC=	X10 CM17A "Firecracker" Support
+EXTENDED_DESC=	Extended Type 0 (Shutter/Shade) Support
+RFXSENS_DESC=	RFXSensors (RF) Support
+RFXMETER_DESC=	RFXMeter (RF) Support
+DMX_DESC=	Digimax Thermostat Support
+OREGON_DESC=	Oregon Support
+
+OPTIONS_DEFAULT=	CM17A EXTENDED RFXSENS RFXMETER DMX OREGON
 
 .include <bsd.port.options.mk>
 
-.if !defined(WITH_CM17A)
+.if ! ${PORT_OPTIONS:MCM17A}
 CONFIGURE_ARGS+=	nocm17a
 .endif
 
-.if !defined(WITH_EXTENDED)
+.if ! ${PORT_OPTIONS:MEXTENDED}
 CONFIGURE_ARGS+=	noext0
 .endif
 
-.if !defined(WITH_RFXSENS)
+.if ! ${PORT_OPTIONS:MRFXSENS}
 CONFIGURE_ARGS+=	norfxs
 .endif
 
-.if !defined(WITH_RFXMETER)
+.if ! ${PORT_OPTIONS:MRFXMETER}
 CONFIGURE_ARGS+=	norfxm
 .endif
 
-.if !defined(WITH_DMX)
+.if ! ${PORT_OPTIONS:MDMX}
 CONFIGURE_ARGS+=	nodmx
 .endif
 
-.if !defined(WITH_OREGON)
+.if ! ${PORT_OPTIONS:MOREGON}
 CONFIGURE_ARGS+=	noore
 .endif
 
diff --git a/misc/krecipes/Makefile b/misc/krecipes/Makefile
index 243e4d7b9b47..f724353afedf 100644
--- a/misc/krecipes/Makefile
+++ b/misc/krecipes/Makefile
@@ -1,9 +1,5 @@
-# ports collection makefile for:	krecipies
-# Date created:				19 March 2005
-# Whom:					hank
-#
+# Created by: Henry Miller <hank@millerfarm.com>
 # $FreeBSD$
-#
 
 PORTNAME=	krecipes
 PORTVERSION=	0.9.1
@@ -17,25 +13,24 @@ COMMENT=	Recipe database for cooks
 USE_KDELIBS_VER=3
 USE_AUTOTOOLS=	libtool
 
-OPTIONS=	SQLITE "Support for SQLite backend" on \
-		MYSQL "Support for MySQL backend" off \
-		POSTGRESQL "Support for PostgreSQL backend" off
+OPTIONS_MULTI=	DB
+OPTIONS_MULTI_DB=	SQLITE MYSQL PGSQL
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITHOUT_SQLITE)
-CONFIGURE_ARGS+=	--without-sqlite
-.else
+.if ${PORT_OPTIONS:MSQLITE}
 USE_SQLITE=	yes
+.else
+CONFIGURE_ARGS+=	--without-sqlite
 .endif
 
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 RUN_DEPENDS+=	${LOCALBASE}/lib/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt-mysql-plugin
 .else
 CONFIGURE_ARGS+=	--without-mysql
 .endif
 
-.if defined(WITH_POSTGRESQL)
+.if ${PORT_OPTIONS:MPGSQL}
 RUN_DEPENDS+=	${LOCALBASE}/lib/plugins/sqldrivers/libqsqlpsql.so:${PORTSDIR}/databases/qt-pgsql-plugin
 .else
 CONFIGURE_ARGS+=	--without-postgresql
@@ -44,10 +39,4 @@ CONFIGURE_ARGS+=	--without-postgresql
 post-extract:
 	@${REINPLACE_CMD} -e 's|-O2||g'	${WRKSRC}/${CONFIGURE_SCRIPT}
 
-pre-configure:
-.if defined(WITHOUT_SQLITE) && !defined(WITH_MYSQL) && !defined(WITH_POSTGRESQL)
-	@${ECHO} "You must have at least one database backend"
-	@exit 1
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/mbuffer/Makefile b/misc/mbuffer/Makefile
index 3d7369e797c2..ab0f95b94757 100644
--- a/misc/mbuffer/Makefile
+++ b/misc/mbuffer/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	mbuffer
-# Date created:				Dec 14 2006
-# Whom:					Rong-En Fan <rafan@FreeBSD.org>
-#
+# Created by: Rong-En Fan <rafan@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	mbuffer
 PORTVERSION=	2011.07.24
@@ -14,7 +10,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	rafan@FreeBSD.org
-COMMENT=	A tool for buffering data streams
+COMMENT=	Tool for buffering data streams
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -27,11 +23,14 @@ PLIST_FILES=	bin/mbuffer
 
 MAN1=		${PORTNAME}.1
 
-OPTIONS=	MHASH	"Use mhash for hash generation"	on
+OPTIONS_DEFINE=	MHASH
+MHASH_DESC=	Use mhash for hash generation
+
+OPTIONS_DEFAULT=	MHASH
 
 .include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_MHASH)
+.if ${PORT_OPTIONS:MMHASH}
 LIB_DEPENDS+=	mhash.2:${PORTSDIR}/security/mhash
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index 989c9a187f77..8767f5409cda 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -25,13 +25,11 @@ USE_AUTOTOOLS=	libtool
 
 PORTDATA=	*
 
-OPTIONS=	SLANG		"Build with SLang library" on \
-		ICONV		"Build with iconv recoding" on \
-		NLS		"Build with NLS support" on \
-		EDIT		"Build with internal editor" on \
-		X11		"Build with X11 library" off \
-		SUBSHELL	"Build with subshell support" on \
-		SAMBA		"Build with Samba support" on
+OPTIONS_DEFINE=	SLANG ICONV NLS EDIT X11 SUBSHELL SMB
+EDIT_DESC=	Build with internal editor
+SUBSHELL_DESC=	Build with subshell support
+
+OPTIONS_DEFAULT=	SLANG ICONV NLS EDIT X11 SUBSHELL SMB
 
 post-patch:
 	${REINPLACE_CMD} -e 's/SUBDIRS = intl/SUBDIRS =/' ${WRKSRC}/Makefile.in
@@ -39,18 +37,18 @@ post-patch:
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_SAMBA) || !(defined(WITHOUT_SAMBA) || defined(MINIMAL))
+.if ${PORT_OPTIONS:MSMB} && !defined(MINIMAL)
 CONFIGURE_ARGS+=--enable-vfs-smb --with-configdir=${LOCALBASE}/etc\
 		--with-codepagedir=${LOCALBASE}/etc/codepages
 .endif
 
-.if defined(WITH_ICONV) || !(defined(WITHOUT_ICONV) || defined(MINIMAL))
+.if ${PORT_OPTIONS:MICONV} && !defined(MINIMAL)
 USES+=		iconv
 .else
 CONFIGURE_ARGS+=--disable-charset
 .endif
 
-.if !defined(WITH_NLS) && (defined(WITHOUT_NLS) || defined(MINIMAL))
+.if ! ${PORT_OPTIONS:MNLS} && !defined(MINIMAL)
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .else
@@ -61,27 +59,27 @@ PLIST_SUB+=	NLS=""
 _MANLANG=	es hu it pl ru sr
 .endif
 
-.if !defined(WITH_X11) || (defined(WITHOUT_X11) || defined(MINIMAL))
+.if ! ${PORT_OPTIONS:MX11} && !defined(MINIMAL)
 CONFIGURE_ARGS+=--without-x
 .else
 USE_XORG=	x11 xext
 .endif
 
-.if !defined(WITH_EDIT) && (defined(WITHOUT_EDIT) || defined(MINIMAL))
+.if ! ${PORT_OPTIONS:MEDIT} && !defined(MINIMAL)
 CONFIGURE_ARGS+=--without-edit
 PLIST_SUB+=	EDITOR="@comment "
 .else
 PLIST_SUB+=	EDITOR=""
 .endif
 
-.if !defined(WITH_SLANG) && (defined(WITHOUT_SLANG) || defined(MINIMAL))
+.if ! ${PORT_OPTIONS:MSLANG} && !defined(MINIMAL)
 CONFIGURE_ARGS+=--with-screen=ncurses
 .else
 LIB_DEPENDS+=	slang.2:${PORTSDIR}/devel/libslang2
 CONFIGURE_ARGS+=--with-screen=slang --with-slang-includes=${LOCALBASE}/include
 .endif
 
-.if !defined(WITH_SUBSHELL) && (defined(WITHOUT_SUBSHELL) || defined(MINIMAL))
+.if ! ${PORT_OPTIONS:MSUBSHELL} && !defined(MINIMAL)
 CONFIGURE_ARGS+=--without-subshell
 .endif
 
diff --git a/misc/ttyrec/Makefile b/misc/ttyrec/Makefile
index fc47b6b39af3..49f6bf9c4e29 100644
--- a/misc/ttyrec/Makefile
+++ b/misc/ttyrec/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   ttyrec
-# Date created:                Feb 14, 2001
-# Whom:                        Ying-Chieh Liao <ijliao@FreeBSD.org>
-#
+# Created by: Ying-Chieh Liao <ijliao@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	ttyrec
 PORTVERSION=	1.0.8
@@ -21,9 +17,10 @@ PLIST_FILES=	bin/ttyplay \
 MAN1=	ttyplay.1 ttyrec.1
 BINS=	ttyplay ttyrec ttytime
 
-OPTIONS=	OPENPTY "Use openpty instead" off
+OPTIONS_DEFINE=	OPENPTY
+OPENPTY_DESC=	Use openpty instead
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|^CC|#CC|g" -e "s|^CFLAGS|#CFLAGS|g" \
@@ -33,8 +30,8 @@ do-install:
 	${INSTALL_PROGRAM} ${BINS:S,^,${WRKSRC}/,} ${PREFIX}/bin
 	${INSTALL_MAN} ${MAN1:S,^,${WRKSRC}/,} ${MAN1PREFIX}/man/man1
 
-.if defined(WITH_OPENPTY)
+.if ${PORT_OPTIONS:MOPENPTY}
 CFLAGS+=	-DHAVE_openpty -lutil
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>