Convert to new options framework

6 files changed, 96 insertions, 95 deletions

diff --git a/x11-toolkits/fltk2/Makefile b/x11-toolkits/fltk2/Makefile
index 877c46116b3..fd708047c7e 100644
--- a/x11-toolkits/fltk2/Makefile
+++ b/x11-toolkits/fltk2/Makefile
@@ -36,10 +36,12 @@ LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png \
 
 SNAPSHOT=	r9166
 
-OPTIONS=	FLTK_THREADS "Install with threads support" on \
-		FLTK_CAIRO "Use cairo as graphics backend" off \
-		FLTK_EXAMPLES "Build and install example programs" on \
-		FLTK_XINERAMA "Enable Xinerama support" on
+OPTIONS_DEFINE=	THREADS CAIRO EXAMPLES XINERAMA DOCS
+OPTIONS_DEFAULT=	THREADS XINERAMA
+#OPTIONS=	THREADS "Install with threads support" on \
+#		CAIRO "Use cairo as graphics backend" off \
+#		EXAMPLES "Build and install example programs" on \
+#		XINERAMA "Enable Xinerama support" on
 
 EXAMPLESDIR=	${PREFIX}/share/examples/fltk2
 LATEST_LINK=	fltk2
@@ -63,9 +65,9 @@ CONFIGURE_ARGS+=	--disable-shared
 DOCSDIR=	${PREFIX}/share/doc/fltk2
 PORTDOCS=	*
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_FLTK_THREADS)
+.if ${PORT_OPTIONS:MTHREADS}
 CONFIGURE_ARGS+=	--enable-threads
 CPPFLAGS+=	${PTHREAD_CFLAGS}
 LDFLAGS+=	${PTHREAD_LIBS}
@@ -73,7 +75,7 @@ LDFLAGS+=	${PTHREAD_LIBS}
 CONFIGURE_ARGS+=	--disable-threads
 .endif
 
-.if defined(WITH_FLTK_CAIRO)
+.if ${PORT_OPTIONS:MCAIRO}
 CONFIGURE_ARGS+=	--enable-cairo
 LIB_DEPENDS+=	cairo.2:${PORTSDIR}/graphics/cairo
 # XXX:
@@ -83,7 +85,7 @@ BUILD_DEPENDS+=	pkg-config:${PORTSDIR}/devel/pkg-config
 CONFIGURE_ARGS+=	--disable-cairo
 .endif
 
-.if defined(WITH_FLTK_EXAMPLES) && !defined (NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 example_apps=	ansiwidget arc \
 		bitmap boxtype browser button buttons \
 		cairo callbacks checkers clock color_chooser cube \
@@ -113,7 +115,7 @@ PORTEXAMPLES=	*
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-Makefile
 .endif
 
-.if defined(WITH_FLTK_XINERAMA)
+.if ${PORT_OPTIONS:MXINERAMA}
 USE_XORG+=	xinerama
 CONFIGURE_ARGS+=	--enable-xinerama
 .else
@@ -126,12 +128,12 @@ post-patch:
 	    ${WRKSRC}/makeinclude.in
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC}/documentation && ${INSTALL_DATA} *.html *.gif ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README_fltk1_to_fltk2.txt ${DOCSDIR}
 .endif
-.if defined(WITH_FLTK_EXAMPLES) && !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${EXAMPLESDIR}/images
 	for f in ${example_apps} ; do \
 	    ${INSTALL_PROGRAM} ${WRKSRC}/test/$${f} ${EXAMPLESDIR} ; \
@@ -144,4 +146,4 @@ post-install:
 	done
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/gtkdatabox/Makefile b/x11-toolkits/gtkdatabox/Makefile
index 1c272b2cb45..0c27270ba02 100644
--- a/x11-toolkits/gtkdatabox/Makefile
+++ b/x11-toolkits/gtkdatabox/Makefile
@@ -22,16 +22,17 @@ USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS+=	--includedir="${PREFIX}/include/${PORTNAME}" \
 			--with-html-dir="${PREFIX}/share/doc"
 
-OPTIONS=	GLADE "Enable libglade2 support" off \
-		GLADEUI "Enable glade3 support" off
+OPTIONS_DEFINE= GLADE GLADEUI DOCS EXAMPLES
+GLADE_DESC=	Enable libglade2 support
+GLADEUI_DESC=	Enable glade3 support
 
 .include <bsd.port.pre.mk>
 
-.if defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 USE_GNOME+=	referencehack
 .endif
 
-.if !defined(WITHOUT_GLADE)
+.if ${PORT_OPTIONS:MGLADE}
 USE_GNOME+=	libglade2
 CONFIGURE_ARGS+=	--enable-libglade
 PLIST_SUB+=	GLADE=""
@@ -40,7 +41,7 @@ CONFIGURE_ARGS+=	--disable-libglade
 PLIST_SUB+=	GLADE="@comment "
 .endif
 
-.if !defined(WITHOUT_GLADEUI)
+.if ${PORT_OPTIONS:MGLADEUI}
 LIB_DEPENDS+=	gladeui-1.10:${PORTSDIR}/devel/glade3
 CONFIGURE_ARGS+=	--enable-glade
 PLIST_SUB+=	GLADEUI=""
@@ -58,7 +59,7 @@ post-patch:
 		${WRKSRC}/gtk/Makefile.in ${WRKSRC}/examples/Makefile.in
 
 post-install:
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/*.c ${EXAMPLESDIR}
 .endif
diff --git a/x11-toolkits/ocaml-lablgtk/Makefile b/x11-toolkits/ocaml-lablgtk/Makefile
index 94b24f38e9e..9dd3a1fe3e6 100644
--- a/x11-toolkits/ocaml-lablgtk/Makefile
+++ b/x11-toolkits/ocaml-lablgtk/Makefile
@@ -27,9 +27,8 @@ CONFIGURE_ENV=	USE_DOTOPT=1 GTK_CONFIG=${GTK_CONFIG} \
 		DLLDIR=${PREFIX}/lib/ocaml/stublibs
 MAKE_JOBS_UNSAFE=	yes
 
-OPTIONS=	GL	"Enable OpenGL support" on \
-		GNOME	"Enable GNOME support" off \
-		GLADE	"Enable Glade support" off
+OPTIONS_DEFINE=	OPENGL GNOME GLADE DOCS
+OPTIONS_DEFAULT=	OPENGL
 
 EXAMPLESDIR=	${PREFIX}/share/examples/ocaml/${PORTNAME}
 DOCSDIR=	${PREFIX}/share/doc/ocaml/${PORTNAME}
@@ -39,18 +38,18 @@ PATTERN=	[[:space:]]*(do|then)?[[:space:]]*)cp([[:space:]]
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITHOUT_GL)
-PLIST_SUB+=	GL="@comment "
-SFXGL=		-nogl
-.else
+.if ${PORT_OPTIONS:MOPENGL}
 PLIST_SUB+=	GL=""
 BUILD_DEPENDS+=	lablgl:${PORTSDIR}/graphics/ocaml-lablgl
 RUN_DEPENDS+=	lablgl:${PORTSDIR}/graphics/ocaml-lablgl
 LIB_DEPENDS+=	gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
 CONFIGURE_ENV+=	USE_GL=1
+.else
+PLIST_SUB+=	GL="@comment "
+SFXGL=		-nogl
 .endif
 
-.if defined(WITH_GNOME)
+.if ${PORT_OPTIONS:MGNOME}
 PLIST_SUB+=	GNOME=""
 USE_GNOME=	gdkpixbuf
 CONFIGURE_ENV+=	USE_GNOME=1
@@ -59,9 +58,9 @@ PLIST_SUB+=	GNOME="@comment "
 SFXGNOME=	-nognome
 .endif
 
-.if defined(WITH_GLADE)
+.if ${PORT_OPTIONS:MGLADE}
 PLIST_SUB+=	GLADE=""
-.if defined(WITH_GNOME)
+.if ${PORT_OPTIONS:MGNOME}
 USE_GNOME+=	libglade
 .else
 LIB_DEPENDS+=	glade.4:${PORTSDIR}/devel/libglade
@@ -92,19 +91,19 @@ post-install:
 	@${MKDIR} ${EXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/examples/*.rgb \
 		${WRKSRC}/examples/*.ml ${WRKSRC}/examples/*.xpm ${EXAMPLESDIR}
-.if !defined(WITHOUT_GL)
+.if ${PORT_OPTIONS:MOPENGL}
 	@${MKDIR} ${EXAMPLESDIR}/GL
 	@${INSTALL_DATA} ${WRKSRC}/examples/GL/* ${EXAMPLESDIR}/GL
 .endif
-.if defined(WITH_GNOME)
+.if ${PORT_OPTIONS:MGNOME}
 	@${MKDIR} ${EXAMPLESDIR}/xmhtml
 	@${INSTALL_DATA} ${WRKSRC}/examples/xmhtml/* ${EXAMPLESDIR}/xmhtml
 .endif
-.if defined(WITH_GLADE)
+.if ${PORT_OPTIONS:MGLADE}
 	@${MKDIR} ${EXAMPLESDIR}/glade
 	@${INSTALL_DATA} ${WRKSRC}/examples/glade/* ${EXAMPLESDIR}/glade
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/README
 .endif
diff --git a/x11-toolkits/py-qt/Makefile b/x11-toolkits/py-qt/Makefile
index 8b7a3b0c322..924b9b3528c 100644
--- a/x11-toolkits/py-qt/Makefile
+++ b/x11-toolkits/py-qt/Makefile
@@ -25,9 +25,9 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-s
 USE_QT_VER=	3
 USE_PYTHON=	2.5+
 
-OPTIONS=	DEBUG "Enable debugging symbols" off \
-		OPENGL "Enable OpenGL support" on \
-		TRACING	"Enable tracing in generated code" off
+OPTIONS_DEFINE=	DEBUG OPENGL TRACING EXAMPLES DOCS
+OPTIONS_DEFAULT=	OPENGL
+TRACING_DESC=	Enable tracing in generated code
 
 DATADIR=	${PREFIX}/share/py-sip
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
@@ -40,10 +40,10 @@ MODULES=	qt qtcanvas qtnetwork qttable qtxml qtui qtsql qtext
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
 ARGS+=		-u
 .endif
-.if exists(${LOCALBASE}/include/qgl.h) && !defined(WITHOUT_OPENGL)
+.if exists(${LOCALBASE}/include/qgl.h) && ${PORT_OPTIONS:MOPENGL}
 PLIST_SUB+=	OPENGL=""
 MODULES+=	qtgl
 .else
@@ -53,7 +53,7 @@ pre-configure:
 		"**  OpenGL is disabled (chosen here or your Qt3 has no OpenGL support) **"\
 		&& ${ECHO_CMD}
 .endif
-.if defined(WITH_TRACING)
+.if ${PORT_OPTIONS:MTRACING}
 ARGS+=		-r
 .endif
 
@@ -72,7 +72,7 @@ post-configure:
 .endfor
 
 post-build:
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	cd ${WRKSRC} &&\
 		${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py examples3
 .endif
@@ -81,12 +81,12 @@ post-install:
 	cd ${PYTHON_SITELIBDIR} &&\
 		${PYTHON_CMD} -c "import pyqtconfig" &&\
 		${PYTHON_CMD} -O -c "import pyqtconfig"
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	cd ${WRKSRC} &&\
 		${MKDIR} ${DOCSDIR} &&\
 		${INSTALL_DATA} ChangeLog NEWS README doc/* ${DOCSDIR}
 .endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	cd ${WRKSRC}/examples3 &&\
 		${MKDIR} ${EXAMPLESDIR}/SQL ${EXAMPLESDIR}/canvas\
 			${EXAMPLESDIR}/i18n ${EXAMPLESDIR}/webbrowser &&\
diff --git a/x11-toolkits/qscintilla/Makefile b/x11-toolkits/qscintilla/Makefile
index fd201a9e2ce..dca7d56bca0 100644
--- a/x11-toolkits/qscintilla/Makefile
+++ b/x11-toolkits/qscintilla/Makefile
@@ -21,13 +21,14 @@ USE_QT_VER=	3
 MAKE_ENV=	QTDIR="${QT_PREFIX}"
 USE_LDCONFIG=	yes
 
-OPTIONS=	DESIGNER_PLUGIN "Install plugin for Qt Designer" on \
-		DOCS "Install documentation" on \
-		EXAMPLES "Install examples" on \
-		LANG_DE "Install German translation" on \
-		LANG_FR "Install French translation" on \
-		LANG_PTBR "Install Brazilian Portuguese translation" on \
-		LANG_RU "Install Russian translation" on
+OPTIONS_DEFINE=	DESIGNER_PLUGIN DOCS EXAMPLES LANG_DE LANG_FR LANG_PTBR LANG_RU
+OPTIONS_DEFAULT=	DESIGNER_PLUGIN DOCS EXAMPLES LANG_DE LANG_FR LANG_PTBR LANG_RU
+
+DESIGNER_PLUGIN_DESC=	Install plugin for Qt Designer
+LANG_DE_DESC=		Install German translation
+LANG_FR_DESC=		Install French translation
+LANG_PTBR_DESC=		Install Brazilian Portuguese translation
+LANG_RU_DESC=		Install Russian translation
 
 QMAKE=		${LOCALBASE}/bin/qmake
 SPEC=		${LOCALBASE}/share/qt/mkspecs/freebsd-g++
@@ -35,45 +36,45 @@ PLUGINDIR=	${LOCALBASE}/lib/plugins/designer
 
 .include <bsd.port.pre.mk>
 
-.if defined(NOPORTDOCS) || defined(WITHOUT_DOCS)
-PLIST_SUB+=	DOCS="@comment "
-.else
+.if ${PORT_OPTIONS:MDOCS}
 PLIST_SUB+=	DOCS=""
-.endif
-.if defined(NOPORTEXAMPLES) || defined(WITHOUT_EXAMPLES)
-PLIST_SUB+=	EXAMPLES="@comment "
 .else
-PLIST_SUB+=	EXAMPLES=""
+PLIST_SUB+=	DOCS="@comment "
 .endif
-.if defined(WITHOUT_DESIGNER_PLUGIN)
-PLIST_SUB+=	DESIGNER_PLUGIN="@comment "
+.if ${PORT_OPTIONS:MEXAMPLES}
+PLIST_SUB+=	EXAMPLES=""
 .else
-PLIST_SUB+=	DESIGNER_PLUGIN=""
+PLIST_SUB+=	EXAMPLES="@comment "
 .endif
-.if defined(WITHOUT_LANG_DE)
-PLIST_SUB+=	LANG_DE="@comment "
+.if ${PORT_OPTIONS:MDESIGNER_PLUGIN}
+PLIST_SUB+=	DESIGNER_PLUGIN=""
 .else
-PLIST_SUB+=	LANG_DE=""
+PLIST_SUB+=	DESIGNER_PLUGIN="@comment "
 .endif
-.if defined(WITHOUT_LANG_FR)
-PLIST_SUB+=	LANG_FR="@comment "
+.if ${PORT_OPTIONS:MLANG_DE}
+PLIST_SUB+=	LANG_DE=""
 .else
-PLIST_SUB+=	LANG_FR=""
+PLIST_SUB+=	LANG_DE="@comment "
 .endif
-.if defined(WITHOUT_LANG_PTBR)
-PLIST_SUB+=	LANG_PTBR="@comment "
+.if ${PORT_OPTIONS:MLANG_FR}
+PLIST_SUB+=	LANG_FR=""
 .else
-PLIST_SUB+=	LANG_PTBR=""
+PLIST_SUB+=	LANG_FR="@comment "
 .endif
-.if defined(WITHOUT_LANG_RU)
-PLIST_SUB+=	LANG_RU="@comment "
+.if ${PORT_OPTIONS:MLANG_PTBR}
+PLIST_SUB+=	LANG_PTBR=""
 .else
-PLIST_SUB+=	LANG_RU=""
+PLIST_SUB+=	LANG_PTBR="@comment "
 .endif
-.if defined(WITHOUT_LANG_DE) && defined(WITHOUT_LANG_FR) && defined(WITHOUT_LANG_PTBR) && defined(WITHOUT_LANG_RU)
-PLIST_SUB+=	TRANSLATIONS="@comment "
+.if ${PORT_OPTIONS:MLANG_RU}
+PLIST_SUB+=	LANG_RU=""
 .else
+PLIST_SUB+=	LANG_RU="@comment "
+.endif
+.if ${PORT_OPTIONS:MLANG_DE} && ${PORT_OPTIONS:MLANG_FR} && ${PORT_OPTIONS:MLANG_PTBR} && ${PORT_OPTIONS:MLANG_RU}
 PLIST_SUB+=	TRANSLATIONS=""
+.else
+PLIST_SUB+=	TRANSLATIONS="@comment "
 .endif
 
 do-configure:
@@ -100,7 +101,7 @@ do-build:
 	( cd ${WRKSRC}/qt && ${SETENV} ${MAKE_ENV} ${MAKE} )
 
 post-build:
-.if !defined(WITHOUT_DESIGNER_PLUGIN)
+.if ${PORT_OPTIONS:MDESIGNER_PLUGIN}
 	( cd ${WRKSRC}/designer && ${SETENV} ${MAKE_ENV} \
 		${QMAKE} -spec ${SPEC} designer.pro && ${MAKE} )
 .endif
@@ -112,30 +113,30 @@ do-install:
 			${PREFIX}/lib/libqscintilla.so.7 && \
 		${LN} -sf ${PREFIX}/lib/libqscintilla.so.7 \
 			${PREFIX}/lib/libqscintilla.so )
-.if !defined(WITHOUT_DESIGNER_PLUGIN)
+.if ${PORT_OPTIONS:MDESIGNER_PLUGIN}
 	( cd ${WRKSRC} && \
 		${INSTALL_DATA} designer/libqscintillaplugin.so ${PLUGINDIR} )
 .endif
-.if !defined(WITHOUT_LANG_DE) || !defined(WITHOUT_LANG_FR) || !defined(WITHOUT_LANG_PTBR) || !defined(WITHOUT_LANG_RU)
+.if ${PORT_OPTIONS:MLANG_DE} || ${PORT_OPTIONS:MLANG_FR} || ${PORT_OPTIONS:MLANG_PTBR} || ${PORT_OPTIONS:MLANG_RU}
 	${MKDIR} -m 0755 ${DATADIR}/translations
 .endif
-.if !defined(WITHOUT_LANG_DE)
+.if ${PORT_OPTIONS:MLANG_DE}
 	( cd ${WRKSRC} && \
 		${INSTALL_DATA} qt/qscintilla_de.qm ${DATADIR}/translations )
 .endif
-.if !defined(WITHOUT_LANG_FR)
+.if ${PORT_OPTIONS:MLANG_FR}
 	( cd ${WRKSRC} && \
 		${INSTALL_DATA} qt/qscintilla_fr.qm ${DATADIR}/translations )
 .endif
-.if !defined(WITHOUT_LANG_PTBR)
+.if ${PORT_OPTIONS:MLANG_PTBR}
 	( cd ${WRKSRC} && \
 		${INSTALL_DATA} qt/qscintilla_pt_br.qm ${DATADIR}/translations )
 .endif
-.if !defined(WITHOUT_LANG_RU)
+.if ${PORT_OPTIONS:MLANG_RU}
 	( cd ${WRKSRC} && \
 		${INSTALL_DATA} qt/qscintilla_ru.qm ${DATADIR}/translations )
 .endif
-.if !defined(NOPORTDOCS) && !defined(WITHOUT_DOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	( cd ${WRKSRC} && \
 		${MKDIR} -m 0755 ${DOCSDIR}/html ${DOCSDIR}/Scintilla && \
 		${INSTALL_DATA} ChangeLog NEWS README ${DOCSDIR} && \
@@ -143,7 +144,7 @@ do-install:
 		${INSTALL_DATA} doc/html/* ${DOCSDIR}/html &&  \
 		${INSTALL_DATA} doc/Scintilla/* ${DOCSDIR}/Scintilla )
 .endif
-.if !defined(NOPORTEXAMPLES) && !defined(WITHOUT_EXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	( cd ${WRKSRC} && \
 		${MKDIR} -m 0755 ${EXAMPLESDIR} && \
 		${INSTALL_DATA} example/* ${EXAMPLESDIR} )
diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile
index 36a94555250..5478936d1de 100644
--- a/x11-toolkits/qt33/Makefile
+++ b/x11-toolkits/qt33/Makefile
@@ -60,11 +60,9 @@ EXTRACT_AFTER_ARGS=| ${TAR} -xf - \
 	--exclude '${DISTNAME}/include/np*' \
 	--exclude '${DISTNAME}/doc/html/qmake*'
 
-OPTIONS=	CUPS "Enable CUPS support" on \
-		KDE_PATCHES "Apply KDE patches" off \
-		NAS "Enable NAS support" on \
-		OPENGL "Enable OpenGL support" on \
-		XFT "Enable Xft support" on
+OPTIONS_DEFINE=	CUPS KDE_PATCHES NAS OPENGL XFT
+OPTIONS_DEFAULT= CUPS NAS OPENGL XFT
+KDE_PATCHES_DESC=	Apply KDE patches
 
 EXTRACT_COOKIE=	${WRKDIR}/.extract_done.${PORTNAME}.${PREFIX:S/\//_/g}
 CONFIGURE_COOKIE=${WRKDIR}/.configure_done.${PORTNAME}.${PREFIX:S/\//_/g}
@@ -93,7 +91,7 @@ CONFIGURE_ARGS+=-platform ${PLATFORM}
 CONFIGURE_ARGS+=-platform ${LOCALBASE}/share/qt/mkspecs/freebsd-g++
 .endif
 
-.if !defined(WITHOUT_XFT)
+.if ${PORT_OPTIONS:MXFT}
 LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 .elif defined(WITHOUT_XFT)
 CONFIGURE_ARGS+=-no-xft
@@ -103,28 +101,28 @@ CONFIGURE_ARGS+=-no-xft
 CONFIGURE_ARGS+=-debug
 .endif
 
-.if !defined(WITHOUT_OPENGL)
+.if ${PORT_OPTIONS:MOPENGL}
 USE_GL=		glu
 CONFIGURE_ARGS+=-dlopen-opengl
-.elif defined(WITHOUT_OPENGL)
+.else
 CONFIGURE_ARGS+=-disable-opengl
 .endif # WITHOUT_OPENGL
 
-.if !defined(WITHOUT_CUPS)
+.if ${PORT_OPTIONS:MCUPS}
 LIB_DEPENDS+=	cups.2:${PORTSDIR}/print/cups-client
 CUPS=	-cups -L${LOCALBASE}/lib -I${LOCALBASE}/include
-.elif defined(WITHOUT_CUPS)
+.else
 CUPS=
 .endif
 
-.if !defined(WITHOUT_NAS)
+.if ${PORT_OPTIONS:MNAS}
 LIB_DEPENDS+=	audio:${PORTSDIR}/audio/nas
 CONFIGURE_ARGS+=-system-nas-sound -no-pch
-.elif defined(WITHOUT_NAS)
+.else
 CONFIGURE_ARGS+=-no-nas-sound
 .endif
 
-.if defined(WITH_KDE_PATCHES)
+.if ${PORT_OPTIONS:MKDE_PATCHES}
 EXTRA_PATCHES+=	${PATCHDIR}/0001-dnd_optimization.patch \
 		${PATCHDIR}/0002-dnd_active_window_fix.patch \
 		${PATCHDIR}/0007-qpixmap_constants.patch \
@@ -153,7 +151,7 @@ EXTRA_PATCHES+=	${PATCHDIR}/0001-dnd_optimization.patch \
 PKGNAMESUFFIX=	-copy
 COMMENT+=	(+ KDE patches)
 CONFLICTS+=	qt-3.3.*
-.elif defined(WITHOUT_KDE_PATCHES)
+.else
 CONFLICTS+=	qt-copy-[0-9]*
 .endif