10 files changed, 82 insertions, 80 deletions
diff --git a/comms/gnocky/Makefile b/comms/gnocky/Makefile
index 8fd0c45dd19d..03b951ee1950 100644
--- a/comms/gnocky/Makefile
+++ b/comms/gnocky/Makefile
@@ -22,11 +22,11 @@ GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS=	NLS	"Build with Native Language Support"	on
+OPTIONS_DEFINE=	NLS
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 .else
@@ -34,4 +34,4 @@ CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/converters/gbase/Makefile b/converters/gbase/Makefile
index 19d2ad8969ea..ce0080a213e1 100644
--- a/converters/gbase/Makefile
+++ b/converters/gbase/Makefile
@@ -14,16 +14,16 @@ MASTER_SITES=	http://www.fluxcode.net/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A program to convert between the 4 common bases used in programming
 
-OPTIONS=	GTK2 "GTK+-2 support" off
+OPTIONS_DEFINE=	GTK2
 
 USE_GNOME=	pkgconfig
 
 PLIST_FILES=	bin/${PORTNAME}
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_GTK2)
-USE_GNOME+=	gtk12
+.if ${PORT_OPTIONS:MGTK2}
+USE_GNOME+=	gtk20
 GTK_CFLAGS=	`pkg-config --cflags gtk+-2.0`
 GTK_LIBS=	`pkg-config --libs gtk+-2.0`
 .else
@@ -43,4 +43,4 @@ do-build:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/cassandra/Makefile b/databases/cassandra/Makefile
index 920c49a111ca..ac03c44f4eba 100644
--- a/databases/cassandra/Makefile
+++ b/databases/cassandra/Makefile
@@ -36,27 +36,28 @@ SCRIPTS=	cassandra \
 		sstablekeys \
 		sstableloader
 
-OPTIONS=	MX4J "Enable HTTP interface for JMX" Off \
-		JNA "Use JNA native access" Off \
-		CQL "Install cqlsh" Off
+OPTIONS_DEFINE=	MX4J JNA CQL
+MX4J_DESC=	Enable HTTP interface for JMX
+JNA_DESC=	Use JNA native access
+CQL_DESC=	Install cqlsh
 
 SUB_FILES=	repaircluster
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_MX4J)
+.if ${PORT_OPTIONS:MMX4J}
 RUN_DEPENDS+=	${JAVAJARDIR}/mx4j-tools.jar:${PORTSDIR}/java/mx4j
 PLIST_SUB+=	MX4J=""
 .else
 PLIST_SUB+=	MX4J="@comment "
 .endif
-.if defined(WITH_JNA)
+.if ${PORT_OPTIONS:MJNA}
 RUN_DEPENDS+=	${JAVAJARDIR}/jna.jar:${PORTSDIR}/devel/jna
 PLIST_SUB+=	JNA=""
 .else
 PLIST_SUB+=	JNA="@comment "
 .endif
-.if defined(WITH_CQL)
+.if ${PORT_OPTIONS:MCQL}
 USE_PYTHON=	yes
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}cql>=0:${PORTSDIR}/databases/py-cql
 PLIST_SUB+=	CQL=""
@@ -71,7 +72,7 @@ post-extract:
 	@${MV} ${WRKSRC}/conf/${i} ${WRKSRC}/conf/${i}.sample
 .endfor
 	@${MV} ${WRKSRC}/bin/cqlshrc.sample ${WRKSRC}/conf
-.if !defined(WITH_CQL)
+.if empty(PORT_OPTIONS:MCQL)
 	@${RM} -r ${WRKSRC}/pylib
 	@${RM} ${WRKSRC}/bin/cqlsh
 .endif
@@ -87,13 +88,13 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|\`dirname \$$\0\`/..|${DATADIR}|' \
 		${WRKSRC}/bin/cassandra.in.sh
 	@${RM} -f ${WRKSRC}/conf/*.orig
-.if defined(WITH_CQL)
+.if ${PORT_OPTIONS:MCQL}
 	@${REINPLACE_CMD} -e 's|os.path.dirname(__file__)|"${DATADIR}/bin"|' \
 		${WRKSRC}/bin/cqlsh
 .endif
 
 do-build:
-.if defined(WITH_CQL)
+.if ${PORT_OPTIONS:MCQL}
 	@${PYTHON_CMD} -m compileall ${WRKSRC}/pylib
 .endif
 
@@ -110,13 +111,13 @@ do-install:
 	@${LN} -s ${DATADIR}/bin/sstable2json ${PREFIX}/bin/sstable2json
 	@${LN} -s ${DATADIR}/bin/sstablekeys ${PREFIX}/bin/sstablekeys
 
-.if defined(WITH_CQL)
+.if ${PORT_OPTIONS:MCQL}
 	@${LN} -s ${DATADIR}/bin/cqlsh ${PREFIX}/bin/cqlsh
 .endif
-.if defined(WITH_MX4J)
+.if ${PORT_OPTIONS:MMX4J}
 	@${LN} -s ${LOCALBASE}/share/java/classes/mx4j-tools.jar ${DATADIR}/lib/mx4j-tools.jar
 .endif
-.if defined(WITH_JNA)
+.if ${PORT_OPTIONS:MJNA}
 	@${LN} -s ${LOCALBASE}/share/java/classes/jna.jar ${DATADIR}/lib/jna.jar
 	@${LN} -s ${LOCALBASE}/share/java/classes/jna-platform.jar ${DATADIR}/lib/jna-platform.jar
 .endif
diff --git a/databases/grass/Makefile b/databases/grass/Makefile
index cdec9a42f3e2..65ec7451ef8f 100644
--- a/databases/grass/Makefile
+++ b/databases/grass/Makefile
@@ -74,10 +74,8 @@ USE_LDCONFIG=	${PREFIX}/${GRASS_INST_DIR}/lib
 
 MAKE_JOBS_SAFE=	yes
 
-OPTIONS=	MYSQL	"Enable MySQL support" Off \
-		ODBC	"Enable ODBC support" Off \
-		PGSQL	"Enable PostgreSQL support" On \
-		SQLITE	"Enable SQLite support" Off
+OPTIONS_DEFINE=	MYSQL ODBC PGSQL SQLITE
+OPTIONS_DEFAULT=	PGSQL
 
 BASH_SCRIPTS=	i.spectral r.tileset
 
@@ -95,7 +93,7 @@ EXTRA_PATCHES=	${PATCHDIR}/extra-patch-vector-v.info-main.c
 GRASS_INST_DIR=	${PORTNAME}-${PORTVERSION}
 .endif
 
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	yes
 CONFIGURE_ARGS+=--with-mysql \
 		--with-mysql-includes=${LOCALBASE}/include/mysql \
@@ -105,7 +103,7 @@ PLIST_SUB+=	MYSQL=""
 PLIST_SUB+=	MYSQL="@comment "
 .endif
 
-.if defined(WITH_ODBC)
+.if ${PORT_OPTIONS:MODBC}
 LIB_DEPENDS+=	odbc:${PORTSDIR}/databases/unixODBC
 CONFIGURE_ARGS+=--with-odbc
 PLIST_SUB+=	ODBC=""
@@ -113,7 +111,7 @@ PLIST_SUB+=	ODBC=""
 PLIST_SUB+=	ODBC="@comment "
 .endif
 
-.if !defined(WITHOUT_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 USE_PGSQL=	yes
 CONFIGURE_ARGS+=--with-postgres
 PLIST_SUB+=	PGSQL=""
@@ -121,7 +119,7 @@ PLIST_SUB+=	PGSQL=""
 PLIST_SUB+=	PGSQL="@comment "
 .endif
 
-.if defined(WITH_SQLITE)
+.if ${PORT_OPTIONS:MSQLITE}
 USE_SQLITE=	yes
 CONFIGURE_ARGS+=--with-sqlite
 PLIST_SUB+=	SQLITE=""
diff --git a/databases/hk_classes/Makefile b/databases/hk_classes/Makefile
index 5b7e48033d7f..2167c021cbd0 100644
--- a/databases/hk_classes/Makefile
+++ b/databases/hk_classes/Makefile
@@ -38,17 +38,16 @@ PYDISTUTILS_PKGVERSION=	1.1
 NOT_FOR_ARCHS=	ia64
 NOT_FOR_ARCHS_REASON_ia64=	Does not build
 
-OPTIONS=	MYSQL		"Build MySQL driver"		on  \
-		POSTGRESQL	"Build PostrgreSQL driver"	off \
-		ODBC		"Build unixODBC driver"		off \
-		PARADOX		"Build Paradox driver"		off \
-		SQLITE2		"Build with sqlite2 driver"	off \
-		SQLITE3		"Build with sqlite3 driver"	off \
-		DBASE		"Build with dbase driver"	off
+OPTIONS_DEFINE=	MYSQL PGSQL ODBC PARADOX SQLITE2 SQLITE3 DBASE
+OPTIONS_DEFAULT=	MYSQL
+SQLITE3_DESC=	Enable SQLite 3 backend
+SQLITE2_DESC=	Enable SQLite 2 backend
+PARADOX_DESC=	Enable paradox backend
+DBASE_DESC=	Enable Dbase backend
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	yes
 CONFIGURE_ARGS+=	--with-mysql-dir=${LOCALBASE} \
 			--with-mysql-incdir=${LOCALBASE}/include/mysql \
@@ -61,14 +60,14 @@ CONFIGURE_ARGS+=	--without-mysql
 PLIST_SUB+=	MYSQL="@comment "
 .endif
 
-.if !defined(WITH_DBASE)
+.if ${PORT_OPTIONS:MDBASE}
+PLIST_SUB+=	DBASE=""
+.else
 CONFIGURE_ARGS+=	--without-dbase
 PLIST_SUB+=	DBASE="@comment "
-.else
-PLIST_SUB+=	DBASE=""
 .endif
 
-.if defined(WITH_POSTGRESQL)
+.if ${PORT_OPTIONS:MPOSTGRESQL}
 USE_PGSQL=	yes
 CONFIGURE_ARGS+=	--with-postgres-incdir=${LOCALBASE}/include/ \
 			--with-postgres-libdir=${LOCALBASE}/lib
@@ -80,7 +79,7 @@ CONFIGURE_ARGS+=	--without-postgres
 PLIST_SUB+=	POSTGRESQL="@comment "
 .endif
 
-.if defined(WITH_ODBC)
+.if ${PORT_OPTIONS:MODBC}
 LIB_DEPENDS+=		odbc.2:${PORTSDIR}/databases/unixODBC
 CONFIGURE_ARGS+=	--with-odbc-incdir=${LOCALBASE}/include/\
 			--with-odbc-libdir=${LOCALBASE}/lib
@@ -90,7 +89,7 @@ CONFIGURE_ARGS+=	--without-odbc
 PLIST_SUB+=	ODBC="@comment "
 .endif
 
-.if defined(WITH_PARADOX)
+.if ${PORT_OPTIONS:MPARADOX}
 LIB_DEPENDS+=		px:${PORTSDIR}/databases/pxlib
 CONFIGURE_ARGS+=	--with-paradox-incdir=${LOCALBASE}/include/\
 			--with-paradox-libdir=${LOCALBASE}/lib
@@ -101,7 +100,7 @@ PLIST_SUB+=	PARADOX="@comment "
 .endif
 
 # XXX does not work yet
-.if defined(WITH_MSACCESS)
+.if ${PORT_OPTIONS:MMSACCESS}
 LIB_DEPENDS+=		mdb:${PORTSDIR}/databases/mdbtools
 CONFIGURE_ARGS+=	--with-mdb-incdir=${LOCALBASE}/include/\
 			--with-mdb-libdir=${LOCALBASE}/lib
@@ -114,7 +113,7 @@ PLIST_SUB+=	MSACCESS="@comment "
 # XXX does not work yet
 CONFIGURE_ARGS+=	--without-xbase
 
-.if defined(WITH_SQLITE2)
+.if ${PORT_OPTIONS:MSQLITE2}
 LIB_DEPENDS+=		sqlite.2:${PORTSDIR}/databases/sqlite2
 CONFIGURE_ARGS+=	--with-sqlite-incdir=${LOCALBASE}/include/\
 			--with-sqlite-libdir=${LOCALBASE}/lib
@@ -124,7 +123,7 @@ CONFIGURE_ARGS+=	--without-sqlite
 PLIST_SUB+=	SQLITE2="@comment "
 .endif
 
-.if defined(WITH_SQLITE3)
+.if ${PORT_OPTIONS:MSQLITE3}
 LIB_DEPENDS+=		sqlite3:${PORTSDIR}/databases/sqlite3
 CONFIGURE_ARGS+=	--with-sqlite-incdir3=${LOCALBASE}/include/\
 			--with-sqlite-libdir3=${LOCALBASE}/lib
@@ -148,4 +147,4 @@ post-install:
 		${PREFIX}/etc/rc.d/hk_classes.sh; \
 	 ${CHMOD} a+x ${PREFIX}/etc/rc.d/hk_classes.sh
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/libmemcache/Makefile b/databases/libmemcache/Makefile
index 3ea563b656bf..84f6b36bbc44 100644
--- a/databases/libmemcache/Makefile
+++ b/databases/libmemcache/Makefile
@@ -20,12 +20,12 @@ USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
-OPTIONS=	DEBUG	"Build with debugging turned on" off
+OPTIONS_DEFINE=	DEBUG
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=--enable-debug
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/memcached12/Makefile b/databases/memcached12/Makefile
index f40a21668594..583b1b6ae7e3 100644
--- a/databases/memcached12/Makefile
+++ b/databases/memcached12/Makefile
@@ -28,8 +28,8 @@ CONFIGURE_ARGS=		--with-libevent=${LOCALBASE} --program-prefix=
 
 PORTSCOUT=	ignore:1
 
-OPTIONS=	REPCACHED	"Enable data replication feature"	off \
-		SASL		"Enable SASL support"			off
+OPTIONS_DEFINE=	REPCACHED SASL DOCS
+REPCACHED_DESC=	Enable data replication feature
 
 MAN1=		memcached.1
 
@@ -45,7 +45,7 @@ PORTDOCS=	protocol.txt threads.txt
 CFLAGS+=       -fstack-protector
 .endif
 
-.if defined(WITH_REPCACHED)
+.if ${PORT_OPTIONS:MREPCACHED}
 # WWW: http://repcached.lab.klab.org/
 PATCH_SITES+=		${MASTER_SITE_SOURCEFORGE:C/%SUBDIR%/repcached\/repcached\/2.2-${PORTVERSION}/}
 PATCH_DIST_STRIP+=	-p1
@@ -53,7 +53,7 @@ PATCHFILES+=		repcached-2.2-${PORTVERSION}.patch.gz
 CONFIGURE_ARGS+=	--enable-replication --disable-threads
 .endif
 
-.if defined(WITH_SASL) && !defined(WITHOUT_SASL)
+.if ${PORT_OPTIONS:MSASL}
 LIB_DEPENDS+=		sasl2.2:${PORTSDIR}/security/cyrus-sasl2
 CONFIGURE_ARGS+=	--enable-sasl
 CFLAGS+=		-I${LOCALBASE}/include
@@ -68,7 +68,7 @@ post-configure:
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/memcached-tool ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/doc/${MAN1} ${MAN1PREFIX}/man/man1
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${ECHO_MSG} "===>   Installing documentation for ${PKGNAME}"
 	@${MKDIR} ${DOCSDIR}
 .for i in ${PORTDOCS}
diff --git a/deskutils/drivel/Makefile b/deskutils/drivel/Makefile
index c3824db3d541..993718b6a364 100644
--- a/deskutils/drivel/Makefile
+++ b/deskutils/drivel/Makefile
@@ -16,7 +16,9 @@ COMMENT=	Blog editor for GNOME
 
 LIB_DEPENDS=	soup-2.4.1:${PORTSDIR}/devel/libsoup
 
-OPTIONS=	GTKSPELL "Enable GtkSpell support" On
+OPTIONS_DEFINE=	GTKSPELL
+OPTIONS_DEFAULT=	GTKSPELL
+GTKSPELL_DESC=	Enable GtkSpell support
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
@@ -35,12 +37,12 @@ GCONF_SCHEMAS=	drivel.schemas
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITHOUT_GTKSPELL)
-CONFIGURE_ARGS+=	--without-gtkspell
-.else
+.if ${PORT_OPTIONS:MGTKSPELL}
 LIB_DEPENDS+=		gtkspell.0:${PORTSDIR}/textproc/gtkspell
+.else
+CONFIGURE_ARGS+=	--without-gtkspell
 .endif
 
 post-patch:
@@ -48,4 +50,4 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|make -C|$$(MAKE) -C|g' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e '/-ldl/s|^|#|g' ${WRKSRC}/src/Makefile.in
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/deskutils/griffith/Makefile b/deskutils/griffith/Makefile
index a9bac2e94b45..ebb02fcc8cba 100644
--- a/deskutils/griffith/Makefile
+++ b/deskutils/griffith/Makefile
@@ -21,10 +21,11 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3
 		${PYTHON_PKGNAMEPREFIX}imaging>=0:${PORTSDIR}/graphics/py-imaging \
 		${PYXML}
 
-OPTIONS=	LXML "Enable lxml support" off \
-		REPORTLAB2 "Enable ReportLab2 support" off \
-		CHARDET "Enable chardet support" off \
-		PYGNOMEEXTRAS "Enable python-gnome-extras support" off
+OPTIONS_DEFINE=	LXML REPORTLAB2 CHARDET PYGNOMEEXTRAS
+LXML_DESC=	Enable lxml support
+REPORTLAB2_DESC=	Enable ReportLab2 support
+CHARDET_DESC=	Enable chardet support
+PYGNOMEEXTRAS_DESC=	Enable python-gnome-extras support
 
 USE_XZ=		yes
 USE_GNOME=	pygtk2
@@ -38,21 +39,21 @@ MAN1=		${PORTNAME}.1
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_LXML)
+.if ${PORT_OPTIONS:MLXML}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}lxml>=0:${PORTSDIR}/devel/py-lxml
 .endif
 
-.if defined(WITH_REPORTLAB2)
+.if ${PORT_OPTIONS:MREPORTLAB2}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}reportlab2>=2:${PORTSDIR}/print/py-reportlab2
 .else
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}reportlab>=1.19:${PORTSDIR}/print/py-reportlab
 .endif
 
-.if defined(WITH_CHARDET)
+.if ${PORT_OPTIONS:MCHARDET}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}chardet>=0:${PORTSDIR}/textproc/py-chardet
 .endif
 
-.if defined(WITH_PYGNOMEEXTRAS)
+.if ${PORT_OPTIONS:MPYGNOMEEXTRAS}
 USE_GNOME+=	pygnomeextras
 .endif
 
diff --git a/deskutils/kdepim3/Makefile b/deskutils/kdepim3/Makefile
index 097f437842af..7dda5939af21 100644
--- a/deskutils/kdepim3/Makefile
+++ b/deskutils/kdepim3/Makefile
@@ -37,13 +37,14 @@ CONFIGURE_ARGS=	--with-gpg=${LOCALBASE}/bin/gpg \
 		--with-gpgsm=${LOCALBASE}/bin/gpgsm \
 		--with-ssl-dir=${OPENSSLBASE}
 
-OPTIONS=	GNOKII "KAdressbook import/export for Nokia phones" off \
-		KITCHENSYNC "PIM synchronization utility" off
+OPTIONS_DEFINE=	GNOKII KITCHENSYNC
+GNOKII_DESC=	KAdressbook import/export for Nokia phones
+KITCHENSYNC_DESC=	PIM synchronization utility
 
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_KITCHENSYNC)
+.if ${PORT_OPTIONS:MKITCHENSYNC}
 LIB_DEPENDS+=	opensync.0:${PORTSDIR}/devel/libopensync022
 PLIST_SUB+=	KITCHENSYNC=""
 .else
@@ -52,15 +53,15 @@ DO_NOT_COMPILE+=kitchensync
 .endif
 
 .if exists(${LOCALBASE}/bin/gnokii)
-.	if !defined(WITH_GNOKII)
+.	if empty(PORT_OPTIONS:MGNOKII)
 GNOKII_OVERRIDE=yes
-WITH_GNOKII=	yes
+PORT_OPTIONS+=	GNOKII
 .	endif
 .endif
 
-.if defined(WITH_GNOKII)
+.if ${PORT_OPTIONS:MGNOKII)
 LIB_DEPENDS+=	gnokii:${PORTSDIR}/comms/gnokii
-.endif # defined ($(WITH_GNOKII))
+.endif
 
 .if defined(DO_NOT_COMPILE)
 CONFIGURE_ENV+=	DO_NOT_COMPILE="${DO_NOT_COMPILE}"
@@ -76,4 +77,4 @@ pre-everything::
 	@${ECHO_MSG}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>