10 files changed, 128 insertions, 178 deletions

diff --git a/www/apache22-event-mpm/Makefile b/www/apache22-event-mpm/Makefile
index f091cf4d6366..b528df80f69a 100644
--- a/www/apache22-event-mpm/Makefile
+++ b/www/apache22-event-mpm/Makefile
@@ -10,7 +10,8 @@ LATEST_LINK=		apache22-${WITH_MPM}-mpm
 DESCR=			${.CURDIR}/pkg-descr
 
 PORT_OPTIONS+=		CGID
-OPTIONS_EXCLUDE=	CGI
-OPTIONS_UNSET+=		CGI
+OPTIONS_UNDEF=		CGI
+#OPTIONS_EXCLUDE=	CGI
+#OPTIONS_UNSET+=		CGI
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/cherokee/Makefile b/www/cherokee/Makefile
index 90b2df86cef9..45d03038ea68 100644
--- a/www/cherokee/Makefile
+++ b/www/cherokee/Makefile
@@ -1,4 +1,4 @@
-# Whom: silence <oksala@videotron.ca>
+# Created by: silence <oksala@videotron.ca>
 # $FreeBSD$
 
 PORTNAME=	cherokee
@@ -81,20 +81,16 @@ MAN1=		cget.1 cherokee-config.1 cherokee.1 cherokee-admin.1 cherokee-admin-launc
 		cherokee-tweak.1 cherokee-worker.1 
 PORTDOCS=	*
 
-OPTIONS=	IPV6	  "IPv6 support"	on	\
-		MYSQL	  "MySQL Database"	off	\
-		LDAP	  "LDAP Support"	off	\
-		GEOIP	  "GeoIP Support (recommended)"	on	\
-		FFMPEG	  "FFMpeg Support"	off	\
-		NLS	  "NLS Support"	on	\
-		INTPCRE	  "Use Internal PCRE Library"	off	\
-		ADMIN	  "Build the Admin Interface"	on	\
-		RRDTOOL   "Usage Graphs Support"  off	\
-		UWSGI     "uWSGI Support" off
+OPTIONS_DEFINE=	IPV6 MYSQL LDAP GEOIP FFMPEG NLS INTPCRE ADMIN ADMIN RRDTOOL UWSGI DOCS
+OPTIONS_DEFAULT=	IPV6 GEOIP ADMIN
+ADMIN_DESC=	Build the Admin Interface
+INTPCRE_DESC=	Use internal PCRE library
+RRDTOOL_DESC=	Usage graphs support
+UWSGI_DESC=	uWSGI support
 
 .include <bsd.port.options.mk>
 
-.ifdef WITH_ADMIN
+.if ${PORT_OPTIONS:MADMIN}
 USE_PYTHON=	2.5+
 PLIST_SUB+=	ADMIN=""
 .else
@@ -102,15 +98,13 @@ CONFIGURE_ARGS+=--disable-admin
 PLIST_SUB+=	ADMIN="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
-
 CONFIGURE_ARGS+=	--with-wwwuser=${CHEROKEE_USER} --with-wwwgroup=${CHEROKEE_GROUP}
 
-.ifdef WITHOUT_IPV6
+.if ${PORT_OPTIONS:MIPV6}
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
-.ifdef WITH_MYSQL
+.if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	yes
 CONFIGURE_ARGS+=	--with-mysql=yes
 PLIST_SUB+=	MYSQL=""
@@ -119,7 +113,7 @@ CONFIGURE_ARGS+=	--with-mysql=no
 PLIST_SUB+=	MYSQL="@comment "
 .endif
 
-.ifdef WITH_LDAP
+.if ${PORT_OPTIONS:MLDAP}
 USE_OPENLDAP=	yes
 CONFIGURE_ARGS+=	--with-ldap=yes
 PLIST_SUB+=	LDAP=""
@@ -128,7 +122,7 @@ CONFIGURE_ARGS+=	--with-ldap=no
 PLIST_SUB+=	LDAP="@comment "
 .endif
 
-.ifdef WITH_GEOIP
+.if ${PORT_OPTIONS:MGEOIP}
 LIB_DEPENDS+=	GeoIP.5:${PORTSDIR}/net/GeoIP
 CONFIGURE_ARGS+=	--with-geoip=yes
 PLIST_SUB+=	GEOIP=""
@@ -137,7 +131,7 @@ CONFIGURE_ARGS+=	--with-geoip=no
 PLIST_SUB+=	GEOIP="@comment "
 .endif
 
-.ifdef WITH_FFMPEG
+.if ${PORT_OPTIONS:MFFMPEG}
 LIB_DEPENDS+=	avformat:${PORTSDIR}/multimedia/ffmpeg \
 		avcodec:${PORTSDIR}/multimedia/ffmpeg \
 		avutil:${PORTSDIR}/multimedia/ffmpeg
@@ -146,24 +140,24 @@ CONFIGURE_ARGS+=	--with-ffmpeg=yes
 CONFIGURE_ARGS+=	--with-ffmpeg=no
 .endif
 
-.ifdef WITH_NLS
+.if ${PORT_OPTIONS:MNLS}
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.ifdef WITH_INTPCRE
+.if ${PORT_OPTIONS:MINTPCRE}
 CONFIGURE_ARGS+=	--enable-internal-pcre
 .else
 LIB_DEPENDS+=	pcre.1:${PORTSDIR}/devel/pcre
 .endif
 
-.ifdef WITH_RRDTOOL
+.if ${PORT_OPTIONS:MRRDTOOL}
 RUN_DEPENDS+=	rrdtool:${PORTSDIR}/databases/rrdtool
 .endif
 
-.ifdef WITH_UWSGI
+.if ${PORT_OPTIONS:MUWSGI}
 RUN_DEPENDS+=	uwsgi:${PORTSDIR}/www/uwsgi
 .endif
 
@@ -217,11 +211,11 @@ post-install:
 	@for i in `${FIND} ${PREFIX}/etc/cherokee/ -name \*.sample`;do\
 		if [ ! -f $${i%.sample} ];then ${CP} $$i $${i%.sample};fi;done
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${DOCSDIR}
 .endif
 
-.ifdef WITH_ADMIN
+.if ${PORT_OPTIONS:MADMIN}
 	@cd ${DATADIR}/admin && ${FIND} . -name "*.py" |\
 	${XARGS} ${PYTHON_CMD} ${PYTHON_LIBDIR}/py_compile.py
 .endif
@@ -242,4 +236,4 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG} "==============================================================="
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/dpsearch/Makefile b/www/dpsearch/Makefile
index ebfb968edddd..f8e01132a350 100644
--- a/www/dpsearch/Makefile
+++ b/www/dpsearch/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    dpsearch
-# Date created:         14.06.2004
-# Whom:                 Maxim Zakharov <maxime@maxime.net.ru>
-#
+# Created by: Maxim Zakharov <maxime@maxime.net.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	dpsearch
 PORTVERSION=	4.53
@@ -28,25 +24,22 @@ CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/etc/dpsearch \
 
 SUB_FILES=	pkg-message
 
-OPTIONS=	DPSEARCH_THREADS  "Enable pthreads"                       on  \
-		DPSEARCH_SSL      "Enable SSL"                            on  \
-		DPSEARCH_CHINESE  "Enable chinese charsets"               off \
-		DPSEARCH_JAPANESE "Enable japanese charsets"              off \
-		DPSEARCH_MECAB    "Enable MeCab japanese analyzer"        off \
-		DPSEARCH_CHASEN   "Enable ChaSen japanese analyzer"       off \
-		DPSEARCH_APACHE   "Enable mod_dpsearch for Apache"        off \
-		DPSEARCH_IDN      "Enable Internationalized Domain Names" off \
-		DPSEARCH_ASPELL   "Enable aspell support"                 off \
-		DPSEARCH_EXTRACT  "Enable libextractor support"           off \
-		DPSEARCH_PGSQL    "Use PostgreSQL  (mutually exclusive)"  on \
-		DPSEARCH_MYSQL    "Use MySQL       (mutually exclusive)"  off \
-		DPSEARCH_SQLITE   "Use SQLite      (mutually exclusive)"  off
-
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	THREADS SSL CHINESE JAPANESE MECAB CHASEN APACHE IDN ASPELL \
+		EXTRACT DOCS
+OPTIONS_DEFAULT=	THREADS SSL PGSQL
+OPTIONS_SINGLE=	DB
+OPTIONS_SINGLE_DB=	PGSQL MYSQL SQLITE
+CHINESE_DESC=	Enable chinese charsets
+JAPANESE_DESC=	Enable japanese charsets
+MECAB_DESC=	Enable MeCab japanese analyzer
+CHASEN_DESC=	Enable ChaSen japanese analyzer
+EXTRACT_DESC=	Enable libextractor support
+
+.include <bsd.port.options.mk>
 
 CONFIGURE_ENV+=	PORTNAME="${PORTNAME}"
 
-.if !defined(WITHOUT_DPSEARCH_THREADS)
+.if ${PORT_OPTIONS:MTHREADS}
 CONFIGURE_ARGS+=--enable-pthreads
 CFLAGS+=	${PTHREAD_CFLAGS}
 CONFIGURE_ENV+=	LIBS="${PTHREAD_LIBS}"
@@ -54,52 +47,48 @@ CONFIGURE_ENV+=	LIBS="${PTHREAD_LIBS}"
 CONFIGURE_ARGS+=--disable-pthreads
 .endif
 
-.if !defined(WITHOUT_DPSEARCH_ASPELL)
-LIB_DEPENDS+=	aspell.16:${PORTSDIR}/textproc/aspell
+.if ${PORT_OPTIONS:MASPELL}
+LIB_DEPENDS+=	aspell:${PORTSDIR}/textproc/aspell
 .else
 CONFIGURE_ARGS+=--without-aspell
 .endif
 
-.if !defined(WITHOUT_DPSEARCH_EXTRACT)
+.if ${PORT_OPTIONS:MEXTRACT}
 LIB_DEPENDS+=	extractor.3:${PORTSDIR}/textproc/libextractor
 .endif
 
-.if !defined(NO_OPENSSL) && !defined(WITHOUT_DPSEARCH_SSL)
-WITH_OPENSSL=	yes
-.endif
-
-.ifdef WITH_OPENSSL
+.if ${PORT_OPTIONS:MSSL}
 CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE}
 .endif
 
-.if defined(WITH_DPSEARCH_CHASRETS)
+.if ${PORT_OPTIONS:MCHARSETS}
 CONFIGURE_ARGS+=--with-extra-charsets=all
 .endif
 
-.if defined(WITH_DPSEARCH_CHINESE)
+.if ${PORT_OPTIONS:MCHINESE}
 CONFIGURE_ARGS+=--with-extra-charsets=chinese
 .endif
 
-.if defined(WITH_DPSEARCH_JAPANESE)
+.if ${PORT_OPTIONS:MJAPANESE}
 CONFIGURE_ARGS+=--with-extra-charsets=japanese
 .endif
 
-.if defined(WITH_DPSEARCH_MECAB)
+.if ${PORT_OPTIONS:MMECAB}
 LIB_DEPENDS+=	mecab.1:${PORTSDIR}/japanese/mecab
 CONFIGURE_ARGS+=--enable-mecab
 .endif
 
-.if defined(WITH_DPSEARCH_CHASEN)
+.if ${PORT_OPTIONS:MCHASEN}
 LIB_DEPENDS+=	chasen.2:${PORTSDIR}/japanese/chasen
 CONFIGURE_ARGS+=--enable-chasen
 .endif
 
-.if defined(WITH_DPSEARCH_IDN)
+.if ${PORT_OPTIONS:MIDN}
 LIB_DEPENDS+=	idn.17:${PORTSDIR}/dns/libidn
 CONFIGURE_ARGS+=--enable-idn
 .endif
 
-.if defined(WITH_DPSEARCH_APACHE)
+.if ${PORT_OPTIONS:MAPACHE}
 USE_APACHE=	22+
 PLIST_SUB+=	APACHE=""
 CONFIGURE_ARGS+=--enable-apache-module
@@ -107,30 +96,23 @@ CONFIGURE_ARGS+=--enable-apache-module
 PLIST_SUB+=	APACHE="@comment "
 .endif
 
-.if !defined(WITH_DPSEARCH_PGSQL) && !defined(WITH_DPSEARCH_MYSQL) && !defined(WITH_DPSEARCH_SQLITE)
-WITH_DPSEARCH_MYSQL=yes
-pre-fetch:
-	@${ECHO}
-	@${ECHO} "Choose MySQL by default."
-	@${ECHO}
-.endif
-
-.if defined(WITH_DPSEARCH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 USE_PGSQL=		yes
 CONFIGURE_ARGS+=	--with-pgsql=${LOCALBASE}
+.endif
 
-.elif defined(WITH_DPSEARCH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=		yes
 CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
+.endif
 
-.elif defined(WITH_DPSEARCH_SQLITE)
+.if ${PORT_OPTIONS:MSQLITE}
 LIB_DEPENDS+=		sqlite.2:${PORTSDIR}/databases/sqlite2
 CONFIGURE_ARGS+=	--with-sqlite=${LOCALBASE}
-
 .endif
 
 post-extract:
-.if defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-doc_Makefile.in
 .endif
 
@@ -149,4 +131,4 @@ post-install:
 	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} /var/dpsearch/' >> ${TMPPLIST}
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/extsm/Makefile b/www/extsm/Makefile
index dd7ef083c9ea..cfc4147c944b 100644
--- a/www/extsm/Makefile
+++ b/www/extsm/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xsm
-# Date created:		2006-07-30
-# Whom:			Stanislav Sedov <ssedov@mbsd.msk.ru>
-#
+# Created by: Stanislav Sedov <ssedov@mbsd.msk.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	extsm
 PORTVERSION=	1.1
@@ -22,36 +18,36 @@ JAVA_VERSION=	1.5+
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/xsm
 
-OPTIONS=	TOMCAT6		"Use Tomcat 6"			on	\
-		TOMCAT55	"Use Tomcat 5.5"		off	\
-		RESIN3		"Use Resin 3"			off
+OPTIONS_DEFINE=	TOMCAT6 TOMCAT5 RESIN3 DOCS EXAMPLES
+OPTIONS_DEFAULT=	TOMCAT6
 
-.if !defined(NOPORTDOCS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	README INSTALL
 .endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 PORTEXAMPLES=	xsm-demo-config.zip
 .endif
 
-.include <bsd.port.pre.mk>
-
 WEBAPP_DIRS=	#empty
 
-.if defined(WITH_TOMCAT6)
+.if ${PORT_OPTIONS:MTOMCAT6}
 WEBAPP_DIRS+=	apache-tomcat-6.0
 RUN_DEPENDS+=	${LOCALBASE}/apache-tomcat-6.0/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
 .endif
 
-.if defined(WITH_TOMCAT55)
+.if ${PORT_OPTIONS:MTOMCAT5}
 WEBAPP_DIRS+=	tomcat5.5
 RUN_DEPENDS+=	${LOCALBASE}/tomcat5.5/bin/bootstrap.jar:${PORTSDIR}/www/tomcat55
 .endif
 
-.if defined(WITH_RESIN3)
+.if ${PORT_OPTIONS:MRESIN3}
 WEBAPP_DIRS+=	resin3
 RUN_DEPENDS+=	${LOCALBASE}/resin3/lib/resin.jar:${PORTSDIR}/www/resin3
 .endif
 
+.include <bsd.port.pre.mk>
 do-install:
 .if ${PREFIX} != ${LOCALBASE}
 	@${ECHO_CMD} "Warning: you changed prefix to ${PREFIX}"
@@ -66,11 +62,11 @@ do-install:
 .endif
 	${INSTALL_DATA} ${WRKSRC}/xsm.war ${PREFIX}/${DIR}/webapps
 .endfor
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}/
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
 .endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}/
 	${INSTALL_DATA} ${PORTEXAMPLES:S,^,${WRKSRC}/,} ${EXAMPLESDIR}/
 .endif
diff --git a/www/firefox-remote/Makefile b/www/firefox-remote/Makefile
index ed7ceaa3a37e..82560cead514 100644
--- a/www/firefox-remote/Makefile
+++ b/www/firefox-remote/Makefile
@@ -1,4 +1,4 @@
-# Created by:					Franz Klammer <klammer@webonaut.com>
+# Created by: Franz Klammer <klammer@webonaut.com>
 # $FreeBSD$
 
 PORTNAME=	firefox
@@ -18,27 +18,28 @@ UTF8_HACK=	no
 FIREFOX_REMOTE=	${PORTNAME}${PKGNAMESUFFIX}
 THUNDERBIRD_REMOTE=	thunderbird${PKGNAMESUFFIX}
 
-OPTIONS=UTF8_LOCALE "Use UTF8 locale (read Makefile for details)" off \
-	MENU_FIREFOX "Add menu entry for firefox" off \
-	MENU_THUNDERBIRD "Add menu entry for thunderbird" off
+OPTIONS_DEFINE=	UTF8_LOCALE MENU_FIREFOX MENU_THUNDERBIRD
+UTF8_LOCALE_DESC=	Use UTF8 locale (read Makefile for details)
+MENU_FIREFOX_DESC=	Add menu entry for firefox
+MENU_THUNDERBIRD_DESC=	Add menu entry for thunderbird
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 # firefox/thunderbird can't display unicode filenames with special
 # characters like umlaute in german correctly if a ISO-locale is set.
 # when enabled the remote scripts try to switch to the UTF8-locale if
 # available (e.g. de_DE.UTF8 instead of de_DE.ISO8859-xx)
-.if defined(WITH_UTF8_LOCALE)
+.if ${PORT_OPTIONS:MUTF8_LOCALE}
 UTF8_HACK=	yes
 .endif
 
-.if defined(WITH_MENU_FIREFOX)
+.if ${PORT_OPTIONS:MMENU_FIREFOX}
 PLIST_SUB+=	MENU_FIREFOX=""
 .else
 PLIST_SUB+=	MENU_FIREFOX="@comment "
 .endif
 
-.if defined(WITH_MENU_THUNDERBIRD)
+.if ${PORT_OPTIONS:MMENU_THUNDERBIRD}
 PLIST_SUB+=	MENU_THUNDERBIRD=""
 .else
 PLIST_SUB+=	MENU_THUNDERBIRD="@comment "
@@ -56,13 +57,13 @@ do-install:
 	${RM} -f ${PREFIX}/bin/${THUNDERBIRD_REMOTE}
 	${LN} -s ${PREFIX}/bin/${FIREFOX_REMOTE} \
 		${PREFIX}/bin/${THUNDERBIRD_REMOTE}
-.if defined (WITH_MENU_FIREFOX)
+.if ${PORT_OPTIONS:MMENU_FIREFOX}
 	${INSTALL_DATA} ${WRKSRC}/mozilla_firefox.desktop \
 		${LOCALBASE}/share/applications/
 	${INSTALL_DATA} ${WRKSRC}/mozilla_firefox.png \
 		${LOCALBASE}/share/pixmaps/
 .endif
-.if defined (WITH_MENU_THUNDERBIRD)
+.if ${PORT_OPTIONS:MMENU_THUNDERBIRD}
 	${INSTALL_DATA} ${WRKSRC}/mozilla_thunderbird.desktop \
 		${LOCALBASE}/share/applications/
 	${INSTALL_DATA} ${WRKSRC}/mozilla_thunderbird.png \
@@ -70,4 +71,4 @@ do-install:
 .endif
 	${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/geronimo/Makefile b/www/geronimo/Makefile
index ff62080aa133..e842555eb92f 100644
--- a/www/geronimo/Makefile
+++ b/www/geronimo/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	geronimo
-# Date created:		26 Apr 2007
-# Whom:			Nemo Liu <nemoliu@FreeBSD.org>
-#
+# Created by: Nemo Liu <nemoliu@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	geronimo
 DISTVERSION=	3.0-beta-1
@@ -22,11 +18,12 @@ NO_BUILD=	YES
 USE_RC_SUBR=	geronimo3
 SUB_FILES=	pkg-deinstall
 
-OPTIONS=	TOMCAT7 "Use Tomcat instead of default Jetty" off
+OPTIONS_DEFINE=	TOMCAT7
+TOMCAT7_DESC=	Use Tomcat instead of default Jetty
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_TOMCAT7)
+.if ${PORT_OPTIONS:MTOMCAT7}
 WEBSERVER=	tomcat7
 .else
 WEBSERVER=	jetty8
@@ -90,4 +87,4 @@ post-install:
 	@${FIND} -s -d ${WRKSRC} -type d | \
 		 ${SED} -ne 's,^${WRKSRC},@dirrm ${APP_HOME:S,${PREFIX}/,,},p' >> ${TMPPLIST}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/ismail/Makefile b/www/ismail/Makefile
index dc862349546a..cbcbf36a070e 100644
--- a/www/ismail/Makefile
+++ b/www/ismail/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	ismail
-# Date created:			18 June 2004
-# Whom:				Kelley Reynolds <kelley@insidesystems.net>
-#
+# Created by: Kelley Reynolds <kelley@insidesystems.net>
 # $FreeBSD$
-#
 
 PORTNAME=	ismail
 PORTVERSION=	2.1
@@ -24,38 +20,26 @@ WANT_PHP_WEB=	yes
 
 SUB_FILES=	pkg-message
 
-OPTIONS=	DOMXML "Use DOMXML for datastore (only with php4.x)" off \
-		MYSQL "Use MySQL for datastore" on \
-		POSTGRESQL "Use PostgresQL for datastore" off
+OPTIONS_DEFINE=	DOCS
+OPTIONS_SINGLE=	DATASTORE
+OPTIONS_SINGLE_DATASTORE=	MYSQL PGSQL
+OPTIONS_DEFAULT=	MYSQL
 
 .include <bsd.port.options.mk>
 
-.ifdef(WITH_DOMXML)
-USE_PHP+=	domxml
-IGNORE_WITH_PHP=	5
-.endif
-
-.ifdef(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 USE_PHP+=	mysql
 PLIST_FILES+=	${EXAMPLESDIR_REL}/mysql4.schema
 PLIST_DIRS+=	${EXAMPLESDIR_REL}
 .endif
 
-.ifdef(WITH_POSTGRESQL)
+.if ${PORT_OPTIONS:MPGSQL}
 USE_PHP+=	pgsql
 PLIST_FILES+=	${EXAMPLESDIR_REL}/pgsql.schema
 PLIST_DIRS+=	${EXAMPLESDIR_REL}
 .endif
 
-.include <bsd.port.pre.mk>
-
-LIB_DEPENDS+=	c-client4.9:${PORTSDIR}/mail/cclient
-
-.pre-extract:
-.if !defined(WITH_DOMXML) && !defined(WITH_MYSQL) && !defined(WITH_POSTGRESQL)
-	@${ECHO_MSG} "Pleasee choose at least one of DOMXML, MYSQL, POSTGRESQL"
-	@${FALSE}
-.endif
+LIB_DEPENDS+=	c-client4:${PORTSDIR}/mail/cclient
 
 pre-install:
 	@${ECHO_MSG} ""
@@ -67,15 +51,15 @@ do-install:
 	@${MKDIR} ${WWWDIR}
 	${TAR} --exclude '*~' -C ${WRKSRC}/${PORTNAME} -cf - . | ${TAR} -C ${WWWDIR} -xf -
 	@${CHOWN} -R www:www ${WWWDIR}
-.ifndef(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs.html ${DOCSDIR}
 .endif
-.ifdef(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/mysql4.schema ${EXAMPLESDIR}
 .endif
-.ifdef(WITH_POSTGRESQL)
+.if ${PORT_OPTIONS:MPGSQL}
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/pgsql.schema ${EXAMPLESDIR}
 .endif
@@ -83,4 +67,4 @@ do-install:
 post-install:
 	@${CAT} ${PKGMEASSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/p5-CGI-FormBuilder/Makefile b/www/p5-CGI-FormBuilder/Makefile
index d681910af05a..d0322fd46953 100644
--- a/www/p5-CGI-FormBuilder/Makefile
+++ b/www/p5-CGI-FormBuilder/Makefile
@@ -15,10 +15,12 @@ COMMENT=	FormBuilder for CGI
 
 PERL_CONFIGURE=	yes
 
-OPTIONS=	TT		"Template Toolkit support" on \
-		HTML_TEMPLATE	"HTML::Template support" off \
-		TEXT_TEMPLATE	"Text::Template support" off \
-		CGI_FAST_TEMPLATE "CGI::FastTemplate support" off
+OPTIONS_DEFINE=	TT HTML_TEMPLATE TEXT_TEMPLATE CGI_FAST_TEMPLATE
+OPTIONS_DEFAULT=	TT
+TT_DESC=	Template Toolkit support
+HTML_TEMPLATE_DESC=	HTML::Template support
+TEXT_TEMPLATE_DESC=	Text::Template support
+CGI_FAST_TEMPLATE_DESC=	CGI::FastTemplate suppor
 
 MAN3=	CGI::FormBuilder.3 \
 	CGI::FormBuilder::Template::Builtin.3 \
@@ -39,22 +41,22 @@ MAN3=	CGI::FormBuilder.3 \
 post-patch:
 	@${FIND} ${WRKSRC} -name "*.orig" -delete
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_TT)
+.if ${PORT_OPTIONS:MTT}
 RUN_DEPENDS+=	p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit
 .endif
 
-.if defined(WITH_HTML_TEMPLATE)
+.if ${PORT_OPTIONS:MHTML_TEMPLATE}
 RUN_DEPENDS+=	p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template
 .endif
 
-.if defined(WITH_TEXT_TEMPLATE)
+.if ${PORT_OPTIONS:MTEXT_TEMPLATE}
 RUN_DEPENDS+=	p5-Text-Template>=0:${PORTSDIR}/textproc/p5-Text-Template
 .endif
 
-.if defined(WITH_CGI_FAST_TEMPLATE)
+.if ${PORT_OPTIONS:MCGI_FAST_TEMPLATE}
 RUN_DEPENDS+=	p5-CGI-FastTemplate>=0:${PORTSDIR}/www/p5-CGI-FastTemplate
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/session2/Makefile b/www/session2/Makefile
index 2b2f66e4d9b7..aca1200605fc 100644
--- a/www/session2/Makefile
+++ b/www/session2/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	quixote-session2
-# Date created:		15 June 2005
-# Whom:	      		Dryice Liu <dryice@liu.com.cn>
-#
+# Created by: Dryice Liu <dryice@liu.com.cn>
 # $FreeBSD$
-#
 
 PORTNAME=	session2
 PORTVERSION=	0.6.1
@@ -20,25 +16,25 @@ USE_PYTHON=	-2.7
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGVERSION=	0.6
 
-OPTIONS=	MYSQL "MySQLdb support" on
-OPTIONS+=	POSTGRESQL "psycopg support" on
+OPTIONS_DEFINE=	MYSQL PGSQL DOCS
+OPTIONS_DEFAULT=	MYSQL PGSQL
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:${PORTSDIR}/databases/py-MySQLdb
 .endif
 
-.if defined(WITH_POSTGRESQL)
+.if ${PORT_OPTIONS:MPGSQL}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}psycopg>0:${PORTSDIR}/databases/py-psycopg
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@ ${MKDIR} ${DOCSDIR}
 .for docfile in ChangeLog default.css README.html README.txt TODO
 	@ ${INSTALL_DATA} ${WRKSRC}/${docfile} ${DOCSDIR}
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/xapian-omega10/Makefile b/www/xapian-omega10/Makefile
index 227cb1026c6d..2ac8033da30c 100644
--- a/www/xapian-omega10/Makefile
+++ b/www/xapian-omega10/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xapian-omega10
-# Date created:		05 Jul 2008
-# Whom:			Henrik Brix Andersen <brix@FreeBSD.org>
-#
+# Created by: Henrik Brix Andersen <brix@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xapian-omega10
 PORTVERSION=	1.0.23
@@ -16,7 +12,7 @@ COMMENT=	CGI search application built on Xapian
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	xapian.21:${PORTSDIR}/databases/xapian-core10
+LIB_DEPENDS=	xapian:${PORTSDIR}/databases/xapian-core10
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
@@ -36,13 +32,14 @@ PORTDOCS=	cgiparams.html omegascript.html overview.html \
 		${MORE_PORTDOCS}
 PORTEXAMPLES=	omega.conf
 
-OPTIONS=	ICONV "Enable iconv character set conversion support" On
+OPTIONS_DEFINE=	ICONV DOCS EXAMPLES
+OPTIONS_DEFAULT=	ICONV
 
 PORTSCOUT=	limit:^1\.0\.
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_ICONV)
+.if ${PORT_OPTIONS:MICONV}
 USE_ICONV=	yes
 CONFIGURE_ARGS+=	--with-iconv
 .else
@@ -54,20 +51,20 @@ post-patch:
 		-e 's|^\(dist_sysconf_DATA\ =\ omega\.conf\)|#\1|' \
 		-e "s|^\(pkglibbindir\)\ =.*/bin|\1\ =\ \$$(prefix)/${WWWDIR_REL}/cgi-bin|" \
 		 ${WRKSRC}/Makefile.in
-.if defined(NOPORTDOCS)
+.if empty(PORT_OPTIONS:MDOCS)
 	@${REINPLACE_CMD} \
 		-e 's|^\(SUBDIRS\ =\ \.\) docs|\1|' \
 		 ${WRKSRC}/Makefile.in
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${MORE_PORTDOCS:S@^@${WRKSRC}/@} ${DOCSDIR}
 .endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${PORTEXAMPLES:S@^@${WRKSRC}/@} ${EXAMPLESDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>