20 files changed, 196 insertions, 252 deletions

diff --git a/www/awffull/Makefile b/www/awffull/Makefile
index aef9b9466bba..6611446c41f0 100644
--- a/www/awffull/Makefile
+++ b/www/awffull/Makefile
@@ -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>
diff --git a/www/b2evolution/Makefile b/www/b2evolution/Makefile
index 5936dd9a5390..376663008470 100644
--- a/www/b2evolution/Makefile
+++ b/www/b2evolution/Makefile
@@ -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>
diff --git a/www/claroline/Makefile b/www/claroline/Makefile
index 5bec06bcdfa4..2eb5210d570e 100644
--- a/www/claroline/Makefile
+++ b/www/claroline/Makefile
@@ -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>
diff --git a/www/drraw/Makefile b/www/drraw/Makefile
index 98f5d634916d..033c4b3ce3b9 100644
--- a/www/drraw/Makefile
+++ b/www/drraw/Makefile
@@ -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 front-end for RRDtool
 
 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>
diff --git a/www/eaccelerator/Makefile b/www/eaccelerator/Makefile
index dab19319f16f..6a418de76504 100644
--- a/www/eaccelerator/Makefile
+++ b/www/eaccelerator/Makefile
@@ -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}/eAccelerator%20${PORTVERSION}/ \
 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>
diff --git a/www/encode-explorer/Makefile b/www/encode-explorer/Makefile
index a68a82cd04ef..30439d657aae 100644
--- a/www/encode-explorer/Makefile
+++ b/www/encode-explorer/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	encode-explorer
-# Date created:			Thu Apr 22 11:24:23 CEST 2010
-# Whom:				Frank Wall <fw@moov.de>
-#
+# Created by: Frank Wall <fw@moov.de>
 # $FreeBSD$
-#
 
 PORTNAME=	encode
 PORTVERSION=	5.0
@@ -21,15 +17,16 @@ WANT_PHP_WEB=	yes
 USE_ZIP=	yes
 NO_BUILD=	yes
 
-OPTIONS=	EXPERIMENTAL "Enable experimental features" off
+OPTIONS_DEFINE=	EXPERIMENTAL
+EXPERIMENTAL_DESC=	Experimental features
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 WWWDIR=		${PREFIX}/www/${PORTNAME}${PKGNAMESUFFIX}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_EXPERIMENTAL)
+.if ${PORT_OPTIONS:MEXPERIMENTAL}
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-index-php-experimental
 .endif
 
@@ -43,4 +40,4 @@ post-install:
 	${CP} ${WRKSRC}/README.txt ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/gallery2/Makefile b/www/gallery2/Makefile
index 52506e2b77cc..f1fefe652c04 100644
--- a/www/gallery2/Makefile
+++ b/www/gallery2/Makefile
@@ -24,58 +24,53 @@ NO_BUILD=	yes
 
 SUB_FILES=	pkg-message
 
-OPTIONS=	NETPBM "Enable netpbm support" off \
-		IMAGEMAGICK "Enable imagemagick support" on \
-		GRAPHMAGICK "Enable graphicsmagick support" off \
-		PGSQL "Use PostgreSQL instead of MySQL" off \
-		JHEAD "Enable jhead support" on \
-		UNZIP "Enable unzip support" on \
-		GD "Enable gd support" off \
-		DCRAW "Enable dcraw support" off \
-		FFMPEG "Enable ffmpeg support" off \
-		NLS "Enable National Language Support" on
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_PGSQL)
+OPTIONS_DEFINE=		DCRAW FFMPEG GD GRAPHMAGICK IMAGEMAGICK JHEAD \
+			NETPBM NLS UNZIP
+OPTIONS_DEFAULT=	IMAGEMAGICK JHEAD UNZIP
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MPGSQL}
 USE_PHP+=	pgsql
 .else
 USE_PHP+=	mysql
 .endif
-.if defined(WITH_GD)
+
+.if ${PORT_OPTIONS:MGD}
 USE_PHP+=	gd
 RUN_DEPENDS+=	pngtogd:${PORTSDIR}/graphics/gd
 .endif
-.if defined(WITH_NLS)
+
+.if ${PORT_OPTIONS:MNLS}
 USE_PHP+=	gettext
 USE_GETTEXT=	yes	# Pet portlint
 .endif
 
-.if defined(WITH_NETPBM)
+.if ${PORT_OPTIONS:MNETPBM}
 RUN_DEPENDS+=	giftopnm:${PORTSDIR}/graphics/netpbm
 .endif
 
-.if defined(WITH_GRAPHMAGICK)
+.if ${PORT_OPTIONS:MGRAPHMAGICK}
 RUN_DEPENDS+=	gm:${PORTSDIR}/graphics/GraphicsMagick
 .endif
 
-.if defined(WITH_IMAGEMAGICK)
+.if ${PORT_OPTIONS:MIMAGEMAGICK}
 RUN_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick
 .endif
 
-.if defined(WITH_JHEAD)
+.if ${PORT_OPTIONS:MJHEAD}
 RUN_DEPENDS+=	jhead:${PORTSDIR}/graphics/jhead
 .endif
 
-.if defined(WITH_UNZIP)
+.if ${PORT_OPTIONS:MUNZIP}
 RUN_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 .endif
 
-.if defined(WITH_FFMPEG)
+.if ${PORT_OPTIONS:MFFMPEG}
 LIB_DEPENDS+=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg
-
 .endif
-.if defined(WITH_DCRAW)
+
+.if ${PORT_OPTIONS:MDCRAW}
 RUN_DEPENDS+=	dcraw:${PORTSDIR}/graphics/dcraw
 .endif
 
@@ -93,4 +88,4 @@ do-install:
 	@ ${CAT} ${PKGMESSAGE}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/gallery3/Makefile b/www/gallery3/Makefile
index 237a8e05f2a9..7476280a6005 100644
--- a/www/gallery3/Makefile
+++ b/www/gallery3/Makefile
@@ -22,15 +22,9 @@ NO_BUILD=	yes
 
 SUB_FILES=	pkg-message
 
-OPTIONS=	DCRAW "Enable dcraw support" off \
-		FFMPEG "Enable ffmpeg support" off \
-		GD "Enable gd support" off \
-		GRAPHMAGICK "Enable graphicsmagick support" off \
-		IMAGEMAGICK "Enable imagemagick support" on \
-		JHEAD "Enable jhead support" on \
-		NETPBM "Enable netpbm support" off \
-		NLS "Enable National Language Support" on \
-		UNZIP "Enable unzip support" on
+OPTIONS_DEFINE=	DCRAW FFMPEG GD GRAPHMAGICK IMAGEMAGICK JHEAD \
+		NETPBM NLS UNZIP
+OPTIONS_DEFAULT=	IMAGEMAGICK JHEAD UNZIP
 
 .include <bsd.port.options.mk>
 
@@ -39,41 +33,41 @@ OPTIONS=	DCRAW "Enable dcraw support" off \
 WWWDIR=		${GALLERY3DIR}
 .endif
 
-.if defined(WITH_DCRAW)
+.if ${PORT_OPTIONS:MDCRAW}
 RUN_DEPENDS+=	dcraw:${PORTSDIR}/graphics/dcraw
 .endif
 
-.if defined(WITH_FFMPEG)
+.if ${PORT_OPTIONS:MFFMPEG}
 LIB_DEPENDS+=	avcodec:${PORTSDIR}/multimedia/ffmpeg
 .endif
 
-.if defined(WITH_GD)
+.if ${PORT_OPTIONS:MGD}
 USE_PHP+=	gd
 RUN_DEPENDS+=	pngtogd:${PORTSDIR}/graphics/gd
 .endif
 
-.if defined(WITH_GRAPHMAGICK)
+.if ${PORT_OPTIONS:MGRAPHMAGICK}
 RUN_DEPENDS+=	gm:${PORTSDIR}/graphics/GraphicsMagick
 .endif
 
-.if !defined(WITHOUT_IMAGEMAGICK)
+.if ${PORT_OPTIONS:MIMAGEMAGICK}
 RUN_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick
 .endif
 
-.if !defined(WITHOUT_JHEAD)
+.if ${PORT_OPTIONS:MJHEAD}
 RUN_DEPENDS+=	jhead:${PORTSDIR}/graphics/jhead
 .endif
 
-.if defined(WITH_NETPBM)
+.if ${PORT_OPTIONS:MNETPBM}
 RUN_DEPENDS+=	giftopnm:${PORTSDIR}/graphics/netpbm
 .endif
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_PHP+=	gettext
 USE_GETTEXT=	yes	# Pet portlint
 .endif
 
-.if !defined(WITHOUT_UNZIP)
+.if ${PORT_OPTIONS:MUNZIP}
 RUN_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 .endif
 
diff --git a/www/ilias3/Makefile b/www/ilias3/Makefile
index 326b2bddbe48..4fa0fc532307 100644
--- a/www/ilias3/Makefile
+++ b/www/ilias3/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	www/ilias
-# Date created:				Oct 24, 2006
-# Whom:					Bartlomiej Rutkowski <r@robakdesign.com>
-#
+# Created by: Bartlomiej Rutkowski <r@robakdesign.com>
 # $FreeBSD$
 
 PORTNAME=	ilias
@@ -36,21 +33,23 @@ PLIST_SUB=	ILIASDATADIR=${ILIASDATADIR}
 SUB_FILES=	pkg-message
 SUB_LIST=	ILIASDATADIR=${ILIASDATADIR}
 
-OPTIONS=	SCORM2004 "Using SCORM2004 support" off	\
-		Checker "Link Checker" off \
-		Mail "Internet compliant E-Mail addresses" off
+OPTIONS_DEFINE=	SCORM2004 CHECKER MAIL
 
-.include <bsd.port.pre.mk>
+SCORM2004_DESC=		Using SCORM2004 support
+CHECKER_DESC=		Link Checker
+MAIL_DESC=		Mail Support
 
-.if defined(WITH_SCORM2004)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MSCORM2004}
 USE_PHP+=	json
 .endif
 
-.if defined(WITH_Checker)
+.if ${PORT_OPTIONS:MCHECKER}
 RUN_DEPENDS+=	 ${LOCALBASE}/share/pear/HTTP/Request.php:${PORTSDIR}/www/pear-HTTP_Request
 .endif
 
-.if defined(WITH_Mail)
+.if ${PORT_OPTIONS:MMAIL}
 RUN_DEPENDS+=	${LOCALBASE}/share/pear/Mail.php:${PORTSDIR}/mail/pear-Mail
 .endif
 
@@ -71,10 +70,10 @@ do-install:
 		>> ${TMPPLIST}
 	@${ECHO_CMD} '@exec ${CHMOD} -R 755 ${PREFIX}/${ILIASDATADIR}' >>${TMPPLIST}
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@cd ${WRKDIR}/docs && ${COPYTREE_SHARE} . ${DOCSDIR}
 .endif
 
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/lightsquid/Makefile b/www/lightsquid/Makefile
index ef5eb55e354c..e3e695346477 100644
--- a/www/lightsquid/Makefile
+++ b/www/lightsquid/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	lightsquid
-# Date created:				24 Nov 2005
-# Whom:					Alexander Logvinov <info@logvinov.com>
-#
+# Created by: Alexander Logvinov <info@logvinov.com>
 # $FreeBSD$
-#
 
 PORTNAME=	lightsquid
 PORTVERSION=	1.8
@@ -15,25 +11,26 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	A light and fast web based squid proxy traffic analyser
 
-OPTIONS=	GDSUPPORT	"Graphics report support"	on
+OPTIONS_DEFINE=		GD DOCS
+OPTIONS_DEFAULT=	GD
 
 NO_BUILD=	yes
 USE_PERL5_RUN=	yes
 
+.include <bsd.port.options.mk>
+
 CONFIGS=	lightsquid.cfg realname.cfg skipuser.cfg group.cfg
 REINPLACE_ARGS=	-i ""
 PORTDOCS=	gnugpl.txt install.txt readme.txt thanks.txt graph.txt logformat.txt \
 		templates.txt version.txt
 SUB_FILES=	pkg-message
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 SUB_LIST+=	NOTEWORK="Read ${DOCSDIR}/readme.txt."
 .else
 SUB_LIST+=	NOTEWORK=""
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if !defined(WITHOUT_GDSUPPORT)
+.if ${PORT_OPTIONS:MGD}
 RUN_DEPENDS+=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD
 .endif
 
@@ -77,7 +74,7 @@ do-install:
 		${INSTALL_SCRIPT} "{}" "${WWWDIR}/{}" \; && \
 		${INSTALL_DATA} .htaccess ${WWWDIR}/
 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for i in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR}
@@ -87,4 +84,4 @@ do-install:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/mod_tsa/Makefile b/www/mod_tsa/Makefile
index b933e48cd48c..cc6c78e22c5d 100644
--- a/www/mod_tsa/Makefile
+++ b/www/mod_tsa/Makefile
@@ -1,25 +1,18 @@
-# New ports collection makefile for:   mod_tsa
-# Date created:        22 November 2010
-# Whom:                ubique
-#
+# Created by: ubique
 # $FreeBSD$
-#
 
 PORTNAME=	mod_tsa
 PORTVERSION=	1.0
 PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://am.nesiac.org/static/ \
-  http://ubique.spb.ru/src/
+		http://ubique.spb.ru/src/
 
 MAINTAINER=	ubique@peterhost.ru
 COMMENT=	Time stamping authority (RFC 3161) module for apache
 
-OPTIONS=	MYSQL "Enable support for MySQL storage" Off \
-		PGSQL "Enable support for PostgreSQL" Off \
-		FIREBIRD "Enable support for Firebird storage" Off \
-		DEBUG   "Build with debug" Off \
-		DEBUG_MEMORY "Build with memory debug" Off
+OPTIONS_DEFINE=	MYSQL PGSQL FIREBIRD DEBUG DEBUG_MEMORY
+DEBUG_MEMORY_DESC=	Memory debug
 
 MAKE_JOBS_SAFE=	yes
 
@@ -43,7 +36,7 @@ PORTEXAMPLES=	*.sql tsa.conf
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	yes
 CONFIGURE_ARGS+=	--enable-mysql=yes
 SRC_FILE+=	db_mysql.c
@@ -51,30 +44,30 @@ AP_INC+=	-I${LOCALBASE}/include/mysql
 AP_LIB+=	-L${LOCALBASE}/lib/mysql -lmysqlclient
 .endif
 
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 USE_PGSQL=	yes
 CONFIGURE_ARGS+=	--enable-pgsql=yes
 SRC_FILE+=	db_postgresql.c
 AP_LIB+=	-lpq
 .endif
 
-.if defined(WITH_FIREBIRD)
+.if ${PORT_OPTIONS:MFIREBIRD}
 USE_FIREBIRD=	yes
 CONFIGURE_ARGS+=	--enable-firebird=yes
 SRC_FILE+=	db_firebird.c	
 AP_LIB+=	-lgds
 .endif
 
-.if defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=	--with-debug=yes
 .endif
 
-.if defined(WITH_DEBUG_MEMORY)
+.if ${PORT_OPTIONS:MDEBUG_MEMORY}
 CONFIGURE_ARGS+=	--with-debug-memory=yes
 .endif
 
 post-install:
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${EXAMPLESDIR}/
 	${INSTALL_DATA} ${WRKSRC}/*.sql ${EXAMPLESDIR}/
 	${INSTALL_DATA} ${WRKSRC}/tsa.conf ${EXAMPLESDIR}/
diff --git a/www/opera-devel/Makefile b/www/opera-devel/Makefile
index 2a9b62bf1499..6bc1f4c6bd3e 100644
--- a/www/opera-devel/Makefile
+++ b/www/opera-devel/Makefile
@@ -36,26 +36,24 @@ MANCOMPRESSED=	yes
 
 NO_BUILD=	yes
 
-OPTIONS=	CUPS	"Enable support for printing (requires CUPS)"		on \
-		VIDEO	"Enable support for HTML5 video (requires GStreamer)"	on \
-		GTK	"Use GTK backend"	off \
-		KDE4	"Use KDE4 backend"	off
+OPTIONS_DEFINE=		CUPS VIDEO GTK2 KDE4
+OPTIONS_DEFAULT=	CUPS VIDEO
 
 .include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_CUPS)
+.if ! ${PORT_OPTIONS:MCUPS}
 LIB_DEPENDS+=	cups.2:${PORTSDIR}/print/cups-client
 .endif
 
-.if !defined(WITHOUT_VIDEO)
+.if ! ${PORT_OPTIONS:MVIDEO}
 USE_GSTREAMER+=	vorbis ogg theora vp8 good
 .endif
 
-.if defined(WITH_GTK)
+.if ${PORT_OPTIONS:MGTK2}
 USE_GNOME+=	gtk20
 .endif
 
-.if defined(WITH_KDE4)
+.if ${PORT_OPTIONS:MKDE4}
 USE_KDE4+=	kdelibs
 .endif
 
diff --git a/www/p5-Apache2-SiteControl/Makefile b/www/p5-Apache2-SiteControl/Makefile
index fc6a135f80f9..5e02498f3b0a 100644
--- a/www/p5-Apache2-SiteControl/Makefile
+++ b/www/p5-Apache2-SiteControl/Makefile
@@ -26,7 +26,8 @@ RUN_DEPENDS=	p5-Apache-AuthCookie>=3.08:${PORTSDIR}/www/p5-Apache-AuthCookie \
 		p5-Crypt-CBC>=2.14:${PORTSDIR}/security/p5-Crypt-CBC \
 		p5-libapreq2>=2.05:${PORTSDIR}/www/p5-libapreq2
 
-OPTIONS=	RADIUS "Support for RADIUS back-end" on
+OPTIONS_DEFINE=		RADIUS
+OPTIONS_DEFAULT=	RADIUS
 
 PERL_CONFIGURE=	yes
 
@@ -41,7 +42,7 @@ MAN3=		Apache2::SiteControl.3 \
 
 .include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_RADIUS)
+.if ! ${PORT_OPTIONS:MRADIUS}
 RUN_DEPENDS+=	p5-Authen-Radius>=0.10:${PORTSDIR}/security/p5-Authen-Radius
 .endif
 
diff --git a/www/pound/Makefile b/www/pound/Makefile
index 9605962f3e2a..ef449a61c1c8 100644
--- a/www/pound/Makefile
+++ b/www/pound/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	pound
-# Date created:				27 August 2002
-# Whom:					Anders Nordby <anders@FreeBSD.org>
-#
+# Created by: Anders Nordby <anders@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	pound
 PORTVERSION=	2.6
@@ -28,20 +24,21 @@ SUB_LIST=	NAME=${PORTNAME}
 
 MAN8=	pound.8 poundctl.8
 
-OPTIONS=	MSDAV		"With the Microsoft WebDAV extensions support" off \
-		PCRE		"Build with libpcre support" on
+OPTIONS_DEFINE=	MSDAV PCRE
+OPTIONS_DEFAULT=	PCRE
+MSDAV_DESC=	Microsoft WebDAV extension support
 
 CONFIGURE_ARGS=	--disable-tcmalloc --disable-hoard
 PLIST_FILES=	sbin/pound sbin/poundctl
 PORTDOCS=	README FAQ CHANGELOG
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_MSDAV)
+.if ${PORT_OPTIONS:MMSDAV}
 CONFIGURE_ARGS+=	--enable-msdav
 .endif
 
-.if !defined(WITHOUT_PCRE)
+.if ${PORT_OPTIONS:MPCRE}
 LIB_DEPENDS+=		pcre.3:${PORTSDIR}/devel/pcre
 CFLAGS+=		"-I${LOCALBASE}/include"
 CPPFLAGS+=		"-I${LOCALBASE}/include"
@@ -51,11 +48,11 @@ CONFIGURE_ARGS+=	--disable-pcreposix
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/punbb/Makefile b/www/punbb/Makefile
index 7e8baa46c436..5dbc32bd6aa6 100644
--- a/www/punbb/Makefile
+++ b/www/punbb/Makefile
@@ -26,12 +26,14 @@ NO_BUILD=	yes
 USE_PHP=	yes
 USE_BZIP2=	yes
 
-OPTIONS=	LANGUAGE_PACK "Install language packs" on \
-		EXTRAS "Install all plugins available" on
+OPTIONS_DEFINE=	LANGUAGE_PACK EXTRAS
+OPTIONS_DEFAULT=	LANGUAGE_PACK EXTRAS
+LANGUAGE_PACK_DESC=	Install language packs
+EXTRAS_DESC=		Install all plugins available
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_LANGUAGE_PACK)
+.if ${PORT_OPTIONS:MLANGUAGE_PACK}
 LANGFILES+=	Arabic.zip \
 		Bangla_UTF8.zip \
 		Belarusian.zip \
@@ -87,7 +89,7 @@ PLIST_SUB+=	LANGUAGE_PACK=""
 PLIST_SUB+=	LANGUAGE_PACK="@comment "
 .endif
 
-.if defined(WITH_EXTRAS)
+.if ${PORT_OPTIONS:MEXTRAS}
 PLUGINS+=	AP_User_Merge.zip \
 		AP_Author_Update.zip \
 		AP_PunBB_Shell.zip \
@@ -129,4 +131,4 @@ do-install:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/py-dojango/Makefile b/www/py-dojango/Makefile
index 5cbcbe64be96..d15966ad4058 100644
--- a/www/py-dojango/Makefile
+++ b/www/py-dojango/Makefile
@@ -20,13 +20,13 @@ PYDISTUTILS_PKGNAME=	${PORTNAME}
 
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django
 
-OPTIONS=	JAVA	"Java support needed to build dojo libraries"	off
+OPTIONS_DEFINE=		JAVA
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_JAVA)
+.if ${PORT_OPTIONS:MJAVA}
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/sit/Makefile b/www/sit/Makefile
index 0baf4dc625c4..c21fbc1bc049 100644
--- a/www/sit/Makefile
+++ b/www/sit/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	sit
-# Date created:				Wed Oct 7, 2010
-# Whom:					Carsten Jensen <carsten@sitracker.org>
-#
+# Created by: Carsten Jensen <carsten@sitracker.org>
 # $FreeBSD$
-#
 
 PORTNAME=	sit
 PORTVERSION=	3.67
@@ -24,21 +20,22 @@ WRKSRC=		${WRKDIR}/sit-${PORTVERSION}
 
 SUB_FILES=	pkg-message
 
-OPTIONS=	IMAP		"If you want email to work"			on \
-		MBSTRING	"If you want to use the inbound email feature"	on \
-		LDAP		"If you want to use LDAP auth"			off
+OPTIONS_DEFINE=	IMAP MBSTRING LDAP
+OPTIONS_DEFAULT=	IMAP MBSTRING
+IMAP_DESC=	Email Support
+MBSTRING_DESC=	Inbound email feature
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_IMAP)
+.if ${PORT_OPTIONS:MIMAP}
 USE_PHP+=	imap
 .endif
 
-.if defined(WITH_MBSTRING)
+.if ${PORT_OPTIONS:MMBSTRING}
 USE_PHP+=	mbstring
 .endif
 
-.if defined(WITH_LDAP)
+.if ${PORT_OPTIONS:MLDAP}
 USE_PHP+=	ldap
 .endif
 
@@ -56,4 +53,4 @@ post-install:
 		${CP} -p ${WWWDIR}/config.inc.php ${WWWDIR}/config.inc.php.bak ; \
 	fi
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/tinyproxy/Makefile b/www/tinyproxy/Makefile
index 71defaeb7665..9bfbec935071 100644
--- a/www/tinyproxy/Makefile
+++ b/www/tinyproxy/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	tinyproxy
-# Date created:		01 Jul 1999
-# Whom:			Mitsuru Yoshida <mitsuru@riken.go.jp>
-#
+# Created by: Mitsuru Yoshida <mitsuru@riken.go.jp>
 # $FreeBSD$
-#
 
 PORTNAME=	tinyproxy
 PORTVERSION=	1.8.3
@@ -34,21 +30,22 @@ CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin \
 MAN8=		tinyproxy.8
 MAN5=		tinyproxy.conf.5
 
-OPTIONS=	XHEADER "Enable X-Tinyproxy header" Off \
-		REVERSE "Enable reverse proxy support" Off \
-		TRANSPARENT "Enable transparent proxy support" Off
+OPTIONS_DEFINE=	XHEADER REVERSE TRANSPARENT
+XHEADER_DESC=		X-Tinyproxy header
+REVERSE_DESC=		Reverse proxy support
+TRANSPARENT_DESC=	Transparent proxy support
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_REVERSE)
+.if ${PORT_OPTIONS:MREVERSE}
 CONFIGURE_ARGS+=	--enable-reverse
 .endif
 
-.if defined(WITH_TRANSPARENT)
+.if ${PORT_OPTIONS:MTRANSPARENT}
 CONFIGURE_ARGS+=	--enable-transparent
 .endif
 
-.if defined(WITHOUT_XHEADER)
+.if !${PORT_OPTIONS:MXHEADER}
 CONFIGURE_ARGS+=	--disable-xtinyproxy
 .endif
 
@@ -79,4 +76,4 @@ post-install:
 	${INSTALL_MAN} ${FILESDIR}/${MAN8} ${MAN1PREFIX}/man/man8
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/trac/Makefile b/www/trac/Makefile
index 87d1a9c2b13e..1e624d02b258 100644
--- a/www/trac/Makefile
+++ b/www/trac/Makefile
@@ -16,12 +16,13 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Genshi>=0.5:${PORTSDIR}/textproc/py-genshi
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Genshi>=0.5:${PORTSDIR}/textproc/py-genshi \
 		${PYTHON_PKGNAMEPREFIX}Babel>=0.9:${PORTSDIR}/devel/py-babel
 
-OPTIONS=	SILVERCITY "Use Silvercity for syntax highlighting" On \
-		DOCUTILS   "Allow additional text markup" On \
-		PYGMENTS   "Use generic syntax highlighter" On \
-		TZ         "Process Time Zones" On \
-		PGSQL	   "Use PostgreSQL instead of SQLite3" Off \
-		SUBVERSION "Support for subversion RCS" On
+OPTIONS_DEFINE=		SILVERCITY DOCUTILS PYGMENTS TZ PGSQL SVN
+OPTIONS_DEFAULT=	SILVERCITY DOCUTILS PYGMENTS TZ SVN
+SILVERCITY_DESC=	Silvercity for syntax highlighting
+DOCUTILS_DESC=		Allow additional text markup
+PYGMENTS_DESC=		Use generic syntax highlighter
+TZ_DESC=		Process Time Zones
+
 CONFLICTS=	ja-trac-[0-9]*
 
 USE_PYTHON=	2.5+
@@ -32,6 +33,34 @@ PYDISTUTILS_NOEGGINFO=	yes
 USE_RC_SUBR=	tracd
 SUB_LIST=	PYTHON_CMD=${PYTHON_CMD}
 
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MSILVERCITY)
+RUN_DEPENDS+=	${LOCALBASE}/bin/source2html.py:${PORTSDIR}/textproc/silvercity
+.endif
+
+.if ${PORT_OPTIONS:MDOCUTILS)
+RUN_DEPENDS+=	${LOCALBASE}/bin/rst2html:${PORTSDIR}/textproc/py-docutils
+.endif
+
+.if ${PORT_OPTIONS:MPYGMENTS}
+RUN_DEPENDS+=	${LOCALBASE}/bin/pygmentize:${PORTSDIR}/textproc/py-pygments
+.endif
+
+.if ${PORT_OPTIONS:MTZ}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz
+.endif
+
+.if ${PORT_OPTIONS:MPGSQL}
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/psycopg2/__init__.py:${PORTSDIR}/databases/py-psycopg2
+.else
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
+.endif
+
+.if ${PORT_OPTIONS:MSVN}
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/svn/__init__.py:${PORTSDIR}/devel/py-subversion
+.endif
+
 # This target is only meant to be used by the port maintainer.
 x-generate-plist:
 	(${PORTSDIR}/Tools/scripts/plist -d -m ${MTREE_FILE} ${PREFIX} \
@@ -62,32 +91,4 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_SILVERCITY)
-RUN_DEPENDS+=	${LOCALBASE}/bin/source2html.py:${PORTSDIR}/textproc/silvercity
-.endif
-
-.if defined(WITH_DOCUTILS)
-RUN_DEPENDS+=	${LOCALBASE}/bin/rst2html:${PORTSDIR}/textproc/py-docutils
-.endif
-
-.if defined(WITH_PYGMENTS)
-RUN_DEPENDS+=	${LOCALBASE}/bin/pygmentize:${PORTSDIR}/textproc/py-pygments
-.endif
-
-.if defined(WITH_TZ)
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz
-.endif
-
-.if defined(WITH_PGSQL)
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/psycopg2/__init__.py:${PORTSDIR}/databases/py-psycopg2
-.else
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
-.endif
-
-.if !defined(WITHOUT_SUBVERSION)
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/svn/__init__.py:${PORTSDIR}/devel/py-subversion
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/udmsearch/Makefile b/www/udmsearch/Makefile
index 5ed9e71bef33..5f374effe082 100644
--- a/www/udmsearch/Makefile
+++ b/www/udmsearch/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	udmsearch
-# Date created:		11/29/1999
-# Whom:			Kelly Yancey <kbyanc@posi.net>
-#
+# Created by: Kelly Yancey <kbyanc@posi.net>
 # $FreeBSD$
-#
 
 PORTNAME=	udmsearch
 PORTVERSION=	3.1.7
@@ -14,9 +10,8 @@ MASTER_SITES=	http://www.mnogosearch.org/Download/ \
 MAINTAINER=	5u623l20@gmail.com
 COMMENT=	Full featured SQL-based hypertext search engine
 
-OPTIONS=	MSQL "MSQL support" off \
-		MYSQL "MYSQL support" on \
-		PGSQL "PGSQL support" off
+OPTIONS_DEFINE=		MSQL MYSQL PGSQL
+OPTIONS_DEFAULT=	MYSQL
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-charset-guesser \
@@ -27,19 +22,19 @@ CONFIGURE_ARGS=	--enable-charset-guesser \
 MAN1=		indexer.1
 MAN5=		indexer.conf.5
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_MSQL)
+.if ${PORT_OPTIONS:MMSQL}
 BUILD_DEPENDS=		${PREFIX}/lib/libmsql.a:${PORTSDIR}/databases/msql
 CONFIGURE_ARGS+=	--with-msql=${LOCALBASE}
 .endif
 
-.if !defined(WITHOUT_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=		YES
 CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
 .endif
 
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 USE_PGSQL=		YES
 CONFIGURE_ARGS+=	--with-pgsql=${LOCALBASE}/pgsql
 .endif
@@ -53,4 +48,4 @@ post-install:
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>