32 files changed, 518 insertions, 775 deletions

diff --git a/www/asterisk-stat/Makefile b/www/asterisk-stat/Makefile
index 863cddeb27e4..9b7005bcf6bb 100644
--- a/www/asterisk-stat/Makefile
+++ b/www/asterisk-stat/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	www/asterisk-stat
-# Date created:				16 June 2007
-# Whom:					Fumihiko Kimura <jfkimura@yahoo.com>
-#
+# Created by: Fumihiko Kimura <jfkimura@yahoo.com>
 # $FreeBSD$
-#
 
 PORTNAME=	asterisk-stat
 PORTVERSION=	2.0.1
@@ -26,11 +22,12 @@ WRKSRC=		${WRKDIR}/${SITE_SUBDIR}
 SUB_FILES=	pkg-message
 SUB_LIST+=	ASTERISKDIR=${ASTERISKDIR}
 
-OPTIONS=	PGSQL "Use PostgreSQL instead of MySQL" off
+OPTIONS_DEFINE=	PGSQL
+PGSQL_DESC=	Use PostgreSQL instead of MySQL
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MGSQL}
 ASTERISKSTATDB=	pgsql
 EXTRA_PATCHES+=	${FILESDIR}/pgsql__patch-call.log.php
 .else
@@ -60,4 +57,4 @@ do-install:
 	${INSTALL_DATA} ${FILESDIR}/cdr_${ASTERISKSTATDB}.tbl ${PREFIX}/etc/asterisk
 	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${ASTERISKDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/aws/Makefile b/www/aws/Makefile
index 6d50515dde20..1d5275813a14 100644
--- a/www/aws/Makefile
+++ b/www/aws/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:  aws
-# Date created:                       12 December 2010
-# Whom:                               John Marino <draco@marino.st>
-#
+# Created by: John Marino <draco@marino.st>
 # $FreeBSD$
-#
 
 PORTNAME=	aws
 PORTVERSION=	2.10.0
@@ -28,13 +24,12 @@ CC=		gnatgcc
 DOTBUILD=	release
 MAKE_ENV+=	ADA_PROJECT_PATH=${PREFIX}/lib/gnat
 
-OPTIONS=	SSL   "Enable HTTPS/SSL support" on
-OPTIONS+=	IPV6  "Enable IPv6 support" off
-OPTIONS+=	DEMOS "Build demo programs in examples/aws/demos" off
-OPTIONS+=	DEBUG "Build AWS with debugging symbols" off
-OPTIONS+=	LDAP  "Enable LDAP support" off
-OPTIONS+=	DSRT  "Disable shared runtime" off
-OPTIONS+=	RELOC "Build shared libraries (default is static)" off
+OPTIONS_DEFINE=	SSL IPV6 DEMOS DEBUG LDAP DSRT RELOC
+OPTIONS_DEFAULT=	SSL
+SSL_DESC=	Enable HTTPS/SSL support
+DEMOS_DESC=	Build demo programs in examples/aws/demos
+DSRT_DESC=	Disable shared runtime
+RELOC_DESC=	Build shared libraries (default is static)
 
 CONF_ARGS=	PROCESSORS=1
 CONF_ARGS+=	GCC=gnatgcc
@@ -46,7 +41,7 @@ CONF_ARGS+=	PYTHON=python${PYTHON_VER}
 ##  SSL Support  ##
 ###################
 
-.if defined(WITH_SSL)
+.if ${PORT_OPTIONS:MSSL}
 CONF_ARGS+=	SOCKET=openssl
 BUILD_DEPENDS+=	openssl>=1:${PORTSDIR}/security/openssl
 RUN_DEPENDS+=	openssl>=1:${PORTSDIR}/security/openssl
@@ -61,7 +56,7 @@ PLIST_SUB+=	NSSL=""
 ##  LDAP Support  ##
 ####################
 
-.if defined(WITH_LDAP)
+.if ${PORT_OPTIONS:MLDAP}
 CONF_ARGS+=	LDAP=true
 RUN_DEPENDS+=	openldap24>=2.4:${PORTSDIR}/net/openldap24-client
 .endif
@@ -70,7 +65,7 @@ RUN_DEPENDS+=	openldap24>=2.4:${PORTSDIR}/net/openldap24-client
 ##  IPv6 Support  ##
 ####################
 
-.if defined(WITH_IPV6)
+.if ${PORT_OPTIONS:MIPV6}
 CONF_ARGS+=	IPv6=true
 .endif
 
@@ -78,7 +73,7 @@ CONF_ARGS+=	IPv6=true
 ##  Debug Support  ##
 #####################
 
-.if defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
 CONF_ARGS+=	DEBUG=true
 .endif
 
@@ -86,7 +81,7 @@ CONF_ARGS+=	DEBUG=true
 ##  Shared Runtime Library  ##
 ##############################
 
-.if defined(WITH_DSRT)
+.if ${PORT_OPTIONS:MDSRT}
 CONF_ARGS+=	ENABLE_SHARED=false
 .endif
 
@@ -94,7 +89,7 @@ CONF_ARGS+=	ENABLE_SHARED=false
 ##  Default Library Type  ##
 ############################
 
-.if defined(WITH_RELOC)
+.if ${PORT_OPTIONS:MRELOC}
 CONF_ARGS+=	DEFAULT_LIBRARY_TYPE=relocatable
 .endif
 
@@ -102,7 +97,7 @@ CONF_ARGS+=	DEFAULT_LIBRARY_TYPE=relocatable
 ##  DEMOS Support  ##
 #####################
 
-.if defined(WITH_DEMOS)
+.if ${PORT_OPTIONS:MDEMOS}
 DEMO_DIRS+=	agent
 DEMO_DIRS+=	auth
 DEMO_DIRS+=	com
@@ -131,7 +126,7 @@ DEMO_DIRS+=	wps
 DEMO_DIRS+=	ws
 DEMO_DIRS+=	zdemo
 
-.if defined (WITH_LDAP)
+.if ${PORT_OPTIONS:MLDAP}
 DEMO_DIRS+=	test_ldap
 PLIST_SUB+=	LDAP=""
 .else
@@ -157,7 +152,7 @@ test: install
 
 do-install:
 	cd ${WRKSRC} && ${GMAKE} install
-.if defined(WITH_DEMOS)
+.if ${PORT_OPTIONS:MDEMOS}
 	${MAKE} demos
 	${MAKE} demos-install
 .endif
diff --git a/www/bigbluebutton/Makefile b/www/bigbluebutton/Makefile
index 9465b90c4175..7c12232efdfa 100644
--- a/www/bigbluebutton/Makefile
+++ b/www/bigbluebutton/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	www/bigbluebutton
-# Date created:				23 October 2010
-# Whom:					alex.deiter@gmail.com
-#
+# Created by: alex.deiter@gmail.com
 # $FreeBSD$
-#
 
 PORTNAME=	bigbluebutton
 PORTVERSION=	0.71
@@ -53,10 +49,12 @@ FS_USER?=	freeswitch
 FS_GROUP?=	${FS_USER}
 WWWROOT?=	${WWWDIR:S|/${PORTNAME}$||}
 
-OPTIONS=	MEETME "meetme Asterisk module" off \
-		KONFERENCE "konference Asterisk module" on \
-		FREESWITCH "mod_conference FreeSWITCH module" off \
-		OPENOFFICE "Include OpenOffice support" off
+OPTIONS_DEFINE=	MEETME KONFERENCE FREESWITCH OPENOFFICE
+OPTIONS_DEFAULT=	KONFERENCE
+MEETME_DESC=	meetme Asterisk module
+KONFERENCE_DESC=	konference Asterisk module
+FREESWITCH_DESC=	mod_conference FreeSWITCH module
+OPENOFFICE_DESC=	Include OpenOffice support
 
 PLIST_SUB+=	RED5_HOME=${RED5_HOME:S,^${PREFIX}/,,} \
 		TOMCAT_HOME=${TOMCAT_HOME:S,^${PREFIX}/,,} \
@@ -79,26 +77,26 @@ SUB_LIST+=	PORTNAME=${PORTNAME} \
 
 SUB_FILES=	pkg-message openoffice nginx.conf-dist bbb-conf
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_MEETME) || defined(WITH_KONFERENCE)
+.if ${PORT_OPTIONS:MMEETME} || ${PORT_OPTIONS:MKONFERENCE}
 BUILD_DEPENDS+=${LOCALBASE}/sbin/asterisk:${PORTSDIR}/net/asterisk
-.if  defined(WITH_MEETME)
+.if  ${PORT_OPTIONS:MMEETME}
 .if !exists(${LOCALBASE}/lib/asterisk/modules/app_meetme.so)
 IGNORE=Option meetme requires app_meetme.so from asterisk port. Rebuild net/asterisk with WITH_DAHDI=yes
 .endif
 .endif
-.if  defined(WITH_KONFERENCE)
+.if  ${PORT_OPTIONS:MKONFERENCE}
 BUILD_DEPENDS+=${LOCALBASE}/lib/asterisk/modules/app_konference.so:${PORTSDIR}/net/appkonference
 .endif
 .endif
 
-.if defined(WITH_FREESWITCH)
+.if ${PORT_OPTIONS:MFREESWITCH}
 BROKEN=freeswitch 1.0.6 does not work with BigBlueButton
 BUILD_DEPENDS+=${LOCALBASE}/bin/freeswitch:${PORTSDIR}/net/freeswitch
 .endif
 
-.if defined(WITH_OPENOFFICE)
+.if ${PORT_OPTIONS:MOPENOFFICE}
 BUILD_DEPENDS+=	${LOCALBASE}/bin/openoffice.org-3.2.1:${PORTSDIR}/editors/openoffice.org-3
 .endif
 
@@ -173,4 +171,4 @@ do-install:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/cacheboy15-devel/Makefile b/www/cacheboy15-devel/Makefile
index fdd360a56a1b..288eaa27df29 100644
--- a/www/cacheboy15-devel/Makefile
+++ b/www/cacheboy15-devel/Makefile
@@ -1,78 +1,5 @@
-# New ports collection makefile for:	squid24
-# Date created:		Tue Mar 27 14:56:08 CEST 2001
-# Whom:			Adrian Chadd <adrian@FreeBSD.org>
-#
+# Created by: Adrian Chadd <adrian@FreeBSD.org>
 # $FreeBSD$
-#
-# Tunables not (yet) configurable via 'make config':
-# SQUID_{U,G}ID
-#   Which user/group Squid should run as (default: squid/squid).
-#   The user and group will be created if they do not already exist using
-#   a uid:gid of 100:100.
-#   NOTE: older versions of Squid defaulted to nobody/nogroup.
-#   If you wish to run Squid as "nobody" (which is not recommended), please
-#   define SQUID_UID=nobody and SQUID_GID=nogroup in your make environment
-#   before you start the update or installation of this port.
-#
-# SQUID_LANGUAGES
-#   A list of languages for which error page files should be installed
-#   (default: all)
-#
-#   E.g. use `make SQUID_LANGUAGES="English French"' if you want to
-#   install the files for these languages only.
-#   Use `make -VSQUID_LANGUAGES' or scroll down to this variable's
-#   definition to see which values are valid.
-#
-# SQUID_DEFAULT_LANG
-#   If you define SQUID_LANGUAGES, select which language should be the default
-#   one (this variable defaults to English). This setting can be overwritten
-#   with squid.conf's error_directory directive.
-#
-# SQUID_CONFIGURE_ARGS
-#   Additional configuration options.
-#
-#   To enable them, use e.g
-#   `make SQUID_CONFIGURE_ARGS="--enable-dlmalloc --enable-truncate" install'
-#
-#   The list below may be incomplete, please see the configure script
-#   in the Squid source distribution for the complete list of additional
-#   options.
-#   Note that you probably do not need to worry about these options in most
-#   cases, they are included in case you want to experiment with them.
-#
-#    --enable-dlmalloc
-#     Compile and use the malloc package from Doug Lea
-#    --enable-gnuregex
-#     Compile and use the supplied GNUregex routines instead of BSD regex
-#     (not recommended).
-#    --enable-xmalloc-statistics
-#     Show malloc statistics in status page
-#    --enable-cachemgr-hostname=some.hostname
-#     Set an explicit hostname in cachemgr.cgi
-#    --enable-truncate
-#     Use truncate() rather than unlink()
-#    --disable-unlinkd
-#     Do not use "unlinkd"
-#    --with-aufs-threads=N_THREADS
-#     Tune the number of worker threads for the aufs object
-#    --with-coss-membuf-size
-#     COSS membuf size (default: 1048576 bytes)
-#    --with-maxfd=N
-#     Override the maximum number of filedescriptors. Useful if you
-#     build as another user who is not privileged to use the amount
-#     of filedescriptors the resulting binary is expected to support.
-#    --enable-ntlm-fail-open
-#     Enable NTLM fail open, where a helper that fails one of the
-#     Authentication steps can allow Squid to still authenticate the user
-#    --enable-x-accelerator-vary
-#     Enable support for the X-Accelerator-Vary HTTP header. Can be used
-#     to indicate variance within an accelerator setup. Typically used
-#     together with other code that adds custom HTTP headers to the
-#     requests.
-#    --enable-forward-log
-#     Enable experimental forward_log directive.
-#    --enable-multicast-miss
-#     Enable experimental multicast notification of cachemisses.
 
 PORTNAME=	cacheboy
 DISTVERSION=	1.5.2
@@ -102,32 +29,39 @@ PORTEXAMPLES=	passwd.sql
 SUB_FILES+=	pkg-deinstall pkg-install pkg-message
 SUB_LIST+=	SQUID_UID=${SQUID_UID} SQUID_GID=${SQUID_GID}
 
-OPTIONS=	SQUID_LDAP_AUTH "Install LDAP authentication helpers" off \
-		SQUID_SASL_AUTH "Install SASL authentication helpers" off \
-		SQUID_DELAY_POOLS "Enable delay pools" off \
-		SQUID_SNMP "Enable SNMP support" off \
-		SQUID_CARP "Enable CARP support" on \
-		SQUID_SSL "Enable SSL support for reverse proxies" off \
-		SQUID_PINGER "Install the icmp helper" off \
-		SQUID_DNS_HELPER "Use the old 'dnsserver' helper" off \
-		SQUID_HTCP "Enable HTCP support" off \
-		SQUID_VIA_DB "Enable forward/via database" off \
-		SQUID_CACHE_DIGESTS "Enable cache digests" off \
-		SQUID_WCCP "Enable Web Cache Coordination Prot. v1" on \
-		SQUID_WCCPV2 "Enable Web Cache Coordination Prot. v2" off \
-		SQUID_STRICT_HTTP "Be strictly HTTP compliant" off \
-		SQUID_IDENT "Enable ident (RFC 931) lookups" on \
-		SQUID_REFERER_LOG "Enable Referer-header logging" off \
-		SQUID_USERAGENT_LOG "Enable User-Agent-header logging" off \
-		SQUID_ARP_ACL "Enable ACLs based on ethernet address" off \
-		SQUID_PF "Enable transparent proxying with PF" off \
-		SQUID_IPFILTER "Enable transp. proxying with IPFilter" off \
-		SQUID_FOLLOW_XFF "Follow X-Forwarded-For headers" off \
-		SQUID_AUFS "Enable the aufs storage scheme" off \
-		SQUID_COSS "Enable the COSS storage scheme" off \
-		SQUID_KQUEUE "Use kqueue(2) instead of poll(2)" on \
-		SQUID_LARGEFILE "Support log and cache files >2GB" off \
-		SQUID_STACKTRACES "Create backtraces on fatal errors" off
+OPTIONS_DEFINE=	DOCS NLS SQUID_LDAP_AUTH SQUID_SASL_AUTH SQUID_DELAY_POOLS SQUID_SNMP \
+		SQUID_CARP SQUID_SSL SQUID_PINGER SQUID_DNS_HELPER SQUID_HTCP SQUID_VIA_DB \
+		SQUID_CACHE_DIGESTS SQUID_WCCP SQUID_WCCPV2 SQUID_STRICT_HTTP SQUID_IDENT \
+		SQUID_REFERER_LOG SQUID_USERAGENT_LOG SQUID_ARP_ACL SQUID_PF SQUID_IPFILTER \
+		SQUID_FOLLOW_XFF SQUID_AUFS SQUID_COSS SQUID_KQUEUE SQUID_LARGEFILE \
+		SQUID_STACKTRACES
+OPTIONS_DEFAULT=	SQUID_CARP SQUID_WCCP SQUID_KQUEUE
+SQUID_LDAP_AUTH_DESC=		Install LDAP authentication helpers
+SQUID_SASL_AUTH_DESC=		Install SASL authentication helpers
+SQUID_DELAY_POOLS_DESC=		Enable delay pools
+SQUID_SNMP_DESC=		Enable SNMP support
+SQUID_CARP_DESC=		Enable CARP support
+SQUID_SSL_DESC=			Enable SSL support for reverse proxies
+SQUID_PINGER_DESC=		Install the icmp helper
+SQUID_DNS_HELPER_DESC=		Use the old 'dnsserver' helper
+SQUID_HTCP_DESC=		Enable HTCP support
+SQUID_VIA_DB_DESC=		Enable forward/via database
+SQUID_CACHE_DIGESTS_DESC=	Enable cache digests
+SQUID_WCCP_DESC=		Enable Web Cache Coordination Prot. v1
+SQUID_WCCPV2_DESC=		Enable Web Cache Coordination Prot. v2
+SQUID_STRICT_HTTP_DESC=		Be strictly HTTP compliant
+SQUID_IDENT_DESC=		Enable ident (RFC 931) lookups
+SQUID_REFERER_LOG_DESC=		Enable Referer-header logging
+SQUID_USERAGENT_LOG_DESC=	Enable User-Agent-header logging
+SQUID_ARP_ACL_DESC=		Enable ACLs based on ethernet address
+SQUID_PF_DESC=			Enable transparent proxying with PF
+SQUID_IPFILTER_DESC=		Enable transp. proxying with IPFilter
+SQUID_FOLLOW_XFF_DESC=		Follow X-Forwarded-For headers
+SQUID_AUFS_DESC=		Enable the aufs storage scheme
+SQUID_COSS_DESC=		Enable the COSS storage scheme
+SQUID_KQUEUE_DESC=		Use kqueue(2) instead of poll(2)
+SQUID_LARGEFILE_DESC=		Support log and cache files >2GB
+SQUID_STACKTRACES_DESC=		Create backtraces on fatal errors
 
 etc_files=	squid/cachemgr.conf.default \
 		squid/mib.txt squid/mime.conf.default \
@@ -177,7 +111,7 @@ CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  \
 		--disable-linux-tproxy \
 		--disable-epoll
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${OSVERSION} >= 800037
 BROKEN=		does not compile with Heimdal 1.1 in 8.0-CURRENT
@@ -194,7 +128,7 @@ digest_auth=	password
 external_acl=	ip_user session unix_group wbinfo_group
 MAN8+=		ncsa_auth.8 pam_auth.8 squid_db_auth.8 squid_session.8 \
 		squid_unix_group.8
-.if defined(WITH_SQUID_LDAP_AUTH)
+.if ${PORT_OPTIONS:MSQUID_LDAP_AUTH}
 USE_OPENLDAP=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -204,7 +138,7 @@ digest_auth+=	ldap
 external_acl+=	ldap_group
 libexec+=	digest_ldap_auth squid_ldap_auth squid_ldap_group
 .endif
-.if defined(WITH_SQUID_SASL_AUTH)
+.if ${PORT_OPTIONS:MSQUID_SASL_AUTH}
 LIB_DEPENDS+=	sasl2:${PORTSDIR}/security/cyrus-sasl2
 CFLAGS+=	-I${LOCALBASE}/include
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -212,7 +146,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 basic_auth+=	SASL
 libexec+=	sasl_auth
 .endif
-.if !defined(NO_NIS) && !defined(WITHOUT_NIS)
+.if !defined(NO_NIS) && ${PORT_OPTIONS:MNIS}
 basic_auth+=	YP
 libexec+=	yp_auth
 .endif
@@ -221,7 +155,7 @@ CONFIGURE_ARGS+=	--enable-auth="basic ntlm digest" \
 			--enable-digest-auth-helpers="${digest_auth}" \
 			--enable-external-acl-helpers="${external_acl}" \
 			--enable-ntlm-auth-helpers="SMB"
-.if !defined(NO_KERBEROS) && !defined(WITHOUT_KERBEROS)
+.if !defined(NO_KERBEROS) && ${PORT_OPTIONS:MKERBEROS}
 # XXX This currently only works with heimdal from the base system,
 #     see files/patch-helpers_negotiate_auth-squid_kerb_auth_*
 CONFIGURE_ARGS+=	--enable-negotiate-auth-helpers="squid_kerb_auth"
@@ -231,15 +165,15 @@ libexec+=	squid_kerb_auth
 # Storage schemes:
 
 storage_schemes=	ufs diskd null
-.if defined(WITH_SQUID_AUFS)
+.if ${PORT_OPTIONS:MSQUID_AUFS}
 storage_schemes+=	aufs
 EXTRA_PATCHES+=		${PATCHDIR}/extra-patch-src-cf.data.pre.aufs
 # Nil aufs threads is default, set any other value via SQUID_CONFIGURE_ARGS
 CONFIGURE_ARGS+=	--with-pthreads
 .endif
-.if defined(WITH_SQUID_COSS)
+.if ${PORT_OPTIONS:MSQUID_COSS}
 storage_schemes+=	coss
-.if !defined(WITH_SQUID_AUFS)
+.if !  ${PORT_OPTIONS:MSQUID_AUFS}
 # use Posix AIO instead of aufs' AIO; note that you then need the kernel to
 # supply AIO support, either by loading the aio(4) module (n/a on 4.x) or by
 # adding the option VFS_AIO to your kernel configuration if you want to
@@ -252,80 +186,80 @@ CONFIGURE_ARGS+=	--enable-storeio="${storage_schemes}"
 
 # Other options set via 'make config':
 
-.if defined(WITH_SQUID_DELAY_POOLS)
+.if ${PORT_OPTIONS:MSQUID_DELAY_POOLS}
 CONFIGURE_ARGS+=	--enable-delay-pools
 .endif
-.if defined(WITH_SQUID_SNMP)
+.if ${PORT_OPTIONS:MSQUID_SNMP}
 CONFIGURE_ARGS+=	--enable-snmp
 .endif
-.if defined(WITHOUT_SQUID_CARP)
+.if ! ${PORT_OPTIONS:MSQUID_CARP}
 CONFIGURE_ARGS+=	--disable-carp
 .endif
-.if defined(WITH_SQUID_SSL)
+.if ${PORT_OPTIONS:MSQUID_SSL}
 # we need to .include bsd.openssl.mk manually here.because USE_OPENSSL only
 # works when it is defined before bsd.port{.pre}.mk is .included.
 # This makes it currently impossible to combine this macro with OPTIONS to
 # conditionally include OpenSSL support.
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL=		yes
 CONFIGURE_ARGS+=	--enable-ssl \
 			--with-openssl="${OPENSSLBASE}"
 CFLAGS+=	-I${OPENSSLINC}
 LDFLAGS+=	-L${OPENSSLLIB}
 .endif
-.if defined(WITH_SQUID_PINGER)
+.if ${PORT_OPTIONS:MSQUID_PINGER}
 CONFIGURE_ARGS+=	--enable-icmp
 libexec+=	pinger
 .endif
-.if defined(WITH_SQUID_DNS_HELPER)
+.if ${PORT_OPTIONS:MSQUID_DNS_HELPER}
 CONFIGURE_ARGS+=	--disable-internal-dns
 libexec+=	dnsserver
 .endif
-.if defined(WITH_SQUID_HTCP)
+.if ${PORT_OPTIONS:MSQUID_HTCP}
 CONFIGURE_ARGS+=	--enable-htcp
 .endif
-.if defined(WITH_SQUID_VIA_DB)
+.if ${PORT_OPTIONS:MSQUID_VIA_DB}
 CONFIGURE_ARGS+=	--enable-forw-via-db
 .endif
-.if defined(WITH_SQUID_CACHE_DIGESTS)
+.if ${PORT_OPTIONS:MSQUID_CACHE_DIGESTS}
 CONFIGURE_ARGS+=	--enable-cache-digests
 .endif
-.if defined(WITHOUT_SQUID_WCCP)
+.if ! ${PORT_OPTIONS:MSQUID_WCCP}
 CONFIGURE_ARGS+=	--disable-wccp
 .endif
-.if defined(WITH_SQUID_WCCPV2)
+.if ${PORT_OPTIONS:MSQUID_WCCPV2}
 CONFIGURE_ARGS+=	--enable-wccpv2
 .endif
-.if defined(WITH_SQUID_STRICT_HTTP)
+.if ${PORT_OPTIONS:MSQUID_STRICT_HTTP}
 CONFIGURE_ARGS+=	--disable-http-violations
 .endif
-.if defined(WITHOUT_SQUID_IDENT)
+.if ! ${PORT_OPTIONS:MSQUID_IDENT}
 CONFIGURE_ARGS+=	--disable-ident-lookups
 .endif
-.if defined(WITH_SQUID_REFERER_LOG)
+.if ${PORT_OPTIONS:MSQUID_REFERER_LOG}
 CONFIGURE_ARGS+=	--enable-referer-log
 .endif
-.if defined(WITH_SQUID_USERAGENT_LOG)
+.if ${PORT_OPTIONS:MSQUID_USERAGENT_LOG}
 CONFIGURE_ARGS+=	--enable-useragent-log
 .endif
-.if defined(WITH_SQUID_ARP_ACL)
+.if ${PORT_OPTIONS:MSQUID_ARP_ACL}
 CONFIGURE_ARGS+=	--enable-arp-acl
 .endif
-.if defined(WITH_SQUID_PF)
+.if ${PORT_OPTIONS:MSQUID_PF}
 CONFIGURE_ARGS+=	--enable-pf-transparent
 .endif
-.if defined(WITH_SQUID_IPFILTER)
+.if ${PORT_OPTIONS:MSQUID_IPFILTER}
 CONFIGURE_ARGS+=	--enable-ipf-transparent
 .endif
-.if defined(WITH_SQUID_FOLLOW_XFF)
+.if ${PORT_OPTIONS:MSQUID_FOLLOW_XFF}
 CONFIGURE_ARGS+=	--enable-follow-x-forwarded-for
 .endif
-.if defined(WITHOUT_SQUID_KQUEUE)
+.if ! ${PORT_OPTIONS:MSQUID_KQUEUE}
 CONFIGURE_ARGS+=	--disable-kqueue
 .endif
-.if defined(WITH_SQUID_LARGEFILE)
+.if ${PORT_OPTIONS:MSQUID_LARGEFILE}
 CONFIGURE_ARGS+=	--with-large-files --enable-large-cache-files
 .endif
-.if defined(WITH_SQUID_STACKTRACES)
+.if ${PORT_OPTIONS:MSQUID_STACKTRACES}
 CONFIGURE_ARGS+=	--enable-stacktraces
 CFLAGS+=	-g
 STRIP=
@@ -377,15 +311,15 @@ pre-su-install:
 	    ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-install:
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MNLS}
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/helpers/basic_auth/DB/passwd.sql ${EXAMPLESDIR}
 .endif
-.if defined(WITH_SQUID_PINGER)
+.if ${PORT_OPTIONS:MSQUID_PINGER}
 	${CHMOD} 4510 ${PREFIX}/libexec/squid/pinger; \
 	${CHGRP} ${SQUID_GID} ${PREFIX}/libexec/squid/pinger
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${docs} ${DOCSDIR}
 .endif
@@ -397,4 +331,4 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD} ""
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/cacheboy16/Makefile b/www/cacheboy16/Makefile
index 110dd46cdfbd..b00cde95c4be 100644
--- a/www/cacheboy16/Makefile
+++ b/www/cacheboy16/Makefile
@@ -1,78 +1,5 @@
-# New ports collection makefile for:	squid24
-# Date created:		Tue Mar 27 14:56:08 CEST 2001
-# Whom:			Adrian Chadd <adrian@FreeBSD.org>
-#
+# Created by: Adrian Chadd <adrian@FreeBSD.org>
 # $FreeBSD$
-#
-# Tunables not (yet) configurable via 'make config':
-# SQUID_{U,G}ID
-#   Which user/group Squid should run as (default: squid/squid).
-#   The user and group will be created if they do not already exist using
-#   a uid:gid of 100:100.
-#   NOTE: older versions of Squid defaulted to nobody/nogroup.
-#   If you wish to run Squid as "nobody" (which is not recommended), please
-#   define SQUID_UID=nobody and SQUID_GID=nogroup in your make environment
-#   before you start the update or installation of this port.
-#
-# SQUID_LANGUAGES
-#   A list of languages for which error page files should be installed
-#   (default: all)
-#
-#   E.g. use `make SQUID_LANGUAGES="English French"' if you want to
-#   install the files for these languages only.
-#   Use `make -VSQUID_LANGUAGES' or scroll down to this variable's
-#   definition to see which values are valid.
-#
-# SQUID_DEFAULT_LANG
-#   If you define SQUID_LANGUAGES, select which language should be the default
-#   one (this variable defaults to English). This setting can be overwritten
-#   with squid.conf's error_directory directive.
-#
-# SQUID_CONFIGURE_ARGS
-#   Additional configuration options.
-#
-#   To enable them, use e.g
-#   `make SQUID_CONFIGURE_ARGS="--enable-dlmalloc --enable-truncate" install'
-#
-#   The list below may be incomplete, please see the configure script
-#   in the Squid source distribution for the complete list of additional
-#   options.
-#   Note that you probably do not need to worry about these options in most
-#   cases, they are included in case you want to experiment with them.
-#
-#    --enable-dlmalloc
-#     Compile and use the malloc package from Doug Lea
-#    --enable-gnuregex
-#     Compile and use the supplied GNUregex routines instead of BSD regex
-#     (not recommended).
-#    --enable-xmalloc-statistics
-#     Show malloc statistics in status page
-#    --enable-cachemgr-hostname=some.hostname
-#     Set an explicit hostname in cachemgr.cgi
-#    --enable-truncate
-#     Use truncate() rather than unlink()
-#    --disable-unlinkd
-#     Do not use "unlinkd"
-#    --with-aufs-threads=N_THREADS
-#     Tune the number of worker threads for the aufs object
-#    --with-coss-membuf-size
-#     COSS membuf size (default: 1048576 bytes)
-#    --with-maxfd=N
-#     Override the maximum number of filedescriptors. Useful if you
-#     build as another user who is not privileged to use the amount
-#     of filedescriptors the resulting binary is expected to support.
-#    --enable-ntlm-fail-open
-#     Enable NTLM fail open, where a helper that fails one of the
-#     Authentication steps can allow Squid to still authenticate the user
-#    --enable-x-accelerator-vary
-#     Enable support for the X-Accelerator-Vary HTTP header. Can be used
-#     to indicate variance within an accelerator setup. Typically used
-#     together with other code that adds custom HTTP headers to the
-#     requests.
-#    --enable-forward-log
-#     Enable experimental forward_log directive.
-#    --enable-multicast-miss
-#     Enable experimental multicast notification of cachemisses.
 
 PORTNAME=	cacheboy
 DISTVERSION=	1.6
@@ -101,33 +28,40 @@ PORTEXAMPLES=	passwd.sql
 SUB_FILES+=	pkg-deinstall pkg-install pkg-message
 SUB_LIST+=	SQUID_UID=${SQUID_UID} SQUID_GID=${SQUID_GID}
 
-OPTIONS=	SQUID_LDAP_AUTH "Install LDAP authentication helpers" off \
-		SQUID_SASL_AUTH "Install SASL authentication helpers" off \
-		SQUID_DELAY_POOLS "Enable delay pools" off \
-		SQUID_SNMP "Enable SNMP support" off \
-		SQUID_CARP "Enable CARP support" on \
-		SQUID_SSL "Enable SSL support for reverse proxies" off \
-		SQUID_PINGER "Install the icmp helper" off \
-		SQUID_DNS_HELPER "Use the old 'dnsserver' helper" off \
-		SQUID_HTCP "Enable HTCP support" off \
-		SQUID_VIA_DB "Enable forward/via database" off \
-		SQUID_CACHE_DIGESTS "Enable cache digests" off \
-		SQUID_WCCP "Enable Web Cache Coordination Prot. v1" on \
-		SQUID_WCCPV2 "Enable Web Cache Coordination Prot. v2" off \
-		SQUID_STRICT_HTTP "Be strictly HTTP compliant" off \
-		SQUID_IDENT "Enable ident (RFC 931) lookups" on \
-		SQUID_REFERER_LOG "Enable Referer-header logging" off \
-		SQUID_USERAGENT_LOG "Enable User-Agent-header logging" off \
-		SQUID_ARP_ACL "Enable ACLs based on ethernet address" off \
-		SQUID_PF "Enable transparent proxying with PF" off \
-		SQUID_IPFILTER "Enable transp. proxying with IPFilter" off \
-		SQUID_FOLLOW_XFF "Follow X-Forwarded-For headers" off \
-		SQUID_AUFS "Enable the aufs storage scheme" off \
-		SQUID_COSS "Enable the COSS storage scheme" off \
-		SQUID_KQUEUE "Use kqueue(2) instead of poll(2)" on \
-		SQUID_LARGEFILE "Support log and cache files >2GB" off \
-		SQUID_STACKTRACES "Create backtraces on fatal errors" off \
-		SQUID_TPROXY "Enable FreeBSD-current TPROXY support" off
+OPTIONS_DEFINE=	DOCS NLS SQUID_LDAP_AUTH SQUID_SASL_AUTH SQUID_DELAY_POOLS SQUID_SNMP \
+		SQUID_CARP SQUID_SSL SQUID_PINGER SQUID_DNS_HELPER SQUID_HTCP SQUID_VIA_DB \
+		SQUID_CACHE_DIGESTS SQUID_WCCP SQUID_WCCPV2 SQUID_STRICT_HTTP SQUID_IDENT \
+		SQUID_REFERER_LOG SQUID_USERAGENT_LOG SQUID_ARP_ACL SQUID_PF SQUID_IPFILTER \
+		SQUID_FOLLOW_XFF SQUID_AUFS SQUID_COSS SQUID_KQUEUE SQUID_LARGEFILE \
+		SQUID_STACKTRACES TPROXY
+OPTIONS_DEFAULT=	SQUID_CARP SQUID_WCCP SQUID_KQUEUE
+SQUID_LDAP_AUTH_DESC=		Install LDAP authentication helpers
+SQUID_SASL_AUTH_DESC=		Install SASL authentication helpers
+SQUID_DELAY_POOLS_DESC=		Enable delay pools
+SQUID_SNMP_DESC=		Enable SNMP support
+SQUID_CARP_DESC=		Enable CARP support
+SQUID_SSL_DESC=			Enable SSL support for reverse proxies
+SQUID_PINGER_DESC=		Install the icmp helper
+SQUID_DNS_HELPER_DESC=		Use the old 'dnsserver' helper
+SQUID_HTCP_DESC=		Enable HTCP support
+SQUID_VIA_DB_DESC=		Enable forward/via database
+SQUID_CACHE_DIGESTS_DESC=	Enable cache digests
+SQUID_WCCP_DESC=		Enable Web Cache Coordination Prot. v1
+SQUID_WCCPV2_DESC=		Enable Web Cache Coordination Prot. v2
+SQUID_STRICT_HTTP_DESC=		Be strictly HTTP compliant
+SQUID_IDENT_DESC=		Enable ident (RFC 931) lookups
+SQUID_REFERER_LOG_DESC=		Enable Referer-header logging
+SQUID_USERAGENT_LOG_DESC=	Enable User-Agent-header logging
+SQUID_ARP_ACL_DESC=		Enable ACLs based on ethernet address
+SQUID_PF_DESC=			Enable transparent proxying with PF
+SQUID_IPFILTER_DESC=		Enable transp. proxying with IPFilter
+SQUID_FOLLOW_XFF_DESC=		Follow X-Forwarded-For headers
+SQUID_AUFS_DESC=		Enable the aufs storage scheme
+SQUID_COSS_DESC=		Enable the COSS storage scheme
+SQUID_KQUEUE_DESC=		Use kqueue(2) instead of poll(2)
+SQUID_LARGEFILE_DESC=		Support log and cache files >2GB
+SQUID_STACKTRACES_DESC=		Create backtraces on fatal errors
+SQUID_TPROXY_DESC=		Enable FreeBSD-current TPROXY support
 
 etc_files=	squid/cachemgr.conf.default \
 		squid/mib.txt squid/mime.conf.default \
@@ -177,7 +111,7 @@ CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  \
 		--disable-linux-tproxy \
 		--disable-epoll
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${OSVERSION} >= 800037
 MAKE_ENV+=	KRB5_LDADD=-lhx509
@@ -194,7 +128,7 @@ digest_auth=	password
 external_acl=	ip_user session unix_group wbinfo_group
 MAN8+=		ncsa_auth.8 pam_auth.8 squid_db_auth.8 squid_session.8 \
 		squid_unix_group.8
-.if defined(WITH_SQUID_LDAP_AUTH)
+.if ${PORT_OPTIONS:MSQUID_LDAP_AUTH}
 USE_OPENLDAP=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -204,7 +138,7 @@ digest_auth+=	ldap
 external_acl+=	ldap_group
 libexec+=	digest_ldap_auth squid_ldap_auth squid_ldap_group
 .endif
-.if defined(WITH_SQUID_SASL_AUTH)
+.if ${PORT_OPTIONS:MSQUID_SASL_AUTH}
 LIB_DEPENDS+=	sasl2:${PORTSDIR}/security/cyrus-sasl2
 CFLAGS+=	-I${LOCALBASE}/include
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -212,7 +146,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 basic_auth+=	SASL
 libexec+=	sasl_auth
 .endif
-.if !defined(NO_NIS) && !defined(WITHOUT_NIS)
+.if !defined(NO_NIS) && ${PORT_OPTIONS:MNIS}
 basic_auth+=	YP
 libexec+=	yp_auth
 .endif
@@ -221,7 +155,7 @@ CONFIGURE_ARGS+=	--enable-auth="basic ntlm digest" \
 			--enable-digest-auth-helpers="${digest_auth}" \
 			--enable-external-acl-helpers="${external_acl}" \
 			--enable-ntlm-auth-helpers="SMB"
-.if !defined(NO_KERBEROS) && !defined(WITHOUT_KERBEROS)
+.if !defined(NO_KERBEROS) && ${PORT_OPTIONS:MKERBEROS}
 # XXX This currently only works with heimdal from the base system,
 #     see files/patch-helpers_negotiate_auth-squid_kerb_auth_*
 CONFIGURE_ARGS+=	--enable-negotiate-auth-helpers="squid_kerb_auth"
@@ -231,15 +165,15 @@ libexec+=	squid_kerb_auth
 # Storage schemes:
 
 storage_schemes=	ufs diskd null
-.if defined(WITH_SQUID_AUFS)
+.if ${PORT_OPTIONS:MSQUID_AUFS}
 storage_schemes+=	aufs
 EXTRA_PATCHES+=		${PATCHDIR}/extra-patch-src-cf.data.pre.aufs
 # Nil aufs threads is default, set any other value via SQUID_CONFIGURE_ARGS
 CONFIGURE_ARGS+=	--with-pthreads
 .endif
-.if defined(WITH_SQUID_COSS)
+.if ${PORT_OPTIONS:MSQUID_COSS}
 storage_schemes+=	coss
-.if !defined(WITH_SQUID_AUFS)
+.if ! ${PORT_OPTIONS:MSQUID_AUFS}
 # use Posix AIO instead of aufs' AIO; note that you then need the kernel to
 # supply AIO support, either by loading the aio(4) module (n/a on 4.x) or by
 # adding the option VFS_AIO to your kernel configuration if you want to
@@ -252,85 +186,85 @@ CONFIGURE_ARGS+=	--enable-storeio="${storage_schemes}"
 
 # Other options set via 'make config':
 
-.if defined(WITH_SQUID_DELAY_POOLS)
+.if ${PORT_OPTIONS:MSQUID_DELAY_POOLS}
 CONFIGURE_ARGS+=	--enable-delay-pools
 .endif
-.if defined(WITH_SQUID_SNMP)
+.if ${PORT_OPTIONS:MSQUID_SNMP}
 CONFIGURE_ARGS+=	--enable-snmp
 .endif
-.if defined(WITHOUT_SQUID_CARP)
+.if ! ${PORT_OPTIONS:MSQUID_CARP}
 CONFIGURE_ARGS+=	--disable-carp
 .endif
-.if defined(WITH_SQUID_SSL)
+.if ${PORT_OPTIONS:MSQUID_SSL}
 # we need to .include bsd.openssl.mk manually here.because USE_OPENSSL only
 # works when it is defined before bsd.port{.pre}.mk is .included.
 # This makes it currently impossible to combine this macro with OPTIONS to
 # conditionally include OpenSSL support.
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL=	yes
 CONFIGURE_ARGS+=	--enable-ssl \
 			--with-openssl="${OPENSSLBASE}"
 CFLAGS+=	-I${OPENSSLINC}
 LDFLAGS+=	-L${OPENSSLLIB}
 .endif
-.if defined(WITH_SQUID_PINGER)
+.if ${PORT_OPTIONS:MSQUID_PINGER}
 CONFIGURE_ARGS+=	--enable-icmp
 libexec+=	pinger
 .endif
-.if defined(WITH_SQUID_DNS_HELPER)
+.if ${PORT_OPTIONS:MSQUID_DNS_HELPER}
 CONFIGURE_ARGS+=	--disable-internal-dns
 libexec+=	dnsserver
 .endif
-.if defined(WITH_SQUID_HTCP)
+.if ${PORT_OPTIONS:MSQUID_HTCP}
 CONFIGURE_ARGS+=	--enable-htcp
 .endif
-.if defined(WITH_SQUID_VIA_DB)
+.if ${PORT_OPTIONS:MSQUID_VIA_DB}
 CONFIGURE_ARGS+=	--enable-forw-via-db
 .endif
-.if defined(WITH_SQUID_CACHE_DIGESTS)
+.if ${PORT_OPTIONS:MSQUID_CACHE_DIGESTS}
 CONFIGURE_ARGS+=	--enable-cache-digests
 .endif
-.if defined(WITHOUT_SQUID_WCCP)
+.if ! ${PORT_OPTIONS:MSQUID_WCCP}
 CONFIGURE_ARGS+=	--disable-wccp
 .endif
-.if defined(WITH_SQUID_WCCPV2)
+.if ${PORT_OPTIONS:MSQUID_WCCPV2}
 CONFIGURE_ARGS+=	--enable-wccpv2
 .endif
-.if defined(WITH_SQUID_STRICT_HTTP)
+.if ${PORT_OPTIONS:MSQUID_STRICT_HTTP}
 CONFIGURE_ARGS+=	--disable-http-violations
 .endif
-.if defined(WITHOUT_SQUID_IDENT)
+.if ! ${PORT_OPTIONS:MSQUID_IDENT}
 CONFIGURE_ARGS+=	--disable-ident-lookups
 .endif
-.if defined(WITH_SQUID_REFERER_LOG)
+.if ${PORT_OPTIONS:MSQUID_REFERER_LOG}
 CONFIGURE_ARGS+=	--enable-referer-log
 .endif
-.if defined(WITH_SQUID_USERAGENT_LOG)
+.if ${PORT_OPTIONS:MSQUID_USERAGENT_LOG}
 CONFIGURE_ARGS+=	--enable-useragent-log
 .endif
-.if defined(WITH_SQUID_ARP_ACL)
+.if ${PORT_OPTIONS:MSQUID_ARP_ACL}
 CONFIGURE_ARGS+=	--enable-arp-acl
 .endif
-.if defined(WITH_SQUID_PF)
+.if ${PORT_OPTIONS:MSQUID_PF}
 CONFIGURE_ARGS+=	--enable-pf-transparent
 .endif
-.if defined(WITH_SQUID_IPFILTER)
+.if ${PORT_OPTIONS:MSQUID_IPFILTER}
 CONFIGURE_ARGS+=	--enable-ipf-transparent
 .endif
-.if defined(WITH_SQUID_FOLLOW_XFF)
+.if ${PORT_OPTIONS:MSQUID_FOLLOW_XFF}
 CONFIGURE_ARGS+=	--enable-follow-x-forwarded-for
 .endif
-.if defined(WITHOUT_SQUID_KQUEUE)
+.if ! ${PORT_OPTIONS:MSQUID_KQUEUE}
 CONFIGURE_ARGS+=	--disable-kqueue
 .endif
-.if defined(WITH_SQUID_LARGEFILE)
+.if ${PORT_OPTIONS:MSQUID_LARGEFILE}
 CONFIGURE_ARGS+=	--with-large-files --enable-large-cache-files
 .endif
-.if defined(WITH_SQUID_STACKTRACES)
+.if ${PORT_OPTIONS:MSQUID_STACKTRACES}
 CONFIGURE_ARGS+=	--enable-stacktraces
 CFLAGS+=	-g
 STRIP=
 .endif
-.if defined(WITH_SQUID_TPROXY)
+.if ${PORT_OPTIONS:MSQUID_TPROXY}
 CONFIGURE_ARGS+=	--enable-freebsd-tproxy
 .endif
 
@@ -380,15 +314,15 @@ pre-su-install:
 	    ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-install:
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MNLS}
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/helpers/basic_auth/DB/passwd.sql ${EXAMPLESDIR}
 .endif
-.if defined(WITH_SQUID_PINGER)
+.if ${PORT_OPTIONS:MSQUID_PINGER}
 	${CHMOD} 4510 ${PREFIX}/libexec/squid/pinger; \
 	${CHGRP} ${SQUID_GID} ${PREFIX}/libexec/squid/pinger
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${docs} ${DOCSDIR}
 .endif
@@ -400,4 +334,4 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD} ""
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/cakephp11/Makefile b/www/cakephp11/Makefile
index bbbcbcbf6870..7b8da5454fd6 100644
--- a/www/cakephp11/Makefile
+++ b/www/cakephp11/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	cakephp
-# Date created:        19 January 2007
-# Whom:                Greg Larkin <glarkin@FreeBSD.org>
-#
+# Created by: Greg Larkin <glarkin@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	cakephp
 PORTVERSION=	1.1.19.6305
@@ -35,10 +31,8 @@ SUB_FILES=	pkg-message
 
 WRKSRC=		${WRKDIR}/cake_${DISTVERSION}
 
-OPTIONS=	PROD "Install for production server (see: make confighelp)" Off \
-		MYSQL "Check for/install MySQL support in PHP" Off \
-		PGSQL "Check for/install PostgreSQL support in PHP" Off \
-		SQLITE "Check for/install SQLite support in PHP" Off
+OPTIONS_DEFINE=	PROD MYSQL PGSQL SQLITE DOCS
+PROD_DESC=	Install for production server (see: make confighelp)
 
 PLIST_SUB+=	CONFDIR=${CONFDIR_REL}
 
@@ -57,7 +51,7 @@ CGI_EXT=
 
 SUB_LIST+=	PHPCGI=${WITH_PHP_CGI}
 
-.if defined(WITH_PROD)
+.if ${PORT_OPTIONS:MPROD}
 PROD=		production
 .else
 PROD=		development
@@ -69,17 +63,17 @@ SUB_FILES+=	${CONF}
 
 DB_DEFINED=	no
 
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 DB_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo_mysql.so:${PORTSDIR}/databases/php5-pdo_mysql
 DB_DEFINED=	yes
 .endif
 
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 DB_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo_pgsql.so:${PORTSDIR}/databases/php5-pdo_pgsql
 DB_DEFINED=	yes
 .endif
 
-.if defined(WITH_SQLITE)
+.if ${PORT_OPTIONS:MSQLITE}
 DB_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo_sqlite.so:${PORTSDIR}/databases/php5-pdo_sqlite
 DB_DEFINED=	yes
 .endif
@@ -126,7 +120,7 @@ post-install:
 	  ${ECHO_MSG} "" ; \
 	  ${FALSE} ; \
 	fi
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${DOCSDIR}
 .endif
diff --git a/www/cakephp12/Makefile b/www/cakephp12/Makefile
index c6c6fa9986a0..fb2de643f780 100644
--- a/www/cakephp12/Makefile
+++ b/www/cakephp12/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	cakephp-devel
-# Date created:        20 December 2007
-# Whom:                Greg Larkin <glarkin@FreeBSD.org>
-#
+# Created by: Greg Larkin <glarkin@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	cakephp
 PORTVERSION=	1.2.10
@@ -43,13 +39,10 @@ CAKE_CONF_FILES=	\
 		app/config/routes.php
 CAKE_CONSOLE=	cake/console/cake
 
-OPTIONS=	PROD "Install for production server (make confighelp)" Off \
-		AP "Add Apache 2.2+ dependency" Off \
-		MYSQL "Check for/install MySQL support in PHP" Off \
-		PGSQL "Check for/install PostgreSQL support in PHP" Off \
-		SQLITE "Check for/install SQLite support in PHP" Off \
-		APC "Enable APC caching engine" Off \
-		MEMCACHE "Enable Memcached caching engine client" Off
+OPTIONS_DEFINE=	PROD AP MYSQL PGSQL SQLITE APC MEMCACHE DOCS
+PROD_DESC=	Install for production server (make confighelp)
+APC_DESC=	APC caching engine
+MEMCACHE_DESC=	Memcached caching engine client
 
 CONFDIR=	${PREFIX}/${CONFDIR_REL}
 CONFDIR_REL=	${APACHEETCDIR}/Includes
@@ -66,7 +59,7 @@ CGI_EXT=
 
 SUB_LIST+=	PHPCGI=${WITH_PHP_CGI}
 
-.if defined(WITH_AP)
+.if ${PORT_OPTIONS:MAP}
 SUB_FILES=	pkg-message
 USE_APACHE_RUN=	22+
 PKGMESSAGE=	pkg-message
@@ -77,7 +70,7 @@ PKGMESSAGE=	pkg-message-no-apache
 APDEP=		"@comment "
 .endif
 
-.if defined(WITH_PROD)
+.if ${PORT_OPTIONS:MPROD}
 PROD=		production
 HTACCESS=	""
 .else
@@ -94,17 +87,17 @@ PLIST_SUB+=	CONFDIR=${CONFDIR_REL} ECHO_MSG=${ECHO_MSG} \
 
 DB_DEFINED=	no
 
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 DB_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo_mysql.so:${PORTSDIR}/databases/php5-pdo_mysql
 DB_DEFINED=	yes
 .endif
 
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 DB_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo_pgsql.so:${PORTSDIR}/databases/php5-pdo_pgsql
 DB_DEFINED=	yes
 .endif
 
-.if defined(WITH_SQLITE)
+.if ${PORT_OPTIONS:MSQLITE}
 DB_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo_sqlite.so:${PORTSDIR}/databases/php5-pdo_sqlite
 DB_DEFINED=	yes
 .endif
@@ -114,11 +107,11 @@ RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo.so:${PORTSDIR}/databases/p
 		${DB_DEPENDS}
 .endif
 
-.if defined(WITH_APC)
+.if ${PORT_OPTIONS:MAPC}
 USE_PHP+=	apc
 .endif
 
-.if defined(WITH_MEMCACHE)
+.if ${PORT_OPTIONS:MMEMCACHE}
 USE_PHP+=	memcache
 .endif
 
@@ -147,7 +140,7 @@ do-install:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} \
 		".htaccess app cake index.php vendors" ${WWWDIR}
 
-.if !defined(WITH_PROD)
+.if ! ${PORT_OPTIONS:MPROD}
 # If installed in development mode, get rid of .htaccess files,
 # as noted by:
 # http://book.cakephp.org/view/42/The-Configuration-Class#CakePHP-Core-Configuration-Variables-44
@@ -181,7 +174,7 @@ do-install:
 	@${ECHO_CMD} '@exec ${CHMOD} 755 ${WWWDIR}/${CAKE_CONSOLE}' >> ${TMPPLIST}
 
 post-install:
-.if defined(WITH_AP)
+.if ${PORT_OPTIONS:MAP}
 	@if [ -d "${CONFDIR}" ]; then \
 	  ${CP} ${WRKDIR}/${CONF} ${CONFDIR}/cakephp.conf; \
 	else \
@@ -193,7 +186,7 @@ post-install:
 	  ${FALSE} ; \
 	fi
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${INSTALL} -d ${DOCSDIR}
 	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
diff --git a/www/cakephp13/Makefile b/www/cakephp13/Makefile
index 03347d3a2052..57e90a182d6b 100644
--- a/www/cakephp13/Makefile
+++ b/www/cakephp13/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	cakephp13
-# Date created:        			19 September 2011
-# Whom:                			Christoph Theis <theis@gmx.at>
-#
+# Created by: Christoph Theis <theis@gmx.at>
 # $FreeBSD$
-#
 
 PORTNAME=	cakephp
 PORTVERSION=	1.3.15
@@ -44,13 +40,10 @@ CAKE_CONF_FILES=	\
 		app/config/routes.php
 CAKE_CONSOLE=	cake/console/cake
 
-OPTIONS=	PROD "Install for production server (make confighelp)" Off \
-		AP "Add Apache 2.2+ dependency" Off \
-		MYSQL "Check for/install MySQL support in PHP" Off \
-		PGSQL "Check for/install PostgreSQL support in PHP" Off \
-		SQLITE "Check for/install SQLite support in PHP" Off \
-		APC "Enable APC caching engine" Off \
-		MEMCACHE "Enable Memcached caching engine client" Off
+OPTIONS_DEFINE=	PROD AP MYSQL PGSQL SQLITE APC MEMCACHE DOCS
+PROD_DESC=	Install for production server (make confighelp)
+APC_DESC=	APC caching engine
+MEMCACHE_DESC=	Memcached caching engine client
 
 CONFDIR=	${PREFIX}/${CONFDIR_REL}
 CONFDIR_REL=	${APACHEETCDIR}/Includes
@@ -67,7 +60,7 @@ CGI_EXT=
 
 SUB_LIST+=	PHPCGI=${WITH_PHP_CGI}
 
-.if defined(WITH_AP)
+.if ${PORT_OPTIONS:MAP}
 SUB_FILES=	pkg-message
 USE_APACHE_RUN=	22+
 PKGMESSAGE=	pkg-message
@@ -78,7 +71,7 @@ PKGMESSAGE=	pkg-message-no-apache
 APDEP=		"@comment "
 .endif
 
-.if defined(WITH_PROD)
+.if ${PORT_OPTIONS:MPROD}
 PROD=		production
 HTACCESS=	""
 .else
@@ -95,17 +88,17 @@ PLIST_SUB+=	CONFDIR=${CONFDIR_REL} ECHO_MSG=${ECHO_MSG} \
 
 DB_DEFINED=	no
 
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 DB_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo_mysql.so:${PORTSDIR}/databases/php5-pdo_mysql
 DB_DEFINED=	yes
 .endif
 
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 DB_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo_pgsql.so:${PORTSDIR}/databases/php5-pdo_pgsql
 DB_DEFINED=	yes
 .endif
 
-.if defined(WITH_SQLITE)
+.if ${PORT_OPTIONS:MSQLITE}
 DB_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo_sqlite.so:${PORTSDIR}/databases/php5-pdo_sqlite
 DB_DEFINED=	yes
 .endif
@@ -115,11 +108,11 @@ RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo.so:${PORTSDIR}/databases/p
 		${DB_DEPENDS}
 .endif
 
-.if defined(WITH_APC)
+.if ${PORT_OPTIONS:MAPC}
 USE_PHP+=	apc
 .endif
 
-.if defined(WITH_MEMCACHE)
+.if ${PORT_OPTIONS:MMEMCACHE}
 USE_PHP+=	memcache
 .endif
 
@@ -156,7 +149,7 @@ do-install:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} \
 		".htaccess app cake index.php vendors" ${WWWDIR}
 
-.if !defined(WITH_PROD)
+.if ! ${PORT_OPTIONS:MPROD}
 # If installed in development mode, get rid of .htaccess files,
 # as noted by:
 # http://book.cakephp.org/view/42/The-Configuration-Class#CakePHP-Core-Configuration-Variables-44
@@ -188,7 +181,7 @@ post-install:
 			${INSTALL_DATA} ${WRKSRC}/$$i.default ${WWWDIR}/$$i; \
 		fi \
 	done
-.if defined(WITH_AP)
+.if ${PORT_OPTIONS:MAP}
 	@if [ -d "${CONFDIR}" ]; then \
 	  ${CP} ${WRKDIR}/${CONF} ${CONFDIR}/cakephp.conf; \
 	else \
@@ -200,7 +193,7 @@ post-install:
 	  ${FALSE} ; \
 	fi
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${INSTALL} -d ${DOCSDIR}
 	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
diff --git a/www/cakephp21/Makefile b/www/cakephp21/Makefile
index 961b880328a5..1233e36ccbf8 100644
--- a/www/cakephp21/Makefile
+++ b/www/cakephp21/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	cakephp2
-# Date created:        			20 February 2012
-# Whom:                			Christoph Theis <theis@gmx.at>
-#
+# Created by: Christoph Theis <theis@gmx.at>
 # $FreeBSD$
-#
 
 PORTNAME=	cakephp
 PORTVERSION=	2.1.3
@@ -45,13 +41,15 @@ CAKE_CONF_FILES=	\
 		app/Config/email.php
 CAKE_CONSOLE=	lib/Cake/Console/cake
 
-OPTIONS=	PROD "Install for production server (make confighelp)" Off \
-		AP "Add Apache 2.2+ dependency" Off \
-		MYSQL "Check for/install MySQL support in PHP" Off \
-		PGSQL "Check for/install PostgreSQL support in PHP" Off \
-		SQLITE "Check for/install SQLite support in PHP" Off \
-		APC "Enable APC caching engine" Off \
-		MEMCACHE "Enable Memcached caching engine client" Off
+OPTIONS_DEFINE=	PROD AP MYSQL PGSQL SQLITE APC MEMCACHE DOCS
+
+PROD_DESC=	Install for production server (make confighelp)
+AP_DESC=	Add Apache 2.2+ dependency
+MYSQL_DESC=	Check for/install MySQL support in PHP
+PGSQL_DESC=	Check for/install PostgreSQL support in PHP
+SQLITE_DESC=	Check for/install SQLite support in PHP
+APC_DESC=	Enable APC caching engine
+MEMCACHE_DESC=	Enable Memcached caching engine client
 
 CONFDIR=	${PREFIX}/${CONFDIR_REL}
 CONFDIR_REL=	${APACHEETCDIR}/Includes
@@ -68,7 +66,7 @@ CGI_EXT=
 
 SUB_LIST+=	PHPCGI=${WITH_PHP_CGI}
 
-.if defined(WITH_AP)
+.if ${PORT_OPTIONS:MAP}
 SUB_FILES=	pkg-message
 USE_APACHE_RUN=	22+
 PKGMESSAGE=	pkg-message
@@ -79,7 +77,7 @@ PKGMESSAGE=	pkg-message-no-apache
 APDEP=		"@comment "
 .endif
 
-.if defined(WITH_PROD)
+.if ${PORT_OPTIONS:MPROD}
 PROD=		production
 HTACCESS=	""
 .else
@@ -94,23 +92,23 @@ SUB_FILES+=	${CONF}
 PLIST_SUB+=	CONFDIR=${CONFDIR_REL} ECHO_MSG=${ECHO_MSG} \
 		HTACCESS=${HTACCESS} APDEP=${APDEP}
 
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 USE_PHP+=	pdo pdo_mysql
 .endif
 
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 USE_PHP+=	pdo pdo_pgsql
 .endif
 
-.if defined(WITH_SQLITE)
+.if ${PORT_OPTIONS:MSQLITE}
 USE_PHP+=	pdo pdo_sqlite
 .endif
 
-.if defined(WITH_APC)
+.if ${PORT_OPTIONS:MAPC}
 USE_PHP+=	apc
 .endif
 
-.if defined(WITH_MEMCACHE)
+.if ${PORT_OPTIONS:MMEMCACHE}
 USE_PHP+=	memcache
 .endif
 
@@ -147,7 +145,7 @@ do-install:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} \
 		".htaccess app lib index.php plugins vendors" ${WWWDIR}
 
-.if !defined(WITH_PROD)
+.if ! ${PORT_OPTIONS:MPROD}
 # If installed in development mode, get rid of .htaccess files,
 # as noted by:
 # http://book.cakephp.org/view/42/The-Configuration-Class#CakePHP-Core-Configuration-Variables-44
@@ -179,7 +177,7 @@ post-install:
 			${INSTALL_DATA} ${WRKSRC}/$$i.default ${WWWDIR}/$$i; \
 		fi \
 	done
-.if defined(WITH_AP)
+.if ${PORT_OPTIONS:MAP}
 	@if [ -d "${CONFDIR}" ]; then \
 	  ${CP} ${WRKDIR}/${CONF} ${CONFDIR}/cakephp.conf; \
 	else \
@@ -191,7 +189,7 @@ post-install:
 	  ${FALSE} ; \
 	fi
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${INSTALL} -d ${DOCSDIR}
 	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
@@ -208,4 +206,4 @@ post-install:
 .endif
 	@${ECHO_MSG}	"*********************************************************************"
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/cakephp22/Makefile b/www/cakephp22/Makefile
index b69fb5a7a458..e7c0f986512d 100644
--- a/www/cakephp22/Makefile
+++ b/www/cakephp22/Makefile
@@ -62,7 +62,7 @@ CGI_EXT=
 
 SUB_LIST+=	PHPCGI=${WITH_PHP_CGI}
 
-.if defined(WITH_AP)
+.if ${PORT_OPTIONS:MAP}
 SUB_FILES=	pkg-message
 USE_APACHE_RUN=	22+
 PKGMESSAGE=	pkg-message
diff --git a/www/codeigniter17/Makefile b/www/codeigniter17/Makefile
index 3c0247d12ffa..e94eb2f905ad 100644
--- a/www/codeigniter17/Makefile
+++ b/www/codeigniter17/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	codeigniter
-# Date created:        04 January 2008
-# Whom:                Greg Larkin <glarkin@FreeBSD.org>
-#
+# Created by: Greg Larkin <glarkin@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	codeigniter
 PORTVERSION=	1.7.3
@@ -58,18 +54,20 @@ STD_BITS=	${CI_CONF_DIR}/index.html \
 		${CI_SYS_DIR}/plugins \
 		${CI_SYS_DIR}/scaffolding
 
-OPTIONS=	APACHE "Configure for Apache-2.x" off \
-		PROD "Install for production server (see: make confighelp)" Off \
-		MSSQL "Install MSSQL support for PHP" Off \
-		MYSQL "Install MySQL support for PHP" Off \
-		MYSQLI "Install MySQLi support for PHP" Off \
-		ODBC "Install ODBC support for PHP" Off \
-		PGSQL "Install PostgreSQL support for PHP" Off \
-		SQLITE "Install SQLite support for PHP" Off
+OPTIONS_DEFINE=	APACHE PROD MSSQL MYSQL MYSQLI ODBC PGSQL SQLITE
+
+APACHE_DESC=	Configure for Apache-2.x
+PROD_DESC=	Install for production server (see: make confighelp)
+MSSQL_DESC=	Install MSSQL support for PHP
+MYSQL_DESC=	Install MySQL support for PHP
+MYSQLI_DESC=	Install MySQLi support for PHP
+ODBC=	Install ODBC support for PHP
+PGSQL_DESC=	Install PostgreSQL support for PHP
+SQLITE_DESC=	Install SQLite support for PHP
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_APACHE)
+.if ${PORT_OPTIONS:MAPACHE}
 USE_APACHE_RUN=	22+
 
 PLIST_SUB+=	NOAPACHE="" CONFDIR=${CONFDIR_REL}
@@ -97,33 +95,33 @@ DEFAULT_PHP_VER=5
 
 SUB_LIST+=	PHPCGI=${WITH_PHP_CGI}
 
-.if defined(WITH_PROD)
+.if ${PORT_OPTIONS:MPROD}
 PROD=		production
 .else
 PROD=		development
 .endif
 
-.if defined(WITH_MSSQL)
+.if ${PORT_OPTIONS:MMSSQL}
 USE_PHP+=	mssql
 .endif
 
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 USE_PHP+=	mysql
 .endif
 
-.if defined(WITH_MYSQLI)
+.if ${PORT_OPTIONS:MMYSQLI}
 USE_PHP+=	mysqli
 .endif
 
-.if defined(WITH_ODBC)
+.if ${PORT_OPTIONS:MODBC}
 USE_PHP+=	odbc
 .endif
 
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 USE_PHP+=	pgsql
 .endif
 
-.if defined(WITH_SQLITE)
+.if ${PORT_OPTIONS:MSQLITE}
 USE_PHP+=	sqlite
 .endif
 
@@ -177,7 +175,7 @@ post-install:
 			fi; \
 		fi; \
 	done
-.if defined(WITH_APACHE)
+.if ${PORT_OPTIONS:MAPACHE}
 	@if [ -d "${CONFDIR}" ]; then \
 	  ${CP} ${WRKDIR}/${CONF} ${CONFDIR}/codeigniter.conf; \
 	else \
@@ -189,7 +187,7 @@ post-install:
 	  ${FALSE} ; \
 	fi
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@cd ${WRKSRC}/user_guide/ && ${COPYTREE_SHARE} . ${DOCSDIR}
 .endif
 
diff --git a/www/dillo2/Makefile b/www/dillo2/Makefile
index 994dcc59ee68..365876b4a93e 100644
--- a/www/dillo2/Makefile
+++ b/www/dillo2/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for:   dillo
-# Date created:        28 August 2008
-# Whom:                bf <bf2006a@yahoo.com>
-#
+# Created by: bf <bf2006a@yahoo.com>
 # $FreeBSD$
 
 PORTNAME=	dillo
@@ -22,48 +19,50 @@ USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 MAN1=		dillo.1
-.ifndef(NOPORTDOCS)
-PORTDOCS=	*
-.endif
 CONFIGURE_ARGS=	--libdir=${PREFIX}/libexec
 CONFLICTS=	dillo-i18n-[0-9]* \
 		dillo-0*
 LATEST_LINK=	dillo2
 
-OPTIONS=	COOKIES 	"Enable cookies" On \
-		DEBUG		"Enable profiling and extra logging" Off \
-		IPV6		"Enable ipv6"	On \
-		SSL		"Enable (experimental) https support" On \
-		THREADED_DNS	"Enable re-entrant resolver library" On
+OPTIONS_DEFINE=	COOKIES DEBUG IPV6 SSL THREADED_DNS
+OPTIONS_DEFAULT=	COOKIES SSL THREADED_DNS
+COOKIES_DESC=		Enable cookies
+DEBUG_DESC=		Enable profiling and extra logging
+SSL_DESC=		Enable (experimental) https support
+THREADED_DNS_DESC=	Enable re-entrant resolver library
 
 .include <bsd.port.options.mk>
 
-.ifdef(WITH_COOKIES)
+.if ${PORT_OPTIONS:MDOCS}
+PORTDOCS=	*
+.endif
+
+.if ${PORT_OPTIONS:MCOOKIES}
 CONFIGURE_ARGS+=	--enable-cookies
 .else
 CONFIGURE_ARGS+=	--disable-cookies
 .endif
 
-.ifdef(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=	--enable-gprof --enable-rtfl
 .else
 CONFIGURE_ARGS+=	--disable-gprof --disable-rtfl
 .endif
 
-.ifdef(WITH_IPV6)
+.if ${PORT_OPTIONS:MIPV6}
 CONFIGURE_ARGS+=	--enable-ipv6
 .else
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
-.ifdef(WITH_SSL)
+.if ${PORT_OPTIONS:MSSL}
 CONFIGURE_ARGS+=	--enable-ssl
 USE_OPENSSL=	yes
 .else
 CONFIGURE_ARGS+=	--disable-ssl
 .endif
 
-.ifdef(WITH_THREADED_DNS)
+.if ${PORT_OPTIONS:MTHREADED_DNS}
 CONFIGURE_ARGS+=	--enable-threaded-dns
 .else
 CONFIGURE_ARGS+=	--disable-threaded-dns
@@ -77,7 +76,7 @@ post-patch:
 	@${REINPLACE_CMD} -e "s|dillorc|dillorc.dist|g" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e "s|dpidrc|dpidrc.dist|g" ${WRKSRC}/dpid/Makefile.in
 	@${REINPLACE_CMD} -e "s|keysrc|keysrc.dist|g" ${WRKSRC}/src/Makefile.in
-.ifdef(NOPORTDOCS)
+.if ! ${PORT_OPTIONS:MDOCS}
 	@${REINPLACE_CMD} -e "\|install-data-am:|s|install-dist_docDATA||" ${WRKSRC}/doc/Makefile.in
 .endif
 
@@ -87,7 +86,7 @@ post-install:
 	${INSTALL_DATA} ${PREFIX}/etc/dillo/${f}.dist ${PREFIX}/etc/dillo/${f}
 . endif
 .endfor
-.ifndef(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${INSTALL_MAN} ${WRKSRC}/doc/* ${DOCSDIR}
 .endif
 
diff --git a/www/dokeos/Makefile b/www/dokeos/Makefile
index ef38eea548ac..79d8b0ef5cd7 100644
--- a/www/dokeos/Makefile
+++ b/www/dokeos/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	dokeos
-# Date created:				21 January 2006
-# Whom:					Filipe Rocha <filiperocha@gmail.com>
-#
+# Created by: Filipe Rocha <filiperocha@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	dokeos
 PORTVERSION=	1.8.6
@@ -16,9 +12,11 @@ COMMENT=	Dokeos is an elearning and course management web application
 USE_PHP=	mysql session gd pcre zlib
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-OPTIONS=	LDAP "Use LDAP" off
+OPTIONS_DEFINE=	LDAP
 
-.if defined(WITH_LDAP)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MLDAP}
 USE_PHP+=	ldap
 .endif
 
diff --git a/www/extjs/Makefile b/www/extjs/Makefile
index 37561c2ba000..6aafc8dc3c13 100644
--- a/www/extjs/Makefile
+++ b/www/extjs/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	extjs
-# Date created:		2010-01-28
-# Whom:			Joe Horn <joehorn@gmail.com>
-#
+# Created by: Joe Horn <joehorn@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	extjs
 PORTVERSION=	4.1.1
@@ -24,8 +20,7 @@ WRKSRC=		${WRKDIR}/extjs-${PORTVERSION}
 USE_ZIP=	yes
 NO_BUILD=	yes
 
-OPTIONS=	DOC	"Install with documents" on \
-		EXAMPLE "Install with examples" on
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 WWW_SUB=	"bootstrap.js build builds ext-all-debug-w-comments.js \
 		 ext-all-debug.js ext-all-dev.js ext-all.js \
@@ -34,36 +29,34 @@ WWW_SUB=	"bootstrap.js build builds ext-all-debug-w-comments.js \
 		 ext-neptune.js	ext.js index.html license.txt locale \
 		 pkgs release-notes.html resources src welcome"
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 SUB_FILES+=	pkg-message
 
-.if !defined(WITH_DOC)
-NOPORTDOCS=	YES
-SUB_LIST+=	COMMENTDOCS="\# "
-.else
+.if ${PORT_OPTIONS:MDOC}
 SUB_LIST+=	COMMENTDOCS=
+.else
+SUB_LIST+=	COMMENTDOCS="\# "
 .endif
 
-.if !defined(WITH_EXAMPLE)
-NOPORTEXAMPLES=	YES
-SUB_LIST+=	COMMENTEXAMPLES="\# "
-.else
+.if ${PORT_OPTIONS:MEXAMPLE}
 SUB_LIST+=	COMMENTEXAMPLES=
+.else
+SUB_LIST+=	COMMENTEXAMPLES="\# "
 .endif
 
 do-install:
 	@cd ${WRKSRC} && ${RM} -rf resources/sass/.sass-cache/*
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} ${WWW_SUB} ${WWWDIR}
 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${DOCSDIR}
 .endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MNLS}
 	@cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${EXAMPLESDIR}
 .endif
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/eyeos-themes/Makefile b/www/eyeos-themes/Makefile
index 4a0fccabead4..346e231e74bf 100644
--- a/www/eyeos-themes/Makefile
+++ b/www/eyeos-themes/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	eyeOS-themes
-# Date created:		2006-04-06
-# Whom:			Nicola Vitale	<nivit@email.it>
-#
+# Created by: Nicola Vitale	<nivit@email.it>
 # $FreeBSD$
-#
 
 PORTNAME=	themes
 PORTVERSION=	1.2
@@ -24,19 +20,19 @@ USE_ZIP=	yes
 EYEDIR?=	${PREFIX}/www/eyeOS
 THEMESDIR=	${EYEDIR}/system/themes
 
-OPTIONS=	Crystal_THEME "based on the Crystal Open Source icons" On
-OPTIONS+=	Executive_THEME "designed specially for Companies" On
-OPTIONS+=	Kids_THEME "designed specially for Kids and Schools" On
-OPTIONS+=	LateBloomer_THEME "based on the Crystal theme" On
-OPTIONS+=	Mac_THEME "based on OSX 2.1 Open Source icons" On
-OPTIONS+=	Mini_THEME "with mall icons based on Nuvola icon set" On
-OPTIONS+=	NuoveXT_THEME "based on 'NuoveXT' Open Source icons" On
-OPTIONS+=	Nuvola_THEME "inspired in the great icons Nuvola" On
-OPTIONS+=	WaterSide_THEME "inspired in countryside of Saskatchewan" On
-OPTIONS+=	fromX_THEME "based on Tango Icons" On
-OPTIONS+=	eyeOSVista_THEME "based on the new Vista style" On
-OPTIONS+=	animus_THEME "created by AnimusMedia.com" On
-OPTIONS+=	minimal_THEME "based on minimalist art" On
+Crystal_THEME "based on the Crystal Open Source icons" On
+Executive_THEME "designed specially for Companies" On
+Kids_THEME "designed specially for Kids and Schools" On
+LateBloomer_THEME "based on the Crystal theme" On
+Mac_THEME "based on OSX 2.1 Open Source icons" On
+Mini_THEME "with mall icons based on Nuvola icon set" On
+NuoveXT_THEME "based on 'NuoveXT' Open Source icons" On
+Nuvola_THEME "inspired in the great icons Nuvola" On
+WaterSide_THEME "inspired in countryside of Saskatchewan" On
+fromX_THEME "based on Tango Icons" On
+eyeOSVista_THEME "based on the new Vista style" On
+animus_THEME "created by AnimusMedia.com" On
+minimal_THEME "based on minimalist art" On
 
 .include <bsd.port.pre.mk>
 
diff --git a/www/foswiki/Makefile b/www/foswiki/Makefile
index 611dedaf2964..d12f9294ccd5 100644
--- a/www/foswiki/Makefile
+++ b/www/foswiki/Makefile
@@ -20,17 +20,19 @@ LICENSE=	GPLv2
 USE_PERL5=	yes
 NO_BUILD=	yes
 
-OPTIONS=	OPTINT "Install Perl modules for intl character support" On \
-		OPTOTH "Install other optional Perl modules" On \
-		APACHE "Install Apache web server and sample config file" Off
+OPTIONS_DEFINE=	OPTINT OPTOTH APACHE
+OPTIONS_DEFAULT=	OPTINT OPTOTH
+OPTINT_DESC=	Install Perl modules for intl character support
+OPTOTH_DESC=	Install other optional Perl modules
+APACHE_DESC=	Install Apache web server and sample config file
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_OPTINT)
+.if ${PORT_OPTIONS:MOPTINT}
 RUN_DEPENDS+=	p5-Locale-Maketext-Lexicon>=0:${PORTSDIR}/devel/p5-Locale-Maketext-Lexicon
 .endif
 
-.if defined(WITH_OPTOTH)
+.if ${PORT_OPTIONS:MOPTOTH}
 RUN_DEPENDS+=	p5-Apache-Htpasswd>=0:${PORTSDIR}/security/p5-Apache-Htpasswd \
 		p5-Archive-Tar>=0:${PORTSDIR}/archivers/p5-Archive-Tar \
 		p5-Cache-Cache>=0:${PORTSDIR}/devel/p5-Cache-Cache \
@@ -44,7 +46,7 @@ RUN_DEPENDS+=	p5-Apache-Htpasswd>=0:${PORTSDIR}/security/p5-Apache-Htpasswd \
 		p5-Net>=1.19:${PORTSDIR}/net/p5-Net
 .endif
 
-.if defined(WITH_APACHE)
+.if ${PORT_OPTIONS:MAPACHE}
 USE_APACHE_RUN?=22+
 PLIST_SUB+=	NOAPACHE=""
 PKGMESSAGE=	pkg-message-apache
@@ -93,7 +95,7 @@ post-patch:
 	@${FIND} ${WRKSRC} -name \*.orig -delete
 
 post-install:
-.if defined(WITH_APACHE)
+.if ${PORT_OPTIONS:MAPACHE}
 	@if [ -d "${CONFDIR}" ]; then \
 	  ${INSTALL_DATA} ${WRKSRC}/foswiki_httpd_conf.txt \
 		${CONFDIR}/foswiki.conf.sample; \
diff --git a/www/p5-WebService-NoPaste/Makefile b/www/p5-WebService-NoPaste/Makefile
index ae8942035515..7231d6eac8d0 100644
--- a/www/p5-WebService-NoPaste/Makefile
+++ b/www/p5-WebService-NoPaste/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-WebService-NoPaste
-# Date created:		2005-12-26
-# Whom:			Gea-Suan Lin <gslin@netnews.NCTU.edu.tw>
-#
+# Created by: Gea-Suan Lin <gslin@netnews.NCTU.edu.tw>
 # $FreeBSD$
-#
 
 PORTNAME=	WebService-NoPaste
 PORTVERSION=	0.03
@@ -23,11 +19,12 @@ PERL_CONFIGURE=	yes
 
 MAN3=		WebService::NoPaste.3
 
-OPTIONS=	X11	"Enable X11 Clipboard support"	off
+OPTIONS_DEFINE=	X11
+X11_DESC=	X11 Clipboard support
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_X11)
+.if ${PORT_OPTIONS:MX11}
 BUILD_DEPENDS+=	p5-Clipboard>=0:${PORTSDIR}/x11/p5-Clipboard
 .else
 EXTRA_PATCHES+=	${FILESDIR}/extrapatch-lib-WebService-NoPaste.pm
@@ -35,8 +32,8 @@ EXTRA_PATCHES+=	${FILESDIR}/extrapatch-lib-WebService-NoPaste.pm
 
 post-patch:
 	@${PERL} -pi -e "s|/usr/bin/perl|${PERL}|;" ${WRKSRC}/nopaste
-.if !defined(WITH_X11)
+.if ! ${PORT_OPTIONS:MX11}
 	@${RM} ${WRKSRC}/lib/WebService/NoPaste.pm.orig
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/phpgedview/Makefile b/www/phpgedview/Makefile
index d31412fa6382..dc700e27eb4a 100644
--- a/www/phpgedview/Makefile
+++ b/www/phpgedview/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	phpGedView
-# Date created:				20 février 2004
-# Whom:					Hubert Tournier <hubert@frbsd.org>
-#
+# Created by: Hubert Tournier <hubert@frbsd.org>
 # $FreeBSD$
-#
 
 PORTNAME=	phpGedView
 PORTVERSION=	4.2.3
@@ -25,30 +21,23 @@ NO_BUILD=	yes
 SUB_FILES=	pkg-message pkg-deinstall
 DISTATE=	config.php config_download.php config_gedcom.php
 
-OPTIONS=\
-	MYSQL	"Install MYSQL data storage option"		off \
-	PGSQL	"Install Postgress data storage option"		off \
-	SQLITE	"Install SQLITE data storage option"		on
+OPTIONS_MULTI=	DB
+OPTIONS_MULTI_DB=	MYSQL PGSQL SQLITE
+DB_DESC=	Data storage
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITH_MYSQL) && !defined(WITH_PGSQL) && !defined(WITH_SQLITE)
-check-makevars::
-		@${ECHO_CMD} "${PKGNAME}: Makefile options: at least one database: MYSQL, PGSQL or SQLITE must be installed."
-		@${FALSE}
-.endif
-
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	yes
 USE_PHP +=	pdo_mysql
 .endif
 
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 USE_PGSQL=	yes
 USE_PHP +=	pdo_pgsql
 .endif
 
-.if defined(WITH_SQLITE)
+.if ${PORT_OPTIONS:MSQLITE}
 USE_PHP +=	pdo_sqlite
 .endif
 
@@ -73,4 +62,4 @@ post-install:
 .endfor
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/pivotx/Makefile b/www/pivotx/Makefile
index bf58198f3632..b8d5df28e327 100644
--- a/www/pivotx/Makefile
+++ b/www/pivotx/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	pivotx
-# Date created:		2011-01-05
-# Whom:			Fumiyuki Shimizu <fumifumi@abacustech.jp>
-#
+# Created by: Fumiyuki Shimizu <fumifumi@abacustech.jp>
 # $FreeBSD$
-#
 
 PORTNAME=	pivotx
 PORTVERSION=	2.3.3
@@ -26,8 +22,9 @@ PORTEXAMPLES=	example.htaccess
 # Requirements:
 # http://book.pivotx.net/index.php?page=app-e#anchor-determining-if-your-server-meets-pivotxs-requirements
 
-OPTIONS=	MYSQL	"Use MySQL instead of flat files" off \
-		PHPDOM	"Use PHP:DOM instead of SimpleXML" off
+OPTIONS_DEFINE=	MYSQL PHPDOM NLS DOCS
+MYSQL_DESC=	Use MySQL instead of flat files
+PHPDOM_DESC=	Use PHP:DOM instead of SimpleXML
 
 .include <bsd.port.options.mk>
 
@@ -35,13 +32,13 @@ WANT_PHP_WEB=	yes
 USE_PHP=	session gettext xml tokenizer gd pcre
 USE_GETTEXT=	yes
 
-.if defined(WITH_PHPDOM)
+.if ${PORT_OPTIONS:MPHPDOM}
 USE_PHP+=	dom
 .else
 USE_PHP+=	simplexml
 .endif
 
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	client
 USE_PHP+=	mysql
 .endif
@@ -99,13 +96,13 @@ do-install:
 	   ${ECHO} 'Press ctrl-C *now* to backup them manually.';	\
 	   sleep 7;	\
 	 fi
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} '${DOCSDIR}'
 .for FILES in ${PORTDOCS}
 	@${INSTALL_DATA} '${TEMP_WRKSRC}/${FILES}' '${DOCSDIR}'
 .endfor
 .endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MNLS}
 	@${MKDIR} '${EXAMPLESDIR}'
 .for FILES in ${PORTEXAMPLES}
 	@${INSTALL_DATA} '${TEMP_WRKSRC}/${FILES}' '${EXAMPLESDIR}'
diff --git a/www/prado/Makefile b/www/prado/Makefile
index e7d315db76d6..a8e1d0a964d1 100644
--- a/www/prado/Makefile
+++ b/www/prado/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	prado
-# Date created:        04 January 2008
-# Whom:                Greg Larkin <glarkin@FreeBSD.org>
-#
+# Created by: Greg Larkin <glarkin@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	prado
 PORTVERSION=	3.1.6.r2699
@@ -11,12 +7,7 @@ PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 PROJECTHOST=	prado3
-.if defined(NOPORTDOCS)
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
-.else
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
-		${PORTNAME}-docs-${PORTVERSION:C|.r|-r|}${EXTRACT_SUFX}
-.endif
 
 MAINTAINER=	glarkin@FreeBSD.org
 COMMENT=	A framework for developing PHP web applications
@@ -36,9 +27,11 @@ IGNORE_WITH_PHP=4
 
 SUB_FILES=	pkg-message
 
-OPTIONS=	PROD "Install for production server (see: make confighelp)" Off \
-		REQPHP "Install required PHP dependencies" On \
-		OPTPHP "Install optional PHP dependencies" Off
+OPTIONS_DEFINE=	PROD REQPHP OPTPHP DOCS EXAMPLES
+OPTIONS_DEFAULT=	REQPHP
+PROD_DESC=	Install for production server (see: make confighelp)
+REQPHP_DESC=	Install required PHP dependencies
+OPTPHP_DESC=	Install optional PHP dependencies
 
 PLIST_SUB+=	CONFDIR=${CONFDIR_REL}
 
@@ -47,6 +40,10 @@ CONFDIR_REL=	${APACHEETCDIR}/Includes
 
 .include <bsd.port.pre.mk>
 
+.if ${PORT_OPTIONS:MDOCS}
+DISTFILES+=	${PORTNAME}-docs-${PORTVERSION:C|.r|-r|}${EXTRACT_SUFX}
+.endif
+
 WITH_PHP_CGI?=	/cgi-bin/php
 
 .if ${PHP_SAPI:Mcgi} == "cgi" && ${PHP_SAPI:Mmod} == ""
@@ -57,32 +54,32 @@ CGI_EXT=
 
 SUB_LIST+=	PHPCGI=${WITH_PHP_CGI}
 
-.if defined(WITH_PROD)
+.if ${PORT_OPTIONS:MPROD}
 PROD=		production
 .else
 PROD=		development
 .endif
 
-.if defined(NOPORTDOCS)
-SUB_LIST+=	HASHMARK=\#
-.else
+.if ${PORT_OPTIONS:MDOCS}
 SUB_LIST+=	HASHMARK=
+.else
+SUB_LIST+=	HASHMARK=\#
 .endif
 
-.if defined(NOPORTEXAMPLES)
-DEMOS=
-.else
+.if ${PORT_OPTIONS:MEXAMPLES}
 DEMOS=		demos
+.else
+DEMOS=
 .endif
 
 CONF=		prado-${PROD}${CGI_EXT}.conf
 SUB_FILES+=	${CONF}
 
-.if defined(WITH_REQPHP)
+.if ${PORT_OPTIONS:MREQPHP}
 USE_PHP+=	dom spl ctype pcre
 .endif
 
-.if defined(WITH_OPTPHP)
+.if ${PORT_OPTIONS:MOPTPHP}
 USE_PHP+=	pdo iconv zlib sqlite memcache mcrypt xsl soap
 RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/apc.so:${PORTSDIR}/www/pecl-APC
 .endif
@@ -136,7 +133,7 @@ post-install:
 	  ${ECHO_MSG} "" ; \
 	  ${FALSE} ; \
 	fi
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@cd ${WRKSRCDOCS} && ${COPYTREE_SHARE} . ${DOCSDIR}
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} "HISTORY UPGRADE" ${DOCSDIR}
 .endif
diff --git a/www/pserv/Makefile b/www/pserv/Makefile
index c038bfd84f15..5cef32300052 100644
--- a/www/pserv/Makefile
+++ b/www/pserv/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	pserv
-# Date created:				Wed Oct 15 14:16:14 CEST 2003
-# Whom:					Alex Dupre <sysadmin@alexdupre.com>
-#
+# Created by: Alex Dupre <sysadmin@alexdupre.com>
 # $FreeBSD$
-#
 
 PORTNAME=	pserv
 PORTVERSION=	3.4
@@ -18,12 +14,13 @@ GNU_CONFIGURE=	yes
 
 CONFLICTS=	popular-[0-9]*
 
-OPTIONS=	LOG "Enable logging" on \
-		PHP "Enable PHP support" on
+OPTIONS_DEFINE=	LOG PHP
+OPTIONS_DEFAULT=	LOG PHP
+LOG_DESC=	Enable loggin
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_PHP)
+.if ${PORT_OPTIONS:MPHP}
 USE_PHP=	yes
 WANT_PHP_CGI=	yes
 .endif
@@ -31,11 +28,11 @@ WANT_PHP_CGI=	yes
 post-patch:
 	@${REINPLACE_CMD} "s|%%PREFIX%%|${PREFIX}|g;s|%%LOCALBASE%%|${LOCALBASE}|g" \
 		${WRKSRC}/defaults/pserv.conf ${WRKSRC}/sources/main.h
-.if defined(WITHOUT_LOG)
+.if ! ${PORT_OPTIONS:MLOG}
 	@${REINPLACE_CMD} "s|define LOG|undef LOG|" \
 		${WRKSRC}/sources/main.h
 .endif
-.if defined(WITHOUT_PHP)
+.if ! ${PORT_OPTIONS:MPHP}
 	@${REINPLACE_CMD} "s|define PHP|undef PHP|" \
 		${WRKSRC}/sources/main.h
 .endif
@@ -47,4 +44,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/defaults/pserv.conf ${PREFIX}/etc/pserv/pserv.conf.sample
 	${INSTALL_SCRIPT} ${FILESDIR}/pserv.sh ${PREFIX}/etc/rc.d/
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/publicfile/Makefile b/www/publicfile/Makefile
index 819f02f5c081..f292f6ca85cb 100644
--- a/www/publicfile/Makefile
+++ b/www/publicfile/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: publicfile
-# Date created:		24 Jan 2000
-# Whom:			Neil Blakey-Milner
-#
+# Created by: Neil Blakey-Milner
 # $FreeBSD$
-#
 
 PORTNAME=	publicfile
 PORTVERSION=	0.52
@@ -17,46 +13,47 @@ COMMENT=	A secure, read-only, anonymous HTTP/FTP server
 RUN_DEPENDS=	setuidgid:${PORTSDIR}/sysutils/daemontools \
 		tcpserver:${PORTSDIR}/sysutils/ucspi-tcp
 
-OPTIONS=	BASICAUTH "basic HTTP authentication support" off \
-		COMMONLOG "support for Apache common log format" off \
-		REDIRECT_SLASH "don't require trailing slash on directories" off \
-		ENV_FILETYPES "get mime types from the environment" off \
-		SSL "provide SSL support through ucspi-ssl" off
+OPTIONS_DEFINE=	BASICAUTH COMMONLOG REDIRECT_SLASH ENV_FILETYPES SSL
+BASICAUTH_DESC=		basic HTTP authentication support
+COMMONLOG_DESC=		support for Apache common log format
+REDIRECT_SLASH_DESC=	do not require trailing slash on directories
+ENV_FILETYPES_DESC=	get mime types from the environment
+SSL_DESC=		provide SSL support through ucspi-ssl
 
 .include <bsd.port.pre.mk>
 
 pre-everything::
-.if defined(WITH_BASICAUTH) && defined(WITH_COMMONLOG)
+.if ${PORT_OPTIONS:MBASICAUTH} && ${PORT_OPTIONS:MCOMMONLOG}
 	@${ECHO_MSG}
 	@${ECHO_MSG} "Currently the common log and auth patches conflict."
 	@${ECHO_MSG}
 BROKEN=	Currently the common log and auth patches conflict.
 .endif
 
-.if defined(WITH_BASICAUTH) && defined(WITH_REDIRECT_SLASH)
+.if ${PORT_OPTIONS:MBASICAUTH} && ${PORT_OPTIONS:MREDIRECT_SLASH}
 	@${ECHO_MSG}
 	@${ECHO_MSG} "Currently the redirect slash and auth patches conflict."
 	@${ECHO_MSG}
 BROKEN=	Currently the redirect slash and auth patches conflict.
 .endif
 
-.if defined(WITH_REDIRECT_SLASH)
+.if ${PORT_OPTIONS:MREDIRECT_SLASH}
 pre-configure::
 	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/redirect-slash-patch
 .endif
 
-.if defined(WITH_ENV_FILETYPES)
+.if ${PORT_OPTIONS:MENV_FILETYPES}
 pre-configure::
 	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/publicfile-0.52-filetype-diff
 .endif
 
-.if defined(WITH_SSL)
+.if ${PORT_OPTIONS:MSSL}
 pre-configure::
 	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/publicfile.sslserver
 RUN_DEPENDS+=	sslserver:${PORTSDIR}/sysutils/ucspi-ssl
 .endif
 
-.if defined(WITH_BASICAUTH)
+.if ${PORT_OPTIONS:MBASICAUTH}
 pre-configure::
 	@${SED} -e "s:__PORTSDIR__:${PORTSDIR}:g" \
 		-e "s:__WRKSRC__:${WRKSRC}:g" \
@@ -70,7 +67,7 @@ PLIST_SUB+=	BASICAUTH=""
 PLIST_SUB+=	BASICAUTH="@comment "
 .endif
 
-.if defined(WITH_COMMONLOG)
+.if ${PORT_OPTIONS:MCOMMONLOG}
 pre-configure::
 	@${PATCH} ${PATCH_ARGS} -p1 < \
 		${PATCHDIR}/publicfile-0.52-commonlog-2.patch
@@ -80,7 +77,7 @@ ALL_TARGET=	it
 INSTALL_TARGET=	setup check
 
 post-extract:
-.if defined(WITH_BASICAUTH)
+.if ${PORT_OPTIONS:MBASICAUTH}
 	@${LN} -s ${PORTSDIR}/databases/cdb/work/cdb-0.75 ${WRKSRC}/cdb-0.75
 .endif
 
@@ -89,4 +86,4 @@ post-patch:
 	@${ECHO_CMD} "${CC} -s" > ${WRKSRC}/conf-ld
 	@${ECHO_CMD} "${PREFIX}" > ${WRKSRC}/conf-home
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/pylot/Makefile b/www/pylot/Makefile
index 71be809b40f5..68cf951740dc 100644
--- a/www/pylot/Makefile
+++ b/www/pylot/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	pylot
-# Date created:		2009-06-01
-# Whom:			Nicola Vitale <nivit@FreeBSD.org>
-#
+# Created by: Nicola Vitale <nivit@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	pylot
 PORTVERSION=	1.26
@@ -15,8 +11,10 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Tool for testing performance and scalability of web services
 
-OPTIONS=	GUI	"Enable GUI mode" off \
-		REPORTGRAPHS "Enable report graphs" on
+OPTIONS_DEFINE=	GUI REPORTGRAPHS
+OPTIONS_DEFAULT=	REPORTGRAPHS
+GUI_DESC=		Enable GUI mode
+REPORTGRAPHS_DESC=	Enable report graphs
 
 PROJECTHOST=	pylt
 
@@ -34,16 +32,16 @@ do-install:
 	@${MKDIR} ${DATADIR} && cd ${WRKSRC} && ${COPYTREE_SHARE} . ${DATADIR}
 	@${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_GUI)
+.if ${PORT_OPTIONS:MGUI}
 USE_WX=	2.4+
 WX_COMPS=	python:run
 .endif
 
-.if defined(WITH_REPORTGRAPHS)
+.if ${PORT_OPTIONS:MREPORTGRAPHS}
 RUN_DEPENDS+=	${PYNUMPY}
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/matplotlib/__init__.py:${PORTSDIR}/math/py-matplotlib
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/rnews/Makefile b/www/rnews/Makefile
index 13a835537feb..0d65552d1b07 100644
--- a/www/rnews/Makefile
+++ b/www/rnews/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	rnews
-# Date created:		22 December 2003
-# Whom:			Vincent Tantardini <vinc@FreeBSD-fr.org>
-#
+# Created by: Vincent Tantardini <vinc@FreeBSD-fr.org>
 # $FreeBSD$
-#
 
 PORTNAME=	rnews
 PORTVERSION=	1.01
@@ -18,25 +14,26 @@ NO_BUILD=	yes
 
 SUB_FILES=	pkg-message
 
-OPTIONS=	GD		"Enable Graphic (GD) support"	ON \
-		MYSQLSERVER	"Use MySQL-Server on localhost"	OFF
+OPTIONS_DEFINE=	GD MYSQLSERVER DOCS
+OPTIONS_DEFAULT=	GD
+MYSQLSERVER_DESC=	Use MySQL-Server on localhost
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 USE_PHP=	mysql mbstring pcre xml iconv
 USE_MYSQL=	yes
 
-.if !defined(WITHOUT_GD)
+.if ${PORT_OPTIONS:MGD}
 USE_PHP+=	gd
 .endif
 
-.if !defined(WITHOUT_MYSQLSERVER)
+.if ${PORT_OPTIONS:MMYSQLSERVER}
 RUN_DEPENDS+=	${LOCALBASE}/libexec/mysqld:${PORTSDIR}/databases/mysql${MYSQL_VER}-server
 .endif
 
 RUN_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	CHANGELOG INSTALL LICENSE README UPGRADE
 .endif
 
@@ -75,7 +72,7 @@ post-install:
 	@${CHMOD} u+w ${WWWDIR}/${FILE}
 . endif
 .endfor
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 . for FILE in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
@@ -103,4 +100,4 @@ create-plist:
 	@${FIND} -ds ${WRKSRC} -type d -a -not -name feeds \
 		| ${SED} -e 's,^${WRKSRC},@dirrm %%WWWDIR%%,' >> ${PLIST}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/thundercache/Makefile b/www/thundercache/Makefile
index 90f1a8969911..af9e709756a2 100644
--- a/www/thundercache/Makefile
+++ b/www/thundercache/Makefile
@@ -14,10 +14,12 @@ DISTNAME=	thundercache-6.1.201104260900-64bits-fbsd
 MAINTAINER=	eksffa@freebsdbrasil.com.br
 COMMENT=	High-performance and high-efficiency caching proxy system
 
-OPTIONS=	DEPENDACK "I have read and understood the depends needs" on \
-		APACHE "Install apache for reporting viewing" on \
-		PHP "Install PHP for reporting generating" on \
-		PGSQL "Install PostgreSQL (report data storing)" on
+OPTIONS_DEFINE=	DEPENDACK APACHE PHP PGSQL DOCS
+OPTIONS_DEFAULT=	DEPENDACK APACHE PHP PGSQK
+DEPENDACK_DESC=		I have read and understood the depends needs
+APACHE_DESC=		Install apache for reporting viewing
+PHP_DESC=		Install PHP for reporting generating
+PGSQL_DESC=		Install PostgreSQL (report data storing)
 
 USE_OPENSSL=	yes
 USE_BZIP2=	yes
@@ -33,11 +35,7 @@ LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
 LICENSE_TEXT=	Commercial software with shareware license to 50 threads
 RESTRICTED=	Commercial software with shareware license to 50 threads
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 800000
-BROKEN=		Won't run on systems version < FreeBSD 8.0-RELEASE
-.endif
+.include <bsd.port.options.mk>
 
 .if ${ARCH} == "i386"
 DISTNAME=	thundercache-6.1.201104260900-32bits-fbsd
@@ -45,22 +43,22 @@ DISTNAME=	thundercache-6.1.201104260900-32bits-fbsd
 
 WRKSRC=		${WRKDIR}/thunder
 
-.if defined (WITH_APACHE)
+.if ${PORT_OPTIONS:MAPACHE}
 USE_APACHE_RUN=	22+
 .endif
 
-.if defined (WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 USE_PGSQL=	yes
 WANT_PGSQL_VER=	84+
 RUN_DEPENDS+=	postgresql-server>=0:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server
 .endif
 
-.if defined(WITH_PHP) && defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPHP} && ${PORT_OPTIONS:MPGSQL}
 RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo_pgsql.so:${PORTSDIR}/databases/php5-pdo_pgsql
 RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pgsql.so:${PORTSDIR}/databases/php5-pgsql
 .endif
 
-.if defined(WITH_PHP)
+.if ${PORT_OPTIONS:MPHP}
 USE_PHP+=	curl pcre bcmath pdo mcrypt mhash session
 .endif
 
@@ -85,7 +83,7 @@ show-info:
 	@${ECHO_MSG} " After you understood it correctly, select DEPENDACK on"
 	@${ECHO_MSG} " the OPTIONS screen. Run ''make config'' to acknowledge"
 	@${ECHO_MSG} ""
-.if !defined(WITH_DEPENDACK)
+.if ! ${PORT_OPTIONS:MDEPENDACK}
 	@${FALSE}
 .endif
 
@@ -112,4 +110,4 @@ post-install:
 		${ECHO_MSG} "" ; \
 	fi)
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/thundersnarf/Makefile b/www/thundersnarf/Makefile
index 4eaf2d80d001..6df9b00ca7dc 100644
--- a/www/thundersnarf/Makefile
+++ b/www/thundersnarf/Makefile
@@ -11,32 +11,34 @@ MASTER_SITES=	http://www.tracanelli.com.br/l/dev/thunder/ \
 MAINTAINER=	eksffa@freebsdbrasil.com.br
 COMMENT=	Web reporting and trending analysis for Thunder Cache Pro
 
-OPTIONS=	APACHE "Install apache for reporting viewing" on \
-		PHP "Install PHP for reporting generating" on \
-		PGSQL "Install PostgreSQL (report data storing)" on
+OPTIONS_DEFINE=	APACHE PHP PGSQL DOCS
+OPTIONS_DEFAULT=	APACHE PHP PGSQL
+APACHE_DESC=	Install apache for reporting viewing
+PHP_DESC=	Install PHP for reporting generating
+PGSQL_DESC=	Install PostgreSQL (report data storing)
 
 USE_BZIP2=	yes
 
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME:R}
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined (WITH_APACHE)
+.if ${PORT_OPTIONS:MAPACHE}
 USE_APACHE_RUN=	22+
 .endif
 
-.if defined (WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 USE_PGSQL=	yes
 WANT_PGSQL_VER=	84+
 RUN_DEPENDS+=	postgresql-server>=0:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server
 .endif
 
-.if defined(WITH_PHP) && defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPHP} && ${PORT_OPTIONS:MPGSQL}
 RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo_pgsql.so:${PORTSDIR}/databases/php5-pdo_pgsql
 .endif
 
-.if defined(WITH_PHP)
+.if ${PORT_OPTIONS:MPHP}
 USE_PHP+=	curl pcre bcmath pdo mcrypt mhash session pgsql spl dom xmlrpc ctype openssl simplexml soap json
 .endif
 
@@ -53,7 +55,7 @@ do-install:
 	@${CHMOD} -R g+rwx ${WWWDIR}/protected/runtime \
 		${WWWDIR}/assets
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@${CP} -Rv ${WRKSRC}/README ${DOCSDIR}/README.pt_BR
 .endif
@@ -61,4 +63,4 @@ do-install:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/tokyopromenade/Makefile b/www/tokyopromenade/Makefile
index 0d5f74739e9d..7291e547d4f0 100644
--- a/www/tokyopromenade/Makefile
+++ b/www/tokyopromenade/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	tokyopromenade
-# Date created:		2009-08-13
-# Whom:			Qing Feng <qingfeng@douban.com>
-#
+# Created by: Qing Feng <qingfeng@douban.com>
 # $FreeBSD$
-#
 
 PORTNAME=	tokyopromenade
 PORTVERSION=	0.9.22
@@ -18,7 +14,7 @@ BUILD_DEPENDS=	tokyocabinet>=1.4.31:${PORTSDIR}/databases/tokyocabinet \
 LIB_DEPENDS=	tokyocabinet:${PORTSDIR}/databases/tokyocabinet
 RUN_DEPENDS=	spawn-fcgi>=0:${PORTSDIR}/www/spawn-fcgi
 
-OPTIONS=	LUA	"Build lua extension" off
+OPTIONS_DEFINE=	LUA
 
 CONFIGURE_ARGS=	--enable-fcgi
 GNU_CONFIGURE=	yes
@@ -30,7 +26,7 @@ MAN1=		prommgr.1
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_LUA)
+.if ${PORT_OPTIONS:MLUA}
 CONFIGURE_ARGS+=	--enable-lua
 LDFLAGS+=	-L${LUA_LIBDIR}
 CFLAGS+=	-I${LUA_INCDIR}
diff --git a/www/w3m/Makefile b/www/w3m/Makefile
index 0fde646e99e6..808821cbb217 100644
--- a/www/w3m/Makefile
+++ b/www/w3m/Makefile
@@ -27,25 +27,26 @@ DOCS=		FAQ.html HISTORY MANUAL.html README \
 		keymap.lynx menu.default menu.submenu
 
 .if !defined(MASTERDIR)
-OPTIONS=	M17N "Multilingualization support" off \
-		JAPANESE "Japanese messages and migemo support" off \
-		INLINE_IMAGE "Inline image support" off \
-		KEY_LYNX "Keymap like lynx browser" off
+OPTIONS_DEFINE=	M17N JAPANESE INLINE_IMAGE KEY_LYNX DOCS
+M17N_DESC=		Multilingualization support
+JAPANESE_DESC=		Japanese messages and migemo support
+INLINE_IMAGE_DESC=	Inline image support
+KEY_LYNX_DESC=		Keymap like lynx browser
 
 .include <bsd.port.options.mk>
 .endif
 
-.if defined(WITH_M17N)
+.if ${PORT_OPTIONS:MM17N}
 CONFIGURE_ARGS+=	--enable-m17n
 PLIST_SUB+=	M17N=""
 .else
-.if !defined(WITH_JAPANESE)
+.if ! ${PORT_OPTIONS:MJAPANESE}
 CONFIGURE_ARGS+=	--disable-m17n
 PLIST_SUB+=	M17N="@comment "
 .endif
 .endif
 
-.if defined(WITH_JAPANESE)
+.if ${PORT_OPTIONS:MJAPANESE}
 USE_GETTEXT=		yes
 CONFIGURE_ARGS+=	--enable-m17n --enable-japanese=E --with-migemo=yes gt_cv_func_gnugettext1_libintl=yes
 DOCS_JP=	${DOCS} README.SSL README.cookie README.keymap README.mailcap \
@@ -57,7 +58,7 @@ CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	JAPANESE="@comment "
 .endif
 
-.if defined(WITH_INLINE_IMAGE)
+.if ${PORT_OPTIONS:MINLINE_IMAGE}
 USE_GNOME=	gtk20
 CONFIGURE_ARGS+=	--with-imagelib=gtk2 --enable-image=fb,x11
 
@@ -74,7 +75,7 @@ PLIST_SUB+=	INLINE_IMAGE="@comment "
 PKGMESSAGE=	${NONEXISTENT}
 .endif
 
-.if defined(WITH_KEY_LYNX)
+.if ${PORT_OPTIONS:MKEY_LYNX}
 CONFIGURE_ARGS+=	--enable-keymap=lynx
 .endif
 
@@ -89,8 +90,8 @@ post-patch:
 		-exec ${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' {} +
 
 post-install:
-.if !defined(NOPORTDOCS)
-.if defined(WITH_JAPANESE)
+.if ${PORT_OPTIONS:MDOCS}
+.if ${PORT_OPTIONS:MJAPANESE}
 	@${MKDIR} ${PREFIX}/share/doc/ja/w3m
 	@cd ${WRKSRC}/doc-jp; \
 	for i in ${DOCS_JP} ; do \
@@ -102,12 +103,12 @@ post-install:
 	for i in ${DOCS} ; do \
 		${INSTALL_DATA} $$i ${PREFIX}/share/doc/w3m/ ; \
 	done
-.if defined(WITH_M17N) || defined(WITH_JAPANESE)
+.if ${PORT_OPTIONS:MM17N} || ${PORT_OPTIONS:MJAPANESE}
 	@${INSTALL_DATA} ${WRKSRC}/doc/README.m17n ${PREFIX}/share/doc/w3m
 .endif
 .endif
 	@${INSTALL_MAN} ${WRKSRC}/scripts/w3mman/w3mman.1 ${PREFIX}/man/ja/man1
-.if defined(WITH_INLINE_IMAGE)
+.if ${PORT_OPTIONS:MINLINE_IMAGE}
 	@${CAT} ${PKGMESSAGE}
 .endif
 
diff --git a/www/webcalendar-devel/Makefile b/www/webcalendar-devel/Makefile
index aa46e0df9d14..99b7caaff267 100644
--- a/www/webcalendar-devel/Makefile
+++ b/www/webcalendar-devel/Makefile
@@ -21,28 +21,23 @@ LICENSE=	GPLv2
 WRKSRC=		${WRKDIR}/${DISTNAME}
 WWWDIR=		${PREFIX}/www/${PORTNAME:L}
 
-.if !defined(NOPORTDOCS)
+OPTIONS_DEFINE=	APACHE LDAP GRADIENTBG REMINDERS PALM DOCS
+OPTIONS_DEFAULT=	MYSQL REMINDERS
+OPTIONS_MULTI=	DB
+OPTIONS_MULTI_DB=	MYSQL PGSQL SQLITE MSSQL DBASE ODBC ORACLE
+GRADIENTBG_DESC=	Gradient background image support
+REMINDERS_DESC=		Email reminder support
+PALM_DESC=		Palm export support
+
+.include <bsd.port.pre.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME:L}
 PORTDOCS=	WebCalendar-SysAdmin.html \
 		newwin.gif
 .endif
 
-OPTIONS=	APACHE "Configure for Apache-2.x" off \
-		MYSQL "Use MySQL database backend (default)" On \
-		PGSQL "Use PostgreSQL database backend" Off \
-		SQLITE "Use SQLite database backend" Off \
-		MSSQL "Use MSSQL database backend" Off \
-		DBASE "Use DBase database backend" Off \
-		ODBC "Use ODBC database backend" Off \
-		ORACLE "Use Oracle database backend" Off \
-		LDAP "Use LDAP user authentication" Off \
-		GRADIENTBG "Add gradient background image support" Off \
-		REMINDERS "Add email reminder support" On \
-		PALM "Add Palm export support" Off
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_APACHE)
+.if ${PORT_OPTIONS:MAPACHE}
 USE_APACHE_RUN=	22+
 
 PLIST_SUB+=	NOAPACHE="" CONFDIR=${CONFDIR_REL}
@@ -65,67 +60,54 @@ DEFAULT_PHP_VER=5
 
 SUB_LIST+=	PHPCGI=${WITH_PHP_CGI}
 
-DB_DEFINED=	no
-
-.if !defined(WITHOUT_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 USE_PHP+=	mysql
-DB_DEFINED=	yes
 .endif
 
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 USE_PHP+=	pgsql
-DB_DEFINED=	yes
 .endif
 
-.if defined(WITH_SQLITE)
+.if ${PORT_OPTIONS:MSQLITE}
 USE_PHP+=	sqlite3
-DB_DEFINED=	yes
 .endif
 
-.if defined(WITH_MSSQL)
+.if ${PORT_OPTIONS:MMSSQL}
 USE_PHP+=	mssql
-DB_DEFINED=	yes
 .endif
 
-.if defined(WITH_DBASE)
+.if ${PORT_OPTIONS:MDBASE}
 USE_PHP+=	dbase
-DB_DEFINED=	yes
 .endif
 
-.if defined(WITH_ODBC)
+.if ${PORT_OPTIONS:MODBC}
 USE_PHP+=	odbc
-DB_DEFINED=	yes
 .endif
 
-.if defined(WITH_ORACLE)
+.if ${PORT_OPTIONS:MORACLE}
 USE_PHP+=	oracle
-DB_DEFINED=	yes
 .endif
 
-.if ${DB_DEFINED} == "no"
-IGNORE=		please choose database backend by running 'make config'
-.endif
-
-.if defined(WITH_LDAP)
+.if ${PORT_OPTIONS:MLDAP}
 USE_PHP+=	ldap
 .endif
 
-.if defined(WITH_GRADIENTBG)
+.if ${PORT_OPTIONS:MGRADIENTBG}
 USE_PHP+=	gd
 .endif
 
-.if defined(WITH_REMINDERS)
+.if ${PORT_OPTIONS:MREMINDERS}
 WANT_PHP_CLI=	yes
 .endif
 
-.if defined(WITH_PALM)
+.if ${PORT_OPTIONS:MPALM}
 RUN_DEPENDS+=	${LOCALBASE}/bin/pilot-xfer:${PORTSDIR}/palm/pilot-link
 .endif
 
-.if defined(NOPORTDOCS)
-SUB_LIST+=	HASHMARK=\#
-.else
+.if ${PORT_OPTIONS:MDOCS}
 SUB_LIST+=	HASHMARK=
+.else
+SUB_LIST+=	HASHMARK=\#
 .endif
 
 CONF=		webcalendar${CGI_EXT}.conf
@@ -144,7 +126,7 @@ do-install:
 		${XARGS} -0 ${CHMOD} 755' >> ${TMPPLIST}
 
 post-install:
-.if defined(WITH_APACHE)
+.if ${PORT_OPTIONS:MAPACHE}
 	@if [ -d "${CONFDIR}" ]; then \
 	  ${CP} ${WRKDIR}/${CONF} ${CONFDIR}/webcalendar.conf; \
 	else \
@@ -157,7 +139,7 @@ post-install:
 	fi
 	@${CAT} ${PKGMESSAGE}
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@cd ${WRKSRC}/docs && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
diff --git a/www/webcalendar/Makefile b/www/webcalendar/Makefile
index 41360c54c7e7..9aeecbaf9989 100644
--- a/www/webcalendar/Makefile
+++ b/www/webcalendar/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   WebCalendar
-# Date created:        21 June 2005
-# Whom:                glarkin
-#
+# Created by: glarkin
 # $FreeBSD$
-#
 
 PORTNAME=	WebCalendar
 PORTVERSION=	1.0.5
@@ -29,7 +25,16 @@ PLIST=		${WRKDIR}/pkg-plist
 SUB_FILES=	pkg-message
 SUB_LIST=	WCURL=${WCURL} WCDIR=${WCDIR}
 
-.if !defined(NOPORTDOCS)
+OPTIONS_DEFINE=	LDAP DOCS
+OPTIONS_MULTI=	DB
+OPTIONS_MULTI_DB=	MYSQL PGSQL MSSQL DBASE ODBC ORACLE
+OPTIONS_DEFAULT=	MYSQL
+DB_DESC=	Database backend
+DBASE_DESC=	DBase database support
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME:L}
 PORTDOCS=	README \
 		WebCalendar-Database.html \
@@ -39,53 +44,31 @@ PORTDOCS=	README \
 		newwin.gif
 .endif
 
-OPTIONS=	MYSQL "Use MySQL database backend (default)" On \
-		PGSQL "Use PostgreSQL database backend" Off \
-		MSSQL "Use MSSQL database backend" Off \
-		DBASE "Use DBase database backend" Off \
-		ODBC "Use ODBC database backend" Off \
-		ORACLE "Use Oracle database backend" Off \
-		LDAP "Use LDAP user authentication" Off
-
-.include <bsd.port.pre.mk>
-
-DB_DEFINED=	no
-
-.if !defined(WITHOUT_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 USE_PHP+=	mysql
-DB_DEFINED=	yes
 .endif
 
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 USE_PHP+=	pgsql
-DB_DEFINED=	yes
 .endif
 
-.if defined(WITH_MSSQL)
+.if ${PORT_OPTIONS:MMSSQL}
 USE_PHP+=	mssql
-DB_DEFINED=	yes
 .endif
 
-.if defined(WITH_DBASE)
+.if ${PORT_OPTIONS:MDBASE}
 USE_PHP+=	dbase
-DB_DEFINED=	yes
 .endif
 
-.if defined(WITH_ODBC)
+.if ${PORT_OPTIONS:MODBC}
 USE_PHP+=	odbc
-DB_DEFINED=	yes
 .endif
 
-.if defined(WITH_ORACLE)
+.if ${PORT_OPTIONS:MORACLE}
 USE_PHP+=	oracle
-DB_DEFINED=	yes
-.endif
-
-.if ${DB_DEFINED} == "no"
-IGNORE=		please choose database backend by running 'make config'
 .endif
 
-.if defined(WITH_LDAP)
+.if ${PORT_OPTIONS:MLDAP}
 USE_PHP+=	ldap
 .endif
 
@@ -106,10 +89,10 @@ do-install:
 		${WCDIR:S|^|%D/|}' >> ${TMPPLIST}
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@cd ${WRKSRC}/docs && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/yahoo-ui/Makefile b/www/yahoo-ui/Makefile
index 4a264a1fd9b2..2bd572aa6516 100644
--- a/www/yahoo-ui/Makefile
+++ b/www/yahoo-ui/Makefile
@@ -22,17 +22,11 @@ USE_ZIP=	yes
 WRKSRC=		${WRKDIR}/yui
 NO_BUILD=	yes
 
-OPTIONS=	APACHE	"Configure for Apache-2.x" off \
-		MINIMAL "Do not install documentation and examples" off
+OPTIONS_DEFINE=	APACHE DOCS EXAMPLES
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_MINIMAL)
-NOPORTDOCS=	yes
-NOPORTEXAMPLES=	yes
-.endif
-
-.if defined(WITH_APACHE)
+.if ${PORT_OPTIONS:MAPACHE}
 USE_APACHE_RUN=	22+
 CONFDIR=	${PREFIX}/${CONFDIR_REL}
 CONFDIR_REL=	${APACHEETCDIR}/Includes
@@ -41,17 +35,18 @@ PLIST_SUB+=	NOAPACHE="" CONFDIR=${CONFDIR_REL}
 CONF=		yui.conf
 SUB_FILES+=	pkg-message ${CONF}
 
-.if defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
+SUB_LIST+=	HASHMARK1=
 SUB_LIST+=	HASHMARK1=\#
 .else
-SUB_LIST+=	HASHMARK1=
 .endif
 
-.if defined(NOPORTEXAMPLES)
-SUB_LIST+=	HASHMARK2=\#
-.else
+.if ${PORT_OPTIONS:MEXAMPLES}
 SUB_LIST+=	HASHMARK2=
+.else
+SUB_LIST+=	HASHMARK2=\#
 .endif
+
 .else
 PLIST_SUB+=	NOAPACHE="@comment "
 .endif
@@ -81,7 +76,7 @@ do-install:
 		${XARGS} -0 ${CHMOD} 755' >> ${TMPPLIST}
 
 post-install:
-.if defined(WITH_APACHE)
+.if ${PORT_OPTIONS:MAPACHE}
 .if !defined(MAINTAINER_MODE)
 	@if [ -d "${CONFDIR}" ]; then \
 	  ${CP} ${WRKDIR}/${CONF} ${CONFDIR}; \
@@ -96,11 +91,11 @@ post-install:
 .endif
 	@${CAT} ${PKGMESSAGE}
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${DOCSDIR}
 .endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MNLS}
 	@cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${EXAMPLESDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/yii/Makefile b/www/yii/Makefile
index 3c89e7ca5aae..8cc2a53ccd6a 100644
--- a/www/yii/Makefile
+++ b/www/yii/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	yii
-# Date created:		2009-03-27
-# Whom:			Yi-Jheng Lin <yzlin@cs.nctu.edu.tw>
-#
+# Created by: Yi-Jheng Lin <yzlin@cs.nctu.edu.tw>
 # $FreeBSD$
-#
 
 PORTNAME=	yii
 PORTVERSION=	1.1.9
@@ -24,30 +20,29 @@ IGNORE_WITH_PHP=	4
 
 SUB_FILES=	pkg-message
 
-OPTIONS=	MYSQL "Install MySQL PDO support" Off \
-		PGSQL "Install PostgreSQL PDO support" Off \
-		SQLITE "Install SQLite v3 PDO support" Off \
-		REQPHP "Install PHP dependencies required by plugins" On
+OPTIONS_DEFINE=	MYSQL PGSQL SQLITE REQPHP DOCS NLS
+OPTIONS_DEFAULT=	REQPHP
+REQPHP_DESC=	PHP dependencies required by plugins
 
 PORTDOCS=	CHANGELOG LICENSE README UPGRADE
 
 INSTALL_DIRS=	framework
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_REQPHP)
+.if ${PORT_OPTIONS:MREQPHP}
 USE_PHP+=	apc dom gd mcrypt memcache pdo soap
 .endif
 
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 USE_PHP+=	pdo_mysql
 .endif
 
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo_pgsql.so:${PORTSDIR}/databases/php5-pdo_pgsql
 .endif
 
-.if defined(WITH_SQLITE)
+.if ${PORT_OPTIONS:MSQLITE}
 USE_PHP+=	pdo_sqlite
 .endif
 
@@ -66,7 +61,7 @@ do-install:
 	@${ECHO_CMD} '@exec ${FIND} ${DATADIR} -type d -print0 | \
 		${XARGS} -0 ${CHMOD} 755' >> ${TMPPLIST}
 	@${INSTALL_SCRIPT} ${WRKSRC}/framework/yiic ${PREFIX}/bin
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MNLS}
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} "demos requirements" ${EXAMPLESDIR})
 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${EXAMPLESDIR}
 	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} \
@@ -80,10 +75,10 @@ do-install:
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
 .endif
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>