Convert ports to use the options helpers in categories [abc]*, and minor fixes.

Sponsored by:	Absolight
Differential Revision:	https://reviews.freebsd.org/D3412?

13 files changed, 92 insertions, 257 deletions

diff --git a/chinese/auto-cn-l10n/Makefile b/chinese/auto-cn-l10n/Makefile
index 7c82164b1b61..ad95d8046236 100644
--- a/chinese/auto-cn-l10n/Makefile
+++ b/chinese/auto-cn-l10n/Makefile
@@ -25,32 +25,13 @@ SCIM_DESC=		Smart Common Input Method platform
 MINICHINPUT_DESC=	A tiny version of Chinput
 RELAXCONF_DESC=		A set of utilities for FreeBSD LiveCD
 
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MWQY}
-RUN_DEPENDS+=	${LOCALBASE}/share/fonts/wqy/wenquanyi_10pt.pcf:${PORTSDIR}/x11-fonts/wqy
-.endif
-
-.if ${PORT_OPTIONS:MFIREFLYTTF}
-RUN_DEPENDS+=	${LOCALBASE}/share/fonts/TrueType/fireflysung.ttf:${PORTSDIR}/chinese/fireflyttf
-.endif
-
-.if ${PORT_OPTIONS:MFCITX}
-RUN_DEPENDS+=	fcitx:${PORTSDIR}/chinese/fcitx
-.endif
-
-.if ${PORT_OPTIONS:MSCIM}
-RUN_DEPENDS+=	${LOCALBASE}/share/scim/tables/Wubi.bin:${PORTSDIR}/chinese/scim-tables
-RUN_DEPENDS+=	${LOCALBASE}/lib/scim-1.0/1.4.0/IMEngine/pinyin.so:${PORTSDIR}/chinese/scim-pinyin
-.endif
-
-.if ${PORT_OPTIONS:MMINICHINPUT}
-RUN_DEPENDS+=	chinput:${PORTSDIR}/chinese/miniChinput
-.endif
-
-.if ${PORT_OPTIONS:MRELAXCONF}
-RUN_DEPENDS+=	relaxconf:${PORTSDIR}/sysutils/relaxconf
-.endif
+WQY_RUN_DEPENDS=	${LOCALBASE}/share/fonts/wqy/wenquanyi_10pt.pcf:${PORTSDIR}/x11-fonts/wqy
+FIREFLYTTF_RUN_DEPENDS=	${LOCALBASE}/share/fonts/TrueType/fireflysung.ttf:${PORTSDIR}/chinese/fireflyttf
+FCITX_RUN_DEPENDS=	fcitx:${PORTSDIR}/chinese/fcitx
+SCIM_RUN_DEPENDS=	${LOCALBASE}/share/scim/tables/Wubi.bin:${PORTSDIR}/chinese/scim-tables \
+			${LOCALBASE}/lib/scim-1.0/1.4.0/IMEngine/pinyin.so:${PORTSDIR}/chinese/scim-pinyin
+MINICHINPUT_RUN_DEPENDS=	chinput:${PORTSDIR}/chinese/miniChinput
+RELAXCONF_RUN_DEPENDS=	relaxconf:${PORTSDIR}/sysutils/relaxconf
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g; \
@@ -60,4 +41,4 @@ do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/skel/zh_CN.eucCN
 	${CP} ${WRKSRC}/* ${STAGEDIR}${PREFIX}/share/skel/zh_CN.eucCN
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/chinese/cnprint/Makefile b/chinese/cnprint/Makefile
index b4d3ea70f55e..b6824bf51976 100644
--- a/chinese/cnprint/Makefile
+++ b/chinese/cnprint/Makefile
@@ -24,8 +24,6 @@ OPTIONS_DEFAULT=	A4SIZE
 
 A4SIZE_DESC=	Set A4 (not Letter) as a default paper size
 
-.include <bsd.port.pre.mk>
-
 do-extract:
 	${MKDIR} ${WRKSRC}
 .for i in ${DISTFILES}
@@ -42,10 +40,9 @@ post-patch:
 	@${REINPLACE_CMD} -e 's/\(DEFAULT_JIS_FONT\):.*$$/\1: kanji48.hbf/; \
 		s/\(DEFAULT_BIG5FONT\):.*$$/\1: ntu_kai48.hbf/; \
 		s/\(DEFAULT_ENCODING\):.*$$/\1: BIG5/' ${WRKSRC}/cnprint33.cmd
-.if ${PORT_OPTIONS:MA4SIZE}
+post-patch-A4SIZE-on:
 	@${REINPLACE_CMD} -e 's/\(DEFAULT_PAPERSIZE\):.*$$/\1: 8.27 11.69/' \
 		${WRKSRC}/cnprint33.cmd
-.endif
 
 do-build:
 	cd ${WRKSRC} ; \
@@ -57,4 +54,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}33.cmd  ${STAGEDIR}${DATADIR}/${PORTNAME}.cmd
 	${INSTALL_DATA} ${FILES} ${STAGEDIR}${DATADIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/chinese/fcitx-configtool/Makefile b/chinese/fcitx-configtool/Makefile
index b6b4a4aea390..21830a663965 100644
--- a/chinese/fcitx-configtool/Makefile
+++ b/chinese/fcitx-configtool/Makefile
@@ -26,17 +26,10 @@ OPTIONS_SINGLE_UI=	GTK2 GTK3
 OPTIONS_DEFAULT=GTK2
 OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MGTK2}
-CMAKE_ARGS+=	-DENABLE_GTK2=ON
-USE_GNOME+=	gtk20
-.endif
-
-.if ${PORT_OPTIONS:MGTK3}
-USE_GNOME+=	gtk30
-.else
-CMAKE_ARGS+=	-DENABLE_GTK3=OFF
-.endif
+GTK2_CMAKE_ON=	-DENABLE_GTK2=ON
+GTK2_USE=	GNOME=gtk20
+
+GTK3_USE=	GNOME=gtk30
+GTK3_CMAKE_OFF=	-DENABLE_GTK3=OFF
 
 .include <bsd.port.mk>
diff --git a/chinese/gcin/Makefile b/chinese/gcin/Makefile
index 889e9ee0c4c6..acae4286760e 100644
--- a/chinese/gcin/Makefile
+++ b/chinese/gcin/Makefile
@@ -20,29 +20,19 @@ USES=		gmake pkgconfig tar:xz
 USE_XORG=	x11 xtst xext
 INSTALLS_ICONS=	YES
 USE_LDCONFIG=	YES
+
 OPTIONS_DEFINE=	ANTHY QT_IM_MODULE DOCS
+OPTIONS_SUB=	yes
 ANTHY_DESC=	Japanese anthy IM module
 QT_IM_MODULE_DESC=	QT IM module
 
-.include <bsd.port.options.mk>
+QT_IM_MODULE_USE=	QT4=inputmethods,qmake_build,moc_build,corelib,gui
+QT_IM_MODULE_LIB_DEPENDS=	libmng.so:${PORTSDIR}/graphics/libmng
+QT_IM_MODULE_CONFIGURE_OFF=	--use_qt4=N
 
-.if ${PORT_OPTIONS:MQT_IM_MODULE}
-USE_QT4=	inputmethods qmake_build moc_build corelib gui
-LIB_DEPENDS+=	libmng.so:${PORTSDIR}/graphics/libmng
-PLIST_SUB+=	QT_IM_MODULE=""
-.else
-CONFIGURE_ARGS+=	--use_qt4=N
-PLIST_SUB+=	QT_IM_MODULE="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MANTHY}
-BUILD_DEPENDS+=	${LOCALBASE}/include/anthy/anthy.h:${PORTSDIR}/japanese/anthy
-LIB_DEPENDS+=	libanthy.so:${PORTSDIR}/japanese/anthy
-PLIST_SUB+=	ANTHY_MODULE=""
-.else
-CONFIGURE_ARGS+=	--use_anthy=N
-PLIST_SUB+=	ANTHY_MODULE="@comment "
-.endif
+ANTHY_BUILD_DEPENDS=	${LOCALBASE}/include/anthy/anthy.h:${PORTSDIR}/japanese/anthy
+ANTHY_LIB_DEPENDS=	libanthy.so:${PORTSDIR}/japanese/anthy
+ANTHY_CONFIGURE_OFF=	--use_anthy=N
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,&,,; 1 s,##!/bin/bash,#!/bin/sh,; \
@@ -78,9 +68,8 @@ post-patch:
 		${WRKSRC}/scripts/utf8-edit
 	@${REINPLACE_CMD} -e '/make/ d' ${WRKSRC}/IMdkit/lib/Makefile
 	@${REINPLACE_CMD} -e 's,/usr/X11R6/lib,${LOCALBASE}/lib,' ${WRKSRC}/im-client/Makefile
-.if empty(PORT_OPTIONS:MDOCS)
+post-patch-DOCS-off:
 	@${REINPLACE_CMD} '/install.*DOC_DIR/d' ${WRKSRC}/Makefile
-.endif
 
 post-build:
 .if !defined(DEBUG_FLAGS)
diff --git a/chinese/gcin/pkg-plist b/chinese/gcin/pkg-plist
index ed52033c3ad7..471a228e9992 100644
--- a/chinese/gcin/pkg-plist
+++ b/chinese/gcin/pkg-plist
@@ -21,7 +21,7 @@ bin/tsin2gtab-phrase
 bin/tslearn
 bin/txt2gtab-phrase
 %%QT_IM_MODULE%%lib/qt4/plugins/inputmethods/im-gcin.so
-%%ANTHY_MODULE%%lib/gcin/anthy-module.so
+%%ANTHY%%lib/gcin/anthy-module.so
 lib/gcin/gcin1.so
 lib/gcin/gcin2.so
 lib/gcin/intcode-module.so
diff --git a/chinese/ibus-libpinyin/Makefile b/chinese/ibus-libpinyin/Makefile
index f46bbfc1743c..ffdc60f786f2 100644
--- a/chinese/ibus-libpinyin/Makefile
+++ b/chinese/ibus-libpinyin/Makefile
@@ -26,46 +26,23 @@ CONFIGURE_ARGS=	--disable-dependency-tracking --disable-boost \
 
 OPTIONS_DEFINE=		ENGLISH STROKE OPENCC NLS
 OPTIONS_DEFAULT=	ENGLISH STROKE NLS
+OPTIONS_SUB=		yes
 ENGLISH_DESC=		Enable English input mode
 STROKE_DESC=		Enable stroke input mode
 OPENCC_DESC=		Use opencc for simplified and traditional Chinese conversion
 
-.include <bsd.port.pre.mk>
+ENGLISH_CONFIGURE_ENABLE=	english-input-mode
+STROKE_CONFIGURE_ENABLE=	stroke-input-mode
 
-.if ${PORT_OPTIONS:MENGLISH}
-CONFIGURE_ARGS+=	--enable-english-input-mode
-PLIST_SUB+=	ENGLISH=""
-.else
-CONFIGURE_ARGS+=	--disable-english-input-mode
-PLIST_SUB+=	ENGLISH="@comment "
-.endif
+OPENCC_BROKEN=			Requires newer OpenCC
+OPENCC_CONFIGURE_ENABLE=	opencc
+OPENCC_LIB_DEPENDS=		libopencc.so:${PORTSDIR}/chinese/opencc
 
-.if ${PORT_OPTIONS:MSTROKE}
-CONFIGURE_ARGS+=	--enable-stroke-input-mode
-PLIST_SUB+=	STROKE=""
-.else
-CONFIGURE_ARGS+=	--disable-stroke-input-mode
-PLIST_SUB+=	STROKE="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MOPENCC}
-BROKEN=			Requires newer OpenCC
-CONFIGURE_ARGS+=	--enable-opencc
-LIB_DEPENDS+=		libopencc.so:${PORTSDIR}/chinese/opencc
-.else
-CONFIGURE_ARGS+=	--disable-opencc
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-USE_GNOME+=	intltool
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+NLS_USES=		gettext
+NLS_USE=		GNOME=intltool
+NLS_CONFIGURE_ENABLE=	nls
 
 post-configure:
 	@${REINPLACE_CMD} -e 's|DATADIRNAME = lib|DATADIRNAME = share|' ${WRKSRC}/po/Makefile
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/chinese/ibus-pinyin/Makefile b/chinese/ibus-pinyin/Makefile
index 8ae61aa9c69d..8dea415e135a 100644
--- a/chinese/ibus-pinyin/Makefile
+++ b/chinese/ibus-pinyin/Makefile
@@ -26,17 +26,11 @@ PROJECTHOST=	ibus
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_DEFAULT=	NLS
+OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-USE_GNOME+=	intltool
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+NLS_USES=	gettext
+NLS_USE=	GNOME=intltool
+NLS_CONFIGURE_ENABLE=	nls
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|DATADIRNAME=lib|DATADIRNAME=share|' ${WRKSRC}/configure
diff --git a/chinese/libtabe/Makefile b/chinese/libtabe/Makefile
index 89019d716ec2..2612e165cda8 100644
--- a/chinese/libtabe/Makefile
+++ b/chinese/libtabe/Makefile
@@ -47,15 +47,14 @@ pre-everything::
 	@${ECHO_CMD} ""
 .endif
 
-post-patch:
-.if !${PORT_OPTIONS:MX11}
+post-patch-X11-off:
 	${REINPLACE_CMD} -e '/all:/s/ bims//; /bims/d' \
 		${WRKSRC}/src/Makefile.in
-.endif
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtabe.so
-.if ${PORT_OPTIONS:MDOCS}
+
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/tsi-src/README \
 		${STAGEDIR}${DOCSDIR}/README.tsi
@@ -67,6 +66,5 @@ post-install:
 		et26.txt libtabe.sgml
 	${INSTALL_DATA} ${WRKSRC}/doc/${DOC} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/chinese/muni/Makefile b/chinese/muni/Makefile
index 3e43363879d0..48563028947c 100644
--- a/chinese/muni/Makefile
+++ b/chinese/muni/Makefile
@@ -11,16 +11,13 @@ COMMENT=	Find Unicode values for Chinese characters
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/muni ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/m7773 ${STAGEDIR}${PREFIX}/bin
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/muni
 	${INSTALL_DATA} ${WRKSRC}/index.html ${STAGEDIR}${PREFIX}/share/doc/muni
 	${INSTALL_DATA} ${WRKSRC}/yung.gif ${STAGEDIR}${PREFIX}/share/doc/muni
 	${INSTALL_DATA} ${WRKSRC}/kang.gif ${STAGEDIR}${PREFIX}/share/doc/muni
-.endif
 
 .include <bsd.port.mk>
diff --git a/chinese/oxim/Makefile b/chinese/oxim/Makefile
index 7ab33f9d7c65..d85743799c72 100644
--- a/chinese/oxim/Makefile
+++ b/chinese/oxim/Makefile
@@ -16,6 +16,7 @@ RUN_DEPENDS=	${LOCALBASE}/share/fonts/TrueType/fireflysung.ttf:${PORTSDIR}/chine
 
 OPTIONS_DEFINE=	GTK2 CHEWING UNICODE
 OPTIONS_DEFAULT=	GTK2 CHEWING UNICODE
+OPTIONS_SUB=	yes
 GTK2_DESC=	 GTK2 input method module
 CHEWING_DESC=	 Chewing input module
 UNICODE_DESC=	 Unicode input module
@@ -36,43 +37,21 @@ CONFIGURE_ARGS+=--disable-bimsphone-module \
 # oxim requires qinputcontextplugin.h which only exists in Debian package
 CONFIGURE_ARGS+=--disable-qt-immodule
 
-.include <bsd.port.options.mk>
+GTK2_USE=		GNOME=gtk20
+GTK2_CONFIGURE_ENABLE=	gtk-immodule
 
-.if ${PORT_OPTIONS:MGTK2}
-USE_GNOME+=	gtk20
-CONFIGURE_ARGS+=	--enable-gtk-immodule
-PLIST_SUB+=	GTK2=""
-.else
-CONFIGURE_ARGS+=	--disable-gtk-immodule
-PLIST_SUB+=	GTK2="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MCHEWING}
 # make sure we have the required libchewing
-BUILD_DEPENDS+=	zh-libchewing>=0.3.2:${PORTSDIR}/chinese/libchewing
-RUN_DEPENDS+=	zh-libchewing>=0.3.2:${PORTSDIR}/chinese/libchewing
-
-CONFIGURE_ARGS+=	--enable-chewing-module
-CONFIGURE_ENV+=	CHEWING_CFLAGS=-I${LOCALBASE}/include
-PLIST_SUB+=	CHEWING=""
-.else
-CONFIGURE_ARGS+=	--disable-chewing-module
-PLIST_SUB+=	CHEWING="@comment "
-.endif
+CHEWING_BUILD_DEPENDS=	zh-libchewing>=0.3.2:${PORTSDIR}/chinese/libchewing
+CHEWING_RUN_DEPENDS=	${CHEWING_BUILD_DEPENDS}
+CHEWING_CONFIGURE_ENABLE=	chewing-module
+CHEWING_CONFIGURE_ENV=	CHEWING_CFLAGS=-I${LOCALBASE}/include
 
-.if ${PORT_OPTIONS:MUNICODE}
-CONFIGURE_ARGS+=	--enable-unicode-module
-PLIST_SUB+=	UNICODE=""
-.else
-CONFIGURE_ARGS+=	--disable-unicode-module
-PLIST_SUB+=	UNICODE="@comment "
-.endif
+UNICODE_CONFIGURE_ENABLE=	unicode-module
 
 # TODO WITHOUT_NLS knob
 #.if ${PORT_OPTIONS:MNLS}
 USES+=		gettext
 LDFLAGS+=	-lintl
-PLIST_SUB+=	NLS=""
 #.else
 #CONFIGURE_ARGS+=--disable-nls
 #PLIST_SUB+=	NLS="@comment "
diff --git a/chinese/pcmanx/Makefile b/chinese/pcmanx/Makefile
index 136169491be5..af17c4a1573d 100644
--- a/chinese/pcmanx/Makefile
+++ b/chinese/pcmanx/Makefile
@@ -19,6 +19,7 @@ GNU_CONFIGURE=	yes
 
 OPTIONS_DEFINE=	NLS DEBUG DOCKLET NOTIFIER LIBNOTIFY NANCY MOUSE EXTERNAL IPLOOKUP PROXY
 OPTIONS_DEFAULT=	DOCKLET NOTIFIER NANCY MOUSE EXTERNAL
+OPTIONS_SUB=	yes
 
 DOCKLET_DESC=	Docklet / system tray support
 NOTIFIER_DESC=	Popup notifier support
@@ -29,55 +30,22 @@ EXTERNAL_DESC=	External SSH/Telnet support
 IPLOOKUP_DESC=	IP location lookup support
 PROXY_DESC=	Proxy support
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-.else
-USES+=		gettext
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MDEBUG}
-CONFIGURE_ARGS+=--enable-debug
-.endif
-
-.if empty(PORT_OPTIONS:MDOCKLET)
-CONFIGURE_ARGS+=--disable-docklet
-.endif
-
-.if empty(PORT_OPTIONS:MNOTIFIER)
-CONFIGURE_ARGS+=--disable-notifier
-.endif
-
-.if ${PORT_OPTIONS:MLIBNOTIFY}
-CONFIGURE_ARGS+=--enable-libnotify
-LIB_DEPENDS+=	libnotify.so:${PORTSDIR}/devel/libnotify
-.endif
-
-.if empty(PORT_OPTIONS:MNANCY)
-CONFIGURE_ARGS+=--disable-nancy
-.endif
-
-.if empty(PORT_OPTIONS:MMOUSE)
-CONFIGURE_ARGS+=--disable-mouse
-.endif
-
-.if empty(PORT_OPTIONS:MEXTERNAL)
-CONFIGURE_ARGS+=--disable-external
-.endif
-
-.if ${PORT_OPTIONS:MIPLOOKUP}
-CONFIGURE_ARGS+=--enable-iplookup
-.endif
-
-.if ${PORT_OPTIONS:MPROXY}
-CONFIGURE_ARGS+=--enable-proxy
-.endif
+NLS_USES=		gettext
+NLS_USES_OFF=	gettext-tools
+NLS_CPPFLAGS=	-I${LOCALBASE}/include
+NLS_LDFLAGS=	-L${LOCALBASE}/lib
+NLS_CONFIGURE_ENABLE=nls
+
+DEBUG_CONFIGURE_ENABLE=		debug
+DOCKLET_CONFIGURE_ENABLE=	docklet
+NOTIFIER_CONFIGURE_ENABLE=	notifier
+LIBNOTIFY_CONFIGURE_ENABLE=	libnotify
+LIBNOTIFY_LIB_DEPENDS=		libnotify.so:${PORTSDIR}/devel/libnotify
+NANCY_CONFIGURE_ENABLE=		nancy
+MOUSE_CONFIGURE_ENABLE=		mouse
+EXTERNAL_CONFIGURE_ENABLE=	external
+IPLOOKUP_CONFIGURE_ENABLE=	iplookup
+PROXY_CONFIGURE_ENABLE=		proxy
 
 post-install:
 	@# create directory for user friendly
diff --git a/chinese/pyzy/Makefile b/chinese/pyzy/Makefile
index d695ababfe7f..fed601e98e03 100644
--- a/chinese/pyzy/Makefile
+++ b/chinese/pyzy/Makefile
@@ -26,45 +26,24 @@ CONFIGURE_ARGS=	--disable-dependency-tracking --disable-boost
 
 OPTIONS_DEFINE=	ANDROID_DB OPENPHRASE_DB OPENCC
 OPTIONS_DEFAULT=	ANDROID_DB
+OPTIONS_SUB=	yes
 ANDROID_DB_DESC=	Build Android DB
 OPENPHRASE_DB_DESC=	Build Open Phrase DB
 OPENCC_DESC=		Use opencc for simplified and traditional Chinese conversion
 
-.include <bsd.port.options.mk>
-
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MANDROID_DB}
-CONFIGURE_ARGS+=	--enable-db-android
-PLIST_SUB+=	ANDROID_DB=""
-.else
-CONFIGURE_ARGS+=	--disable-db-android
-PLIST_SUB+=	ANDROID_DB="@comment "
-.endif
+ANDROID_DB_CONFIGURE_ENABLE=	db-android
 
 OPENPHRASE_DBVER=	1.0.0
 OPENPHRASE_DBFILE=	pyzy-database-${OPENPHRASE_DBVER}.tar.bz2
 
-.if ${PORT_OPTIONS:MOPENPHRASE_DB}
-CONFIGURE_ARGS+=	--enable-db-open-phrase
-DISTFILES+=	${OPENPHRASE_DBFILE}
-PLIST_SUB+=	OPENPHRASE_DB=""
-.else
-CONFIGURE_ARGS+=	--disable-db-open-phrase
-PLIST_SUB+=	OPENPHRASE_DB="@comment "
-.endif
+OPENPHRASE_DB_CONFIGURE_ENABLE=	db-open-phrase
+OPENPHRASE_DB_DISTFILES=	${OPENPHRASE_DBFILE}
 
-.if ${PORT_OPTIONS:MOPENCC}
-CONFIGURE_ARGS+=	--enable-opencc
-LIB_DEPENDS+=		libopencc.so:${PORTSDIR}/chinese/opencc
-.else
-CONFIGURE_ARGS+=	--disable-opencc
-.endif
+OPENCC_CONFIGURE_ENABLE=	opencc
+OPENCC_LIB_DEPENDS=		libopencc.so:${PORTSDIR}/chinese/opencc
 
-post-extract:
-.if ${PORT_OPTIONS:MOPENPHRASE_DB}
+post-extract-OPENPHRASE_DB-on:
 	@${CP} ${DISTDIR}/${OPENPHRASE_DBFILE} ${WRKSRC}/data/db/open-phrase
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|' ${WRKSRC}/Makefile.in
@@ -72,4 +51,4 @@ post-patch:
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}-1.0.so
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/chinese/qterm/Makefile b/chinese/qterm/Makefile
index c5f6d3107c32..189c62dc32cf 100644
--- a/chinese/qterm/Makefile
+++ b/chinese/qterm/Makefile
@@ -27,45 +27,28 @@ PHONON_DESC=	Multimedia support via Phonon
 QTSCRIPT_DESC=	Scripting support via QtScript Bindings
 KDE_DESC=	Password management via KWallet
 
-.include <bsd.port.options.mk>
+OPENSSL_USE=	OPENSSL=yes
+OPENSSL_CMAKE_ON=	-DQTERM_ENABLE_SSH:BOOL=TRUE
+OPENSSL_CMAKE_OFF=	-DQTERM_ENABLE_SSH:BOOL=FALSE
 
-.if ${PORT_OPTIONS:MOPENSSL}
-USE_OPENSSL=	yes
-CMAKE_ARGS+=	-DQTERM_ENABLE_SSH:BOOL=TRUE
-.else
-CMAKE_ARGS+=	-DQTERM_ENABLE_SSH:BOOL=FALSE
-.endif
+DBUS_USE=	QT4=dbus
+DBUS_CMAKE_ON=	-DQTERM_ENABLE_DBUS:BOOL=TRUE
+DBUS_CMAKE_OFF=	-DQTERM_ENABLE_DBUS:BOOL=FALSE
 
-.if ${PORT_OPTIONS:MDBUS}
-USE_QT4+=	dbus
-CMAKE_ARGS+=	-DQTERM_ENABLE_DBUS:BOOL=TRUE
-.else
-CMAKE_ARGS+=	-DQTERM_ENABLE_DBUS:BOOL=FALSE
-.endif
+PHONON_USE=	QT4=phonon
+PHONON_CMAKE_ON=	-DQTERM_ENABLE_PHONON:BOOL=TRUE
+PHONON_CMAKE_OFF=	-DQTERM_ENABLE_PHONON:BOOL=FALSE
 
-.if ${PORT_OPTIONS:MPHONON}
-USE_QT4+=	phonon
-CMAKE_ARGS+=	-DQTERM_ENABLE_PHONON:BOOL=TRUE
-.else
-CMAKE_ARGS+=	-DQTERM_ENABLE_PHONON:BOOL=FALSE
-.endif
+QTSCRIPT_USE=	QT4=script
+QTSCRIPT_RUN_DEPENDS=	${QT_PLUGINDIR}/script/libqtscript_core.so:${PORTSDIR}/devel/qtscriptgenerator
+QTSCRIPT_CMAKE_ON=	-DQTERM_ENABLE_SCRIPT:BOOL=TRUE
+QTSCRIPT_CMAKE_OFF=	-DQTERM_ENABLE_SCRIPT:BOOL=FALSE
 
-.if ${PORT_OPTIONS:MQTSCRIPT}
-USE_QT4+=	script
-RUN_DEPENDS+=	${QT_PLUGINDIR}/script/libqtscript_core.so:${PORTSDIR}/devel/qtscriptgenerator
-CMAKE_ARGS+=	-DQTERM_ENABLE_SCRIPT:BOOL=TRUE
-.else
-CMAKE_ARGS+=	-DQTERM_ENABLE_SCRIPT:BOOL=FALSE
-.endif
+KDE_USE=	KDE4=kdelibs,automoc4
 
-.if ${PORT_OPTIONS:MKDE}
-USE_KDE4=	kdelibs automoc4
-.endif
-
-post-patch:
-.if !${PORT_OPTIONS:MKDE}
+post-patch-KDE-off:
 	${REINPLACE_CMD} -e "/^find_package(KDE4)/d" ${WRKSRC}/CMakeLists.txt
-.endif
+post-patch:
 	${REINPLACE_CMD} -e "/^set(QT_MIN_VERSION/d" ${WRKSRC}/CMakeLists.txt
 
 .include <bsd.port.mk>