Convert to new option framework

5 files changed, 40 insertions, 37 deletions

diff --git a/databases/metakit/Makefile b/databases/metakit/Makefile
index 711e507a9ec..065fa92bc2d 100644
--- a/databases/metakit/Makefile
+++ b/databases/metakit/Makefile
@@ -24,12 +24,12 @@ CONFIGURE_SCRIPT=	../unix/configure
 USE_LDCONFIG=	yes
 ONLY_FOR_ARCHS=	i386 alpha amd64
 
-OPTIONS=	PYTHON	"Enable Python support"	on \
-		TCL	"Enable Tcl support" off
+OPTIONS_DEFINE=	PYTHON TCL DOCS
+OPTIONS_DEFAULT=	PYTHON
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_PYTHON)
+.if ${PORT_OPTIONS:MPYTHON}
 USE_PYTHON=	yes
 .include "${PORTSDIR}/Mk/bsd.python.mk"
 CONFIGURE_ARGS+=	--with-python=${LOCALBASE}
@@ -39,12 +39,13 @@ PLIST_SUB+=	WITH_PYTHON=""
 PLIST_SUB+=	WITH_PYTHON="@comment "
 .endif
 
-.if defined(WITH_TCL)
+.if ${PORT_OPTIONS:MTCL}
 CATEGORIES+=	tcl
 USE_TCL=	83+
-.include "${PORTSDIR}/Mk/bsd.tcl.mk"
 .endif
 
+.include <bsd.port.pre.mk>
+
 .if defined(USE_TCL)
 CONFIGURE_ARGS+=	--with-tcl=${TCL_INCLUDEDIR}
 CONFIGURE_ENV+=		TCL_LIBDIR=${TCL_LIBDIR}
@@ -60,13 +61,13 @@ pre-patch:
 	${REINPLACE_CMD} -e "s/= tclsh/=tclsh${TCL_VER}/" \
 		${WRKSRC}/../unix/Makefile.in
 .endif
-.if !defined(WITHOUT_PYTHON)
+.if ${PORT_OPTIONS:MPYTHON}
 	${REINPLACE_CMD} -e "s=python2.[0-9]=${PYTHON_VERSION}=" \
 		${WRKSRC}/../unix/Makefile.in ${WRKSRC}/../unix/configure
 .endif
 
 post-build:
-.if !defined(WITHOUT_PYTHON)
+.if ${PORT_OPTIONS:MPYTHON}
 	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
 		${WRKSRC}/../python
 	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
@@ -77,7 +78,7 @@ post-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/libmk4.so \
 		${PREFIX}/lib/libmk4.so.0
 	@${LN} -sf libmk4.so.0 ${PREFIX}/lib/libmk4.so
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${TAR} -C ${WRKSRC}/../doc --exclude "*CVS" -cf - . | \
 		${TAR} -C ${DOCSDIR} --unlink -xf -
diff --git a/databases/mysql-workbench51/Makefile b/databases/mysql-workbench51/Makefile
index f5fbffc3624..88d9e48b00b 100644
--- a/databases/mysql-workbench51/Makefile
+++ b/databases/mysql-workbench51/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS+=	gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
 
 MAKE_JOBS_UNSAFE=	yes
 
-OPTIONS=	PYTHON	"Enable Python scripting and modules" off
+OPTIONS_DEFINE=	PYTHON
 
 USE_AUTOTOOLS=	autoheader autoconf automake aclocal libtool
 AUTOMAKE_ARGS=	--add-missing --foreign
@@ -61,9 +61,8 @@ USE_MYSQL=	client
 DEFAULT_MYSQL_VER=	51
 IGNORE_WITH_MYSQL=	41 55
 
-.if defined(WITH_PYTHON)
+.if ${PORT_OPTIONS:MPYTHON}
 CONFIGURE_ARGS+=	--enable-python-modules
-WITH_PYTHON=	yes
 .endif
 
 run-autotools-aclocal:
diff --git a/databases/xapian-core10/Makefile b/databases/xapian-core10/Makefile
index 86ffede8be8..b4efeea3543 100644
--- a/databases/xapian-core10/Makefile
+++ b/databases/xapian-core10/Makefile
@@ -19,7 +19,8 @@ LICENSE=	GPLv2
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-OPTIONS=	SSE2 "Use SSE2 for floating point" Off
+OPTIONS_DEFINE=	SSE2
+SSE2_DESC=	Use SSE2 for floating point
 
 MAN1=		quartzcheck.1 quartzcompact.1 quartzdump.1 \
 		xapian-check.1 xapian-compact.1 xapian-config.1 \
@@ -27,7 +28,9 @@ MAN1=		quartzcheck.1 quartzcompact.1 quartzdump.1 \
 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME:S/10$//}
 
-.if defined(WITHOUT_SSE2)
+.include <bsd.port.options.mk>
+
+.if empty(PORT_OPTIONS:MSSE2)
 CONFIGURE_ARGS+=	--disable-sse
 .endif
 
@@ -35,7 +38,7 @@ post-install:
 .for file in delve quest copydatabase
 	${INSTALL_PROGRAM} ${WRKSRC}/examples/.libs/${file} ${PREFIX}/bin/xapian-${file}
 .endfor
-.ifdef(NOPORTDOCS)
+.if	empty(PORT_OPTIONS:MDOCS)
 	${RM} -rf ${DOCSDIR}
 .endif
 
diff --git a/deskutils/phpcollab/Makefile b/deskutils/phpcollab/Makefile
index fdbe03a4dd5..b518811f999 100644
--- a/deskutils/phpcollab/Makefile
+++ b/deskutils/phpcollab/Makefile
@@ -25,20 +25,19 @@ PKGMESSAGE=	${WRKDIR}/${PORTNAME}/pkg-message
 SUB_FILES=      pkg-message
 PLIST_DIRSTRY=	%%WWWDIR%%
 
-OPTIONS=	POSTGRE "Use PostgreSQL Database" off \
-		APACHE "Use Apache webserver" on \
-		LIGHTTPD "Use Lighttpd webserver" off
+OPTIONS_DEFINE=	PGSQL APACHE LIGHTTPD
+LIGHTTPD_DESC=	Use Lighttpd webserver
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_POSTGRE)
+.if ${PORT_OPTIONS:MPGSQL}
 USE_PHP+=	pgsql
 RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo_pgsql.so:${PORTSDIR}/databases/php5-pdo_pgsql
 .endif
-.if defined(WITH_APACHE)
+.if ${PORT_OPTIONS:MAPACHE}
 USE_APACHE=	22
 .endif
-.if defined(WITH_LIGHTTPD)
+.if ${PORT_OPTIONS:MLIGHTTPD}
 RUN_DEPENDS+=	lighttpd:${PORTSDIR}/www/lighttpd
 .endif
 
diff --git a/deskutils/planner.el/Makefile b/deskutils/planner.el/Makefile
index 02077259db1..6616cc8bb7f 100644
--- a/deskutils/planner.el/Makefile
+++ b/deskutils/planner.el/Makefile
@@ -22,13 +22,14 @@ USE_GMAKE=	yes
 
 BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_SITE_LISPDIR}/muse/muse.el:${PORTSDIR}/textproc/muse
 
-OPTIONS=	BBDB "BBDB support" off
-OPTIONS+=	GNATS "GNATS support" off
-OPTIONS+=	PSVN "PSVN support" off
-OPTIONS+=	VM "View Mail support" off
-OPTIONS+=	W3M "W3M support" off
-OPTIONS+=	WL "Wanderlust support" off
-OPTIONS+=	XTLA "XTLA support" off
+OPTIONS_DEFINE=	BBDB GNATS PSVN VM W3M WL XTLA DOCS
+BBDB_DESC=	BBDB support
+GNATS_DESC=	GNATS support
+PSVN_DESC=	PSVN support
+VM_DESC=	View Mail support
+W3M_DESC=	W3M support
+WL_DESC=	Wanderlust support
+XTLA_DESC=	XTLA support
 
 .include <bsd.port.pre.mk>
 
@@ -42,7 +43,7 @@ PLIST_SUB+=	HAS_ICAL="@comment "
 PLIST_SUB+=	HAS_ICAL=""
 .endif
 
-.if defined(WITH_BBDB)
+.if ${PORT_OPTIONS:MBBDB}
 BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/bbdb/bbdb-com.el:${PORTSDIR}/databases/bbdb
 PLIST_SUB+=	HAS_BBDB=""
 .else
@@ -56,42 +57,42 @@ PLIST_SUB+=	HAS_ERC="@comment "
 PLIST_SUB+=	HAS_ERC=""
 .endif
 
-.if defined(WITH_GNATS)
+.if ${PORT_OPTIONS:MGNATS}
 BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_SITE_LISPDIR}/gnats.el:${PORTSDIR}/databases/gnats4
 PLIST_SUB+=	HAS_GNATS=""
 .else
 PLIST_SUB+=	HAS_GNATS="@comment "
 .endif
 
-.if defined(WITH_PSVN)
+.if ${PORT_OPTIONS:MPSVN}
 BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/psvn/psvn.el:${PORTSDIR}/devel/psvn
 PLIST_SUB+=	HAS_PSVN=""
 .else
 PLIST_SUB+=	HAS_PSVN="@comment "
 .endif
 
-.if defined(WITH_VM)
+.if ${PORT_OPTIONS:MVM}
 BUILD_DEPENDS+=	qp-decode:${PORTSDIR}/mail/vm
 PLIST_SUB+=	HAS_VM=""
 .else
 PLIST_SUB+=	HAS_VM="@comment "
 .endif
 
-.if defined(WITH_W3M)
+.if ${PORT_OPTIONS:MW3M}
 BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/w3m/w3m.el:${PORTSDIR}/www/emacs-w3m
 PLIST_SUB+=	HAS_W3M=""
 .else
 PLIST_SUB+=	HAS_W3M="@comment "
 .endif
 
-.if defined(WITH_WL)
+.if ${PORT_OPTIONS:MWL}
 BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/wl/wl.el:${PORTSDIR}/mail/wanderlust
 PLIST_SUB+=	HAS_WL=""
 .else
 PLIST_SUB+=	HAS_WL="@comment "
 .endif
 
-.if defined(WITH_XTLA)
+.if ${PORT_OPTIONS:MXTLA}
 BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/xtla/xtla.el:${PORTSDIR}/devel/xtla
 PLIST_SUB+=	HAS_XTLA=""
 .else
@@ -102,7 +103,7 @@ RUN_DEPENDS+=	${BUILD_DEPENDS}
 
 LISPDIR=	${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/planner
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	AUTHORS ChangeLog.1 ChangeLog.2 ChangeLog.3 ChangeLog \
 		COMMENTARY NEWS README
 .endif
@@ -114,7 +115,7 @@ pre-build:
 	${CP} ${WRKSRC}/contrib/schedule.el ${WRKSRC}/schedule.el
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .for i in ${PORTDOCS}
 	${CP} -R ${WRKSRC}/${i} ${DOCSDIR}