Convert to new options framework

16 files changed, 214 insertions, 211 deletions

diff --git a/x11-drivers/input-wacom/Makefile b/x11-drivers/input-wacom/Makefile
index c03aedee0703..1c483b12c858 100644
--- a/x11-drivers/input-wacom/Makefile
+++ b/x11-drivers/input-wacom/Makefile
@@ -50,15 +50,16 @@ CONFIGURE_WRKSRC=	${WRKDIR}/${LINUXWACOM}
 USE_AUTOTOOLS=	autoconf
 MAKE_ARGS+=	UDEV_CFLAGS=""
 
+OPTIONS_DEFINE=	UWACOMKLD
+UWACOMKLD_DESC=	Install USB kernel module (not supported on 8.x)
+
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 800064
-OPTIONS=	UWACOMKLD "Install USB kernel module (not supported on 8.x)" Off
-.else
-OPTIONS=	UWACOMKLD "Install USB kernel module (not supported on 8.x)" On
+.if ${OSVERSION} < 800064
+OPTIONS_DEFAULT=	UWACOMKLD
 .endif
 
-.if defined(WITH_UWACOMKLD)
+.if ${PORT_OPTIONS:MUWACOMKLD}
 .if ${OSVERSION} >= 800064
 BROKEN=		does not build with USB support
 .endif
@@ -70,7 +71,7 @@ PORTTYPE=	serial
 .endif
 
 do-build:
-.if defined(WITH_UWACOMKLD)
+.if ${PORT_OPTIONS:MUWACOMKLD}
 	@cd ${WRKDIR}/uwacom \
 		&& ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS}
 .endif
@@ -78,7 +79,7 @@ do-build:
 		&& ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS}
 
 do-install:
-.if defined(WITH_UWACOMKLD)
+.if ${PORT_OPTIONS:MUWACOMKLD}
 	@${MKDIR} ${KMODDIR}
 	@${INSTALL_KLD} ${WRKDIR}/uwacom/uwacom.ko ${KMODDIR}/
 .endif
diff --git a/x11-fonts/indic-ttf/Makefile b/x11-fonts/indic-ttf/Makefile
index 43db4c991935..9d8ba442d4fc 100644
--- a/x11-fonts/indic-ttf/Makefile
+++ b/x11-fonts/indic-ttf/Makefile
@@ -24,17 +24,23 @@ WRKSRC=		${WRKDIR}/${DISTNAME:S|_|-|}
 
 NO_BUILD=	yes
 
-OPTIONS=	BENGALI		"BENGALI font set" on \
-		DEVANAGARI	"DEVANAGARI font set" on \
-		GUJARATI	"GUJARATI font set" on \
-		KANNADA		"KANNADA font set" on \
-		MALAYALAM	"MALAYALAM font set" on \
-		ORIYA		"ORIYA font set" on \
-		PUNJABI		"PUNJABI font set" on \
-		TAMIL		"TAMIL font set" on \
-		TELUGU		"TELUGU font set" on
-
-.include <bsd.port.pre.mk>
+OPTIONS_MULTI=	FONTS
+OPTIONS_MULTI_FONTS=	BENGALI DEVANAGARI GUJARATI KANNADA ORIYA PUNJABI \
+			TAMIL TELUGU
+OPTIONS_DEFAULT=	BENGALI DEVANAGARI GUJARATI KANNADA ORIYA PUNJABI \
+			TAMIL TELUGU
+
+BENGALI_DESC=		BENGALI font set
+DEVANAGARI_DESC=	DEVANAGARI font set
+GUJARATI_DESC=		GUJARATI font set
+KANNADA_DESC=		KANNADA font set
+MALAYALAM_DESC=		MALAYALAM font set
+ORIYA_DESC=		ORIYA font set
+PUNJABI_DESC=		PUNJABI font set
+TAMIL_DESC=		TAMIL font set
+TELUGU_DESC=		TELUGU font set
+
+.include <bsd.port.options.mk>
 
 FONTSNAME=	${PORTNAME}
 FONTSDIR?=	${PREFIX}/lib/X11/fonts/${FONTSNAME}
@@ -53,75 +59,71 @@ SUB_FILES=	pkg-message
 SUB_LIST=	FONTSDIR=${FONTSDIR} \
 		CONFAVAILDIR=${CONFAVAILDIR}
 
-.if defined(WITHOUT_BENGALI)
-PLIST_SUB+=	BENGALI='@comment '
-.else
+.if ${PORT_OPTIONS:MBENGALI}
 FONTS=		bengali
 PLIST_SUB+=	BENGALI=''
+.else
+PLIST_SUB+=	BENGALI='@comment '
 .endif
 
-.if defined(WITHOUT_DEVANAGARI)
-PLIST_SUB+=	DEVANAGARI='@comment '
-.else
+.if ${PORT_OPTIONS:MDEVANAGARI}
 FONTS+=		devanagari
 PLIST_SUB+=	DEVANAGARI=''
+.else
+PLIST_SUB+=	DEVANAGARI='@comment '
 .endif
 
-.if defined(WITHOUT_GUJARATI)
-PLIST_SUB+=	GUJARATI='@comment '
-.else
+.if ${PORT_OPTIONS:MGUJARATI}
 FONTS+=		gujarati
 PLIST_SUB+=	GUJARATI=''
+.else
+PLIST_SUB+=	GUJARATI='@comment '
 .endif
 
-.if defined(WITHOUT_KANNADA)
-PLIST_SUB+=	KANNADA='@comment '
-.else
+.if ${PORT_OPTIONS:MKANNADA}
 FONTS+=		kannada
 PLIST_SUB+=	KANNADA=''
+.else
+PLIST_SUB+=	KANNADA='@comment '
 .endif
 
-.if defined(WITHOUT_MALAYALAM)
-PLIST_SUB+=	MALAYALAM='@comment '
-.else
+.if ${PORT_OPTIONS:MMALAYALAM}
 FONTS+=		malayalam
 PLIST_SUB+=	MALAYALAM=''
+.else
+PLIST_SUB+=	MALAYALAM='@comment '
 .endif
 
-.if defined(WITHOUT_ORIYA)
-PLIST_SUB+=	ORIYA='@comment '
-.else
+.if ${PORT_OPTIONS:MORIYA}
 FONTS+=		oriya
 PLIST_SUB+=	ORIYA=''
+.else
+PLIST_SUB+=	ORIYA='@comment '
 .endif
 
-.if defined(WITHOUT_PUNJABI)
-PLIST_SUB+=	PUNJABI='@comment '
-.else
+.if ${PORT_OPTIONS:MPUNJABI}
 FONTS+=		punjabi
 PLIST_SUB+=	PUNJABI=''
+.else
+PLIST_SUB+=	PUNJABI='@comment '
 .endif
 
-.if defined(WITHOUT_TAMIL)
-PLIST_SUB+=	TAMIL='@comment '
-.else
+.if ${PORT_OPTIONS:MTAMIL}
 FONTS+=		tamil
 PLIST_SUB+=	TAMIL=''
+.else
+PLIST_SUB+=	TAMIL='@comment '
 .endif
 
-.if defined(WITHOUT_TELUGU)
-PLIST_SUB+=	TELUGU='@comment '
-.else
+.if ${PORT_OPTIONS:MTELUGU}
 FONTS+=		telugu
 PLIST_SUB+=	TELUGU=''
+.else
+PLIST_SUB+=	TELUGU='@comment '
 .endif
 
 SUB_LIST+=	FONTS="${FONTS}"
 
-.if empty(FONTS)
-IGNORE=	you have to select at least an option
-.endif
-
 do-install: install-fonts install-conf
 
 install-fonts:
@@ -147,4 +149,4 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-themes/gtk-qnxtheme/Makefile b/x11-themes/gtk-qnxtheme/Makefile
index eff65757311e..09864779e367 100644
--- a/x11-themes/gtk-qnxtheme/Makefile
+++ b/x11-themes/gtk-qnxtheme/Makefile
@@ -15,20 +15,22 @@ DISTNAME=	3414-qnxtheme-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	QNX-inspired theme for GTK1 and GTK2
 
-OPTIONS=	GTK2     "Build the GTK2 theme as well"     on
+OPTIONS_DEFINE=	GTK2
+OPTIONS_DEFALT=	GTK2
+GTK2_DESC=	Build the GTK2 theme as well
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
 WANT_GNOME=	yes
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITHOUT_GTK2)
-PLIST_SUB+=	GTK2="@comment "
-.else
+.if ${PORT_OPTIONS:MGTK2}
 USE_GNOME=	gtk20
 PLIST_SUB+=	GTK2=""
+.else
+PLIST_SUB+=	GTK2="@comment "
 .endif
 
 post-patch:
@@ -44,10 +46,10 @@ do-install:
 	@${MKDIR} ${PREFIX}/share/themes/qnxtheme/gtk
 	@(cd ${WRKSRC}/QNX/gtk \
 		&& ${COPYTREE_SHARE} . ${PREFIX}/share/themes/qnxtheme/gtk)
-.if !defined(WITHOUT_GTK2)
+.if ${PORT_OPTIONS:MGTK2}
 	@${MKDIR} ${PREFIX}/share/themes/qnxtheme/gtk-2.0
 	@(cd ${WRKSRC}/QNX/gtk-2.0 \
 		&& ${COPYTREE_SHARE} . ${PREFIX}/share/themes/qnxtheme/gtk-2.0)
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/fltk2/Makefile b/x11-toolkits/fltk2/Makefile
index 877c46116b38..fd708047c7ea 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 1c272b2cb458..0c27270ba029 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 94b24f38e9ee..9dd3a1fe3e6f 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 8b7a3b0c322b..924b9b3528c0 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 fd201a9e2cec..dca7d56bca0f 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 36a945552500..5478936d1de6 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
 
diff --git a/x11-wm/compiz-fusion/Makefile b/x11-wm/compiz-fusion/Makefile
index 24e8c483e321..4db98686307c 100644
--- a/x11-wm/compiz-fusion/Makefile
+++ b/x11-wm/compiz-fusion/Makefile
@@ -23,36 +23,32 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/compiz.pc:${PORTSDIR}/x11-wm/compiz
 
 NO_BUILD=	yes
 
-OPTIONS=	EXTRA "Enable extra plugins" on \
-		UNSUP "Enable unsupported plugins" off \
-		EMERALD "Enable emerald window decorator" on \
-		GCONF "Enable the gconf backend" on
-# Hold off on this until I can get a clean tb run...
-#		KCONFIG "Enable kconfig backend" off
+OPTIONS_DEFINE=	EXTRA UNSUP EMERALD GCONF
+OPTIONS_DEFAULT=	GCONF EXTRA EMERALD
+
+EXTRA_DESC=	Enable extra plugins
+UNSUP_DESC=	Enable unsupported plugins
+EMERALD_DESC=	Enable emerald window decorator
 
 do-install:	# empty
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_EXTRA)
+.if ${PORT_OPTIONS:MEXTRA}
 RUN_DEPENDS+=	${LOCALBASE}/lib/compiz/libaddhelper.so:${PORTSDIR}/x11-wm/compiz-plugins-extra
 .endif
 
-.if defined(WITH_UNSUP)
+.if ${PORT_OPTIONS:MUNSUP}
 RUN_DEPENDS+=	${LOCALBASE}/lib/compiz/libfakeargb.so:${PORTSDIR}/x11-wm/compiz-plugins-unsupported
 .endif
 
-.if !defined(WITHOUT_EMERALD)
+.if ${PORT_OPTIONS:MEMERALD}
 RUN_DEPENDS+=	${LOCALBASE}/bin/emerald:${PORTSDIR}/x11-wm/emerald \
 		${LOCALBASE}/share/emerald/themes/Adonis_Mod/theme.ini:${PORTSDIR}/x11-themes/emerald-themes
 .endif
 
-.if !defined(WITHOUT_GCONF)
+.if ${PORT_OPTIONS:MGCONF}
 RUN_DEPENDS+=	${LOCALBASE}/lib/compizconfig/backends/libgconf.so:${PORTSDIR}/x11-wm/compizconfig-backend-gconf
 .endif
 
-#.if defined(WITH_KCONFIG)
-#RUN_DEPENDS+=	${LOCALBASE}/lib/compizconfig/backends/libkconfig.so:${PORTSDIR}/x11-wm/compizconfig-backend-kconfig
-#.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-wm/compiz/Makefile b/x11-wm/compiz/Makefile
index 9b5c1e31faf8..5c2e9c512663 100644
--- a/x11-wm/compiz/Makefile
+++ b/x11-wm/compiz/Makefile
@@ -69,13 +69,10 @@ GCONF_SCHEMAS=	gwd.schemas \
 CONFIGURE_ARGS=	--disable-kde4
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
-OPTIONS=	RSVG "Enable librsvg2 support" on \
-		GTK "Enable gtk2 support" on \
-		METACITY "Enable Metacity support" on \
-		GNOME "Enable Gnome support" on \
-		DBUS "Enable DBUS support" on \
-		FUSEFS "Enable fusefs support" off \
-		KDE "Enable KDE support" off
+OPTIONS_DEFINE=	SVG GTK2 METACITY GNOME DBUS FUSE KDE3
+OPTIONS_DEFAULT=	SVG GTK2 METACITY GNOME DBUS
+
+METACITY_DESC=	Enable Metacity support
 
 SUB_FILES=		compiz-manager
 DESKTOP_ENTRIES=	"Compiz Manager" \
@@ -93,7 +90,7 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/compiz-manager ${PREFIX}/bin/compiz-manager
 .include <bsd.port.pre.mk>
 
-.if !defined(WITHOUT_RSVG)
+.if ${PORT_OPTIONS:MSVG}
 CONFIGURE_ARGS+=	--enable-librsvg
 USE_GNOME+=		librsvg2
 PLIST_SUB+=		RSVG=""
@@ -102,23 +99,23 @@ CONFIGURE_ARGS+=	--disable-librsvg
 PLIST_SUB+=		RSVG="@comment "
 .endif
 
-.if !defined(WITHOUT_GTK)
+.if ${PORT_OPTIONS:MGTK2}
 CONFIGURE_ARGS+=	--enable-gtk
 USE_GNOME+=	 glib20 libwnck
-PLIST_SUB+=	GTK=""
+PLIST_SUB+=	GTK2=""
 .else
 CONFIGURE_ARGS+=	--disable-gtk
-PLIST_SUB+=	GTK="@comment "
+PLIST_SUB+=	GTK2="@comment "
 .endif
 
-.if !defined(WITHOUT_METACITY) && !defined(WITHOUT_GNOME) && !defined(WITHOUT_GTK)
+.if ${PORT_OPTIONS:MMETACITY} && ${PORT_OPTIONS:MGNOME} && ${PORT_OPTIONS:MGTK2}
 CONFIGURE_ARGS+=	--enable-metacity
 USE_GNOME+=	metacity
 .else
 CONFIGURE_ARGS+=	--disable-metacity
 .endif
 
-.if !defined(WITHOUT_GNOME) && !defined(WITHOUT_GTK)
+.if ${PORT_OPTIONS:MGNOME} && ${PORT_OPTIONS:MGTK2}
 CONFIGURE_ARGS+=	--enable-gnome \
 			--enable-gnome-keybindings
 USE_GNOME+=	 gnomecontrolcenter2
@@ -135,11 +132,11 @@ CONFIGURE_ARGS+=	--disable-gnome \
 PLIST_SUB+=	GNOME="@comment "
 .endif
 
-.if !defined(WITHOUT_DBUS)
+.if ${PORT_OPTIONS:MDBUS}
 CONFIGURE_ARGS+=	--enable-dbus
 BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:${PORTSDIR}/devel/dbus
 RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:${PORTSDIR}/devel/dbus
-.if !defined(WITHOUT_GTK) && !defined(WITHOUT_GNOME)
+.if ${PORT_OPTIONS:MGTK} && ${PORT_OPTIONS:MGNOME}
 CONFIGURE_ARGS+=	--enable-dbus-glib
 BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dbus-glib-1.pc:${PORTSDIR}/devel/dbus-glib
 RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dbus-glib-1.pc:${PORTSDIR}/devel/dbus-glib
@@ -150,25 +147,25 @@ CONFIGURE_ARGS+=	--disable-dbus --disable-dbus-glib
 PLIST_SUB+=	DBUS="@comment "
 .endif
 
-.if defined(WITH_FUSEFS)
+.if ${PORT_OPTIONS:MFUSE}
 CONFIGURE_ARGS+=	--enable-fuse
 BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/fuse.pc:${PORTSDIR}/sysutils/fusefs-libs
 RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/fuse.pc:${PORTSDIR}/sysutils/fusefs-libs
-PLIST_SUB+=		FUSEFS=""
+PLIST_SUB+=		FUSE=""
 .else
 CONFIGURE_ARGS+=	--disable-fuse
-PLIST_SUB+=		FUSEFS="@comment "
+PLIST_SUB+=		FUSE="@comment "
 .endif
 
-.if defined(WITH_KDE)
+.if ${PORT_OPTIONS:MKDE3}
 USE_KDEBASE_VER=	3
 CONFIGURE_ARGS+=	--enable-kde
-PLIST_SUB+=	KDE=""
+PLIST_SUB+=	KDE3=""
 # allow bsd.kde.mk to be included after bsd.port.mk
 .include "${PORTSDIR}/Mk/bsd.kde.mk"
 .else
 CONFIGURE_ARGS+=	--disable-kde
-PLIST_SUB+=	KDE="@comment "
+PLIST_SUB+=	KDE3="@comment "
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/x11-wm/compiz/pkg-plist b/x11-wm/compiz/pkg-plist
index 0a0e7cf0e353..a53116bdd2fe 100644
--- a/x11-wm/compiz/pkg-plist
+++ b/x11-wm/compiz/pkg-plist
@@ -1,8 +1,8 @@
 @comment $FreeBSD$
 bin/compiz
 bin/compiz-manager
-%%GTK%%bin/gtk-window-decorator
-%%KDE%%bin/kde-window-decorator
+%%GTK2%%bin/gtk-window-decorator
+%%KDE3%%bin/kde-window-decorator
 include/compiz/compiz.h
 include/compiz/compiz-common.h
 include/compiz/compiz-core.h
@@ -34,9 +34,9 @@ lib/compiz/libdecoration.so
 lib/compiz/libfade.a
 lib/compiz/libfade.la
 lib/compiz/libfade.so
-%%FUSEFS%%lib/compiz/libfs.a
-%%FUSEFS%%lib/compiz/libfs.la
-%%FUSEFS%%lib/compiz/libfs.so
+%%FUSE%%lib/compiz/libfs.a
+%%FUSE%%lib/compiz/libfs.la
+%%FUSE%%lib/compiz/libfs.so
 lib/compiz/libgconf.a
 lib/compiz/libgconf.la
 lib/compiz/libgconf.so
diff --git a/x11-wm/golem/Makefile b/x11-wm/golem/Makefile
index a7ed172e835d..b96bfd7af370 100644
--- a/x11-wm/golem/Makefile
+++ b/x11-wm/golem/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Small window manager with themes and plugins
 
 LICENSE=	BSD
 
-OPTIONS=	ESOUND "Build sound plugin (requires EsounD)" off \
-		XINERAMA "Enable Xinerama extension support" on
+OPTIONS_DEFINE=	ESOUND XINERAMA
+OPTIONS_DEFAULT=	XINERAMA
 
 USE_PERL5_BUILD=yes
 USE_BZIP2=	yes
@@ -39,7 +39,7 @@ CFLAGS+=	-fPIC
 BROKEN=		Does not compile on ia64, powerpc, or sparc64
 .endif
 
-.if defined(WITH_ESOUND)
+.if ${PORT_OPTIONS:MESOUND}
 USE_GNOME+=	esound
 CONFIGURE_ARGS+=--enable-sound
 PLIST_SUB+=	ESOUND=""
@@ -47,7 +47,7 @@ PLIST_SUB+=	ESOUND=""
 PLIST_SUB+=	ESOUND="@comment "
 .endif
 
-.if !defined(WITHOUT_XINERAMA)
+.if ${PORT_OPTIONS:MXINERAMA}
 USE_XORG+=	xinerama
 CONFIGURE_ARGS+=--enable-xinerama
 .endif
diff --git a/x11-wm/libcompizconfig/Makefile b/x11-wm/libcompizconfig/Makefile
index 430b9c8c1047..bef6c0461084 100644
--- a/x11-wm/libcompizconfig/Makefile
+++ b/x11-wm/libcompizconfig/Makefile
@@ -27,7 +27,9 @@ USE_GNOME=	gnomehack intltool libxml2
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
-OPTIONS=	INOTIFY "Enable inotify support" on
+OPTONS_DEFINE=	INOTIFY
+OPTIONS_DEFAULT=	INOTIFY
+INOTIFY_DESC?=	Enable inotify support
 
 .include <bsd.port.pre.mk>
 
@@ -36,13 +38,13 @@ OPTIONS=	INOTIFY "Enable inotify support" on
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src-compiz.cpp
 .endif
 
-.if !defined(WITHOUT_INOTIFY)
+.if ${PORT_OPTIONS:MINOTIFY}
 LIB_DEPENDS+=	inotify.0:${PORTSDIR}/devel/libinotify
 LDFLAGS+=	-linotify
 .endif
 
 post-patch:
-.if defined(WITHOUT_INOTIFY)
+.if empty(PORT_OPTIONS:MINOTIFY)
 	@${REINPLACE_CMD} -e 's|sys/inotify.h||' ${WRKSRC}/configure
 .endif
 	@echo "OSVERSION=${OSVERSION}"
diff --git a/x11/fbdesk/Makefile b/x11/fbdesk/Makefile
index f2880127bf62..7791119678fe 100644
--- a/x11/fbdesk/Makefile
+++ b/x11/fbdesk/Makefile
@@ -19,7 +19,8 @@ LICENSE=	MIT
 
 LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png
 
-OPTIONS=	IMLIB2 "Imlib2 (pixmap themes) support" On
+OPTIONS_DEFINE=	IMLIB2 DOCS
+OPTIONS_DEFAULT=	IMLIB2
 
 USE_XORG=	xext xft xpm xrender
 WANT_EFL=	yes
@@ -29,20 +30,20 @@ MAKE_JOBS_SAFE=	yes
 PORTDOCS=	ChangeLog INSTALL README
 PLIST_FILES=	bin/fbdesk
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITHOUT_IMLIB2)
-CONFIGURE_ARGS+=	--disable-imlib2
-.else
+.if ${PORT_OPTIONS:MIMLIB2}
 USE_EFL+=	imlib2
+.else
+CONFIGURE_ARGS+=	--disable-imlib2
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for file in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/ggiterm/Makefile b/x11/ggiterm/Makefile
index 6bf69c2db63e..a58d3070ee7e 100644
--- a/x11/ggiterm/Makefile
+++ b/x11/ggiterm/Makefile
@@ -24,7 +24,8 @@ LDFLAGS+=	${PTHREAD_LIBS}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 SUB_FILES=	pkg-message
 
-OPTIONS=	FREETYPE "Build with Freetype support" on
+OPTIONS_DEFINE=	FREETYPE DOCS
+OPTIONS_DEFAULT=	FREETYPE
 
 PORTDOCS=	AUTHORS README
 
@@ -34,7 +35,7 @@ PORTDOCS=	AUTHORS README
 BROKEN=		fails to build with new utmpx
 .endif
 
-.if !defined(WITHOUT_FREETYPE)
+.if ${PORT_OPTIONS:MFREETYPE}
 LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
 USE_ICONV=	yes
 CONFIGURE_ARGS+=--with-ft-prefix=${LOCALBASE}
@@ -46,7 +47,7 @@ MAN1=		ggiterm.1
 
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/ggiterm.termcap ${DATADIR}
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for f in ${PORTDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}