Convert to new options framework

5 files changed, 62 insertions, 84 deletions

diff --git a/databases/sqlite2/Makefile b/databases/sqlite2/Makefile
index f7922b6..c25d91a 100644
--- a/databases/sqlite2/Makefile
+++ b/databases/sqlite2/Makefile
@@ -29,39 +29,20 @@ LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}2
 
 EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude CVS
 
-OPTIONS=	TCLWRAPPER	"Enable TCL wrapper"			off \
-		THREADS		"Compile with threads support"		off \
-		DOCS		"Building docs (depends on TCL)"	on
+OPTIONS_DEFINE=	TCL THREADS DOCS
 
-.include <bsd.port.pre.mk>
-
-# Deprecated options
-.if defined(SQLITE_WITH_TCL83) || defined(WITH_TCL83)
-WITH_TCL_VER=		83
-WITH_TCLWRAPPER=	yes
-.endif
-.if defined(SQLITE_WITH_TCL84) || defined(WITH_TCL84)
-WITH_TCL_VER=		84
-WITH_TCLWRAPPER=	yes
-.endif
+.include <bsd.port.options.mk>
 
-.if defined(WITHOUT_DOCS)
-NOPORTDOCS=		yes
-.elif defined(NOPORTDOCS)
-WITHOUT_DOCS=		yes
-.endif
-
-.if defined(WITH_TCLWRAPPER)
+.if ${PORT_OPTIONS:MTCL}
 USE_TCL=		83+
-.include		"${PORTSDIR}/Mk/bsd.tcl.mk"
 .else
-. if !defined(WITHOUT_DOCS)
+.if ${PORT_OPTIONS:MDOCS}
 USE_TCL_BUILD=		83+
-. include		"${PORTSDIR}/Mk/bsd.tcl.mk"
 . endif
 .endif
 
-.if defined(WITH_TCLWRAPPER)
+.include <bsd.port.pre.mk>
+.if ${PORT_OPTIONS:MTCL}
 CATEGORIES+=	lang tcl
 COMMENT+=	with TCL wrapper
 MAKE_ARGS+=	TCLSH=${TCLSH}
@@ -71,7 +52,7 @@ PLIST_SUB+=	WITH_TCLWRAPPER=""
 PLIST_SUB+=	WITH_TCLWRAPPER="@comment "
 .endif
 
-.if !defined(WITHOUT_DOCS)
+.if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	*
 MAKE_ARGS+=	TCLSH=${TCLSH}
 MAKE_ENV+=	TCL_VER=${TCL_VER}
@@ -80,7 +61,7 @@ MAKE_ENV+=	TCL_VER=${TCL_VER}
 post-patch:
 	@${REINPLACE_CMD} -e "s/tclsh \$$(TOP)/\$$(TCLSH) \$$(TOP)/g" \
 		 -e "s|\./libtool|${LIBTOOL}|g" ${WRKSRC}/Makefile.in
-.if defined(WITH_TCLWRAPPER) || !defined(WITHOUT_DOCS)
+.if ${PORT_OPTIONS:MTCL} || !empty(PORT_OPTIONS:MDOCS)
 	@${ECHO} "config_TARGET_TCL_INC=\"-I${TCL_INCLUDEDIR}\"" \
 		> ${WRKSRC}/freebsd.hints
 	@${ECHO} "config_TARGET_TCL_LIBS=\"-L${PREFIX}/lib -ltcl${TCL_VER:S/.//}\"" \
@@ -88,23 +69,23 @@ post-patch:
 .else
 	@${ECHO} "" > ${WRKSRC}/freebsd.hints
 .endif
-.if defined(WITH_THREADS)
+.if ${PORT_OPTIONS:MTHREADS}
 	@${ECHO} "config_TARGET_CFLAGS=\"-DTHREADSAFE=1 ${PTHREAD_LIBS}\"" \
 		>> ${WRKSRC}/freebsd.hints
 .endif
 
 post-build:
-.if !defined(NOPORTDOCS) && !defined(WITHOUT_DOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${ECHO_MSG} "===> Building docs"
 	@(cd ${WRKSRC} && ${GMAKE} ${MAKE_ARGS} doc)
 .endif
 
 post-install:
-.if defined(WITH_TCLWRAPPER)
+.if ${PORT_OPTIONS:MTCL}
 	@(cd ${WRKSRC} && ${GMAKE} install-tcl)
 	${INSTALL_DATA} ${FILESDIR}/pkgIndex.tcl ${PREFIX}/lib/sqlite/
 .endif
-.if !defined(NOPORTDOCS) && !defined(WITHOUT_DOCS)
+.if ${PORT_OPTIONS:MTCL}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
 .endif
diff --git a/deskutils/surrealtodo/Makefile b/deskutils/surrealtodo/Makefile
index ad184e7..f123531 100644
--- a/deskutils/surrealtodo/Makefile
+++ b/deskutils/surrealtodo/Makefile
@@ -25,19 +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
+OPTIONS_DEFAULT=	APACHE
+LIGHTTPD_DESC=	Use Lighttpd webserver
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_POSTGRE)
+.if ${PORT_OPTIONS:MPOSTGRE}
 USE_PHP+=	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/taskjuggler/Makefile b/deskutils/taskjuggler/Makefile
index 02b2259..544cfee 100644
--- a/deskutils/taskjuggler/Makefile
+++ b/deskutils/taskjuggler/Makefile
@@ -22,8 +22,8 @@ BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Class/MethodMaker.pm:${PORTSDIR}/devel/
 		${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-OPTIONS=	DOCS "Build documentation" on \
-		KDE "Build KDE frontend" on
+OPTIONS_DEFINE=	DOCS KDE3
+OPTIONS_DEFAULT=	KDE3
 
 USE_BZIP2=	yes
 USE_QT_VER=	3
@@ -38,19 +38,15 @@ USE_LDCONFIG=	yes
 
 AUTOTOOLSFILES=	admin/cvs.sh
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITHOUT_DOCS)
-NOPORTDOCS=	true
-.endif
-
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 BUILD_DEPENDS+=	xsltproc:${PORTSDIR}/textproc/libxslt
 .else
 CONFIGURE_ARGS+=--disable-docs
 .endif
 
-.if !defined(WITHOUT_KDE)
+.if ${PORT_OPTIONS:MKDE3}
 LIB_DEPENDS+=	kimproxy:${PORTSDIR}/x11/kdelibs3 \
 		kcal.2:${PORTSDIR}/deskutils/kdepim3
 PLIST_SUB+=	KDE=""
@@ -92,4 +88,4 @@ regression-test:
 	@(cd ${BUILD_WRKSRC}/TestSuite;	\
 	${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/antlr/Makefile b/devel/antlr/Makefile
index 32836b5..b5f5e35 100644
--- a/devel/antlr/Makefile
+++ b/devel/antlr/Makefile
@@ -21,7 +21,7 @@ USE_GMAKE=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.5+
 
-OPTIONS=	PYTHON "Include Python runtime support" off
+OPTIONS_DEFINE=	PYTHON DOCS
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	JAVAC="${JAVAC}" JAR="${JAR}" JAVA="${JAVA}" CLASSPATH="${PORT_CLASSPATH}"
@@ -29,8 +29,9 @@ CONFIGURE_ARGS=	--disable-csharp --prefix=${PREFIX}
 
 PORT_CLASSPATH=	${WRKSRC}/antlrall.jar:.
 
+.include <bsd.port.options.mk>
 EXAMPLES=	cpp java
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	ANTLRException.gif closure.gif cpp-runtime.html \
 		csharp-runtime.html err.html glossary.html hidden.stream.gif \
 		index.html inheritance.html j-guru-blue.jpg jguru-logo.gif \
@@ -41,13 +42,10 @@ PORTDOCS=	ANTLRException.gif closure.gif cpp-runtime.html \
 		vocab.html
 .endif
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_PYTHON)
+.if ${PORT_OPTIONS:MPYTHON}
 USE_PYTHON=	2.2+
-# we need to manually include this, because USE_PYTHON is defined
-# after including bsd.port.pre.mk
-.include "${PORTSDIR}/Mk/bsd.python.mk"
 PORTDOCS+=	python-runtime.html
 ANTLR_PYTHON=	${WRKSRC}/lib/python
 PLIST_SUB+=	WITH_PYTHON=""
@@ -62,7 +60,7 @@ post-configure:
 	${SED} -e 's|%%JAVAJARDIR%%|${JAVAJARDIR}|' \
 	-e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 	-e 's|%%JAVA_VERSION%%|${JAVA_VERSION}|' ${FILESDIR}/antlr.sh > ${WRKDIR}/antlr.sh
-.if defined(WITH_PYTHON)
+.if ${PORT_OPTIONS:MPYTHON}
 	(cd ${ANTLR_PYTHON} && ${PYTHON_CMD} setup.py config)
 .endif
 
@@ -72,7 +70,7 @@ pre-build:
 	(cd ${WRKSRC} && ${JAVA} -classpath "${PORT_CLASSPATH}" antlr.build.Tool jar)
 .endif
 
-.if defined(WITH_PYTHON)
+.if ${PORT_OPTIONS:MPYTHON}
 post-build:
 	(cd ${ANTLR_PYTHON} && ${PYTHON_CMD} setup.py build && \
 	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${ANTLR_PYTHON})
@@ -89,16 +87,16 @@ do-install:
 	@${ECHO_MSG} ">> Installing native files..."
 	@(cd ${WRKSRC}/lib/cpp && ${GMAKE} install)
 	@${ECHO_MSG} "   [ DONE ]"
-.if defined(WITH_PYTHON)
+.if ${PORT_OPTIONS:MPYTHON}
 	@${ECHO_MSG} -n ">> Installing Python runtime files..."
 	@(cd ${ANTLR_PYTHON} && ${PYTHON_CMD} setup.py install)
 	@${ECHO_MSG} "   [ DONE ]"
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
 	@${MKDIR} ${DOCSDIR}
 	@cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
 	@${ECHO_MSG} " [ DONE ]"
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/asmx/Makefile b/devel/asmx/Makefile
index e8c999a..9029096 100644
--- a/devel/asmx/Makefile
+++ b/devel/asmx/Makefile
@@ -20,65 +20,68 @@ ALL_TARGET=
 
 PORTDOCS=	README.txt
 
-OPTIONS=	1802 "RCA 1802" On \
-		6502 "MOS Technology 6502, 65C02 and 6502" On \
-		6809 "Motorola 6809" On \
-		68HC11 "Motorola 6800/6801/68HC11 and Hitachi 6303" On \
-		68HC16 "Motorola 68HC16" On \
-		68000 "Motorola 68000/68010" On \
-		8051 "Intel 8051" On \
-		8085 "Intel 8080 and 8085" On \
-		F8 "Fairchild F8" On \
-		Z80 "Zilog Z-80 and Nintendo Gameboy Z-80 variant" On
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_1802)
+OPTIONS_DEFINE=	1802 6502 6809 68HC11 68HC16 8051 8085 F8 Z80 DOCS
+OPTIONS_DEFAULT=	1802 6502 6809 68HC11 68HC16 8051 8085 F8 Z80
+
+1802_DESC=	RCA 1802
+6502_DESC=	MOS Technology 6502, 65C02 and 6502
+6809_DESC=	Motorola 6809
+68HC11_DESC=	Motorola 6800/6801/68HC11 and Hitachi 6303
+68HC16_DESC=	Motorola 68HC16
+68000_DESC=	Motorola 68000/68010
+8051_DESC=	Intel 8051
+8085_DESC=	Intel 8080 and 8085
+F8_DESC=	Fairchild F8
+Z80_DESC=	Zilog Z-80 and Nintendo Gameboy Z-80 variant
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:M1802}
 ALL_TARGET+=	asmx-1802
 PLIST_FILES+=	bin/asmx-1802
 .endif
 
-.if defined(WITH_6502)
+.if ${PORT_OPTIONS:M6502}
 ALL_TARGET+=	asmx-6502
 PLIST_FILES+=	bin/asmx-6502
 .endif
 
-.if defined(WITH_6809)
+.if ${PORT_OPTIONS:M6809}
 ALL_TARGET+=	asmx-6809
 PLIST_FILES+=	bin/asmx-6809
 .endif
 
-.if defined(WITH_68HC11)
+.if ${PORT_OPTIONS:M68HC11}
 ALL_TARGET+=	asmx-68hc11
 PLIST_FILES+=	bin/asmx-68hc11
 .endif
 
-.if defined(WITH_68HC16)
+.if ${PORT_OPTIONS:M68HC16}
 ALL_TARGET+=	asmx-68hc16
 PLIST_FILES+=	bin/asmx-68hc16
 .endif
 
-.if defined(WITH_68000)
+.if ${PORT_OPTIONS:M68000}
 ALL_TARGET+=	asmx-68k
 PLIST_FILES+=	bin/asmx-68k
 .endif
 
-.if defined(WITH_8051)
+.if ${PORT_OPTIONS:M8051}
 ALL_TARGET+=	asmx-8051
 PLIST_FILES+=	bin/asmx-8051
 .endif
 
-.if defined(WITH_8085)
+.if ${PORT_OPTIONS:M8085}
 ALL_TARGET+=	asmx-8085
 PLIST_FILES+=	bin/asmx-8085
 .endif
 
-.if defined(WITH_F8)
+.if ${PORT_OPTIONS:MF8}
 ALL_TARGET+=	asmx-f8
 PLIST_FILES+=	bin/asmx-f8
 .endif
 
-.if defined(WITH_Z80)
+.if ${PORT_OPTIONS:MZ80}
 ALL_TARGET+=	asmx-z80
 PLIST_FILES+=	bin/asmx-z80
 .endif
@@ -93,9 +96,9 @@ do-install:
 .for f in ${ALL_TARGET}
 	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/bin/
 .endfor
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.txt ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>