Convert to new options framework left unconverted ports in databases category

22 files changed, 273 insertions, 360 deletions

diff --git a/databases/adodb/Makefile b/databases/adodb/Makefile
index b092ff653441..84a2e1dd89c2 100644
--- a/databases/adodb/Makefile
+++ b/databases/adodb/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: adodb
-# Date created:		4 May 2001
-# Whom:			abgoeree@uwnet.nl
-#
+# Created by: abgoeree@uwnet.nl
 # $FreeBSD$
-#
 
 PORTNAME=	adodb
 PORTVERSION=	4.99.2
@@ -26,13 +22,14 @@ NO_BUILD=	YES
 
 ADODB_SUBDIRS=	contrib datadict drivers lang pear perf session xsl
 
-OPTIONS=	TESTS "Install tests" off
+OPTIONS_DEFINE=	TESTS DOCS
+TESTS_DESC=	Install tests
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 SUB_FILES+=	pkg-message
 
-.if defined (WITH_TESTS)
+.if ${PORT_OPTIONS:MTESTS}
 PLIST_SUB+=	TESTS=
 .else
 PLIST_SUB+=	TESTS="@comment "
@@ -50,14 +47,14 @@ do-install:
 	@cd ${WRKSRC}; ${FIND} ${ADODB_SUBDIRS} -type f \
 		-exec ${INSTALL_DATA} ${WRKSRC}/{} ${DATADIR}/{} \;
 
-.if defined (WITH_TESTS)
+.if ${PORT_OPTIONS:MTESTS}
 	@${MKDIR} ${DATADIR}/tests
 	@cd ${WRKSRC}; ${FIND} tests -type f \
 		-exec ${INSTALL_DATA} ${WRKSRC}/{} ${DATADIR}/{} \;
 .endif
 
 post-install:
-.if !defined (NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR} ${DOCSDIR}/cute_icons_for_site
 	@cd ${WRKSRC}; ${FIND} . ! -path './*/*' -type f -name '*.txt' \
 		-exec ${INSTALL_MAN} ${WRKSRC}/{} ${DOCSDIR}/{} \;
@@ -68,4 +65,4 @@ post-install:
 .endif
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/dbconnect/Makefile b/databases/dbconnect/Makefile
index 694407447b2f..d860c7b4d8b6 100644
--- a/databases/dbconnect/Makefile
+++ b/databases/dbconnect/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# New ports collection makefile for:	dbconnect
-# Date created:			Jul 23, 2001
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	dbconnect
 PORTVERSION=	0.3.5
@@ -23,14 +18,14 @@ USE_LDCONFIG=	yes
 CXXFLAGS+=	${PTHREAD_CFLAGS} -fPIC -DFREEBSD
 LDFLAG+=	${PTHREAD_LIBS}
 
-OPTIONS=	MYSQL "With MySQL driver" on \
-		PGSQL "With PostgreSQL driver" off
+OPTIONS_DEFINE=	MYSQL PGSQL
+OPTIONS_DEFAULT=	MYSQL
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
-.if !defined(WITHOUT_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=		YES
 CONFIGURE_ARGS+=	--enable-mysql=yes \
 			--with-mysql_include=${LOCALBASE}/include/mysql \
@@ -40,7 +35,7 @@ PLIST_SUB+=	MYSQL=""
 PLIST_SUB+=	MYSQL="@comment "
 .endif
 
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 USE_PGSQL=	yes
 CONFIGURE_ARGS+=	--enable-pgsql=yes \
 			--with-pgsql_include=${LOCALBASE}/include \
@@ -65,4 +60,4 @@ do-install:
 			$${libname}.so); \
 	done
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/drizzle/Makefile b/databases/drizzle/Makefile
index 7d257e12a656..cc527a603efd 100644
--- a/databases/drizzle/Makefile
+++ b/databases/drizzle/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	drizzle
-# Date created:		2010-04-22
-# Whom:			Greg Larkin <glarkin@FreeBSD.org>
-#
+# Created by: Greg Larkin <glarkin@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	drizzle
 PORTVERSION=	2010.05.1561
@@ -34,7 +30,7 @@ GROUPS=		drizzle
 # Replace token in the rc.d script
 SUB_LIST+=	USERS=${USERS}
 
-OPTIONS=	DOCS "Build documentation with doxygen (very slow)" Off
+OPTIONS_DEFINE=	DOXYGEN NLS
 
 BUILD_DEPENDS+=	libdrizzle>=0:${PORTSDIR}/databases/libdrizzle \
 		e2fsprogs-libuuid>=0:${PORTSDIR}/misc/e2fsprogs-libuuid \
@@ -57,22 +53,21 @@ MAN8=	drizzled.8
 
 USE_RC_SUBR=	drizzle-server
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${ARCH} == "i386"
 CONFIGURE_ARGS+=--disable-64bit
 .endif
 
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.else
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
 .endif
 
-.if !defined(NOPORTDOCS)
-.if defined(WITH_DOCS)
+.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MDOXYGEN}
 BUILD_DEPENDS+=	doxygen>=0:${PORTSDIR}/devel/doxygen \
 		${LOCALBASE}/bin/dot:${PORTSDIR}/graphics/graphviz
 ALL_TARGET=	all doxygen
@@ -84,6 +79,5 @@ post-install::
 .else
 PLIST_SUB+=	PORTDOCS="@comment "
 .endif
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile
index a0c1563a0c4a..f62e1fd98abd 100644
--- a/databases/freetds/Makefile
+++ b/databases/freetds/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for:   freetds
-# Date created:		02 Nov 1999
-# Whom:			Domas Mituzas <midom@dammit.lt>
-#
+# Created by: Domas Mituzas <midom@dammit.lt>
 # $FreeBSD$
 
 PORTNAME=	freetds
@@ -30,35 +27,34 @@ PORTDOCS=	*
 
 MAN1=		datacopy.1 freebcp.1 tsql.1 bsqldb.1 defncopy.1
 
-OPTIONS=	OPENSSL "Use openssl" off       \
-		GNUTLS "Use GNUTLS" off \
-		IODBC   "Use iodbc (Mutually Exclusive)" off    \
-		UNIXODBC "Use unixodbc (Mutually Exclusive)" off        \
-		MSDBLIB "MS SQL Server support (breaks databases/sybtcl)" off
+OPTIONS_DEFINE=	OPENSSL GNUTLS MSDBLIB DOCS
+OPTIONS_RADIO=	ODBC
+OPTIONS_RADIO_ODBC=	IODBC UNIXODBC
+MSDBLIB_DESC=	MS SQL Server support (breaks databases/sybtcl)
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_OPENSSL)
+.if ${PORT_OPTIONS:MOPENSSL}
 USE_OPENSSL=	yes
 CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE}
 .endif
 
-.if defined(WITH_GNUTLS)
+.if ${PORT_OPTIONS:MGNUTLS}
 LIB_DEPENDS+=	gnutls:${PORTSDIR}/security/gnutls
 CONFIGURE_ARGS+=--with-gnutls
 .endif
 
-.if defined(WITH_IODBC)
+.if ${PORT_OPTIONS:MIODBC}
 LIB_DEPENDS+=	iodbc:${PORTSDIR}/databases/libiodbc
 CONFIGURE_ARGS+=	--with-iodbc=${LOCALBASE}
 .endif
 
-.if defined(WITH_UNIXODBC)
+.if ${PORT_OPTIONS:MUNIXODBC}
 LIB_DEPENDS+=	odbc:${PORTSDIR}/databases/unixODBC
 CONFIGURE_ARGS+=	--with-unixodbc=${LOCALBASE}
 .endif
 
-.if defined(WITH_IODBC) || defined(WITH_UNIXODBC)
+.if ${PORT_OPTIONS:MIODBC) || defined(WITH_UNIXODBC}
 PLIST_SUB+=	ODBC=""
 .else
 PLIST_SUB+=	ODBC="@comment "
@@ -66,7 +62,7 @@ PLIST_SUB+=	ODBC="@comment "
 
 # We cannot use msdblib-style by default, because port databases/sybtcl
 # relies on sybase-style dblib
-.if defined(WITH_MSDBLIB)
+.if ${PORT_OPTIONS:MMSDBLIB}
 CONFIGURE_ARGS+=	--enable-msdblib
 .endif
 
@@ -84,7 +80,7 @@ post-patch:
 		 s| common.h||g'
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@cd ${WRKSRC}/doc && ${COPYTREE_SHARE} images ${DOCSDIR}
 	@cd ${WRKSRC}/doc && ${COPYTREE_SHARE} doc ${DOCSDIR}
 .endif
@@ -93,4 +89,4 @@ post-install:
 	@${ECHO_CMD} "Sample configuration files have been installed in ${PREFIX}/etc"
 	@${ECHO_CMD} "You should edit them and remove the .dist-suffix from their names"
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/gdbm/Makefile b/databases/gdbm/Makefile
index e9bc5d9b3176..6923395b3bc7 100644
--- a/databases/gdbm/Makefile
+++ b/databases/gdbm/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: gdbm
-# Date created:		8 Apr 1996
-# Whom:			Brent J. Nordquist <bjn@visi.com>
-#
+# Created by: Brent J. Nordquist <bjn@visi.com>
 # $FreeBSD$
-#
 
 PORTNAME=	gdbm
 PORTVERSION=	1.9.1
@@ -13,7 +9,8 @@ MASTER_SITES=	GNU
 MAINTAINER=	gabor@FreeBSD.org
 COMMENT=	The GNU database manager
 
-OPTIONS=	COMPAT	"dbm/ndbm compatibility" off
+OPTIONS_DEFINE=	COMPAT
+COMPAT_DESC=	dbm/ndbm compatibility
 
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	libtool
@@ -25,7 +22,7 @@ MAN3=		gdbm.3
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_COMPAT)
+.if ${PORT_OPTIONS:MCOMPAT}
 CONFIGURE_ARGS+=--enable-libgdbm-compat
 PLIST_SUB=	GDBM_COMPAT=""
 .else
@@ -33,10 +30,10 @@ PLIST_SUB=	GDBM_COMPAT="@comment "
 .endif
 
 pre-everything::
-.if !defined(WITH_COMPAT)
+.if ! ${PORT_OPTIONS:MCOMPAT}
 	@${ECHO_MSG}
 	@${ECHO_MSG} "If you need UNIX dbm/ndbm compatibility functions,"
-	@${ECHO_MSG} "use \"make WITH_COMPAT=yes\""
+	@${ECHO_MSG} "use \"make WITH=COMPAT\""
 	@${ECHO_MSG}
 .endif
 
diff --git a/databases/libdbi-drivers/Makefile b/databases/libdbi-drivers/Makefile
index a8727a444c95..5ec9a5a17be3 100644
--- a/databases/libdbi-drivers/Makefile
+++ b/databases/libdbi-drivers/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for:	libdbi-drivers
-# Date created:				Oct 30, 2003
-# Whom:					ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	libdbi-drivers
 DISTVERSION=	0.8.3-1
@@ -22,23 +18,15 @@ CONFIGURE_ARGS=	--disable-static \
 		--with-dbi-incdir=${LOCALBASE}/include/dbi
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${DISTVERSION}
 
-OPTIONS=	MYSQL		"With MySQL Driver" 		on  \
-		MSQL		"With MSQL Driver" 		off \
-		PGSQL		"With PostgreSQL Driver"	on  \
-		SQLITE2		"With SQLite 2 Driver" 		off \
-		SQLITE3		"With SQLite 3 Driver" 		on  \
-		FIREBIRD	"With Firebird Driver (BROKEN)"	off \
-		FREETDS		"With FreeTDS Driver"		off
+OPTIONS_MULTI=	DRIVER
+OPTIONS_MULTI_DRIVER=	MYSQL MSQL PGSQL SQLITE2 SQLITE3 FIREBIRD FREETDS
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFAULT=	MYSQL PGSQL SQLITE3
+SQLITE2_DESC=	SQLite 2 Database
 
-.if defined(WITHOUT_MYSQL) && defined(WITHOUT_MSQL) && defined(WITHOUT_PGSQL) \
-	&& defined(WITHOUT_SQLITE2) && defined(WITHOUT_SQLITE3) \
-	&& defined(WITHOUT_FIREBIRD) && defined(WITHOUT_FREETDS)
-IGNORE=		choose at least one driver
-.endif
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	yes
 CONFIGURE_ARGS+=	--with-mysql
 PLIST_SUB+=	MYSQL=""
@@ -46,7 +34,7 @@ PLIST_SUB+=	MYSQL=""
 PLIST_SUB+=	MYSQL="@comment "
 .endif
 
-.if defined(WITH_MSQL)
+.if ${PORT_OPTIONS:MMSQL}
 LIB_DEPENDS+=	msql.1:${PORTSDIR}/databases/msql
 CONFIGURE_ARGS+=	--with-msql
 PLIST_SUB+=	MSQL=""
@@ -54,7 +42,7 @@ PLIST_SUB+=	MSQL=""
 PLIST_SUB+=	MSQL="@comment "
 .endif
 
-.if !defined(WITHOUT_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 USE_PGSQL=	yes
 CONFIGURE_ARGS+=	--with-pgsql
 PLIST_SUB+=	PGSQL=""
@@ -62,7 +50,7 @@ PLIST_SUB+=	PGSQL=""
 PLIST_SUB+=	PGSQL="@comment "
 .endif
 
-.if defined(WITH_SQLITE2)
+.if ${PORT_OPTIONS:MSQLITE2}
 LIB_DEPENDS+=	sqlite.2:${PORTSDIR}/databases/sqlite2
 CONFIGURE_ARGS+=	--with-sqlite
 PLIST_SUB+=	SQLITE2=""
@@ -70,7 +58,7 @@ PLIST_SUB+=	SQLITE2=""
 PLIST_SUB+=	SQLITE2="@comment "
 .endif
 
-.if !defined(WITHOUT_SQLITE3)
+.if ${PORT_OPTIONS:MSQLITE3}
 LIB_DEPENDS+=	sqlite3.8:${PORTSDIR}/databases/sqlite3
 CONFIGURE_ARGS+=	--with-sqlite3
 PLIST_SUB+=	SQLITE3=""
@@ -78,7 +66,7 @@ PLIST_SUB+=	SQLITE3=""
 PLIST_SUB+=	SQLITE3="@comment "
 .endif
 
-.if defined(WITH_FIREBIRD)
+.if ${PORT_OPTIONS:MFIREBIRD}
 LIB_DEPENDS+=	gds.2:${PORTSDIR}/databases/firebird20-client
 CONFIGURE_ARGS+=	--with-firebird
 PLIST_SUB+=	FIREBIRD=""
@@ -86,7 +74,7 @@ PLIST_SUB+=	FIREBIRD=""
 PLIST_SUB+=	FIREBIRD="@comment "
 .endif
 
-.if defined(WITH_FREETDS)
+.if ${PORT_OPTIONS:MFREETDS}
 LIB_DEPENDS+=	tds.5:${PORTSDIR}/databases/freetds
 CONFIGURE_ARGS+=	--with-freetds
 PLIST_SUB+=	FREETDS=""
@@ -102,4 +90,4 @@ post-patch:
 		-e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/configure
 	@${TOUCH} ${WRKSRC}/drivers/*/dbd_*/*
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/libdrizzle/Makefile b/databases/libdrizzle/Makefile
index 70fbf6c81006..f752220025b2 100644
--- a/databases/libdrizzle/Makefile
+++ b/databases/libdrizzle/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	libdrizzle
-# Date created:		2010-03-03
-# Whom:			Greg Larkin <glarkin@FreeBSD.org>
-#
+# Created by: Greg Larkin <glarkin@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libdrizzle
 PORTVERSION=	0.8
@@ -17,7 +13,7 @@ COMMENT=	Client and protocol library for the Drizzle database
 
 LIB_DEPENDS=	sqlite3.8:${PORTSDIR}/databases/sqlite3
 
-OPTIONS=	DOCS "Build documentation with doxygen" Off
+OPTIONS_DEFINE=	DOXYGEN EXAMPLES
 
 USE_GCC=	4.2+
 GNU_CONFIGURE=	yes
@@ -28,10 +24,9 @@ USE_LDCONFIG=	yes
 SAMPLE_PROGS=	client pipe_query proxy server simple \
 		simple_multi sqlite_server
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(NOPORTDOCS)
-.if defined(WITH_DOCS)
+.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MDOXYGEB}
 BUILD_DEPENDS+=	doxygen>=0:${PORTSDIR}/devel/doxygen
 ALL_TARGET=	all doxygen
 PLIST_SUB+=	PORTDOCS=""
@@ -42,9 +37,8 @@ post-install::
 .else
 PLIST_SUB+=	PORTDOCS="@comment "
 .endif
-.endif
 
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 post-install::
 	@${INSTALL} -d ${EXAMPLESDIR}
 .for i in ${SAMPLE_PROGS}
diff --git a/databases/mysql2odbc/Makefile b/databases/mysql2odbc/Makefile
index 44a081eebee1..662ffaddcfeb 100644
--- a/databases/mysql2odbc/Makefile
+++ b/databases/mysql2odbc/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	mysql2odbc
-# Date created:				8 Aug 2005
-# Whom:					Max Khon <fjoe@FreeBSD.org>
-#
+# Created by: Max Khon <fjoe@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	mysql2odbc
 PORTVERSION=	0.99.2
@@ -14,25 +10,18 @@ MASTER_SITES=	http://www.iodbc.org/downloads/mysql2odbc/
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	Openlink MySQL-ODBC Gateway
 
-OPTIONS=	UNIXODBC	"Build with unixODBC" on \
-		IODBC		"Build with iODBC" off \
+OPTIONS_SINGLE=	ODBC
+OPTIONS_SINGLE_ODBC=	UNIXODBC IODBC
+OPTIONS_DEFAULT=	UNIXODBC
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITH_UNIXODBC) && !defined(WITH_IODBC)
-WITH_UNIXODBC=	yes
-.endif
-
-.if defined(WITH_UNIXODBC) && defined(WITH_IODBC)
-BROKEN=		UNIXODBC and IODBC options are mutually exclusive
-.endif
-
-.if defined(WITH_UNIXODBC)
+.if ${PORT_OPTIONS:MUNIXODBC}
 LIB_DEPENDS=	odbc:${PORTSDIR}/databases/unixODBC
 CONFIGURE_ARGS=	--with-unixodbc=${LOCALBASE}
 .endif
 
-.if defined(WITH_IODBC)
+.if ${PORT_OPTIONS:MIODBC}
 LIB_DEPENDS=	iodbc:${PORTSDIR}/databases/libiodbc
 CONFIGURE_ARGS=	--with-iodbc
 .endif
@@ -44,4 +33,4 @@ LDFLAGS+=	${PTHREAD_LIBS}
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/opendbx/Makefile b/databases/opendbx/Makefile
index f0ee1805edf0..ea57a649d30b 100644
--- a/databases/opendbx/Makefile
+++ b/databases/opendbx/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    opendbx
-# Date Created:                         17 March 2006
-# Whom:                                 tremere@cainites.net
-#
+# Created by: tremere@cainites.net
 # $FreeBSD$
-#
 
 PORTNAME=	opendbx
 PORTVERSION=	1.4.5
@@ -23,20 +19,17 @@ CONFIGURE_ARGS+=	--with-backends="${CONFIGURE_MODULES}"
 
 USE_LDCONFIG=	${PREFIX}/lib/opendbx
 
-OPTIONS=	MYSQL	"Support for the MySQL database" on \
-		PGSQL	"Support for the PostgreSQL database" off \
-		SQLITE	"Support for the SQLite 2 database" off \
-		SQLITE3	"Support for the SQLite 3 database" off \
-		MSSQL	"Support for the MSSQL database" off \
-		SYBASE	"Support for the Sybase database" off
+OPTIONS_DEFINE=	NLS
+OPTIONS_MULTI=	DRIVER
+OPTIONS_MULTI_DRIVER=	MYSQL PGSQL SQLITE2 MSSQL SYBASE
+OPTIONS_DEFAULT=	MYSQL
+SQLITE2_DESC=	SQLite 2 database
+SYBASE_DESC=	Sybase database
+DRIVER_DESC=	Database drivers
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITH_MYSQL) && !defined(WITH_PGSQL) && !defined(WITH_SQLITE) && !defined(WITH_SQLITE3) && !defined(WITH_MSSQL) && !defined(WITH_SYBASE)
-IGNORE=		needs at least one database backend
-.endif
-
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL?=		YES
 CONFIGURE_MODULES+=	"mysql"
 CPPFLAGS+=		-I${LOCALBASE}/include/mysql
@@ -46,7 +39,7 @@ PLIST_SUB+=		WITHMYSQL=""
 PLIST_SUB+=		WITHMYSQL="@comment "
 .endif
 
-.if !defined(WITHOUT_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 USE_PGSQL?=		YES
 CONFIGURE_MODULES+=	"pgsql"
 PLIST_SUB+=		WITHPGSQL=""
@@ -54,7 +47,7 @@ PLIST_SUB+=		WITHPGSQL=""
 PLIST_SUB+=		WITHPGSQL="@comment "
 .endif
 
-.if defined(WITH_SQLITE)
+.if ${PORT_OPTIONS:MSQLITE}
 LIB_DEPENDS+=		sqlite.2:${PORTSDIR}/databases/sqlite2
 CONFIGURE_MODULES+=	"sqlite"
 PLIST_SUB+=		WITHSQLITE=""
@@ -62,7 +55,7 @@ PLIST_SUB+=		WITHSQLITE=""
 PLIST_SUB+=		WITHSQLITE="@comment "
 .endif
 
-.if defined(WITH_SQLITE3)
+.if ${PORT_OPTIONS:MSQLITE3}
 LIB_DEPENDS+=		sqlite3:${PORTSDIR}/databases/sqlite3
 CONFIGURE_MODULES+=	"sqlite3"
 PLIST_SUB+=		WITHSQLITE3=""
@@ -70,7 +63,7 @@ PLIST_SUB+=		WITHSQLITE3=""
 PLIST_SUB+=		WITHSQLITE3="@comment "
 .endif
 
-.if defined(WITH_MSSQL)
+.if ${PORT_OPTIONS:MMSSQL}
 LIB_DEPENDS+=		sybdb.5:${PORTSDIR}/databases/freetds
 CONFIGURE_MODULES+=	"mssql"
 PLIST_SUB+=		WITHMSSQL=""
@@ -78,7 +71,7 @@ PLIST_SUB+=		WITHMSSQL=""
 PLIST_SUB+=		WITHMSSQL="@comment "
 .endif
 
-.if defined(WITH_SYBASE)
+.if ${PORT_OPTIONS:MSYBASE}
 LIB_DEPENDS+=		ct.4:${PORTSDIR}/databases/freetds
 CONFIGURE_MODULES+=	"sybase"
 PLIST_SUB+=		WITHSYBASE=""
@@ -86,12 +79,12 @@ PLIST_SUB+=		WITHSYBASE=""
 PLIST_SUB+=		WITHSYBASE="@comment "
 .endif
 
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=		NLS="@comment "
-.else
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=		yes
 PLIST_SUB+=		NLS=""
+.else
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=		NLS="@comment "
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/p5-DBD-mysql/Makefile b/databases/p5-DBD-mysql/Makefile
index cee8d9eb73bd..81f1ec5afadc 100644
--- a/databases/p5-DBD-mysql/Makefile
+++ b/databases/p5-DBD-mysql/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    DBD::mysql
-# Date created:				27 Nov 2001
-# Whom:	      				Sergey Skvortsov <skv@FreeBSD.org>
-#
+# Created by: Sergey Skvortsov <skv@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	DBD-mysql
 PORTVERSION=	4.021
@@ -29,11 +25,11 @@ PERL_CONFIGURE=	yes
 
 MAN3=	Bundle::DBD::mysql.3 DBD::mysql.3 DBD::mysql::INSTALL.3
 
-OPTIONS=	SSL	"build with OpenSSL support" off
+OPTIONS_DEFINE=	SSL
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_SSL)
+.if ${PORT_OPTIONS:MSSL}
 CONFIGURE_ARGS+=	--ssl
 RUN_DEPENDS+=		p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay
 .endif
diff --git a/databases/p5-DBIx-Simple/Makefile b/databases/p5-DBIx-Simple/Makefile
index 1745f73a3fc7..6de07deb771c 100644
--- a/databases/p5-DBIx-Simple/Makefile
+++ b/databases/p5-DBIx-Simple/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	DBIx::Simple
-# Date created:				10 December 2005
-# Whom:					Parv <parv@pair.org>
-#
+# Created by: Parv <parv@pair.org>
 # $FreeBSD$
-#
 
 PORTNAME=	DBIx-Simple
 PORTVERSION=	1.35
@@ -16,10 +12,11 @@ COMMENT=	Simplified object oriented interface to Perl DBI
 
 RUN_DEPENDS=	p5-DBI>=1.21:${PORTSDIR}/databases/p5-DBI
 
-OPTIONS=	SQL_INTERP "Interpolate Perl variables into SQL" off \
-		SQL_ABSTRACT "Generate SQL from Perl data structures" off \
-		DBIX_XHTML_TABLE "Create XHTML tables from SQL queries" off \
-		TEXT_TABLE "Create plain text table from data" off
+OPTIONS_DEFINE=	SQL_INTERP SQL_ABSTRACT DBIX_XHTML_TABLE TEXT_TABLE
+SQL_INTERP_DESC=	Interpolate Perl variables into SQL
+SQL_ABSTRACT_DESC=	Generate SQL from Perl data structures
+DBIX_XHTML_TABLE_DESC=	Create XHTML tables from SQL queries
+TEXT_TABLE_DESC=	Create plain text table from data
 
 PERL_CONFIGURE=	yes
 
@@ -28,22 +25,22 @@ MAN3=	DBIx::Simple.3 \
 	DBIx::Simple::Comparison.3 \
 	DBIx::Simple::Result::RowObject.3
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_SQL_INTERP)
+.if ${PORT_OPTIONS:MSQL_INTERP}
 RUN_DEPENDS+=	p5-SQL-Interp>=0:${PORTSDIR}/databases/p5-SQL-Interp
 .endif
 
-.if defined(WITH_SQL_ABSTRACT)
+.if ${PORT_OPTIONS:MSQL_ABSTRACT}
 RUN_DEPENDS+=	p5-SQL-Abstract>=0:${PORTSDIR}/databases/p5-SQL-Abstract
 .endif
 
-.if defined(WITH_DBIX_XHTML_TABLE)
+.if ${PORT_OPTIONS:MDBIX_XHTML_TABLE}
 RUN_DEPENDS+=	p5-DBIx-XHTML_Table>=0:${PORTSDIR}/databases/p5-DBIx-XHTML_Table
 .endif
 
-.if defined(WITH_TEXT_TABLE)
+.if ${PORT_OPTIONS:MTEXT_TABLE}
 RUN_DEPENDS+=	p5-Text-Table>=0:${PORTSDIR}/textproc/p5-Text-Table
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/pxlib/Makefile b/databases/pxlib/Makefile
index 2d0f1c27fa12..efbe35e8a211 100644
--- a/databases/pxlib/Makefile
+++ b/databases/pxlib/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	pxlib
-# Date created:				10 December 2005
-# Whom:					Sergey Matveychuk <sem@FreeBSD.org>
-#
+# Created by: Sergey Matveychuk <sem@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	pxlib
 PORTVERSION=	0.6.3
@@ -27,11 +23,12 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 USE_LDCONFIG=	yes
 
-OPTIONS=	DOCS	"Build and install documentation" off
+OPTIONS_DEFINE=	MAN
+MAN_DESC=	Build and install manpages
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_DOCS)
+.if ${PORT_OPTIONS:MMAN}
 BUILD_DEPENDS+=	docbook-to-man:${PORTSDIR}/textproc/docbook-to-man \
 		docbook2man:${PORTSDIR}/textproc/docbook-utils
 
@@ -58,4 +55,4 @@ pre-build:
 	${REINPLACE_CMD} -e 's/^DOCDIR =.*/DOCDIR =/' ${WRKSRC}/Makefile
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index 2c9bde1a92b4..d5bb7b3895b5 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	rrdtool
-# Date created:				20 July 1999
-# Whom:					Dmitry Sivachenko <dima@Chg.RU>
-#
+# Created by: Dmitry Sivachenko <dima@Chg.RU>
 # $FreeBSD$
-#
 
 PORTNAME=	rrdtool
 PORTVERSION=	1.4.7
@@ -38,16 +34,18 @@ PORTDOCS=	*
 PORTEXAMPLES=	4charts.pl bigtops.pl cgi-demo.cgi minmax.pl perftest.pl \
 		piped-demo.pl shared-demo.pl stripes.pl
 
-OPTIONS=	DEJAVU		"Use DejaVu fonts (requires X11)" off \
-		JSON		"Support of json export" off \
-		MMAP		"Use mmap in rrd_update" on \
-		PERL_MODULE	"Build PERL module" on \
-		PYTHON_MODULE	"Build PYTHON bindings" off \
-		RUBY_MODULE	"Build RUBY bindings" off
+OPTIONS_DEFINE=	DEJAVU JSON MMAP PERL_MODULE PYTHON_MODULE RUBY_MODULE EXAMPLES DOCS
+OPTIONS_DEFAULT=	MMAP PERL_MODULE
+DEJAVU_DESC=		Use DejaVu fonts (requires X11)
+JSON_DESC=		Support of json export
+MMAP_DESC=		Use mmap in rrd_update
+PERL_MODULE_DESC=	Build PERL module
+PYTHON_MODULE_DESC=	Build PYTHON bindings
+RUBY_MODULE_DESC=	Build RUBY bindings
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_PYTHON_MODULE)
+.if ${PORT_OPTIONS:MPYTHON_MODULE}
 USE_PYTHON=	yes
 INSTALLS_EGGINFO=yes
 PYDISTUTILS_EGGINFO=py_rrdtool-0.2.1-${PYTHON_VERSION:S/thon//}.egg-info
@@ -59,7 +57,7 @@ CONFIGURE_ARGS+=	--disable-python
 PLIST_SUB+=	WITH_PYTHON="@comment "
 .endif
 
-.if defined(WITH_RUBY_MODULE)
+.if ${PORT_OPTIONS:MRUBY_MODULE}
 USE_RUBY=	yes
 .include "${PORTSDIR}/Mk/bsd.ruby.mk"
 PLIST_SUB+=	WITH_RUBY=""
@@ -69,7 +67,7 @@ CONFIGURE_ARGS+=	--disable-ruby
 PLIST_SUB+=	WITH_RUBY="@comment "
 .endif
 
-.if !defined(WITHOUT_PERL_MODULE)
+.if ${PORT_OPTIONS:MPERL_MODULE}
 USE_PERL5=	yes
 CONFIGURE_ARGS+=	--enable-perl --enable-perl-site-install
 PLIST_SUB+=	WITH_PERL=""
@@ -78,15 +76,15 @@ CONFIGURE_ARGS+=	--disable-perl
 PLIST_SUB+=	WITH_PERL="@comment "
 .endif
 
-.if defined(WITHOUT_MMAP)
+.if ! ${PORT_OPTIONS:MMMAP}
 CONFIGURE_ARGS+=	--disable-mmap
 .endif
 
-.if defined(WITH_JSON)
+.if ${PORT_OPTIONS:MJSON}
 EXTRA_PATCHES+=		${FILESDIR}/thirdparty-json.diff
 .endif
 
-.if exists(${LOCALBASE}/lib/X11/fonts/dejavu) || defined(WITH_DEJAVU)
+.if exists(${LOCALBASE}/lib/X11/fonts/dejavu) || ${PORT_OPTIONS:MDEJAVU}
 RUN_DEPENDS+=	${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu
 .endif
 
@@ -102,26 +100,26 @@ MAN1=		bin_dec_hex.1 cdeftutorial.1 rpntutorial.1 rrd-beginners.1 \
 		rrdresize.1 rrdrestore.1 rrdthreads.1 rrdtool.1 rrdtune.1 \
 		rrdtutorial.1 rrdupdate.1 rrdxport.1
 
-.if !defined(WITHOUT_PERL_MODULE)
+.if ${PORT_OPTIONS:MPERL_MODULE}
 MAN3=		RRDp.3 RRDs.3
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 .endif
 
 post-extract:
 	@${REINPLACE_CMD} -e 's/^POD3/#POD3/' ${WRKSRC}/doc/Makefile.in
-.if defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${REINPLACE_CMD} -e 's/[[:space:]]install-idocDATA//g' \
 		-e 's/[[:space:]]install-ihtmlDATA//g' \
 		-e 's/^[[:space:]].*cd .* rrdtool.html index.html/	#/' \
 		${WRKSRC}/doc/Makefile.in
 .endif
-.if defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	${REINPLACE_CMD} -e '/^SUBDIRS = /s| examples | |' \
 		${WRKSRC}/Makefile.in
 .endif
 
 post-install:
-.if !defined(BATCH) && !defined(NOPORTEXAMPLES)
+.if !defined(BATCH) && ${PORT_OPTIONS:MEXAMPLES}
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "############################################################################"
 	@${ECHO_MSG} "# See ${EXAMPLESDIR} for some demonstration code        #"
diff --git a/databases/rrdtool10/Makefile b/databases/rrdtool10/Makefile
index 5da5a00d57e0..e6263a9bb905 100644
--- a/databases/rrdtool10/Makefile
+++ b/databases/rrdtool10/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	rrdtool
-# Date created:				20 July 1999
-# Whom:					Dmitry Sivachenko <dima@Chg.RU>
-#
+# Created by: Dmitry Sivachenko <dima@Chg.RU>
 # $FreeBSD$
-#
 
 PORTNAME=	rrdtool
 PORTVERSION=	1.0.50
@@ -37,11 +33,12 @@ MAN1=		RRDp.1 RRDs.1 bin_dec_hex.1 rrdcgi.1 rrdcreate.1 rrddump.1 \
 MAN3=		RRDp.3 RRDs.3
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-OPTIONS=	LATIN2 "ISO-8859-2 fonts support" off
+OPTIONS_DEFINE=	LATIN2
+LATIN2_DESC=	ISO-8859-2 fonts support
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_LATIN2)
+.if ${PORT_OPTIONS:MLATIN2}
 CONFIGURE_ARGS+=--enable-latin2
 .endif
 
@@ -54,7 +51,7 @@ BROKEN=		Does not build on ia64
 .endif
 
 post-extract:
-.if defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${REINPLACE_CMD} -e 's/install-idocDATA install-ihtmlDATA//g' \
 		${WRKSRC}/doc/Makefile.in
 .endif
@@ -67,4 +64,4 @@ post-install:
 	@${ECHO_MSG} "############################################################################"
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/slony1/Makefile b/databases/slony1/Makefile
index d76dc5104504..5c2577f6c38a 100644
--- a/databases/slony1/Makefile
+++ b/databases/slony1/Makefile
@@ -23,13 +23,14 @@ USE_RC_SUBR=	slon
 SUB_FILES=	pkg-message slon-mkservice.sh
 SUB_LIST+=	NAME=slon
 
-OPTIONS=	PERLTOOLS "Install perl configuration tools" Off
+OPTIONS_DEFINE=	PERLTOOLS DOCS
+PERLTOOLS_DESC=	Install perl configuration tools
 
 CONFLICTS?=	slony1v2-2*
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_PERLTOOLS)
+.if ${PORT_OPTIONS:MPERLTOOLS}
 USE_PERL5=	yes
 CONFIGURE_ARGS+=	--with-perltools=${LOCALBASE}/sbin
 RUN_DEPENDS+=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
@@ -55,7 +56,7 @@ MAN1=	slon.1 slonik.1
 .endif
 
 post-install:
-.if ! defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${MKDIR} ${DOCSDIR}/adminguide
 	${MKDIR} ${DOCSDIR}/howto
@@ -70,4 +71,4 @@ post-install:
 	@${INSTALL_DATA} ${FILESDIR}/slon.conf-sample ${PREFIX}/etc/
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/sqlite-ext-mobigroup/Makefile b/databases/sqlite-ext-mobigroup/Makefile
index 933bcc2ff445..25ea76651f9d 100644
--- a/databases/sqlite-ext-mobigroup/Makefile
+++ b/databases/sqlite-ext-mobigroup/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	sqlite-ext-mobigroup
-# Date created:		28 Jul 2010
-# Whom:			Pavel Volkov <pavelivolkov@googlemail.com>
-#
+# Created by: Pavel Volkov <pavelivolkov@googlemail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	sqlite-ext-mobigroup
 PORTVERSION=	3.7.5.1
@@ -22,10 +18,11 @@ WRKSRC=		${WRKDIR}/sqlite3-${PORTVERSION:R}
 
 USE_LDCONFIG=	${PREFIX}/libexec/${DIST_SUBDIR}
 
-OPTIONS=	COMPRESS "compress content into a blob using libz" off \
-		ENV "implements the getenv" off \
-		INET "provide the ipv4 functions in SQL queries" on \
-		MD5 "implements the MD5 message-digest algorithm" off
+OPTIONS_DEFINE=	COMPRESS ENV INET MD5 EXAMPLES DOCS
+COMPRESS_DESC=	compress content into a blob using libz
+ENV_DESC=	implements the getenv
+INET_DESC=	provide the ipv4 functions in SQL queries
+MD5_DESC=	implements the MD5 message-digest algorithm
 
 PLIST_DIRS=	libexec/${DIST_SUBDIR}
 PORTDOCS=	*
@@ -33,74 +30,74 @@ PORTEXAMPLES=	*
 
 .include <bsd.port.options.mk>
 
-.ifdef WITH_COMPRESS
+.if ${PORT_OPTIONS:MCOMPRESS}
 PLIST_FILES+=	libexec/${DIST_SUBDIR}/libsqlitecompress.so
 .endif
-.ifdef WITH_INET
+.if ${PORT_OPTIONS:MINET}
 PLIST_FILES+=	libexec/${DIST_SUBDIR}/libsqliteipv4.so
 .endif
-.ifdef WITH_ENV
+.if ${PORT_OPTIONS:MENV}
 PLIST_FILES+=	libexec/${DIST_SUBDIR}/libsqliteenv.so
 .endif
-.ifdef WITH_MD5
+.if ${PORT_OPTIONS:MMD5}
 PLIST_FILES+=	libexec/${DIST_SUBDIR}/libsqlitemd5.so
 .endif
 
 CFLAGS+=	-I${PREFIX}/include -fPIC -lm -shared
 
 do-build:
-.ifdef WITH_COMPRESS
+.if ${PORT_OPTIONS:MCOMPRESS}
 	@cd ${WRKSRC}/ext/_compress && \
 		${CC} -lz ${CFLAGS} compress.c -o libsqlitecompress.so
 .endif
-.ifdef WITH_INET
+.if ${PORT_OPTIONS:MINET}
 	@cd ${WRKSRC}/ext/inet && \
 		${CC} ${CFLAGS} ipv4-ext.c -o libsqliteipv4.so
 .endif
-.ifdef WITH_ENV
+.if ${PORT_OPTIONS:MENV}
 	@cd ${WRKSRC}/ext/env && \
 		${CC} ${CFLAGS} env.c -o libsqliteenv.so
 .endif
-.ifdef WITH_MD5
+.if ${PORT_OPTIONS:MMD5}
 	@cd ${WRKSRC}/ext/md5 && \
 		${CC} ${CFLAGS} md5.c -o libsqlitemd5.so
 .endif
 
 do-install:
 	@${MKDIR} ${PREFIX}/libexec/${DIST_SUBDIR}
-.ifndef NOPORTDOCS
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .endif
-.ifndef NOPORTEXAMPLES
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
 .endif
-.ifdef WITH_COMPRESS
+.if ${PORT_OPTIONS:MCOMPRESS}
 	@${INSTALL_PROGRAM} ${WRKSRC}/ext/_compress/libsqlitecompress.so ${PREFIX}/libexec/${DIST_SUBDIR}
 .endif
-.ifdef WITH_INET
+.if ${PORT_OPTIONS:MINET}
 	@${INSTALL_PROGRAM} ${WRKSRC}/ext/inet/libsqliteipv4.so ${PREFIX}/libexec/${DIST_SUBDIR}
-.	ifndef NOPORTDOCS
+.	if ${PORT_OPTIONS:MDOCS}
 		@${SED} '/\/\*/d;/\*\//,$$d' ${WRKSRC}/ext/inet/ipv4-ext.c > ${WRKSRC}/ext/inet/README-ipv4.txt
 		@${INSTALL_DATA} ${WRKSRC}/ext/inet/README-ipv4.txt ${DOCSDIR}
 .	endif
-.	ifndef NOPORTEXAMPLES
+.	if ${PORT_OPTIONS:MEXAMPLES}
 		@${INSTALL_DATA} ${WRKSRC}/ext/inet/ipv4-ext.sql ${EXAMPLESDIR}
 .	endif
 .endif
-.ifdef WITH_ENV
+.if ${PORT_OPTIONS:MENV}
 	@${INSTALL_PROGRAM} ${WRKSRC}/ext/env/libsqliteenv.so ${PREFIX}/libexec/${DIST_SUBDIR}
-.	ifndef NOPORTDOCS
+.	if ${PORT_OPTIONS:MDOCS}
 		@${SED} '/\/\*/d;/\*\//,$$d' ${WRKSRC}/ext/env/env.c > ${WRKSRC}/ext/env/README-env.txt
 		@${INSTALL_DATA} ${WRKSRC}/ext/env/README-env.txt ${DOCSDIR}
 .	endif
 .endif
-.ifdef WITH_MD5
+.if ${PORT_OPTIONS:MMD5}
 	@${INSTALL_PROGRAM} ${WRKSRC}/ext/md5/libsqlitemd5.so ${PREFIX}/libexec/${DIST_SUBDIR}
-.	ifndef NOPORTDOCS
+.	if ${PORT_OPTIONS:MDOCS}
 		@${SED} '/\/\*/d;/\*\//,$$d' ${WRKSRC}/ext/md5/md5.c > ${WRKSRC}/ext/md5/README-md5.txt
 		@${INSTALL_DATA} ${WRKSRC}/ext/md5/README-md5.txt ${DOCSDIR}
 .	endif
-.	ifndef NOPORTEXAMPLES
+.	if ${PORT_OPTIONS:MEXAMPLES}
 		@${INSTALL_DATA} ${WRKSRC}/ext/md5/md5.sql ${EXAMPLESDIR}
 .	endif
 .endif
diff --git a/databases/sqlite3/Makefile b/databases/sqlite3/Makefile
index 052c9e0dd0eb..b12d43d35901 100644
--- a/databases/sqlite3/Makefile
+++ b/databases/sqlite3/Makefile
@@ -17,29 +17,32 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 CONFLICTS=	sqlite34-[0-9]* sqlcipher-*
 
-USE_GNOME=	pkgconfig
+USE_PKGCONFIG=	build
 USE_LDCONFIG=	YES
 GNU_CONFIGURE=	YES
 
 MAKE_JOBS_UNSAFE=	yes
 
 # Compilation Options For SQLite http://www.sqlite.org/compile.html
-OPTIONS=	\
-		FTS3		"Enable FTS3/4 (Full Text Search) module" on \
-		ICU		"Enable built with ICU"			off \
-		RTREE		"Enable R*Tree module (${RTREE_INT})"	off \
-		RAMTABLE	"Store temporary tables in RAM = ${TEMP_STORE}" off \
-		UPD_DEL_LIMIT	"ORDER BY and LIMIT on UPDATE and DELETE" off \
-		URI		"Enable use the URI filename"		on \
-		SOUNDEX		"Enables the soundex() SQL function"	off \
-		METADATA	"Enable column metadata"		on \
-		STAT3		"Help SQLite to chose a better query plan" off \
-		DIRECT_READ	"File is read directly from disk"	off \
-		MEMMAN		"Allows it to release unused memory"	off \
-		SECURE_DELETE	"Overwrite deleted information with zeros" on \
-		UNLOCK_NOTIFY	"Enable notification on unlocking"	on \
-		THREADSAFE	"Build thread-safe library"		on \
-		EXTENSION	"Allow loadable extensions"		on \
+OPTIONS_DEFINE=	FTS3 ICU RTREE RAMTABLE UPD_DEL_LIMIT URI SOUNDEX METADATA \
+		STAT3 DIRECT_READ MEMMAN SECURE_DELETE UNLOCK_NOTIFY THREADSAFE \
+		EXTENSION
+OPTIONS_DEFAULT=	FTS3 SECURE_DELETE THREADSAFE EXTENSION
+FTS3_DESC=		Enable FTS3/4 (Full Text Search) module
+ICU_DESC=		Enable built with ICU
+RTREE_DESC=		Enable R*Tree module (${RTREE_INT})
+RAMTABLE_DESC=		Store temporary tables in RAM = ${TEMP_STORE}
+UPD_DEL_LIMIT_DESC=	ORDER BY and LIMIT on UPDATE and DELETE
+URI_DESC=		Enable use the URI filename
+SOUNDEX_DESC=		Enables the soundex() SQL function
+METADATA_DESC=		Enable column metadata
+STAT3_DESC=		Help SQLite to chose a better query plan
+DIRECT_READ_DESC=	File is read directly from disk
+MEMMAN_DESC=		Allows it to release unused memory
+SECURE_DELETE_DESC=	Overwrite deleted information with zeros
+UNLOCK_NOTIFY_DESC=	Enable notification on unlocking
+THREADSAFE_DESC=	Build thread-safe library
+EXTENSION_DESC=		Allow loadable extensions
 
 .include <bsd.port.options.mk>
 
@@ -55,7 +58,7 @@ MAN1=		sqlite3.1
 # Some devices are compelled to use an older file system with 8+3 filename
 # restrictions for backwards compatibility, or due to other non-technical factors.
 # http://www.sqlite.org/shortnames.html
-.if defined(WITH_NAME83)
+.if ${PORT_OPTIONS:MNAME83}
 CPPFLAGS+=		-DSQLITE_ENABLE_8_3_NAMES=1
 .endif
 
@@ -72,35 +75,35 @@ CPPFLAGS+=		-DSQLITE_DEFAULT_FILE_PERMISSIONS=${DEFAULT_FILE_PERMISSIONS}
 CPPFLAGS+=		-DSQLITE_DEFAULT_TEMP_CACHE_SIZE=${TEMP_CACHE_SIZE}
 .endif
 
-.if defined(WITH_MEMMAN)
+.if ${PORT_OPTIONS:MMEMMAN}
 CPPFLAGS+=		-DSQLITE_ENABLE_MEMORY_MANAGEMENT=1
 .endif
 
-.if defined(WITH_UPD_DEL_LIMIT)
+.if ${PORT_OPTIONS:MUPD_DEL_LIMIT}
 CPPFLAGS+=		-DSQLITE_ENABLE_UPDATE_DELETE_LIMIT=1
 .endif
 
-.if defined(WITH_URI)
+.if ${PORT_OPTIONS:MURI}
 CPPFLAGS+=		-DSQLITE_USE_URI=1
 .endif
 
-.if defined(WITH_SOUNDEX)
+.if ${PORT_OPTIONS:MSOUNDEX}
 CPPFLAGS+=		-DSQLITE_SOUNDEX=1
 .endif
 
-.if defined(WITH_STAT3)
+.if ${PORT_OPTIONS:MSTAT3}
 CPPFLAGS+=		-DSQLITE_ENABLE_STAT3=1
 .endif
 
-.if defined(WITH_DIRECT_READ)
+.if ${PORT_OPTIONS:MDIRECT_READ}
 CPPFLAGS+=		-DSQLITE_DIRECT_OVERFLOW_READ=1
 .endif
 
-.if defined(WITH_FTS3)
+.if ${PORT_OPTIONS:MFTS3}
 CPPFLAGS+=		-DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_FTS3_PARENTHESIS=1 -DSQLITE_ENABLE_FTS4=1
 .endif
 
-.if defined(WITH_RTREE)
+.if ${PORT_OPTIONS:MRTREE}
 CPPFLAGS+=		-DSQLITE_ENABLE_RTREE=1
 .ifdef RTREE_INT
 CPPFLAGS+=		-DSQLITE_RTREE_INT_ONLY=1
@@ -110,7 +113,7 @@ RTREE_INT=		"float"
 .endif
 .endif
 
-.if defined(WITH_ICU)
+.if ${PORT_OPTIONS:MICU}
 BUILD_DEPENDS+=		${LOCALBASE}/bin/icu-config:${PORTSDIR}/devel/icu
 LIB_DEPENDS+=		icudata:${PORTSDIR}/devel/icu
 CPPFLAGS+=		-DSQLITE_ENABLE_ICU=1
@@ -120,41 +123,39 @@ LDFLAGS+=		`${LOCALBASE}/bin/icu-config --ldflags`
 
 # Use an in-ram database for temporary tables (never,no,yes,always),
 # which is equivalent of TEMP_STORE=[0,1,2,3], default = 1.
-.if defined(WITH_RAMTABLE)
+.if ${PORT_OPTIONS:MRAMTABLE}
 TEMP_STORE?=		2
 CPPFLAGS+=		-DSQLITE_TEMP_STORE=${TEMP_STORE}
 .endif
 
-.if defined(WITH_SECURE_DELETE)
+.if ${PORT_OPTIONS:MSECURE_DELETE}
 CPPFLAGS+=		-DSQLITE_SECURE_DELETE=1
 .endif
 
-.if defined(WITH_UNLOCK_NOTIFY)
+.if ${PORT_OPTIONS:MUNLOCK_NOTIFY}
 CPPFLAGS+=		-DSQLITE_ENABLE_UNLOCK_NOTIFY=1
 .endif
 
-.if !defined(WITHOUT_METADATA)
+.if ${PORT_OPTIONS:MMETADATA}
 CPPFLAGS+=		-DSQLITE_ENABLE_COLUMN_METADATA=1
 .endif
 
-.if !defined(WITHOUT_THREADSAFE)
+.if ${PORT_OPTIONS:MTHREADSAFE}
 CONFIGURE_ARGS+=	--enable-threadsafe
 LDFLAGS+=		${PTHREAD_LIBS}
 .else
 CONFIGURE_ARGS+=	--disable-threadsafe
 .endif
 
-.if !defined(WITHOUT_EXTENSION)
+.if ${PORT_OPTIONS:MEXTENSION}
 CONFIGURE_ARGS+=	--enable-dynamic-extensions
 .else
 CONFIGURE_ARGS+=	--disable-dynamic-extensions
 .endif
 
-.include <bsd.port.pre.mk>
-
 post-install:
 .if !defined(NO_INSTALL_MANPAGES)
 	@${INSTALL_MAN} ${WRKSRC}/sqlite3.1 ${MANPREFIX}/man/man1
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile
index 57938baa89ce..185dc6e8d028 100644
--- a/databases/sqlrelay/Makefile
+++ b/databases/sqlrelay/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	SQL Relay
-# Date created:		2 July 2001
-# Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
-#
+# Created by: Akinori MUSHA aka knu <knu@idaemons.org>
 # $FreeBSD$
-#
 
 PORTNAME=	${SQLRELAY_PORTNAME}
 PORTVERSION=	${SQLRELAY_PORTVERSION}
@@ -36,18 +32,13 @@ PORTDOCS=	*
 
 .include "${.CURDIR}/Makefile.common"
 
-OPTIONS=	MSQL "Build MSQL connection" off \
-		MYSQL "Build MySQL connection" off \
-		ODBC "Build ODBC connection" off \
-		POSTGRESQL "Build PostgreSQL connection" off \
-		SQLITE "Build SQLite connection" off \
-		FREETDS "Build FreeTDS connection" off \
-		INTERBASE "Build Interbase connection" off \
-		GTK "Build GTK configuration tool" off
+OPTIONS_DEFINE=	MSQL MYSQL ODBC PGSQL SQLITE2 FREETDS INTERBASE GTK1 DOCS
+SQLITE2_DESC=	SQLite 2 database
+INTERBASE_DESC=	Interbase database
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_SQLITE) && ${WITH_SQLITE:L} != no
+.if ${PORT_OPTIONS:MSQLITE2}
 LIB_DEPENDS+=		gdbm.4:${PORTSDIR}/databases/gdbm \
 			sqlite.2:${PORTSDIR}/databases/sqlite2
 CONFIGURE_ARGS+=	--with-gdbm-prefix="${LOCALBASE}" \
@@ -59,7 +50,7 @@ CONFIGURE_ARGS+=	--without-gdbm-prefix \
 IF_SQLITE=	"@comment "
 .endif
 
-.if defined(WITH_MYSQL) && ${WITH_MYSQL:L} != no
+.if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	yes
 CONFIGURE_ARGS+=	--with-mysql-prefix="${LOCALBASE}"
 IF_MYSQL=	""
@@ -68,7 +59,7 @@ CONFIGURE_ARGS+=	--disable-mysql
 IF_MYSQL=	"@comment "
 .endif
 
-.if defined(WITH_INTERBASE) && ${WITH_INTERBASE:L} != no
+.if ${PORT_OPTIONS:MINTERBASE}
 USE_FIREBIRD=	yes
 CONFIGURE_ARGS+=	--with-interbase-prefix="${LOCALBASE}"
 IF_INTERBASE=	""
@@ -77,7 +68,7 @@ CONFIGURE_ARGS+=	--disable-interbase
 IF_INTERBASE=	"@comment "
 .endif
 
-.if defined(WITH_MSQL) && ${WITH_MSQL:L} != no
+.if ${PORT_OPTIONS:MMSQL}
 LIB_DEPENDS+=		msql.1:${PORTSDIR}/databases/msql
 CONFIGURE_ARGS+=	--with-msql-prefix="${LOCALBASE}"
 IF_MSQL=	""
@@ -86,7 +77,7 @@ CONFIGURE_ARGS+=	--disable-msql
 IF_MSQL=	"@comment "
 .endif
 
-.if defined(WITH_POSTGRESQL) && ${WITH_POSTGRESQL:L} != no
+.if ${PORT_OPTIONS:MPGSQL}
 USE_PGSQL=	yes
 CONFIGURE_ARGS+=	--with-postgresql-prefix="${LOCALBASE}"
 IF_POSTGRESQL=	""
@@ -95,7 +86,7 @@ CONFIGURE_ARGS+=	--disable-postgresql
 IF_POSTGRESQL=	"@comment "
 .endif
 
-.if defined(WITH_[BODBC) && ${WITH_ODBC:L} != no
+.if ${PORT_OPTIONS:MODBC}
 LIB_DEPENDS+=		odbc.2:${PORTSDIR}/databases/unixODBC
 CONFIGURE_ARGS+=	--with-odbc-prefix="${LOCALBASE}"
 IF_ODBC=	""
@@ -104,7 +95,7 @@ CONFIGURE_ARGS+=	--disable-odbc
 IF_ODBC=	"@comment "
 .endif
 
-.if defined(WITH_FREETDS) && ${WITH_FREETDS:L} != no
+.if ${PORT_OPTIONS:MFREETDS}
 LIB_DEPENDS+=		tds.5:${PORTSDIR}/databases/freetds
 CONFIGURE_ARGS+=	--with-freetds-prefix="${LOCALBASE}"
 IF_FREETDS=	""
@@ -113,7 +104,7 @@ CONFIGURE_ARGS+=	--disable-freetds
 IF_FREETDS=	"@comment "
 .endif
 
-.if defined(WITH_GTK) && ${WITH_GTK:L} != no
+.if ${PORT_OPTIONS:MGTK1}
 USE_GNOME+=		gtk12
 CONFIGURE_ARGS+=	--with-gtk-prefix="${LOCALBASE}"
 IF_GTK=		""
@@ -147,8 +138,8 @@ post-patch:
 	@${REINPLACE_CMD} -e '/EXAMPLEDIR/d' ${WRKSRC}/etc/Makefile
 	${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} -E \
 		-e 's#-release \$$\(SQLR_VERSION\)##g;'
-.ifdef NOPORTDOCS
+.if ${PORT_OPTIONS:MDOCS}
 	 @${REINPLACE_CMD} '/$$(MAKE) -C doc/d' ${WRKSRC}/Makefile
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/tdb/Makefile b/databases/tdb/Makefile
index 1f9ed158f52f..a58bf916bc13 100644
--- a/databases/tdb/Makefile
+++ b/databases/tdb/Makefile
@@ -27,7 +27,8 @@ MAKE_JOBS_SAFE=		yes
 PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
 PLIST_SUB+=		PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}
 
-OPTIONS=		PYTHON		"Python bindings"	on
+OPTIONS_DEFINE=		PYTHON
+OPTIONS_DEFAULT=	PYTHON
 
 .include <bsd.port.options.mk>
 
@@ -58,7 +59,7 @@ _MAKE_JOBS=		--jobs=${MAKE_JOBS_NUMBER}
 .endif
 .endif
 
-.if defined(WITH_PYTHON)
+.if ${PORT_OPTIONS:MPYTHON}
 USE_PYTHON_RUN=		yes
 PLIST_FILES+=		%%PYTHON_SITELIBDIR%%/tdb.so
 PLIST_DIRSTRY+=		%%PYTHON_SITELIBDIR%% \
diff --git a/databases/tokyocabinet/Makefile b/databases/tokyocabinet/Makefile
index 8d23c578e15b..ea5ec0862e55 100644
--- a/databases/tokyocabinet/Makefile
+++ b/databases/tokyocabinet/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD$
 # Created by: Gea-Suan Lin <gslin@gslin.org>
+# $FreeBSD$
 
 PORTNAME=	tokyocabinet
 PORTVERSION=	1.4.48
@@ -17,9 +17,6 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 
-.if defined(NOPORTDOCS)
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-Makefile.in
-.endif
 
 MAN1=		tcamgr.1 tcamttest.1 tcatest.1 tcbmgr.1 tcbmttest.1 tcbtest.1 \
 		tcfmgr.1 tcfmttest.1 tcftest.1 \
@@ -29,54 +26,61 @@ MAN3=		tcadb.3 tcbdb.3 tcfdb.3 tchdb.3 tclist.3 tcmap.3 \
 		tcmdb.3 tcmpool.3 tcutil.3 tcxstr.3 tokyocabinet.3 tctree.3 \
 		tctdb.3
 
-OPTIONS=	DEBUG "Debugging support" off \
-		DEVEL "Development build" off \
-		FASTEST "Fastest run" off \
-		LZMA "Enable LZMA codec" off \
-		LZO "Enable LZO codec" off \
-		PTHREAD "Enable POSIX thread support" on \
-		PROFILE "Profiling build" off \
-		SHARED "Shared build" on \
-		SWAB "Swapping byte-orders build" off \
-		UYIELD "Detecting race conditions" off
+OPTIONS_DEFINE=	DEBUG DEVEL FASTEST LZMA LZO PTHREAD PROFILE SHARED SWAB UYIELD DOCS
+OPTIONS_DEFAULT=	PTHREAD SHARED
+DEBUG_DESC=	Debugging support
+DEVEL_DESC=	Development build
+FASTEST_DESC=	Fastest run
+LZMA_DESC=	LZMA codec
+LZO_DESC=	LZO codec
+PTHREAD_DESC=	Enable POSIX thread support
+PROFILE_DESC=	Profiling build
+SHARED_DESC=	Shared build
+SWAB_DESC=	Swapping byte-orders build
+UYIELD_DESC=	Detecting race conditions
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
+EXTRA_PATCHES=	${FILESDIR}/extra-patch-Makefile.in
 PORTDOCS=	*
 .endif
 
-.if defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=	--enable-debug
 .endif
-.if defined(WITH_DEVEL)
+.if ${PORT_OPTIONS:MDEVEL}
 CONFIGURE_ARGS+=	--enable-devel
 .endif
-.if defined(WITH_FASTEST)
+.if ${PORT_OPTIONS:MFASTEST}
 CONFIGURE_ARGS+=	--enable-fastest
 .endif
 # liblzma on 9-current does not have liblzma.h file.
-.if defined(WITH_LZMA) || exists(${LOCALBASE}/include/liblzma.h)
+.if ${PORT_OPTIONS:MLZMA}
 CONFIGURE_ARGS+=	--enable-exlzma
 LIB_DEPENDS+=		lzma:${PORTSDIR}/archivers/lzmalib
+.else
+CONFIGURE_ARGS+=	--disable-exlzma
 .endif
-.if defined(WITH_LZO) || exists(${LOCALBASE}/lib/liblzo2.so)
+.if ${PORT_OPTIONS:MLZO}
 CONFIGURE_ARGS+=	--enable-exlzo
 LIB_DEPENDS+=		lzo2:${PORTSDIR}/archivers/lzo2
+.else
+CONFIGURE_ARGS+=	--disable-exlzo
 .endif
-.if defined(WITHOUT_PTHREAD)
+.if ! ${PORT_OPTIONS:MPTHREAD}
 CONFIGURE_ARGS+=	--disable-pthread
 .endif
-.if defined(WITH_PROFILE)
+.if ${PORT_OPTIONS:MPROFILE}
 CONFIGURE_ARGS+=	--enable-profile
 .endif
-.if defined(WITHOUT_SHARED)
+.if ! ${PORT_OPTIONS:MSHARED}
 CONFIGURE_ARGS+=	--disable-shared
 .endif
-.if defined(WITH_SWAB)
+.if ${PORT_OPTIONS:MSWAB}
 CONFIGURE_ARGS+=	--enable-swab
 .endif
-.if defined(WITH_UYIELD)
+.if ${PORT_OPTIONS:MUYIELD}
 CONFIGURE_ARGS+=	--enable-uyield
 .endif
 
@@ -92,4 +96,4 @@ post-patch:
 		-e 's|@datarootdir@|@datarootdir@/doc|' \
 		${WRKSRC}/Makefile.in
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/tokyotyrant/Makefile b/databases/tokyotyrant/Makefile
index 0102829a31f4..f3bcfd1a4203 100644
--- a/databases/tokyotyrant/Makefile
+++ b/databases/tokyotyrant/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	tokyotyrant
-# Date created:		2009-03-09
-# Whom:			Gea-Suan Lin <gslin@gslin.org>
-#
+# Created by: Gea-Suan Lin <gslin@gslin.org>
 # $FreeBSD$
-#
 
 PORTNAME=	tokyotyrant
 PORTVERSION=	1.1.41
@@ -25,14 +21,14 @@ MAN1=		tcrmgr.1 tcrmttest.1 tcrtest.1 ttserver.1 ttulmgr.1 ttultest.1
 MAN3=		tcrdb.3 tculog.3 ttutil.3
 MAN8=		ttservctl.8
 
-OPTIONS=	LUA	"Enable LUA support" off
+OPTIONS_DEFINE=	LUA
 
 LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	-I${LOCALBASE}/include
 
-.include <bsd.port.pre.mk>
+.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}
@@ -47,4 +43,4 @@ post-patch:
 	${REINPLACE_CMD} -e 's|@libdir@/pkgconfig|@prefix@/libdata/pkgconfig|g' \
 		${WRKSRC}/Makefile.in
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/virtuoso/Makefile b/databases/virtuoso/Makefile
index 94fa09cf8aaa..1b0a16ae413a 100644
--- a/databases/virtuoso/Makefile
+++ b/databases/virtuoso/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    virtuoso
-# Date created:         		Jul 08, 2006
-# Whom:                 		Max Khon <fjoe@FreeBSD.org>
-#
+# Created by: Max Khon <fjoe@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	virtuoso
 PORTVERSION=	6.1.6
@@ -47,9 +43,7 @@ GROUPS=		virtuoso
 
 CHECK_PORT=	/usr/bin/nc -z localhost $$\1 2>\&1
 
-OPTIONS=	IMAGEMAGICK "ImageMagick support" off\
-		KERBEROS "Kerberos extension" off\
-		OPENLDAP "OpenLDAP support" off
+OPTIONS_DEFINE=	IMAGEMAGICK KERBEROS LDAP
 #		PERL "Perl hosting" off
 #		PYTHON "Python hosting" off
 #		MONO "Mono extension" off\
@@ -73,9 +67,9 @@ post-install:
 check:
 	${SETENV} -u HOST ${MAKE_ENV} ${MAKE} -C ${WRKSRC} check
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_IMAGEMAGICK)
+.if ${PORT_OPTIONS:MIMAGEMAGICK}
 CONFIGURE_ARGS+=--enable-imagemagick=${LOCALBASE}
 LIB_DEPENDS+=	MagickWand:${PORTSDIR}/graphics/ImageMagick
 PLIST_SUB+=	WITH_IMAGEMAGICK=""
@@ -84,47 +78,47 @@ CONFIGURE_ARGS+=--disable-imagemagick
 PLIST_SUB+=	WITH_IMAGEMAGICK="@comment "
 .endif
 
-.if defined(WITH_KERBEROS)
+.if ${PORT_OPTIONS:MKERBEROS}
 CONFIGURE_ARGS+=--enable-krb=${LOCALBASE}
 LIB_DEPENDS+=	krb5.3:${PORTSDIR}/security/krb5
 .endif
 
 # XXX broken (does not build, requires gc.h)
-#.if defined(WITH_MONO)
+#.if ${PORT_OPTIONS:MMONO}
 #CONFIGURE_ARGS+=--enable-mono
 #.endif
 
-.if defined(WITH_OPENLDAP)
+.if ${PORT_OPTIONS:MOPENLDAP}
 CONFIGURE_ARGS+=--enable-openldap=${LOCALBASE}
 USE_OPENLDAP=	yes
 .endif
 
 # XXX broken (requires perl to be built with -Dusemultiplicity)
-#.if defined(WITH_PERL)
+#.if ${PORT_OPTIONS:MPERL}
 #CONFIGURE_ARGS+=--enable-perl
 #USE_PERL5=	yes
 #.endif
 
 # XXX broken (no libphp)
-#.if defined(WITH_PHP4)
+#.if ${PORT_OPTIONS:MPHP4}
 #CONFIGURE_ARGS+=--enable-php4
 #.endif
 
 # XXX broken (no libphp)
-#.if defined(WITH_PHP5)
+#.if ${PORT_OPTIONS:MPHP5}
 #CONFIGURE_ARGS+=--enable-php5
 #.endif
 
 # XXX broken (USE_PYTHON does not work with OPTIONS)
-#.if defined(WITH_PYTHON)
+#.if ${PORT_OPTIONS:MPYTHON}
 #CONFIGURE_ARGS+=--enable-python
 #USE_PYTHON=	yes
 #.endif
 
 # XXX broken (USE_LIBRUBY does not work with OPTIONS)
-#.if defined(WITH_RUBY)
+#.if ${PORT_OPTIONS:MRUBY}
 #CONFIGURE_ARGS+=--enable-ruby
 #USE_LIBRUBY=	yes
 #.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>