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

Sponsored by: Absolight Differential Revision: https://reviews.freebsd.org/D3412?
author: mat <mat@FreeBSD.org> 2015-08-19 13:29:59 +0000
committer: mat <mat@FreeBSD.org> 2015-08-19 13:29:59 +0000
commit: df89b8efc8508ebed07f6e8f0a805a93eee0af58 (patch)
tree: ac5a462edc3d85d5f0b20a594802ce4b12f0bf9f
parent: 4a1eea8e721008727b250a284a4ad8137f9bef91 (diff)
download: FreeBSD-ports-df89b8efc8508ebed07f6e8f0a805a93eee0af58.zip
FreeBSD-ports-df89b8efc8508ebed07f6e8f0a805a93eee0af58.tar.gz
172 files changed, 778 insertions, 1992 deletions
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 417459e..48b5700 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -45,14 +45,10 @@ post-patch:
 		${WRKSRC}/src/fr-command-tar.c \
 		${WRKSRC}/src/fr-command-zip.c
 
-.include <bsd.port.options.mk>
-
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}/${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/archivers/php5-snappy/Makefile b/archivers/php5-snappy/Makefile
index aaf0a5d..574f96c 100644
--- a/archivers/php5-snappy/Makefile
+++ b/archivers/php5-snappy/Makefile
@@ -23,16 +23,10 @@ PHP_MODNAME=	snappy
 WRKSRC=		${WRKDIR}/${PROJECTHOST}
 OPTIONS_DEFINE=	TEST
 
-.include <bsd.port.options.mk>
-test: build
+post-build-TEST-on:
 	@(cd ${WRKSRC} && ${MAKE} ${MAKE_ENV} NO_INTERACTION=yes ${.TARGET})
 
-.if !empty(${PORT_OPTIONS:MTEST})
-post-stage: test
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/php/${PHP_EXT_DIR}/snappy.so
-.else
 post-stage:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/php/${PHP_EXT_DIR}/snappy.so
-.endif
 
 .include <bsd.port.mk>
diff --git a/archivers/xarchiver/Makefile b/archivers/xarchiver/Makefile
index 79da256..fafae00 100644
--- a/archivers/xarchiver/Makefile
+++ b/archivers/xarchiver/Makefile
@@ -27,14 +27,9 @@ NLS_USES=	gettext
 NLS_CPPFLAGS+=	-I${LOCALBASE}/include
 NLS_LDFLAGS+=	-L${LOCALBASE}/lib
 
-.include <bsd.port.options.mk>
-
-post-patch:
-.if empty(PORT_OPTIONS:MDOCS)
+post-patch-DOCS-off:
 	@${REINPLACE_CMD} -e 's|doc||g' ${WRKSRC}/Makefile.in
-.endif
-.if empty(PORT_OPTIONS:MNLS)
+post-patch-NLS-off:
 	@${REINPLACE_CMD} -e 's| po | |g' ${WRKSRC}/Makefile.in
-.endif
 
 .include <bsd.port.mk>
diff --git a/astro/boinc-astropulse/Makefile b/astro/boinc-astropulse/Makefile
index 830c34b..470a8e6 100644
--- a/astro/boinc-astropulse/Makefile
+++ b/astro/boinc-astropulse/Makefile
@@ -42,11 +42,7 @@ X11_USE=		GL=gl,glu,glut \
 			XORG=ice,sm,x11,xau,xcb,xext,xi,xdamage,xdmcp,xfixes,xmu,xt,xxf86vm
 X11_CONFIGURE_ENABLE=	graphics
 
-.include <bsd.port.options.mk>
-
-.if ! ${PORT_OPTIONS:MX11}
-BUILD_DEPENDS+=	${LOCALBASE}/include/boinc/std_fixes.h:${PORTSDIR}/net/boinc-client
-.endif
+X11_BUILD_DEPENDS_OFF=	${LOCALBASE}/include/boinc/std_fixes.h:${PORTSDIR}/net/boinc-client
 
 SETI_WORK!=	cd ${.CURDIR}/../boinc-setiathome-v7 && ${MAKE} -V WRKSRC
 CONFIGURE_ENV+=	BOINCDIR="${NONEXISTENT}" \
@@ -76,9 +72,8 @@ do-install:
 	${INSTALL} -d ${STAGEDIR}${BOINC_CLIENT_HOME}/projects/${SETI_SITE}
 	${INSTALL_PROGRAM} ${WRKSRC}/${AP_BINARY} \
 	    ${STAGEDIR}${BOINC_CLIENT_HOME}/projects/${SETI_SITE}/
-.if ${PORT_OPTIONS:MX11}
+do-install-X11-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/ap_graphics \
 	    ${STAGEDIR}${BOINC_CLIENT_HOME}/projects/${SETI_SITE}/
-.endif
 
 .include <bsd.port.mk>
diff --git a/astro/boinc-setiathome-v7/Makefile b/astro/boinc-setiathome-v7/Makefile
index 54182fb..868f53a 100644
--- a/astro/boinc-setiathome-v7/Makefile
+++ b/astro/boinc-setiathome-v7/Makefile
@@ -45,11 +45,7 @@ X11_USE=		GL=gl,glu,glut \
 			XORG=ice,sm,x11,xau,xcb,xext,xi,xdamage,xdmcp,xfixes,xmu,xt,xxf86vm
 X11_CONFIGURE_ENABLE=	graphics
 
-.include <bsd.port.options.mk>
-
-.if ! ${PORT_OPTIONS:MX11}
-BUILD_DEPENDS+=	${LOCALBASE}/include/boinc/std_fixes.h:${PORTSDIR}/net/boinc-client
-.endif
+X11_BUILD_DEPENDS_OFF=	${LOCALBASE}/include/boinc/std_fixes.h:${PORTSDIR}/net/boinc-client
 
 .if ${ARCH} == i386 || ${ARCH} == amd64
 # comment out if world is built with clang and port with gcc
@@ -101,8 +97,8 @@ do-install:
 	${INSTALL} -d ${STAGEDIR}${BOINC_CLIENT_HOME}/projects/${SETI_SITE}
 	${INSTALL_PROGRAM} ${WRKSRC}/client/${SETI_BINARY} \
 	    ${STAGEDIR}${BOINC_CLIENT_HOME}/projects/${SETI_SITE}/
-.if ${PORT_OPTIONS:MX11}
+do-install-X11-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/client/seti_graphics \
 	    ${STAGEDIR}${BOINC_CLIENT_HOME}/projects/${SETI_SITE}/
-.endif
+
 .include <bsd.port.mk>
diff --git a/astro/google-earth/Makefile b/astro/google-earth/Makefile
index c1f5e25..9d02db6 100644
--- a/astro/google-earth/Makefile
+++ b/astro/google-earth/Makefile
@@ -28,17 +28,11 @@ USES=		perl5 shared-mime-info desktop-file-utils
 USE_PERL5=	patch build
 
 #SUB_FILES=	bin/googleearth
-.include <bsd.port.pre.mk>
-.include <bsd.port.options.mk>
 
 UNMAKESELF=	${LOCALBASE}/bin/unmakeself
 
-.if ${PORT_OPTIONS:MNVIDIA}
-RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
-.else
-USE_LINUX_APPS+=	dri libpciaccess
-LIBGL_ALWAYS_SOFTWARE=LIBGL_ALWAYS_SOFTWARE=yes
-.endif
+NVIDIA_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
+NVIDIA_USE_OFF=	LINUX_APPS=dri,libpciaccess
 
 # Fixed by the first post-patch target line?  Also, linprocfs needs to be mounted.
 #.if ${OSVERSION} >= 900000 && ${ARCH} == "amd64"
@@ -54,14 +48,17 @@ do-extract:
 
 post-patch:
 	@${REINPLACE_CMD} -e '/OS.*=/s|linux|FreeBSD|' ${WRKSRC}/drivers.ini
-	@${REINPLACE_CMD} -e 's|^# Set the home.*|GOOGLEEARTH_DATA_PATH=${DATADIR}|; \
-		s|%%LIBGL_ALWAYS_SOFTWARE%%|${LIBGL_ALWAYS_SOFTWARE}|' ${WRKSRC}/bin/googleearth
+	@${REINPLACE_CMD} -e 's|^# Set the home.*|GOOGLEEARTH_DATA_PATH=${DATADIR}|' ${WRKSRC}/bin/googleearth
 	@${REINPLACE_CMD} -i "" -e "s|^# Let's boogie.*|rm -f ${LINUXBASE}\$${HOME}/.googleearth/instance-running-lock|" ${WRKSRC}/bin/googleearth
 	@${REINPLACE_CMD} -i "" -e 's/^TMPPATH.*/exit 0/' ${WRKSRC}/postinstall.sh
 	@${REINPLACE_CMD} -i "" -e 's|\"\$$SETUP_INSTALLPATH/|\"${WRKSRC}/|' ${WRKSRC}/postinstall.sh
 	@${REINPLACE_CMD} -i "" -e 's|\$$SETUP_INSTALLPATH/googleearth |${PREFIX}/bin/googleearth |' ${WRKSRC}/postinstall.sh
 	${RM} ${WRKSRC}/libcurl.so.4
 	${PERL} -i -pe 's|/lib/ld-lsb.so.3\0\0\0|/lib/ld-linux.so.2\0|' ${WRKSRC}/googleearth-bin
+post-patch-NVIDIA-on:
+	@${REINPLACE_CMD} 's|%%LIBGL_ALWAYS_SOFTWARE%%||' ${WRKSRC}/bin/googleearth
+post-patch-NVIDIA-off:
+	@${REINPLACE_CMD} 's|%%LIBGL_ALWAYS_SOFTWARE%%|LIBGL_ALWAYS_SOFTWARE=yes|' ${WRKSRC}/bin/googleearth
 
 do-build:
 	@${SETENV} SETUP_INSTALLPATH=${DATADIR} ${WRKSRC}/postinstall.sh
@@ -83,4 +80,4 @@ do-install:
 	${LN} -sf ${DATADIR}/bin/googleearth \
 		${STAGEDIR}${PREFIX}/bin/
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/astro/gpsd/Makefile b/astro/gpsd/Makefile
index 5346ecd..c3d8a22 100644
--- a/astro/gpsd/Makefile
+++ b/astro/gpsd/Makefile
@@ -75,189 +75,68 @@ QTBIND_DESC=		build QT bindings
 UBLOX_DESC=		u-blox protocol support
 USB_DESC=		libusb support for USB devices
 
-.include <bsd.port.options.mk>
-
 # Options related to GPS protocols
-.if ! ${PORT_OPTIONS:MNMEA0183}
-MAKE_ARGS+=	nmea0183=no
-.endif
-
-.if ! ${PORT_OPTIONS:MASHTECH}
-MAKE_ARGS+=	ashtech=no
-.endif
-
-.if ! ${PORT_OPTIONS:MEARTHMATE}
-MAKE_ARGS+=	earthmate=no
-.endif
-
-.if ! ${PORT_OPTIONS:MEVERMORE}
-MAKE_ARGS+=	evermore=no
-.endif
-
-.if ! ${PORT_OPTIONS:MFURY}
-MAKE_ARGS+=	fury=no
-.endif
-
-.if ! ${PORT_OPTIONS:MFV18}
-MAKE_ARGS+=	fv18=no
-.endif
-
-.if ! ${PORT_OPTIONS:MGARMIN}
-MAKE_ARGS+=	garmin=no
-.endif
-
-.if ! ${PORT_OPTIONS:MGARMINTXT}
-MAKE_ARGS+=	garmintxt=no
-.endif
-
-.if ! ${PORT_OPTIONS:MGEOSTAR}
-MAKE_ARGS+=	geostar=no
-.endif
-
-.if ! ${PORT_OPTIONS:MITRAX}
-MAKE_ARGS+=	itrax=no
-.endif
-
-.if ! ${PORT_OPTIONS:MMTK}
-MAKE_ARGS+=	mtk3301=no
-.endif
-
-.if ! ${PORT_OPTIONS:MNAVCOM}
-MAKE_ARGS+=	navcom=no
-.endif
-
-.if ! ${PORT_OPTIONS:MONCORE}
-MAKE_ARGS+=	oncore=no
-.endif
-
-.if ! ${PORT_OPTIONS:MSIRF}
-MAKE_ARGS+=	sirf=no
-.endif
-
-.if ! ${PORT_OPTIONS:MSUPERSTARII}
-MAKE_ARGS+=	superstar2=no
-.endif
-
-.if ! ${PORT_OPTIONS:MTNT}
-MAKE_ARGS+=	tnt=no
-.endif
-
-.if ! ${PORT_OPTIONS:MTRIPMATE}
-MAKE_ARGS+=	tripmate=no
-.endif
-
-.if ! ${PORT_OPTIONS:MTSIP}
-MAKE_ARGS+=	tsip=no
-.endif
-
-.if ! ${PORT_OPTIONS:MUBLOX}
-MAKE_ARGS+=	ublox=no
-.endif
+NMEA0183_MAKE_ARGS_OFF=	nmea0183=no
+ASHTECH_MAKE_ARGS_OFF=	ashtech=no
+EARTHMATE_MAKE_ARGS_OFF=	earthmate=no
+EVERMORE_MAKE_ARGS_OFF=	evermore=no
+FURY_MAKE_ARGS_OFF=	fury=no
+FV18_MAKE_ARGS_OFF=	fv18=no
+GARMIN_MAKE_ARGS_OFF=	garmin=no
+GARMINTXT_MAKE_ARGS_OFF=	garmintxt=no
+GEOSTAR_MAKE_ARGS_OFF=	geostar=no
+ITRAX_MAKE_ARGS_OFF=	itrax=no
+MTK_MAKE_ARGS_OFF=	mtk3301=no
+NAVCOM_MAKE_ARGS_OFF=	navcom=no
+ONCORE_MAKE_ARGS_OFF=	oncore=no
+SIRF_MAKE_ARGS_OFF=	sirf=no
+SUPERSTARII_MAKE_ARGS_OFF=	superstar2=no
+TNT_MAKE_ARGS_OFF=	tnt=no
+TRIPMATE_MAKE_ARGS_OFF=	tripmate=no
+TSIP_MAKE_ARGS_OFF=	tsip=no
+UBLOX_MAKE_ARGS_OFF=	ublox=no
 
 # Options related to Non-GPS protocols
-.if ! ${PORT_OPTIONS:MAIVDM}
-MAKE_ARGS+=	aivdm=no
-.endif
-
-.if ! ${PORT_OPTIONS:MGPSCLOCK}
-MAKE_ARGS+=	gpsclock=no
-.endif
-
-.if ! ${PORT_OPTIONS:MNTRIP}
-MAKE_ARGS+=	ntrip=no
-.endif
-
-.if ! ${PORT_OPTIONS:MOCEANSERVER}
-MAKE_ARGS+=	oceanserver=no
-.endif
-
-.if ! ${PORT_OPTIONS:MRTCM104V2}
-MAKE_ARGS+=	rtcm104v2=no
-.endif
-
-.if ! ${PORT_OPTIONS:MRTCM104V3}
-MAKE_ARGS+=	rtcm104v3=no
-.endif
+AIVDM_MAKE_ARGS_OFF=	aivdm=no
+GPSCLOCK_MAKE_ARGS_OFF=	gpsclock=no
+NTRIP_MAKE_ARGS_OFF=	ntrip=no
+OCEANSERVER_MAKE_ARGS_OFF=	oceanserver=no
+RTCM104V2_MAKE_ARGS_OFF=	rtcm104v2=no
+RTCM104V3_MAKE_ARGS_OFF=	rtcm104v3=no
 
 # Time service
-.if ! ${PORT_OPTIONS:MNTP}
-MAKE_ARGS+=	ntp=no
-.endif
-
-.if ! ${PORT_OPTIONS:MNTPSHM}
-MAKE_ARGS+=	ntpshm=no
-.endif
-
-.if ! ${PORT_OPTIONS:MPPS}
-MAKE_ARGS+=	pps=no
-.else
-.	if ! ${PORT_OPTIONS:MNTPSHM}
-IGNORE=		PPS requires NTPSHM
-.	endif
-.endif
+NTP_MAKE_ARGS_OFF=	ntp=no
+NTPSHM_MAKE_ARGS_OFF=	ntpshm=no
+PPS_MAKE_ARGS_OFF=	pps=no
+PPS_IMPLIES=	NTPSHM
 
 # Export methods
-.if ! ${PORT_OPTIONS:MSOCKEXPORT}
-MAKE_ARGS+=	socket_export=no
-.endif
-
-.if ${PORT_OPTIONS:MDBUS}
-LIB_DEPENDS+=	libdbus-1.so:${PORTSDIR}/devel/dbus
-MAKE_ARGS+=	dbus_export=yes
-.endif
-
-.if ! ${PORT_OPTIONS:MSHMEXPORT}
-MAKE_ARGS+=	shm_export=no
-.endif
+SOCKEXPORT_MAKE_ARGS_OFF=	socket_export=no
+DBUS_LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
+DBUS_MAKE_ARGS=	dbus_export=yes
+SHMEXPORT_MAKE_ARGS_OFF=	shm_export=no
 
 # Communication
-.if ! ${PORT_OPTIONS:MUSB}
-MAKE_ARGS+=	usb=no
-.endif
-
-.if ! ${PORT_OPTIONS:MIPV6}
-MAKE_ARGS+=	ipv6=no
-.endif
-
-.if ! ${PORT_OPTIONS:MNETFEED}
-MAKE_ARGS+=	netfeed=no
-.endif
-
-.if ! ${PORT_OPTIONS:MPASSTHROUGH}
-MAKE_ARGS+=	passthrough=no
-.endif
+USB_MAKE_ARGS_OFF=	usb=no
+IPV6_MAKE_ARGS_OFF=	ipv6=no
+NETFEED_MAKE_ARGS_OFF=	netfeed=no
+PASSTHROUGH_MAKE_ARGS_OFF=	passthrough=no
 
 # Other daemon options
-.if ! ${PORT_OPTIONS:MTIMING}
-MAKE_ARGS+=	timing=no
-.endif
+TIMING_MAKE_ARGS_OFF=	timing=no
 
 # Client-side options
-.if ! ${PORT_OPTIONS:MNCURSES}
-MAKE_ARGS+=	ncurses=no
-.endif
-
-.if ${PORT_OPTIONS:MQTBIND}
-USE_QT4=	network
-MAKE_ARGS+=	qt=yes
-PLIST_SUB+=	QTBIND=""
-.else
-MAKE_ARGS+=	qt=no
-PLIST_SUB+=	QTBIND="@comment "
-.endif
-
-.if ! ${PORT_OPTIONS:MRECONFIGURE}
-MAKE_ARGS+=	reconfigure=no
-.endif
-
-.if ! ${PORT_OPTIONS:MCPPBIND}
-MAKE_ARGS+=	libgpsmm=no
-.endif
+NCURSES_MAKE_ARGS_OFF=	ncurses=no
+QTBIND_USE=	QT4=network
+QTBIND_MAKE_ARGS=	qt=yes
+QTBIND_MAKE_ARGS_OFF=	qt=no
+QTBIND_PLIST_SUB=	QTBIND=""
+QTBIND_PLIST_SUB_OFF=	QTBIND="@comment "
+RECONFIGURE_MAKE_ARGS_OFF=	reconfigure=no
+CPPBIND_MAKE_ARGS_OFF=	libgpsmm=no
 
 # Build control
-.if ${PORT_OPTIONS:MPROFILING}
-MAKE_ARGS+=	profiling=yes
-.endif
+PROFILING_MAKE_ARGS=	profiling=yes
 
 # generates .py[co] files for installed modules
 # if that's not done, ${PYTHON_SITELIBDIR}/gps will be polluted
diff --git a/astro/gpsdrive/Makefile b/astro/gpsdrive/Makefile
index 4450f86..b4ac29b 100644
--- a/astro/gpsdrive/Makefile
+++ b/astro/gpsdrive/Makefile
@@ -36,13 +36,10 @@ OPTIONS_SUB=	yes
 NLS_USES=	gettext
 NLS_USES_OFF=	gettext-tools
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} 's/test "$$CC" = "gcc"/false/' ${WRKSRC}/configure
-.if empty(PORT_OPTIONS:MNLS)
+post-patch-NLS-off:
 	@${REINPLACE_CMD} 's|SUBDIRS = src po man|SUBDIRS = src man|' \
 		${WRKSRC}/Makefile.in
-.endif
 
 .include <bsd.port.mk>
diff --git a/astro/gpsman/Makefile b/astro/gpsman/Makefile
index fb4387b..aeb42bb 100644
--- a/astro/gpsman/Makefile
+++ b/astro/gpsman/Makefile
@@ -19,13 +19,9 @@ PLIST_SUB+=	GPSMANDIR=${GPSMANDIR:S/${PREFIX}\///}
 NO_BUILD=	yes
 PORTDOCS=	*
 
-.include <bsd.port.options.mk>
-
 GPSMAN_DEFAULT_PORT?=	/dev/cuau0
 
-.if ${PORT_OPTIONS:MDOCS}
-SUB_FILES=	pkg-message
-.endif
+DOCS_SUB_FILES=	pkg-message
 
 post-patch:
 	@${REINPLACE_CMD} "s|/dev/ttyS0|${GPSMAN_DEFAULT_PORT}|" \
@@ -42,7 +38,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/gmsrc/gmicons/* ${STAGEDIR}${GPSMANDIR}/gmsrc/gmicons
 	${INSTALL_DATA} ${WRKSRC}/util/*.sh ${STAGEDIR}${GPSMANDIR}/util
 	${INSTALL_DATA} ${WRKSRC}/util/*.tcl ${STAGEDIR}${GPSMANDIR}/util
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html/info
 	${INSTALL_DATA} ${WRKSRC}/manual/*.pdf ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/manual/html/*.html ${STAGEDIR}${DOCSDIR}/html
@@ -50,7 +46,5 @@ do-install:
 .for i in gif txt ps
 	${INSTALL_DATA} ${WRKSRC}/manual/html/info/*.${i} ${STAGEDIR}${DOCSDIR}/html/info
 .endfor
-	@${CAT} ${PKGMESSAGE}
-.endif
 
 .include <bsd.port.mk>
diff --git a/astro/merkaartor/Makefile b/astro/merkaartor/Makefile
index 4f9f6c0..ef0c327 100644
--- a/astro/merkaartor/Makefile
+++ b/astro/merkaartor/Makefile
@@ -34,27 +34,20 @@ GEOIMAGE_LIB_DEPENDS=	libexiv2.so:${PORTSDIR}/graphics/exiv2
 ZBAR_DESC=	Read barcodes from walking papers (BROKEN)
 ZBAR_QMAKE_ON=	ZBAR=1
 ZBAR_LIB_DEPENDS=	libzbar.so:${PORTSDIR}/graphics/zbar
+ZBAR_BROKEN=	Does not build with option ZBAR selected
 
 DEBUG_QMAKE_OFF=	NODEBUG=1 RELEASE=1
 
-OPTIONS_SUB=	yes
-
-.include <bsd.port.options.mk>
+NLS_USE=	QT4=linguist_build
 
-.if ${PORT_OPTIONS:MZBAR}
-BROKEN=	Does not build with option ZBAR selected
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-USE_QT4+=	linguist_build
+OPTIONS_SUB=	yes
 
-pre-build:
+pre-build-NLS-on:
 	@cd ${WRKSRC}/translations && ${LRELEASE} ../src/src.pro
 
-post-install:
+post-install-NLS-on:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/translations
 	@(cd ${WRKSRC}/translations && ${COPYTREE_SHARE} "merkaartor_*.qm" \
 		${STAGEDIR}${DATADIR}/translations)
-.endif
 
 .include <bsd.port.mk>
diff --git a/astro/osmium/Makefile b/astro/osmium/Makefile
index 8581031..b180fb2 100644
--- a/astro/osmium/Makefile
+++ b/astro/osmium/Makefile
@@ -29,6 +29,7 @@ CXXFLAGS+=	-I${LOCALBASE}/include \
 		-L${LOCALBASE}/lib
 
 NO_ARCH=	yes
+NO_BUILD=	yes
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	JAVASCRIPT DOXYGEN DOCS
@@ -38,19 +39,13 @@ JAVASCRIPT_DESC=Enable javascript support
 JAVASCRIPT_LIB_DEPENDS=	libv8.so:${PORTSDIR}/lang/v8 \
 			libshp.so:${PORTSDIR}/devel/shapelib \
 			libicuuc.so:${PORTSDIR}/devel/icu
-.include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MDOXYGEN} && ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
-.endif
+DOXYGEN_IMPLIES=	DOCS
+DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
 
-do-build:
-.if ${PORT_OPTIONS:MDOXYGEN} && ${PORT_OPTIONS:MDOCS}
+do-build-DOXYGEN-on:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKR_ARGS} doc
-.else
-	${TRUE}
-.endif
 
 regression-test:
 	cd ${WRKSRC}/test && ${SETENV} ${MAKE_ENV} ${SH} run_tests.sh
@@ -59,10 +54,9 @@ do-install:
 	cd ${WRKSRC}/include && ${COPYTREE_SHARE} '${PORTNAME} ${PORTNAME}.hpp' \
 		${STAGEDIR}${PREFIX}/include/
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-.if ${PORT_OPTIONS:MDOXYGEN}
-	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR}/
-.endif
 	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/THANKS \
 		${WRKSRC}/NOTES_FOR_DEVELOPERS ${STAGEDIR}${DOCSDIR}/
+do-install-DOXYGEN-on:
+	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
diff --git a/astro/viking/Makefile b/astro/viking/Makefile
index 571e12d..dc49321 100644
--- a/astro/viking/Makefile
+++ b/astro/viking/Makefile
@@ -53,6 +53,7 @@ MERKAATOR_DESC=	Edit OpenStreetMap via Merkaartor
 OPTIONS_SUB=	yes
 
 GEOCACHES_CONFIGURE_ENABLE=	geocaches
+GEOCACHES_SUB_FILES=	pkg-message
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
@@ -66,12 +67,6 @@ GPSD_CONFIGURE_ENABLE=	realtime-gps-tracking
 JOSM_RUN_DEPENDS=	josm:${PORTSDIR}/astro/josm
 MERKAATOR_RUN_DEPENDS=	merkaartor:${PORTSDIR}/astro/merkaartor
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MGEOCACHES}
-SUB_FILES+=	pkg-message
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e '/^AM_CFLAGS/s| -g | |' ${WRKSRC}/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|Science;|Education;Science;|' \
diff --git a/astro/xtide/Makefile b/astro/xtide/Makefile
index 64f7a4e..d6165fe 100644
--- a/astro/xtide/Makefile
+++ b/astro/xtide/Makefile
@@ -85,14 +85,12 @@ post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${HARM_WRKSRC} && ${INSTALL_DATA} harmonics.tcd \
 		${STAGEDIR}${DATADIR})
-.if ${PORT_OPTIONS:MWVS}
+post-install-WVS-on:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/wvs
 	(cd ${WRKDIR} && ${INSTALL_DATA} wvs*.dat \
 		${STAGEDIR}${DATADIR}/wvs)
-.endif
-.if ${PORT_OPTIONS:MX11}
+post-install-X11-on:
 	(cd ${WRKSRC}/iconsrc && ${INSTALL_DATA} xtide.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps)
-.endif
 
 .include <bsd.port.mk>
diff --git a/audio/abraca/Makefile b/audio/abraca/Makefile
index 7dc5960..2bc9099 100644
--- a/audio/abraca/Makefile
+++ b/audio/abraca/Makefile
@@ -28,13 +28,9 @@ OPTIONS_DEFAULT=	NLS
 OPTIONS_SUB=	yes
 NLS_USES=	gettext
 
-.include <bsd.port.options.mk>
-
-post-patch:
-.if ! ${PORT_OPTIONS:MNLS}
+post-patch-NLS-off:
 	@${REINPLACE_CMD} -e '/\.load(/s/ intltool//' \
 		-e '/recurse/s/ po//' ${WRKSRC}/wscript
-.endif
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
diff --git a/audio/alsa-plugins/Makefile b/audio/alsa-plugins/Makefile
index 87d68f8..b23d52c 100644
--- a/audio/alsa-plugins/Makefile
+++ b/audio/alsa-plugins/Makefile
@@ -40,6 +40,7 @@ VERBOSE_CFLAGS=	-DFREEBSD_OSS_DEBUG_VERBOSE
 
 JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
 JACK_CONFIGURE_ENABLE=	jack
+JACK_IMPLIES=		SAMPLERATE
 
 FFMPEG_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
 FFMPEG_CONFIGURE_ENABLE=avcodec
@@ -55,12 +56,6 @@ SPEEX_LIB_DEPENDS=	libspeex.so:${PORTSDIR}/audio/speex
 SPEEX_CONFIGURE_ON=	--with-speex=lib
 SPEEX_CONFIGURE_OFF=	--without-speex
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MJACK} && empty(PORT_OPTIONS:MSAMPLERATE)
-IGNORE=			JACK audio support requires SAMPLERATE
-.endif
-
 post-patch:	.SILENT
 	${REINPLACE_CMD} -e '/LIBS/s/-ldl//g' \
 		-e '/lt_cv_dlopen/s/-ldl//g' \
diff --git a/audio/alure/Makefile b/audio/alure/Makefile
index 4eafb1b..99e1231 100644
--- a/audio/alure/Makefile
+++ b/audio/alure/Makefile
@@ -49,21 +49,18 @@ SNDFILE_LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
 SNDFILE_CMAKE_ON=	-DSNDFILE:BOOL=TRUE
 SNDFILE_CMAKE_OFF=	-DSNDFILE:BOOL=FALSE
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|lib$${LIB_SUFFIX}/pkgconfig|libdata/pkgconfig|' \
 		-e 's|LIBFLAC_LIBRARIES|FLAC_LIBRARIES|' \
 		${WRKSRC}/CMakeLists.txt
 
-.if ${PORT_OPTIONS:MDOCS}
+post-patch-DOCS-on:
 	@${REINPLACE_CMD} \
 		-e 's|INSTALL(DIRECTORY "$${ALURE_SOURCE_DIR}/docs/html"|INSTALL(DIRECTORY "$${ALURE_SOURCE_DIR}/docs/html" "$${ALURE_SOURCE_DIR}/docs/naturaldocs"|' \
 		${WRKSRC}/CMakeLists.txt
-.else
+post-patch-DOCS-off:
 	@${REINPLACE_CMD} -i '' '/FIND_PROGRAM(NATDOCS_BIN NaturalDocs)/,/ENDIF(NATDOCS_BIN)/s/^/#/' ${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} -i '' -e '/INSTALL(DIRECTORY "$${ALURE_SOURCE_DIR}/,+2d' ${WRKSRC}/CMakeLists.txt
-.endif
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
diff --git a/audio/ario/Makefile b/audio/ario/Makefile
index 261aad2..82d4924 100644
--- a/audio/ario/Makefile
+++ b/audio/ario/Makefile
@@ -34,21 +34,11 @@ INSTALL_TARGET=	install-strip
 OPTIONS_DEFINE=	AVAHI NLS
 AVAHI_DESC=	Zeroconf support (Avahi)
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MAVAHI}
-LIB_DEPENDS+=	libavahi-client.so:${PORTSDIR}/net/avahi-app
-CONFIGURE_ARGS+=	--enable-avahi
-.else
-CONFIGURE_ARGS+=	--disable-avahi
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-CONFIGURE_ARGS+=	--enable-nls
-.else
-CONFIGURE_ARGS+=	--disable-nls
-.endif
+AVAHI_LIB_DEPENDS=	libavahi-client.so:${PORTSDIR}/net/avahi-app
+AVAHI_CONFIGURE_ENABLE=	avahi
+
+NLS_USES=		gettext
+NLS_CONFIGURE_ENABLE=	nls
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|glib/gslist.h|glib.h|g ; \
diff --git a/audio/asunder/Makefile b/audio/asunder/Makefile
index 6590dd3..1b30ed9 100644
--- a/audio/asunder/Makefile
+++ b/audio/asunder/Makefile
@@ -35,18 +35,13 @@ WAVPACK_RUN_DEPENDS=	wavpack:${PORTSDIR}/audio/wavpack
 APE_RUN_DEPENDS=	mac:${PORTSDIR}/audio/mac
 NLS_CONFIGURE_ENABLE=	yes
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's/^itlocaledir = .*/itlocaledir = @datarootdir@\/locale/' ${WRKSRC}/po/Makefile.in.in
-.if ${PORT_OPTIONS:MWINDOWS_CHARS}
+post-patch-WINDOWS_CHARS-on:
 	@${REINPLACE_CMD} -e 's^#define[[:blank:]]*BADCHARS.*^#define BADCHARS "/"^' ${WRKSRC}/src/util.h
-.endif
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
-.endif
 
 .include <bsd.port.mk>
diff --git a/audio/baudline/Makefile b/audio/baudline/Makefile
index e43f75d..756486d 100644
--- a/audio/baudline/Makefile
+++ b/audio/baudline/Makefile
@@ -28,9 +28,6 @@ OPTIONS_DEFAULT=	MPG123
 
 MMPG123_RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
 
-.include <bsd.port.options.mk>
-.include <bsd.port.pre.mk>
-
 .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING)
 IGNORE=		may not be automatically fetched due to licensing\
 		restrictions. You must manually fetch ${DISTFILES} from\
@@ -44,10 +41,8 @@ do-build:
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/baudline ${STAGEDIR}${PREFIX}/bin
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
 	@${INSTALL} -d ${STAGEDIR}${DOCSDIR}
 	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
-.endif
-	@[ -f /compat/linux/proc/stat ] || ${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/clementine-player/Makefile b/audio/clementine-player/Makefile
index 085ae8a..ac9f6a9 100644
--- a/audio/clementine-player/Makefile
+++ b/audio/clementine-player/Makefile
@@ -66,90 +66,49 @@ MOODBAR_DESC=		Moodbar Support
 OPTIONS_DEFAULT=	AUDIOCD BOX DEVICEKIT DROPBOX GIO GOOGLE_DRIVE GPOD \
 			LASTFM MTP VISUALISATION WIIMOTEDEV MOODBAR
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDROPBOX}
-CMAKE_ARGS+=	-DENABLE_DROPBOX=ON
-.else
-CMAKE_ARGS+=	-DENABLE_DROPBOX=OFF
-.endif
-
-.if ${PORT_OPTIONS:MMOODBAR}
-CMAKE_ARGS+=	-DENABLE_MOODBAR=ON
-.else
-CMAKE_ARGS+=	-DENABLE_MOODBAR=OFF
-.endif
-
-.if ${PORT_OPTIONS:MAUDIOCD}
-CMAKE_ARGS+=	-DENABLE_AUDIOCD=ON
-LIB_DEPENDS+=	libcdio.so:${PORTSDIR}/sysutils/libcdio
-.else
-CMAKE_ARGS+=	-DENABLE_AUDIOCD=OFF
-.endif
-
-.if ${PORT_OPTIONS:MBOX}
-CMAKE_ARGS+=	-DENABLE_BOX=ON
-.else
-CMAKE_ARGS+=	-DENABLE_BOX=OFF
-.endif
-
-.if ${PORT_OPTIONS:MBREAKPAD}
-CMAKE_ARGS+=	-DENABLE_BREAKPAD=ON
-.else
-CMAKE_ARGS+=	-DENABLE_BREAKPAD=OFF
-.endif
-
-.if ${PORT_OPTIONS:MDEVICEKIT}
-CMAKE_ARGS+=	-DENABLE_DEVICEKIT=ON
-.else
-CMAKE_ARGS+=	-DENABLE_DEVICEKIT=OFF
-.endif
-
-.if ${PORT_OPTIONS:MGIO}
-CMAKE_ARGS+=	-DENABLE_GIO=ON
-USE_GNOME=	glib20
-.else
-CMAKE_ARGS+=	-DENABLE_GIO=OFF
-.endif
-
-.if ${PORT_OPTIONS:MGOOGLE_DRIVE}
-CMAKE_ARGS+=	-DENABLE_GOOGLE_DRIVE=ON
-BUILD_DEPENDS+=	google-sparsehash>=2.0.2:${PORTSDIR}/devel/google-sparsehash
-.else
-CMAKE_ARGS+=	-DENABLE_GOOGLE_DRIVE=OFF
-.endif
-
-.if ${PORT_OPTIONS:MGPOD}
-CMAKE_ARGS+=	-DENABLE_LIBGPOD=ON
-LIB_DEPENDS+=	libgpod.so:${PORTSDIR}/audio/libgpod
-.else
-CMAKE_ARGS+=	-DENABLE_LIBGPOD=OFF
-.endif
-
-.if ${PORT_OPTIONS:MLASTFM}
-CMAKE_ARGS+=	-DENABLE_LIBLASTFM=ON
-LIB_DEPENDS+=	liblastfm.so:${PORTSDIR}/audio/liblastfm
-.else
-CMAKE_ARGS+=	-DENABLE_LIBLASTFM=OFF
-.endif
-
-.if ${PORT_OPTIONS:MMTP}
-CMAKE_ARGS+=	-DENABLE_LIBMTP=ON
-LIB_DEPENDS+=	libmtp.so:${PORTSDIR}/multimedia/libmtp
-.else
-CMAKE_ARGS+=	-DENABLE_LIBMTP=OFF
-.endif
-
-.if ${PORT_OPTIONS:MVISUALISATION}
-CMAKE_ARGS+=	-DENABLE_VISUALISATIONS=ON
-.else
-CMAKE_ARGS+=	-DENABLE_VISUALISATIONS=OFF
-.endif
-
-.if ${PORT_OPTIONS:MWIIMOTEDEV}
-CMAKE_ARGS+=	-DENABLE_WIIMOTEDEV=ON
-.else
-CMAKE_ARGS+=	-DENABLE_WIIMOTEDEV=OFF
-.endif
+DROPBOX_CMAKE_ON=	-DENABLE_DROPBOX=ON
+DROPBOX_CMAKE_OFF=	-DENABLE_DROPBOX=OFF
+
+MOODBAR_CMAKE_ON=	-DENABLE_MOODBAR=ON
+MOODBAR_CMAKE_OFF=	-DENABLE_MOODBAR=OFF
+
+AUDIOCD_LIB_DEPENDS=	libcdio.so:${PORTSDIR}/sysutils/libcdio
+AUDIOCD_CMAKE_ON=	-DENABLE_AUDIOCD=ON
+AUDIOCD_CMAKE_OFF=	-DENABLE_AUDIOCD=OFF
+
+BOX_CMAKE_ON=	-DENABLE_BOX=ON
+BOX_CMAKE_OFF=	-DENABLE_BOX=OFF
+
+BREAKPAD_CMAKE_ON=	-DENABLE_BREAKPAD=ON
+BREAKPAD_CMAKE_OFF=	-DENABLE_BREAKPAD=OFF
+
+DEVICEKIT_CMAKE_ON=	-DENABLE_DEVICEKIT=ON
+DEVICEKIT_CMAKE_OFF=	-DENABLE_DEVICEKIT=OFF
+
+GIO_USE=	GNOME=glib20
+GIO_CMAKE_ON=	-DENABLE_GIO=ON
+GIO_CMAKE_OFF=	-DENABLE_GIO=OFF
+
+GOOGLE_DRIVE_BUILD_DEPENDS=	google-sparsehash>=2.0.2:${PORTSDIR}/devel/google-sparsehash
+GOOGLE_DRIVE_CMAKE_ON=	-DENABLE_GOOGLE_DRIVE=ON
+GOOGLE_DRIVE_CMAKE_OFF=	-DENABLE_GOOGLE_DRIVE=OFF
+
+GPOD_LIB_DEPENDS=	libgpod.so:${PORTSDIR}/audio/libgpod
+GPOD_CMAKE_ON=	-DENABLE_LIBGPOD=ON
+GPOD_CMAKE_OFF=	-DENABLE_LIBGPOD=OFF
+
+LASTFM_LIB_DEPENDS=	liblastfm.so:${PORTSDIR}/audio/liblastfm
+LASTFM_CMAKE_ON=	-DENABLE_LIBLASTFM=ON
+LASTFM_CMAKE_OFF=	-DENABLE_LIBLASTFM=OFF
+
+MPT_LIB_DEPENDS=	libmtp.so:${PORTSDIR}/multimedia/libmtp
+MTP_CMAKE_ON=	-DENABLE_LIBMTP=ON
+MTP_CMAKE_OFF=	-DENABLE_LIBMTP=OFF
+
+VISUALISATION_CMAKE_ON=	-DENABLE_VISUALISATIONS=ON
+VISUALISATION_CMAKE_OFF=	-DENABLE_VISUALISATIONS=OFF
+
+WIIMOTEDEV_CMAKE_ON=	-DENABLE_WIIMOTEDEV=ON
+WIIMOTEDEV_CMAKE_OFF=	-DENABLE_WIIMOTEDEV=OFF
 
 .include <bsd.port.mk>
diff --git a/audio/csound/Makefile b/audio/csound/Makefile
index bd12948..972d609 100644
--- a/audio/csound/Makefile
+++ b/audio/csound/Makefile
@@ -131,8 +131,6 @@ MAKE_ARGS+=	buildCsound5GUI=0 buildCSEditor=0 buildWinsound=0 useFLTK=0
 CSOUND_DOCS=	Csound${PORTVERSION:R}_manual_html.zip
 .endif
 
-.include <bsd.port.pre.mk>
-
 .if ${ARCH} == amd64 || ${ARCH} == sparc64 || ${ARCH} == ia64
 MAKE_ARGS+=	Word64=1
 .endif
@@ -148,8 +146,6 @@ CXXLIB=		c++
 CXXLIB=		# empty
 .endif
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${SED} -e "s|%%LOCALBASE%%|${LOCALBASE}|g; \
 		s|%%PYTHON_INCLUDEDIR%%|${PYTHON_INCLUDEDIR}|" \
@@ -190,4 +186,4 @@ post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* ${STAGEDIR}${PREFIX}/lib/*.so* \
 		${STAGEDIR}${PREFIX}/lib/csound/plugins64/*.so
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/csound6/Makefile b/audio/csound6/Makefile
index 645c36c..5cb258f 100644
--- a/audio/csound6/Makefile
+++ b/audio/csound6/Makefile
@@ -48,6 +48,7 @@ OPTIONS_SUB=		yes
 ALSA_DESC=		Build ALSA I/O module
 ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
 ALSA_CMAKE_OFF=		-DUSE_ALSA:BOOL=OFF
+ALSA_PREVENTS=		DSSI
 CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
 CURL_CMAKE_OFF=		-DUSE_CURL:BOOL=OFF
 DSSI_DESC=		Build DSSI/LADSPA host opcodes
@@ -105,10 +106,6 @@ BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
 CMAKE_ARGS+=	-DFLEX_EXECUTABLE:STRING="${LOCALBASE}/bin/flex"
 .endif
 
-.if ${PORT_OPTIONS:MALSA} && ${PORT_OPTIONS:MDSSI}
-IGNORE=		ALSA and DSSI options are mutually exclusive
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/-O3/s|^|#| ; \
@@ -138,8 +135,7 @@ post-patch:
 post-install:
 	@${LN} -sf libcsnd6.so.6.0 ${STAGEDIR}${PREFIX}/lib/libcsnd6.so.6
 	@${LN} -sf libcsound64.so.6.0 ${STAGEDIR}${PREFIX}/lib/libcsound64.so.6
-.if ${PORT_OPTIONS:MFLTK}
+post-install-FLTK-on:
 	@${LN} -sf libCsoundAC.so.6.0 ${STAGEDIR}${PREFIX}/lib/libCsoundAC.so.6
-.endif
 
 .include <bsd.port.mk>
diff --git a/audio/deadbeef/Makefile b/audio/deadbeef/Makefile
index e3f76a1..a666915 100644
--- a/audio/deadbeef/Makefile
+++ b/audio/deadbeef/Makefile
@@ -73,6 +73,7 @@ PULSEAUDIO_CONFIGURE_OFF=	--disable-pulse
 
 GUI_USE=	gnome=gtk20,glib20
 GUI_CONFIGURE_OFF=	--disable-gtkui --disable-gtk3
+GUI_IMPLIES=		CONVERTER
 
 VFS_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
 VFS_CONFIGURE_OFF=	--disable-vfs-curl
@@ -84,6 +85,7 @@ ART_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
 			libImlib2.so:${PORTSDIR}/graphics/imlib2
 ART_USES=		jpeg
 ART_CONFIGURE_OFF=	--disable-artwork --disable-artwork-imlib2
+ART_IMPLIES=		VFS
 
 SUPEREQ_CONFIGURE_OFF=	--disable-supereq
 
@@ -168,16 +170,6 @@ PLTBROWSER_CONFIGURE_OFF=	--disable-pltbrowser
 
 WMA_CONFIGURE_OFF=		--disable-wma
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MART} && ! ${PORT_OPTIONS:MVFS}
-BROKEN=		VFS plugin required for album art loader, please rerun 'make config' and either disable ART or enable VFS
-.endif
-
-.if ${PORT_OPTIONS:MCONVERTER} && ! ${PORT_OPTIONS:MGUI}
-BROKEN=		CONVERTER plugin required for gui, please rerun 'make config' and either disable CONVERTER or enable GUI
-.endif
-
 post-patch:
 # Do not link to libsupc++ which may be PIC-unsafe (breaks 64-bit arches)
 	@${REINPLACE_CMD} -e 's, -lsupc++,,' \
diff --git a/audio/dumb-allegro/Makefile b/audio/dumb-allegro/Makefile
index ed4625b..afe0e60 100644
--- a/audio/dumb-allegro/Makefile
+++ b/audio/dumb-allegro/Makefile
@@ -3,5 +3,6 @@
 
 OPTIONS_SLAVE=	ALLEGRO
 MASTERDIR=	${.CURDIR}/../dumb
+PKGNAMESUFFIX=	-allegro
 
 .include "${MASTERDIR}/Makefile"
diff --git a/audio/dumb/Makefile b/audio/dumb/Makefile
index 9cf4697..959da04 100644
--- a/audio/dumb/Makefile
+++ b/audio/dumb/Makefile
@@ -13,26 +13,19 @@ COMMENT=	IT, XM, S3M, and MOD player library
 USES=		gmake
 
 OPTIONS_DEFINE=	ALLEGRO
+OPTIONS_SUB=	yes
 ALLEGRO_DESC=	Enable allegro support
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MALLEGRO}
-LIB_DEPENDS+=	liballeg.so:${PORTSDIR}/devel/allegro
-PLIST_SUB+=	ALLEGRO=""
-MAKE_ARGS=	_PORT_ALLEGRO_CFLAGS="`allegro-config --cflags`"
-MAKE_ARGS+=	LINK_ALLEGRO="`allegro-config --libs` -lm"
-PKGNAMESUFFIX=	-allegro
-CONFLICTS=	dumb-[0-9]*
-.else
-PLIST_SUB+=	ALLEGRO="@comment "
-MAKE_ARGS=	_PORT_ALLEGRO_CFLAGS=
-CONFLICTS=	dumb-allegro-[0-9]*
-.endif
-
-.if ${ARCH} == "amd64" || ${ARCH} == "ia64" || ${ARCH} == "sparc64"
-CFLAGS+=	-fPIC
-.endif
+ALLEGRO_LIB_DEPENDS=	liballeg.so:${PORTSDIR}/devel/allegro
+ALLEGRO_MAKE_ARGS=	_PORT_ALLEGRO_CFLAGS="`allegro-config --cflags`" \
+			LINK_ALLEGRO="`allegro-config --libs` -lm"
+ALLEGRO_CONFLICTS=	dumb-[0-9]*
+ALLEGRO_MAKE_ARGS_OFF=	_PORT_ALLEGRO_CFLAGS=
+ALLEGRO_CONFLICTS_OFF=	dumb-allegro-[0-9]*
+
+CFLAGS_amd64=	-fPIC
+CFLAGS_ia64=	-fPIC
+CFLAGS_sparc64=	-fPIC
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|_INSTALL_PATH := |&$${DESTDIR}|' ${WRKSRC}/Makefile
@@ -40,8 +33,7 @@ post-patch:
 do-configure:
 	@${ECHO_CMD} 'include make/unix.inc' > ${WRKSRC}/make/config.txt
 	@${ECHO_CMD} 'ALL_TARGETS := core core-examples core-headers' >> ${WRKSRC}/make/config.txt
-.if ${PORT_OPTIONS:MALLEGRO}
+do-configure-ALLEGRO-on:
 	@${ECHO_CMD} 'ALL_TARGETS += allegro allegro-examples allegro-headers' >> ${WRKSRC}/make/config.txt
-.endif
 
 .include <bsd.port.mk>
diff --git a/audio/dvda-author/Makefile b/audio/dvda-author/Makefile
index cceaec2..d14b720 100644
--- a/audio/dvda-author/Makefile
+++ b/audio/dvda-author/Makefile
@@ -33,11 +33,7 @@ USE_CSTD=	gnu89
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-.if ! ${PORT_OPTIONS:MDOCS}
-CONFIGURE_ARGS+=	--docdir=${WRKDIR}/doc
-.endif
+DOCS_CONFIGURE_OFF=	--docdir=${WRKDIR}/doc
 
 post-patch:
 	@${REINPLACE_CMD} 's|-std=c99||g' \
diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index 21b5d1b..f2ed494 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -48,19 +48,13 @@ OPUS_CONFIGURE_ENABLE=	opus
 SPEEX_LIB_DEPENDS=	libspeex.so:${PORTSDIR}/audio/speex
 SPEEX_CONFIGURE_ENABLE=	speex
 
-.include <bsd.port.options.mk>
-
 NLS_USES=		gettext-runtime
 
-.if ${PORT_OPTIONS:MGTK2}
-USE_GNOME+=	gtk20
-CONFIGURE_ARGS+=--with-gtk2
-.endif
+GTK2_USE=	GNOME=gtk20
+GTK2_CONFIGURE_ON=--with-gtk2
 
-.if ${PORT_OPTIONS:MGTK3}
-USE_GNOME+=	gtk30
-CONFIGURE_ARGS+=--without-gtk2
-.endif
+GTK3_USE=	GNOME=gtk30
+GTK3_CONFIGURE_ON=--without-gtk2
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/audio/espeak/Makefile b/audio/espeak/Makefile
index fbc9089..2388c87 100644
--- a/audio/espeak/Makefile
+++ b/audio/espeak/Makefile
@@ -49,13 +49,11 @@ REINPLACE_ARGS=	-i.bak -e "s|%%DATADIR%%|${DATADIR}|g"
 
 BROKEN_sparc64=	Does not compile on sparc64
 
-.include <bsd.port.options.mk>
 
 post-patch:
 	cd ${BUILD_WRKSRC} && ${REINPLACE_CMD} ${REINPLACE_FILES}
-.if ${PORT_OPTIONS:MPORTAUDIO}
+post-patch-PORTAUDIO-on:
 	${MV} ${WRKSRC}/src/portaudio19.h ${WRKSRC}/src/portaudio.h
-.endif
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/audio/etktab/Makefile b/audio/etktab/Makefile
index 75e99a5..4849e6c 100644
--- a/audio/etktab/Makefile
+++ b/audio/etktab/Makefile
@@ -23,14 +23,10 @@ WRKSRC=		${WRKDIR}/eTktab-${PORTVERSION}
 PLIST_FILES=	bin/${PORTNAME}
 PORTDOCS=	*
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-DISTFILES+=	canada_multi-3.2.etk:keyboard \
+DOCS_DISTFILES=	canada_multi-3.2.etk:keyboard \
 		dvorak-3.2.etk:keyboard \
 		uk-3.2.etk:keyboard \
 		us-3.2.etk:keyboard
-.endif
 
 post-patch:
 	${REINPLACE_CMD} -e 's|wish|${WISH}|g' ${WRKSRC}/eTktab
@@ -42,12 +38,11 @@ post-extract:
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/eTktab ${STAGEDIR}${PREFIX}/bin/etktab
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for FILE in CHANGES.html LICENSE.html README.html eTktab-small.xpm eTktab.xpm \
 		canada_multi-3.2.etk dvorak-3.2.etk uk-3.2.etk us-3.2.etk
 	${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/audio/festival/Makefile b/audio/festival/Makefile
index 758670c..de23dc6 100644
--- a/audio/festival/Makefile
+++ b/audio/festival/Makefile
@@ -75,18 +75,12 @@ post-patch::
 	${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g'	\
 		${WRKSRC}/*/config/systems/default.mak
 
-.include <bsd.port.options.mk>
-
 .for m in nas esd
-.	if ${PORT_OPTIONS:M${m:tu}}
-LIB_DEPENDS+=	lib${m:nas=audio}.so:${PORTSDIR}/audio/${m:esd=esound}
-post-patch::
+${m:tu}_LIB_DEPENDS=	lib${m:nas=audio}.so:${PORTSDIR}/audio/${m:esd=esound}
+post-patch-${m:tu}-on:
 	${REINPLACE_CMD} -e 's,# INCLUDE_MODULES += ${m:tu}_AUDIO,INCLUDE_MODULES += ${m:tu}_AUDIO,' \
 		${WRKDIR}/*/config/config.in
-CONFIGURE_ARGS+=--enable-$m
-.	else
-CONFIGURE_ARGS+=--disable-$m
-.	endif
+${m:tu}_CONFIGURE_ENABLE=${m}
 .endfor
 
 do-configure:
diff --git a/audio/firefly/Makefile b/audio/firefly/Makefile
index 55f3dd1..524664b 100644
--- a/audio/firefly/Makefile
+++ b/audio/firefly/Makefile
@@ -51,13 +51,9 @@ USE_GCC=	any
 OPTIONS_DEFINE=	JAPANESE DOCS
 JAPANESE_DESC=	Japanese support in ID3 tags
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MJAPANESE}
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-src_scan-mp3.c
-USES+=		iconv
-CONFIGURE_ARGS+=	--enable-iconv
-.endif
+JAPANESE_EXTRA_PATCHES=	${FILESDIR}/extra-patch-src_scan-mp3.c
+JAPANESE_USES=		iconv
+JAPANESE_CONFIGURE_ON=	--enable-iconv
 
 pre-everything::
 	@${ECHO_CMD} "Define vars below if you need:"
@@ -66,17 +62,17 @@ pre-everything::
 	@${ECHO_CMD} "DAAPD_DBDIR=${DAAPD_DBDIR} (default: /var/db/${PORTNAME})"
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for i in README AUTHORS COPYING CREDITS \
-	ChangeLog INSTALL NEWS TODO
-	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
-.endfor
-.endif
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/contrib/mt-daapd.conf \
 		${STAGEDIR}${PREFIX}/etc/${PORTNAME}/mt-daapd.conf.sample
 	@${MKDIR} ${STAGEDIR}${DAAPD_DBDIR}
 	@${MKDIR} ${STAGEDIR}${DATADIR}
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for i in README AUTHORS COPYING CREDITS \
+	ChangeLog INSTALL NEWS TODO
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
+.endfor
+
 
 .include <bsd.port.mk>
diff --git a/audio/gbsplay/Makefile b/audio/gbsplay/Makefile
index 74ed506..0786157 100644
--- a/audio/gbsplay/Makefile
+++ b/audio/gbsplay/Makefile
@@ -29,15 +29,10 @@ OPTIONS_DEFINE=	NAS DOCS
 
 .endif
 
-.include <bsd.port.options.mk>
-
 .if ${PKGNAMEPREFIX} == ""
 
-.if ${PORT_OPTIONS:MNAS}
-LIB_DEPENDS+=	libaudio.so:${PORTSDIR}/audio/nas
-.else
-CONFIGURE_ARGS+=	--disable-nas
-.endif
+NAS_LIB_DEPENDS=	libaudio.so:${PORTSDIR}/audio/nas
+NAS_CONFIGURE_ENABLE=	nas
 
 .endif
 
diff --git a/audio/gimmix/Makefile b/audio/gimmix/Makefile
index ee37a5c..e4f7f7a 100644
--- a/audio/gimmix/Makefile
+++ b/audio/gimmix/Makefile
@@ -16,6 +16,7 @@ LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd \
 LICENSE=	GPLv2
 
 OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
 
 USE_GNOME=	gtk20 intltool libglade2
 
@@ -24,18 +25,10 @@ USES=		tar:bzip2 desktop-file-utils gmake pkgconfig
 
 CONFIGURE_ENV=	DATADIRNAME=share
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -lintl
-CONFIGURE_ARGS+=	--enable-nls
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+NLS_CPPFLAGS=	-I${LOCALBASE}/include
+NLS_LDFLAGS=	-L${LOCALBASE}/lib -lintl
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=		gettext
 
 post-patch:
 	@${LN} -sf ${LOCALBASE}/share/intltool/Makefile.in.in ${WRKSRC}/po/Makefile.in.in
diff --git a/audio/gmpc/Makefile b/audio/gmpc/Makefile
index d61799f..ba97e2c 100644
--- a/audio/gmpc/Makefile
+++ b/audio/gmpc/Makefile
@@ -31,17 +31,9 @@ LIBS+=		-L${LOCALBASE}/lib -lm
 OPTIONS_DEFINE=	MMKEYS XSPF
 OPTIONS_DEFAULT=	MMKEYS
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MMMKEYS}
-CONFIGURE_ARGS+=--disable-mmkeys
-.endif
-
-.if ${PORT_OPTIONS:MXSPF}
-LIB_DEPENDS+=	libxspf.so:${PORTSDIR}/multimedia/libxspf
-CONFIGURE_ARGS+=--enable-libxspf
-.else
-CONFIGURE_ARGS+=--disable-libxspf
-.endif
+MMKEYS_CONFIGURE_ON=--disable-mmkeys
+
+XSPF_LIB_DEPENDS=	libxspf.so:${PORTSDIR}/multimedia/libxspf
+XSPF_CONFIGURE_ENABLE=	libxspf
 
 .include <bsd.port.mk>
diff --git a/audio/gmusicbrowser/Makefile b/audio/gmusicbrowser/Makefile
index 6e605ca..c00b80f 100644
--- a/audio/gmusicbrowser/Makefile
+++ b/audio/gmusicbrowser/Makefile
@@ -34,8 +34,6 @@ LIBNOTIFY_RUN_DEPENDS=	p5-Gtk2-Notify>=0.05:${PORTSDIR}/devel/p5-Gtk2-Notify
 NLS_RUN_DEPENDS=	p5-Locale-gettext>=1.0:${PORTSDIR}/devel/p5-Locale-gettext
 OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
-
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.man ${STAGEDIR}${MANPREFIX}/man/man1/${MAN1}
@@ -47,9 +45,8 @@ do-install:
 		${INSTALL_SCRIPT} iceserver.pl ${STAGEDIR}${DATADIR})
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
-.if ${PORT_OPTIONS:MNLS}
+do-install-NLS-on:
 	(cd ${WRKSRC}/locale && \
 		${COPYTREE_SHARE} \* ${STAGEDIR}${PREFIX}/share/locale)
-.endif
 
 .include <bsd.port.mk>
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 75fc0e6..619cc51 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -34,17 +34,10 @@ GCONF_SCHEMAS=	gnome-audio-profiles.schemas \
 
 OPTIONS_DEFINE=	PULSEAUDIO
 OPTIONS_DEFAULT=PULSEAUDIO
+OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MPULSEAUDIO}
-LIB_DEPENDS+=	libpulse.so:${PORTSDIR}/audio/pulseaudio
-CONFIGURE_ARGS+=--enable-pulseaudio
-PLIST_SUB+=	PULSE=""
-.else
-CONFIGURE_ARGS+=--disable-pulseaudio
-PLIST_SUB+=	PULSE="@comment "
-.endif
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_CONFIGURE_ENABLE=pulseaudio
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|have_gladeui=true|have_gladeui=false|g' \
diff --git a/audio/gnome-media/pkg-plist b/audio/gnome-media/pkg-plist
index f9fde61..543418f 100644
--- a/audio/gnome-media/pkg-plist
+++ b/audio/gnome-media/pkg-plist
@@ -1,9 +1,9 @@
 bin/gnome-audio-profiles-properties
 bin/gnome-sound-recorder
-%%PULSE%%bin/gnome-volume-control
-%%PULSE%%bin/gnome-volume-control-applet
+%%PULSEAUDIO%%bin/gnome-volume-control
+%%PULSEAUDIO%%bin/gnome-volume-control-applet
 bin/gstreamer-properties
-%%PULSE%%etc/xdg/autostart/gnome-volume-control-applet.desktop
+%%PULSEAUDIO%%etc/xdg/autostart/gnome-volume-control-applet.desktop
 include/gnome-media/profiles/audio-profile-choose.h
 include/gnome-media/profiles/audio-profile-edit.h
 include/gnome-media/profiles/audio-profile.h
@@ -16,48 +16,48 @@ lib/libgnome-media-profiles.so.0
 lib/libgnome-media-profiles.so.0.0.0
 libdata/pkgconfig/gnome-media-profiles.pc
 share/applications/gnome-sound-recorder.desktop
-%%PULSE%%share/applications/gnome-volume-control.desktop
+%%PULSEAUDIO%%share/applications/gnome-volume-control.desktop
 share/applications/gstreamer-properties.desktop
 %%DATADIR%%/gnome-audio-profile-edit.ui
 %%DATADIR%%/gnome-audio-profile-new.ui
-%%PULSE%%%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-high.png
-%%PULSE%%%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-low.png
-%%PULSE%%%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-medium.png
-%%PULSE%%%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-muted.png
-%%PULSE%%%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-high.png
-%%PULSE%%%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-low.png
-%%PULSE%%%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-medium.png
-%%PULSE%%%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-muted.png
-%%PULSE%%%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-high.png
-%%PULSE%%%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-low.png
-%%PULSE%%%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-medium.png
-%%PULSE%%%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-muted.png
-%%PULSE%%%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-high.png
-%%PULSE%%%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-low.png
-%%PULSE%%%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-medium.png
-%%PULSE%%%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-muted.png
-%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-center.svg
-%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-center-testing.svg
-%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left-back.svg
-%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left-back-testing.svg
-%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left.svg
-%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left-side.svg
-%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left-side-testing.svg
-%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left-testing.svg
-%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right-back.svg
-%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right-back-testing.svg
-%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right.svg
-%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right-side.svg
-%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right-side-testing.svg
-%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right-testing.svg
-%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-center-back-testing.svg
-%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-center-back.svg
-%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-subwoofer.svg
-%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-subwoofer-testing.svg
-%%PULSE%%%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-high.svg
-%%PULSE%%%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-low.svg
-%%PULSE%%%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-medium.svg
-%%PULSE%%%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-muted.svg
+%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-high.png
+%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-low.png
+%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-medium.png
+%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-muted.png
+%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-high.png
+%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-low.png
+%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-medium.png
+%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-muted.png
+%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-high.png
+%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-low.png
+%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-medium.png
+%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-muted.png
+%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-high.png
+%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-low.png
+%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-medium.png
+%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-muted.png
+%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-center.svg
+%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-center-testing.svg
+%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left-back.svg
+%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left-back-testing.svg
+%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left.svg
+%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left-side.svg
+%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left-side-testing.svg
+%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left-testing.svg
+%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right-back.svg
+%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right-back-testing.svg
+%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right.svg
+%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right-side.svg
+%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right-side-testing.svg
+%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right-testing.svg
+%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-center-back-testing.svg
+%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-center-back.svg
+%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-subwoofer.svg
+%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-subwoofer-testing.svg
+%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-high.svg
+%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-low.svg
+%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-medium.svg
+%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-muted.svg
 %%DATADIR%%/sounds/gnome-sounds-default.xml
 share/gnome-sound-recorder/ui/ui.xml
 share/gnome/help/gnome-audio-profiles/C/figures/gnome-audio-profiles-profile-window.png
@@ -157,21 +157,21 @@ share/gnome/help/gstreamer-properties/zh_CN/gstreamer-properties.xml
 share/gstreamer-properties/gstreamer-properties.ui
 share/gstreamer-properties/icons/gstreamer-properties.png
 share/icons/hicolor/16x16/apps/gnome-sound-recorder.png
-%%PULSE%%share/icons/hicolor/16x16/apps/multimedia-volume-control.png
-%%PULSE%%share/icons/hicolor/16x16/apps/multimedia-volume-control.svg
+%%PULSEAUDIO%%share/icons/hicolor/16x16/apps/multimedia-volume-control.png
+%%PULSEAUDIO%%share/icons/hicolor/16x16/apps/multimedia-volume-control.svg
 share/icons/hicolor/22x22/apps/gnome-sound-recorder.png
-%%PULSE%%share/icons/hicolor/22x22/apps/multimedia-volume-control.png
-%%PULSE%%share/icons/hicolor/22x22/apps/multimedia-volume-control.svg
+%%PULSEAUDIO%%share/icons/hicolor/22x22/apps/multimedia-volume-control.png
+%%PULSEAUDIO%%share/icons/hicolor/22x22/apps/multimedia-volume-control.svg
 share/icons/hicolor/24x24/apps/gnome-sound-recorder.png
-%%PULSE%%share/icons/hicolor/24x24/apps/multimedia-volume-control.png
+%%PULSEAUDIO%%share/icons/hicolor/24x24/apps/multimedia-volume-control.png
 share/icons/hicolor/32x32/apps/gnome-sound-recorder.png
-%%PULSE%%share/icons/hicolor/32x32/apps/multimedia-volume-control.png
-%%PULSE%%share/icons/hicolor/32x32/apps/multimedia-volume-control.svg
+%%PULSEAUDIO%%share/icons/hicolor/32x32/apps/multimedia-volume-control.png
+%%PULSEAUDIO%%share/icons/hicolor/32x32/apps/multimedia-volume-control.svg
 share/icons/hicolor/48x48/apps/gnome-sound-recorder.png
-%%PULSE%%share/icons/hicolor/48x48/apps/multimedia-volume-control.png
+%%PULSEAUDIO%%share/icons/hicolor/48x48/apps/multimedia-volume-control.png
 share/icons/hicolor/48x48/apps/gstreamer-properties.png
 share/icons/hicolor/scalable/apps/gnome-sound-recorder.svg
-%%PULSE%%share/icons/hicolor/scalable/apps/multimedia-volume-control.svg
+%%PULSEAUDIO%%share/icons/hicolor/scalable/apps/multimedia-volume-control.svg
 share/locale/af/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/am/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-media-2.0.mo
diff --git a/audio/goobox/Makefile b/audio/goobox/Makefile
index 7f35da7..456061f 100644
--- a/audio/goobox/Makefile
+++ b/audio/goobox/Makefile
@@ -33,13 +33,7 @@ GLIB_SCHEMAS=	org.gnome.Goobox.gschema.xml
 OPTIONS_DEFINE=	NOTIFY
 OPTIONS_DEFAULT=NOTIFY
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNOTIFY}
-LIB_DEPENDS+=	libnotify.so:${PORTSDIR}/devel/libnotify
-CONFIGURE_ARGS+=--enable-notification
-.else
-CONFIGURE_ARGS+=--disable-notification
-.endif
+NOTIFY_LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
+NOTIFY_CONFIGURE_ENABLE=notification
 
 .include <bsd.port.mk>
diff --git a/audio/gspeakers/Makefile b/audio/gspeakers/Makefile
index 3134222..ea0a496 100644
--- a/audio/gspeakers/Makefile
+++ b/audio/gspeakers/Makefile
@@ -24,13 +24,8 @@ CFLAGS+=	-O0
 OPTIONS_DEFINE=	SPICE
 SPICE_DESC=	Use spice instead of gnucap
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MSPICE}
-RUN_DEPENDS+=	spice3:${PORTSDIR}/cad/spice
-.else
-RUN_DEPENDS+=	gnucap:${PORTSDIR}/cad/gnucap
-.endif
+SPICE_RUN_DEPENDS=	spice3:${PORTSDIR}/cad/spice
+SPICE_RUN_DEPENDS_OFF=	gnucap:${PORTSDIR}/cad/gnucap
 
 post-extract:
 	@${FIND} ${WRKSRC} -type l -delete
diff --git a/audio/jack/Makefile b/audio/jack/Makefile
index ce61691..618528d 100644
--- a/audio/jack/Makefile
+++ b/audio/jack/Makefile
@@ -41,18 +41,11 @@ ALSA_CONFIGURE_ENABLE=	alsa
 
 READLINE_LIB_DEPENDS=	libreadline.so:${PORTSDIR}/devel/readline
 
-.include <bsd.port.options.mk>
+DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOXYGEN_CONFIGURE_ENV_OFF=	ac_cv_prog_HAVE_DOXYGEN="false"
 
-.if ${PORT_OPTIONS:MDOXYGEN}
-BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
-.else
-CONFIGURE_ENV+=	ac_cv_prog_HAVE_DOXYGEN="false"
-.endif
-
-.if ! ${PORT_OPTIONS:MREADLINE}
-CONFIGURE_ENV+=	ac_cv_lib_readline_readline=no \
+READLINE_CONFIGURE_ENV_OFF=	ac_cv_lib_readline_readline=no \
 		ac_cv_header_readline_chardefs_h=no
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|define USE_MLOCK|undef USE_MLOCK|' \
diff --git a/audio/jack_ghero/Makefile b/audio/jack_ghero/Makefile
index 6bc64e5..95b7a2d 100644
--- a/audio/jack_ghero/Makefile
+++ b/audio/jack_ghero/Makefile
@@ -21,13 +21,9 @@ PLIST_FILES=	sbin/jack_ghero \
 
 OPTIONS_DEFINE=	DEBUG
 
-.include <bsd.port.options.mk>
-
 MAKE_ARGS+=	HAVE_MAN="YES"
 MAKE_ARGS+=	PTHREAD_LIBS="-lpthread"
 
-.if ${PORT_OPTIONS:MDEBUG}
-MAKE_ARGS+=	HAVE_DEBUG="YES"
-.endif
+DEBUG_MAKE_ARGS=	HAVE_DEBUG="YES"
 
 .include <bsd.port.mk>
diff --git a/audio/jack_umidi/Makefile b/audio/jack_umidi/Makefile
index 1bbc473..8634c06 100644
--- a/audio/jack_umidi/Makefile
+++ b/audio/jack_umidi/Makefile
@@ -23,24 +23,16 @@ OPTIONS_DEFINE=        DEBUG DEVD_SCRIPT
 
 DEVD_SCRIPT_DESC=	Install devd script to auto-launch jack_umidi
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDEVD_SCRIPT}
-PLIST_FILES+=	etc/devd/jack_umidi.conf
-.endif
+DEVD_SCRIPT_PLIST_FILES=	etc/devd/jack_umidi.conf
 
 MAKE_ARGS+=	HAVE_MAN="YES"
 MAKE_ARGS+=	PTHREAD_LIBS="-lpthread"
 
-.if ${PORT_OPTIONS:MDEBUG}
-MAKE_ARGS+=	HAVE_DEBUG="YES"
-.endif
+DEBUG_MAKE_ARGS=	HAVE_DEBUG="YES"
 
-post-install:
-.if ${PORT_OPTIONS:MDEVD_SCRIPT}
+post-install-DEVD_SCRIPT-on::
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/devd
 	${INSTALL_DATA} ${WRKDIR}/jack_umidi.conf \
 		 ${STAGEDIR}${PREFIX}/etc/devd
-.endif
 
 .include <bsd.port.mk>
diff --git a/audio/juke/Makefile b/audio/juke/Makefile
index 969ff88..ae04627 100644
--- a/audio/juke/Makefile
+++ b/audio/juke/Makefile
@@ -17,11 +17,7 @@ SUB_FILES=	pkg-message
 OPTIONS_DEFINE=	VI_BINDINGS
 VI_BINDINGS_DESC=	Use vi-like key bindings
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MVI_BINDINGS}
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-vi
-.endif
+VI_BINDINGS_EXTRA_PATCHES=	${FILESDIR}/extra-patch-vi
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/juke.conf ${STAGEDIR}${PREFIX}/etc/juke.conf.sample
diff --git a/audio/kaudiocreator/Makefile b/audio/kaudiocreator/Makefile
index c7ab38a..0d5e624 100644
--- a/audio/kaudiocreator/Makefile
+++ b/audio/kaudiocreator/Makefile
@@ -31,11 +31,7 @@ OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 NLS_USES=	gettext
 
-.include <bsd.port.options.mk>
-
-.if empty(PORT_OPTIONS:MNLS)
-post-patch:
+post-patch-NLS-off:
 	${REINPLACE_CMD} 's,add_subdirectory(po),,' ${WRKSRC}/CMakeLists.txt
-.endif
 
 .include <bsd.port.mk>
diff --git a/audio/lash/Makefile b/audio/lash/Makefile
index 68f40c2..5a1720f 100644
--- a/audio/lash/Makefile
+++ b/audio/lash/Makefile
@@ -37,19 +37,11 @@ PYTHON_USES=	python
 PYTHON_BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
 PYTHON_CONFIGURE_OFF=	--disable-pylash
 
-.include <bsd.port.options.mk>
+READLINE_USES=		readline
+READLINE_CONFIGURE_ENV_OFF=	vl_cv_lib_readline=no
 
-.if ${PORT_OPTIONS:MREADLINE}
-USES+=		readline
-.else
-CONFIGURE_ENV+=	vl_cv_lib_readline=no
-.endif
-
-.if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+=	texi2html:${PORTSDIR}/textproc/texi2html
-.else
-CONFIGURE_ENV+=	ac_cv_prog_lash_texi2html=no
-.endif
+DOCS_BUILD_DEPENDS=	texi2html:${PORTSDIR}/textproc/texi2html
+DOCS_CONFIGURE_ENV_OFF=	ac_cv_prog_lash_texi2html=no
 
 post-patch:
 	@${REINPLACE_CMD} -e \
@@ -57,11 +49,9 @@ post-patch:
 	@${REINPLACE_CMD} -e \
 		'/texi2html/s|--number||' ${WRKSRC}/docs/Makefile.in
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/lash-manual-html-one-page/lash-manual.html \
 		${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/audio/liba52/Makefile b/audio/liba52/Makefile
index 973b6ae..6782b3c 100644
--- a/audio/liba52/Makefile
+++ b/audio/liba52/Makefile
@@ -28,22 +28,17 @@ DJBFFT_CFLAGS=		-I${LOCALBASE}/include
 DJBFFT_LDFLAGS=		-L${LOCALBASE}/lib
 DJBFFT_CONFIGURE_ON=	--enable-djbfft
 
-.include <bsd.port.options.mk>
-
 CFLAGS_aarch64=	-fPIC
 CFLAGS_amd64=	-fPIC
 CFLAGS_powerpc=	-fPIC
 
 HEADER_FILES=	liba52/a52_internal.h
 
-post-patch:
-.if ! ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
+post-patch-OPTIMIZED_CFLAGS-off:
 	@${REINPLACE_CMD} -E -e 's!-O3!${CFLAGS}!' -e 's!-mcpu=[^"]+"!"!' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-.endif
-.if ${PORT_OPTIONS:MDJBFFT}
+post-patch-DJBFFT-on:
 	@${REINPLACE_CMD} -E -e 's|(fftc4.h)|djbfft/\1|' ${WRKSRC}/liba52/imdct.c
-.endif
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/audio/libaacplus/Makefile b/audio/libaacplus/Makefile
index 99d171a..9c1a01d 100644
--- a/audio/libaacplus/Makefile
+++ b/audio/libaacplus/Makefile
@@ -42,15 +42,10 @@ SRC26410=	26410-800.zip
 
 FFTW3_DESC=	Use FFTW3 library for performance
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MFFTW3}
-LIB_DEPENDS+=	libfftw3.so:${PORTSDIR}/math/fftw3 \
-		libfftw3f.so:${PORTSDIR}/math/fftw3-float
-CONFIGURE_ARGS+=--with-fftw3=yes --with-fftw3-prefix=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=--with-fftw3=no
-.endif
+FFTW3_LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3 \
+			libfftw3f.so:${PORTSDIR}/math/fftw3-float
+FFTW3_CONFIGURE_ON=	--with-fftw3=yes --with-fftw3-prefix=${LOCALBASE}
+FFTW3_CONFIGURE_OFF=	--with-fftw3=no
 
 pre-configure:
 	@${CP} ${DISTDIR}/26410-800.zip ${WRKSRC}/src
diff --git a/audio/libamrnb/Makefile b/audio/libamrnb/Makefile
index f8a7855..71dbbdc 100644
--- a/audio/libamrnb/Makefile
+++ b/audio/libamrnb/Makefile
@@ -41,15 +41,11 @@ OPTIONS_DEFINE=	DOCS
 
 SRC26104=	26104-b00.zip
 
-.include <bsd.port.options.mk>
-
 post-extract:
 	@${CP} ${_DISTDIR}/${SRC26104} ${WRKSRC}/
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-off:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
-.endif
 
 .include <bsd.port.mk>
diff --git a/audio/libamrwb/Makefile b/audio/libamrwb/Makefile
index 34feabc..9072fed 100644
--- a/audio/libamrwb/Makefile
+++ b/audio/libamrwb/Makefile
@@ -40,15 +40,11 @@ OPTIONS_DEFINE=	DOCS
 
 SRC26204=	26204-b00.zip
 
-.include <bsd.port.options.mk>
-
 post-extract:
-	@${CP} ${_DISTDIR}/${SRC26204} ${WRKSRC}/
+	@${CP} ${_DISTDIR}/${SRC26204} ${WRKSRC}
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
-.endif
+	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/audio/libfishsound/Makefile b/audio/libfishsound/Makefile
index 4b17747..e4d23be 100644
--- a/audio/libfishsound/Makefile
+++ b/audio/libfishsound/Makefile
@@ -24,16 +24,12 @@ INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 USES=		libtool pathfix pkgconfig
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MDOXYGEN}
-BUILD_DEPENDS+=	${LOCALBASE}/bin/doxygen:${PORTSDIR}/devel/doxygen
 PORTDOCS=	*
-.endif
 
-post-patch:
-.if !${PORT_OPTIONS:MDOCS} || !${PORT_OPTIONS:MDOXYGEN}
+DOXYGEN_BUILD_DEPENDS=	${LOCALBASE}/bin/doxygen:${PORTSDIR}/devel/doxygen
+DOXYGEN_IMPLIES=	DOCS
+
+post-patch-DOCS-off:
 	@${REINPLACE_CMD} -e '/^SUBDIRS = / s| doc||' ${WRKSRC}/Makefile.in
-.endif
 
 .include <bsd.port.mk>
diff --git a/audio/liblo/Makefile b/audio/liblo/Makefile
index 14d0712..ecafb1a 100644
--- a/audio/liblo/Makefile
+++ b/audio/liblo/Makefile
@@ -26,8 +26,6 @@ OPTIONS_SUB=	yes
 
 DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
 
-.include <bsd.port.options.mk>
-
 post-patch:
 .if ${ARCH} == i386 || ${ARCH} == powerpc
 	@${REINPLACE_CMD} -e 's,deadbeef,, ; s,f00baa23,,' \
@@ -39,13 +37,12 @@ post-install:
 .for f in AUTHORS ChangeLog NEWS README TODO
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
-.if ${PORT_OPTIONS:MDOXYGEN}
-	(cd ${WRKSRC}/doc/man/man3 && ${INSTALL_MAN} l*.3 p*.3 \
-		${STAGEDIR}${MAN3PREFIX}/man/man3/)
-	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR})
-.endif
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_SCRIPT} ${PORTEXAMPLES:S|^|${WRKSRC}/examples/|} \
 		${STAGEDIR}${EXAMPLESDIR}
+post-install-DOXYGEN-on:
+	(cd ${WRKSRC}/doc/man/man3 && ${INSTALL_MAN} l*.3 p*.3 \
+		${STAGEDIR}${MAN3PREFIX}/man/man3/)
+	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/audio/libmpdclient/Makefile b/audio/libmpdclient/Makefile
index d2df63d..bfa6cd8 100644
--- a/audio/libmpdclient/Makefile
+++ b/audio/libmpdclient/Makefile
@@ -16,13 +16,9 @@ INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	DOCS DOXYGEN
 OPTIONS_SUB=	yes
+DOXYGEN_IMPLIES=	DOCS
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MDOXYGEN}
-BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
-.else
-CONFIGURE_ARGS=	--disable-documentation
-.endif
+DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOCS_CONFIGURE_OFF=	--disable-documentation
 
 .include <bsd.port.mk>
diff --git a/audio/libnjb/Makefile b/audio/libnjb/Makefile
index 2fdc4c6..f2d518c 100644
--- a/audio/libnjb/Makefile
+++ b/audio/libnjb/Makefile
@@ -25,13 +25,8 @@ PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
-.else
-CONFIGURE_ENV+=	ac_cv_prog_HAVE_DOXYGEN=no
-.endif
+DOCS_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOCS_CONFIGURE_ENV_OFF=	ac_cv_prog_HAVE_DOXYGEN=no
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git a/audio/libsidplayfp/Makefile b/audio/libsidplayfp/Makefile
index ff8fc76..e868739 100644
--- a/audio/libsidplayfp/Makefile
+++ b/audio/libsidplayfp/Makefile
@@ -34,8 +34,6 @@ MMX_CONFIGURE_ENABLE=	mmx
 
 BUILD_DEPENDS+=	xa65:${PORTSDIR}/devel/xa65
 
-.include <bsd.port.options.mk>
-
 SIDPLAYFP_SHLIB_VERSION=	3.2.0
 STILVIEW_SHLIB_VERSION=	0.0.2
 PLIST_SUB+=	\
@@ -44,17 +42,13 @@ PLIST_SUB+=	\
 	STILVIEW_SHLIB_VER=${STILVIEW_SHLIB_VERSION:C/\.[[:digit:].]+//} \
 	STILVIEW_SHLIB_VERSION=${STILVIEW_SHLIB_VERSION}
 
-post-build:
-.if ${PORT_OPTIONS:MDOXYGEN}
+post-build-DOXYGEN-on:
 	cd ${WRKSRC} && ${MAKE} doc
-.endif
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR} ; \
 	cd ${WRKSRC} && ${INSTALL_MAN} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
-.if ${PORT_OPTIONS:MDOXYGEN}
+post-install-DOXYGEN-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html ; \
 	${INSTALL_MAN} ${WRKSRC}/docs/html/* ${STAGEDIR}${DOCSDIR}/html ; \
 	${RM} -f ${WRKDIR}/PLIST.doc ; \
@@ -62,6 +56,5 @@ post-install:
 		${SED} 's|${STAGEDIR}${PREFIX}/||' \
 		>> ${WRKDIR}/PLIST.doc
 	cd ${WRKDIR} ; ${SED} -i -e '/PLIST.doc/ r PLIST.doc' ${TMPPLIST}
-.endif
 
 .include <bsd.port.mk>
diff --git a/audio/mctoolame-decoder/Makefile b/audio/mctoolame-decoder/Makefile
index 0a2d962..8cc6f1a 100644
--- a/audio/mctoolame-decoder/Makefile
+++ b/audio/mctoolame-decoder/Makefile
@@ -19,8 +19,6 @@ PLIST_SUB=	PKGNAMESUFFIX="${PKGNAMESUFFIX}"
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$(ARCH)||' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -E \
@@ -29,9 +27,8 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mctoolamed ${STAGEDIR}${PREFIX}/bin
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}${PKGNAMESUFFIX}/html
 	${INSTALL_DATA} ${WRKSRC}/html/* ${STAGEDIR}${DOCSDIR}${PKGNAMESUFFIX}/html
-.endif
 
 .include <bsd.port.mk>
diff --git a/audio/mctoolame-encoder/Makefile b/audio/mctoolame-encoder/Makefile
index ed0a456..de645c3 100644
--- a/audio/mctoolame-encoder/Makefile
+++ b/audio/mctoolame-encoder/Makefile
@@ -19,8 +19,6 @@ PLIST_SUB=	PKGNAMESUFFIX="${PKGNAMESUFFIX}"
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$(ARCH)||' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -E \
@@ -29,9 +27,8 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mctoolame ${STAGEDIR}${PREFIX}/bin
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}${PKGNAMESUFFIX}/html
 	${INSTALL_DATA} ${WRKSRC}/html/* ${STAGEDIR}${DOCSDIR}${PKGNAMESUFFIX}/html
-.endif
 
 .include <bsd.port.mk>
diff --git a/audio/mma/Makefile b/audio/mma/Makefile
index d27fab0..2871aa7 100644
--- a/audio/mma/Makefile
+++ b/audio/mma/Makefile
@@ -33,11 +33,7 @@ WRKSRC=	${WRKDIR}/${PORTNAME}-bin-${DISTVERSION}
 
 python_OLD_CMD=	/usr/bin/env python
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-DISTFILES+=	${PORTNAME}-pdf-${DISTVERSION:S,a,,}.tar.gz
-.endif
+DOCS_DISTFILES=	${PORTNAME}-pdf-${DISTVERSION:S,a,,}.tar.gz
 
 post-patch:
 	@(cd ${WRKSRC} && \
diff --git a/audio/mp3asm/Makefile b/audio/mp3asm/Makefile
index ac10ff9..4606c95 100644
--- a/audio/mp3asm/Makefile
+++ b/audio/mp3asm/Makefile
@@ -21,8 +21,6 @@ PORTDOCS=	Changelog README
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-extract:
 	${RM} ${WRKSRC}/config.cache
 
@@ -33,10 +31,8 @@ post-patch:
 		-e 's|\([ (!]\)\(log[\.;]\)|\1mp3asm\2|g' \
 		${WRKSRC}/src/mp3asm.h ${WRKSRC}/src/*.c
 
-.if ${PORT_OPTIONS:MDOCS}
-post-install:
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
-.endif
 
 .include <bsd.port.mk>
diff --git a/audio/mp3blaster/Makefile b/audio/mp3blaster/Makefile
index 731cba2..25ec6d9 100644
--- a/audio/mp3blaster/Makefile
+++ b/audio/mp3blaster/Makefile
@@ -22,43 +22,23 @@ OPTIONS_DEFINE=	LIRC SIDPLAY VORBIS DOCS
 OPTIONS_DEFAULT=	SIDPLAY VORBIS
 SIDPLAY_DESC=	Sidplayer support
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	AUTHORS CREDITS ChangeLog FAQ README TODO
-.endif
 
-.if ${PORT_OPTIONS:MLIRC}
-LIB_DEPENDS+=		liblirc_client.so:${PORTSDIR}/comms/lirc
-CONFIGURE_ARGS+=	--with-lirc
-.endif
+LIRC_LIB_DEPENDS=		liblirc_client.so:${PORTSDIR}/comms/lirc
+LIRC_CONFIGURE_WITH=		lirc
 
-.if ${PORT_OPTIONS:MSIDPLAY}
-LIB_DEPENDS+=		libsidplay.so:${PORTSDIR}/audio/libsidplay
-.else
-CONFIGURE_ARGS+=	--without-sidplay
-.endif
+SIDPLAY_LIB_DEPENDS=		libsidplay.so:${PORTSDIR}/audio/libsidplay
+SIDPLAY_CONFIGURE_WITH=		sidplay
 
-.if ${PORT_OPTIONS:MVORBIS}
-LIB_DEPENDS+=		libvorbisfile.so:${PORTSDIR}/audio/libvorbis
-.else
-CONFIGURE_ARGS+=	--without-oggvorbis
-.endif
+VORBIS_LIB_DEPENDS=		libvorbisfile.so:${PORTSDIR}/audio/libvorbis
+VORBIS_CONFIGURE_WITH=		oggvorbis
 
-.if ${PORT_OPTIONS:MSDL}
-CONFIGURE_ARGS+=	--with-sdl
-USE_SDL=	yes
-.else
-CONFIGURE_ARGS+=	--without-sdl
-.endif
+SDL_CONFIGURE_WITH=	sdl
+SDL_USE=		SDL=yes
 
-.if ${PORT_OPTIONS:MNAS}
-CONFIGURE_ARGS+=	--with-nas
-LIB_DEPENDS+=		libaudio.so:${PORTSDIR}/audio/nas
-LDFLAGS+=		-laudio
-.else
-CONFIGURE_ARGS+=	--without-nas
-.endif
+NAS_CONFIGURE_WITH=	nas
+NAS_LIB_DEPENDS=	libaudio.so:${PORTSDIR}/audio/nas
+NAS_LDFLAGS=		-laudio
 
 .include <bsd.port.pre.mk>
 .if ${HAVE_GNOME:Mesound} != ""
@@ -72,12 +52,10 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local/share/mp3blaster/win2koi.tbl|${DATADIR}/charmap/win2koi.tbl|' \
 		${WRKSRC}/doc/sample.mp3blasterrc
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/audio/mp3stat/Makefile b/audio/mp3stat/Makefile
index 43a5970..4e164d6 100644
--- a/audio/mp3stat/Makefile
+++ b/audio/mp3stat/Makefile
@@ -32,14 +32,9 @@ PLIST_FILES=	bin/mp3stat \
 		lib/mp3stat/ui_gtk2.so \
 		lib/mp3stat/ui_console.so
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MVORBIS}
-LIB_DEPENDS+=	libvorbis.so:${PORTSDIR}/audio/libvorbis
-PLIST_FILES+=	lib/mp3stat/input_vorb.so
-.else
-MAKE_ARGS+=	VORBIS=""
-.endif
+VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+VORBIS_PLIST_FILES=	lib/mp3stat/input_vorb.so
+VORBIS_MAKE_ARGS_OFF=	VORBIS=""
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile*" | ${XARGS} ${REINPLACE_CMD} -e \
@@ -59,11 +54,10 @@ do-install:
 		${STAGEDIR}${PREFIX}/lib/mp3stat)
 	(cd ${WRKSRC}/input/mp3 && ${INSTALL_LIB} input_mp3.so \
 		${STAGEDIR}${PREFIX}/lib/mp3stat)
-.if ${PORT_OPTIONS:MVORBIS}
-	(cd ${WRKSRC}/input/vorbis && ${INSTALL_LIB} input_vorb.so \
-		${STAGEDIR}${PREFIX}/lib/mp3stat)
-.endif
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} README ${STAGEDIR}${DOCSDIR})
+do-install-VORBIS-on:
+	(cd ${WRKSRC}/input/vorbis && ${INSTALL_LIB} input_vorb.so \
+		${STAGEDIR}${PREFIX}/lib/mp3stat)
 
 .include <bsd.port.mk>
diff --git a/audio/mpdscribble/Makefile b/audio/mpdscribble/Makefile
index 8931e9e..3441c55 100644
--- a/audio/mpdscribble/Makefile
+++ b/audio/mpdscribble/Makefile
@@ -23,25 +23,19 @@ USE_RC_SUBR=	mpdscribble
 OPTIONS_DEFINE=	SOUP DOCS
 SOUP_DESC=	Use libsoup instead of libcurl
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MSOUP}
-LIB_DEPENDS+=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup
-CONFIGURE_ARGS+=	--with-http-client=soup
-.else
-LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
-CONFIGURE_ARGS+=	--with-http-client=curl
-.endif
+SOUP_LIB_DEPENDS=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup
+SOUP_CONFIGURE_ON=	--with-http-client=soup
+SOUP_LIB_DEPENDS_OFF=	libcurl.so:${PORTSDIR}/ftp/curl
+SOUP_CONFIGURE_OFF=	--with-http-client=curl
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/mpdscribble ${STAGEDIR}${PREFIX}/bin/mpdscribble
 	${INSTALL_MAN} ${WRKSRC}/doc/mpdscribble.1 ${STAGEDIR}${MANPREFIX}/man/man1/mpdscribble.1
 	${INSTALL_DATA} ${WRKSRC}/doc/mpdscribble.conf ${STAGEDIR}${PREFIX}/etc/mpdscribble.conf.sample
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in AUTHORS NEWS README
 	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/audio/mps/Makefile b/audio/mps/Makefile
index fec6386..916d3da 100644
--- a/audio/mps/Makefile
+++ b/audio/mps/Makefile
@@ -24,12 +24,7 @@ MPV_DESC=	Mpv media player support
 USES=		python
 USE_PYTHON=	distutils autoplist
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MMPLAYER}
-RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer
-.elif ${PORT_OPTIONS:MMPV}
-RUN_DEPENDS=	mpv:${PORTSDIR}/multimedia/mpv
-.endif
+MPLAYER_RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer
+MPV_RUN_DEPENDS=	mpv:${PORTSDIR}/multimedia/mpv
 
 .include <bsd.port.mk>
diff --git a/audio/muse/Makefile b/audio/muse/Makefile
index c52488a..88ff817 100644
--- a/audio/muse/Makefile
+++ b/audio/muse/Makefile
@@ -37,15 +37,12 @@ SNDFILE_LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
 X11_USE=		GNOME=gtk20
 X11_CONFIGURE_OFF=	--without-x --with-rubik
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|machine/soundcard.h|sys/soundcard.h|' \
 		${WRKSRC}/src/portaudio/pa_unix_oss.c
-.if empty(PORT_OPTIONS:MSNDFILE)
+post-patch-SNDFILE-off:
 	@${REINPLACE_CMD} -e '/sndfile >=/s|$$PKG_CONFIG|${FALSE}|' \
 		${WRKSRC}/configure
-.endif
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/audio/musicpc/Makefile b/audio/musicpc/Makefile
index 46697ec..d6737f2 100644
--- a/audio/musicpc/Makefile
+++ b/audio/musicpc/Makefile
@@ -27,14 +27,9 @@ PLIST_FILES=	bin/mpc man/man1/mpc.1.gz
 PORTDOCS=	AUTHORS README NEWS
 PORTEXAMPLES=	*
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MICONV}
-USES+=		iconv
-LDFLAGS+=	${ICONV_LIB}
-.else
-CONFIGURE_ARGS+=--disable-iconv
-.endif
+ICONV_USES=		iconv
+ICONV_LDFLAGS=	${ICONV_LIB}
+ICONV_CONFIGURE_ENABLE=	iconv
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lintl|${ICONV_LIB}|g' ${WRKSRC}/configure
diff --git a/audio/ncmpc/Makefile b/audio/ncmpc/Makefile
index aff4a05..045c11d 100644
--- a/audio/ncmpc/Makefile
+++ b/audio/ncmpc/Makefile
@@ -23,8 +23,6 @@ OPTIONS_DEFINE=	NLS LYRICS
 OPTIONS_DEFAULT=	LYRICS
 LYRICS_DESC=	Compile with lyrics screen
 
-.include <bsd.port.options.mk>
-
 USES=		iconv pkgconfig
 PLIST_FILES=	bin/ncmpc \
 		man/man1/ncmpc.1.gz \
@@ -32,23 +30,17 @@ PLIST_FILES=	bin/ncmpc \
 		%%EXAMPLESDIR%%/keys \
 		%%EXAMPLESDIR%%/ncmpc.lirc
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
+NLS_USES=		gettext
+
 LANGUAGES=cs da de eo es fi fr gl he hu it ko nb nl pl pt_BR ru sk sv uk zh_CN
 .for language in ${LANGUAGES}
-PLIST_FILES+=share/locale/${language}/LC_MESSAGES/ncmpc.mo
+NLS_PLIST_FILES+=share/locale/${language}/LC_MESSAGES/ncmpc.mo
 .endfor
-.else
-CONFIGURE_ARGS+=--disable-nls
-.endif
+NLS_CONFIGURE_OFF=--disable-nls
 
-.if ${PORT_OPTIONS:MLYRICS}
-CONFIGURE_ARGS+=--enable-lyrics-screen
-PLIST_FILES+=	lib/ncmpc/lyrics/10-hd.sh \
+LYRICS_CONFIGURE_ENABLE=	lyrics-screen
+LYRICS_PLIST_FILES=	lib/ncmpc/lyrics/10-hd.sh \
 		lib/ncmpc/lyrics/20-lyricwiki.rb
-.else
-CONFIGURE_ARGS+=--disable-lyrics-screen
-.endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/ncmpc ${STAGEDIR}${PREFIX}/bin
@@ -57,14 +49,13 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/keys.sample ${STAGEDIR}${EXAMPLESDIR}/keys
 	${INSTALL_DATA} ${WRKSRC}/doc/ncmpc.lirc ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_MAN} ${WRKSRC}/doc/ncmpc.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
-.if ${PORT_OPTIONS:MNLS}
+do-install-NLS-on:
 .for language in ${LANGUAGES}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/${language}/LC_MESSAGES
 	${INSTALL_DATA} ${WRKSRC}/po/${language}.gmo \
 		${STAGEDIR}${PREFIX}/share/locale/${language}/LC_MESSAGES/ncmpc.mo
 .endfor
-.endif
-.if ${PORT_OPTIONS:MLYRICS}
+do-install-LYRICS-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/ncmpc/lyrics
 	(cd ${WRKSRC}/lyrics && ${INSTALL_SCRIPT} \
 		10-hd.sh 20-lyricwiki.rb \
diff --git a/audio/ncmpcpp/Makefile b/audio/ncmpcpp/Makefile
index 2e774d2..d9b2cc9 100644
--- a/audio/ncmpcpp/Makefile
+++ b/audio/ncmpcpp/Makefile
@@ -50,8 +50,6 @@ OUTPUTS_CONFIGURE_ENABLE=	outputs
 VISUALIZER_BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3
 VISUALIZER_CONFIGURE_ENABLE=	visualizer
 
-.include <bsd.port.pre.mk>
-
 .if ${NCURSESBASE} == /usr
 # no need to use ncurses-config if we use ncurses from the base system
 CONFIGURE_ARGS+=	NCURSES_CONFIG=/usr/bin/true
@@ -59,10 +57,9 @@ CONFIGURE_ARGS+=	NCURSES_CONFIG=/usr/bin/true
 
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/ncmpcpp ${STAGEDIR}${PREFIX}/bin/
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/NEWS ${WRKSRC}/AUTHORS ${WRKSRC}/COPYING ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/bindings ${WRKSRC}/doc/config ${STAGEDIR}${DOCSDIR}/
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/openal/Makefile b/audio/openal/Makefile
index 54ff847..2e00406 100644
--- a/audio/openal/Makefile
+++ b/audio/openal/Makefile
@@ -44,8 +44,6 @@ ASM_BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 NOT_FOR_ARCHS=	ia64
 NOT_FOR_ARCHS_REASON_ia64=	does not compile
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's/x86_64\*/amd64\* | \*ia64\*/g; \
 		/CPPFLAGS=/ d; s/ \*linux\*)/ \*bsd\*)/' ${WRKSRC}/configure
@@ -55,8 +53,7 @@ post-patch:
 		${WRKSRC}/src/mixaudio16.h
 	@${REINPLACE_CMD} -e 's|@requirements@||' \
 		${WRKSRC}/admin/pkgconfig/openal.pc.in
-.if ! ${PORT_OPTIONS:MASM}
+post-patch-ASM-off:
 	@${REINPLACE_CMD} -e '/^NASM=/ s|=.*|=no|' ${WRKSRC}/configure
-.endif
 
 .include <bsd.port.mk>
diff --git a/audio/opusfile/Makefile b/audio/opusfile/Makefile
index 58d1c61..b1cf05c 100644
--- a/audio/opusfile/Makefile
+++ b/audio/opusfile/Makefile
@@ -33,8 +33,6 @@ DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
 
 INSTALL_TARGET=	install-strip
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's| @openssl@||' \
 		${WRKSRC}/opusfile.pc.in  ${WRKSRC}/opusurl.pc.in
@@ -43,13 +41,11 @@ post-patch:
 		${WRKSRC}/Makefile.am
 	@${CP} ${FILESDIR}/ftime.c ${WRKSRC}/src/
 
-post-install:
-.if ${PORT_OPTIONS:MDOXYGEN}
+post-install-DOXYGEN-on:
 	@${RM} -f ${WRKDIR}/PLIST.doc ; \
 	${FIND} ${STAGEDIR}${DOCSDIR}/html -type f | \
 		${SED} 's|${STAGEDIR}${PREFIX}/||' \
 		>> ${WRKDIR}/PLIST.doc ; \
 	(cd ${WRKDIR} ; ${SED} -i -e '/PLIST.doc/ r PLIST.doc' ${TMPPLIST})
-.endif
 
 .include <bsd.port.mk>
diff --git a/audio/pacpl/Makefile b/audio/pacpl/Makefile
index 0f45a15..894b22a 100644
--- a/audio/pacpl/Makefile
+++ b/audio/pacpl/Makefile
@@ -58,8 +58,6 @@ TTA_RUN_DEPENDS=	ttaenc:${PORTSDIR}/audio/tta
 VORBIS_RUN_DEPENDS=	vorbiscomment:${PORTSDIR}/audio/vorbis-tools
 WAVPACK_RUN_DEPENDS=	wavpack:${PORTSDIR}/audio/wavpack
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|"/etc/pacpl|"${ETCDIR}| ; \
@@ -100,12 +98,11 @@ do-install:
 		${STAGEDIR}${DOCSDIR})
 	(cd ${WRKSRC}/plugins/gnome/nautilus && ${INSTALL_SCRIPT} PACPL-Convert \
 		${STAGEDIR}${PREFIX}/libexec)
-.if ${PORT_OPTIONS:MKDE4}
+do-install-KDE4-on:
 	(cd ${WRKSRC}/plugins/kde && ${INSTALL_SCRIPT} PACPL-Konvert \
 		${STAGEDIR}${PREFIX}/libexec)
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/kde4/services/ServiceMenus
 	(cd ${WRKSRC}/plugins/kde && ${INSTALL_DATA} pacpl.desktop \
 		${STAGEDIR}${PREFIX}/share/kde4/services/ServiceMenus)
-.endif
 
 .include <bsd.port.mk>
diff --git a/audio/paprefs/Makefile b/audio/paprefs/Makefile
index c7cc65a..7cd388b 100644
--- a/audio/paprefs/Makefile
+++ b/audio/paprefs/Makefile
@@ -21,20 +21,12 @@ USE_GNOME=	gconfmm26 gnomeprefix intltool
 CONFIGURE_ARGS=	--disable-lynx
 
 OPTIONS_DEFINE=	PK NLS
+OPTIONS_SUB=	yes
 PK_DESC=	Force dependency on PackageKit
 
-.include <bsd.port.options.mk>
+PK_LIB_DEPENDS=	libpackagekit-glib2.so:${PORTSDIR}/ports-mgmt/packagekit
 
-.if ${PORT_OPTIONS:MPK}
-LIB_DEPENDS+=	libpackagekit-glib2.so:${PORTSDIR}/ports-mgmt/packagekit
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+NLS_USES=		gettext
+NLS_CONFIGURE_ENABLE=	nls
 
 .include <bsd.port.mk>
diff --git a/audio/portaudio/Makefile b/audio/portaudio/Makefile
index 2094bde..f671d47 100644
--- a/audio/portaudio/Makefile
+++ b/audio/portaudio/Makefile
@@ -46,49 +46,38 @@ JACK_CONFIGURE_OFF=	--without-jack
 EXAMPLES_BIN=	pa_d* pa_f* paex_*
 PATEST_BIN=	pa_m* paqa_* patest*
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOXYGEN} && ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
-.endif
+DOXYGEN_IMPLIES=	DOCS
+DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|machine/soundcard.h|sys/soundcard.h|' ${WRKSRC}/configure.in \
 		${WRKSRC}/src/hostapi/oss/pa_unix_oss.c ${WRKSRC}/src/SConscript
 	@${REINPLACE_CMD} -e 's|PACKAGE_NAME=|PACKAGE_NAME=portaudio2|' ${WRKSRC}/configure
 
-.if ! ${PORT_OPTIONS:MEXAMPLES}
+post-patch-EXAMPLES-off:
 	@${REINPLACE_CMD} -i '' '/EXAMPLES =/,/bin\/paex_write_sine_nonint/s/^/#/' \
 		${WRKSRC}/Makefile.in
-.endif
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libportaudio.so.2
 
-.if ${PORT_OPTIONS:MEXAMPLES}
-.for f in ${EXAMPLES_BIN}
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${STAGEDIR}${PREFIX}/bin/
-.endfor
-.endif
-
-.if ${PORT_OPTIONS:MPATEST}
+post-install-PATEST-on:
 .for f in ${PATEST_BIN}
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${STAGEDIR}${PREFIX}/bin/
 .endfor
-.endif
 
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR}
-.endif
 
-.if ${PORT_OPTIONS:MDOXYGEN} && ${PORT_OPTIONS:MDOCS}
+post-install-DOXYGEN-on:
 	@cd ${WRKSRC} && doxygen
 	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR})
-.endif 
 
-.if ${PORT_OPTIONS:MEXAMPLES}
-	@(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
-.endif
+post-install-EXAMPLES-on:
+.for f in ${EXAMPLES_BIN}
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${STAGEDIR}${PREFIX}/bin/
+.endfor
+	(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index f58a349..fadd818 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -79,8 +79,6 @@ ZSH_CONFIGURE_OFF=	--without-zsh-completion-dir
 PULSE_VERSION=	${PORTVERSION}
 PLIST_SUB=	PULSE_VERSION=${PULSE_VERSION}
 
-.include <bsd.port.pre.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/src/daemon/default.pa.in
@@ -94,8 +92,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/src/${ii} \
 		${STAGEDIR}${PREFIX}/etc/pulse/${ii}.sample
 .endfor
-.if !${PORT_OPTIONS:MBASH}
+post-install-BASH-off:
 	@${RM} -rf ${STAGEDIR}${PREFIX}/etc/bash_completion.d
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/scrobbler/Makefile b/audio/scrobbler/Makefile
index 861ea3c..823cf6e 100644
--- a/audio/scrobbler/Makefile
+++ b/audio/scrobbler/Makefile
@@ -41,11 +41,6 @@ APE_CONFIGURE_ENABLE=	prefer-ape
 
 ENCODINGS_PATCH_USES=	iconv
 
-.include <bsd.port.options.mk>
-
-post-patch::
-.if ${PORT_OPTIONS:MENCODINGS_PATCH}
-	@${PATCH} ${PATCH_ARGS} -p1 < ${FILESDIR}/extra-encodings-patch
-.endif
+ENCODINGS_PATCH_EXTRA_PATCHES= ${FILESDIR}/extra-encodings-patch:-p1
 
 .include <bsd.port.mk>
diff --git a/audio/shairport/Makefile b/audio/shairport/Makefile
index d81e747..1d79536 100644
--- a/audio/shairport/Makefile
+++ b/audio/shairport/Makefile
@@ -34,8 +34,6 @@ REV=		b1cb9ea
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|avahi-|${LOCALBASE}/bin/avahi-|g' \
 		-e 's|$$FindBin.*|"${PREFIX}/bin/hairtunes";|' \
@@ -48,11 +46,10 @@ do-install:
 .for file in ${PORTNAME} hairtunes
 	${INSTALL_PROGRAM} ${WRKSRC}/${file} ${STAGEDIR}${PREFIX}/bin
 .endfor
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOCS}
 	${INSTALL_DATA} -p ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/audio/shoutcast/Makefile b/audio/shoutcast/Makefile
index 373aa03..a69caefd 100644
--- a/audio/shoutcast/Makefile
+++ b/audio/shoutcast/Makefile
@@ -27,6 +27,7 @@ NO_BUILD=	yes
 
 OPTIONS_DEFAULT=	SERVERSETUP EXAMPLES
 OPTIONS_DEFINE=	SERVERSETUP DOCS EXAMPLES
+OPTIONS_SUB=	yes
 SETUPSERVER_DESC=	SHOUTcast Server Setup Tools
 EXAMPLE_DESC=	SHOUTcast Server Example Configuration Files
 
@@ -50,8 +51,6 @@ SUB_LIST=	${SHOUTCAST_SUB}
 USERS=		${SHOUTCASTUSER}
 GROUPS=		${SHOUTCASTGROUP}
 
-.include <bsd.port.options.mk>
-
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000010
 .if ${ARCH} == "i386"
 RUN_DEPENDS+=	${LOCALBASE}/lib/compat/libstdc++.so.6:${PORTSDIR}/misc/compat9x
@@ -60,12 +59,6 @@ RUN_DEPENDS+=	${LOCALBASE}/lib32/compat/libstdc++.so.6:${PORTSDIR}/misc/compat9x
 .endif
 .endif
 
-.if ${PORT_OPTIONS:MSERVERSETUP}
-PLIST_SUB+=	SERVERSETUP=""
-.else
-PLIST_SUB+=	SERVERSETUP="@comment "
-.endif
-
 post-patch:
 .for _file in basic public relay simple
 	@${REINPLACE_CMD} -e '/sc_serv2 directory/d' \
@@ -80,7 +73,8 @@ do-install:
 	${MKDIR} ${STAGEDIR}${SHOUTCASTDIR}
 	${MKDIR} ${STAGEDIR}${SHOUTCASTDIR}/logs
 	${MKDIR} ${STAGEDIR}${SHOUTCASTDIR}/control
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/DNAS_Server_Changelog.html ${STAGEDIR}${DOCSDIR}/DNAS_Server_Changelog.html
 	${INSTALL_DATA} ${WRKSRC}/Readme_DNAS_Server.html ${STAGEDIR}${DOCSDIR}/Readme_DNAS_Server.html
@@ -127,20 +121,18 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/docs/res/Console_Windows.png ${STAGEDIR}${DOCSDIR}/docs/res/Console_Windows.png
 	${INSTALL_DATA} ${WRKSRC}/docs/res/View_Source_Connection_Details.png ${STAGEDIR}${DOCSDIR}/docs/res/View_Source_Connection_Details.png
 
-.endif
-.if ${PORT_OPTIONS:MSERVERSETUP}
+do-install-SERVERSETUP-on:
 	${MKDIR} ${STAGEDIR}${WWWDIR}/setup
 	${INSTALL_DATA} ${WRKSRC}/setup.sh ${STAGEDIR}${WWWDIR}/setup.sh
 	${INSTALL_DATA} ${WRKSRC}/setup/setup.js ${STAGEDIR}${WWWDIR}/setup/setup.js
 	${INSTALL_DATA} ${WRKSRC}/setup/setup.html ${STAGEDIR}${WWWDIR}/setup/setup.html
 	${INSTALL_DATA} ${WRKSRC}/setup/setup.txt ${STAGEDIR}${WWWDIR}/setup/setup.txt
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
+
+do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/sc_serv_basic.conf ${STAGEDIR}${EXAMPLESDIR}/sc_serv_basic.conf
 	${INSTALL_DATA} ${WRKSRC}/examples/sc_serv_public.conf ${STAGEDIR}${EXAMPLESDIR}/sc_serv_public.conf
 	${INSTALL_DATA} ${WRKSRC}/examples/sc_serv_relay.conf ${STAGEDIR}${EXAMPLESDIR}/sc_serv_relay.conf
 	${INSTALL_DATA} ${WRKSRC}/examples/sc_serv_simple.conf ${STAGEDIR}${EXAMPLESDIR}/sc_serv_simple.conf
-.endif
 
 .include <bsd.port.mk>
diff --git a/audio/soundtracker/Makefile b/audio/soundtracker/Makefile
index 9f59731..66218be 100644
--- a/audio/soundtracker/Makefile
+++ b/audio/soundtracker/Makefile
@@ -23,6 +23,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	JACK SDL NLS
 OPTIONS_DEFINE_i386=	ASM
+OPTIONS_SUB=	yes
 ASM_DESC=	Use optimized assembly (potentially unstable)
 
 CONFIGURE_ARGS+=	--disable-gnome
@@ -31,31 +32,16 @@ DESKTOP_ENTRIES="SoundTracker" "Pattern-oriented music editor" \
 		"${PREFIX}/share/pixmaps/${PORTNAME}.xpm" \
 		"soundtracker" "AudioVideo;Audio;AudioVideoEditing;" false
 
-.include <bsd.port.options.mk>
+ASM_CONFIGURE_ENABLE=	asm
 
-.if ${PORT_OPTIONS:MASM}
-CONFIGURE_ARGS+=	--enable-asm
-.endif
+JACK_LIB_DEPENDS=		libjack.so:${PORTSDIR}/audio/jack
+JACK_CONFIGURE_ENABLE=	jack
 
-.if ${PORT_OPTIONS:MJACK}
-LIB_DEPENDS+=		libjack.so:${PORTSDIR}/audio/jack
-.else
-CONFIGURE_ARGS+=	--disable-jack
-.endif
+DSL_USE=	SDL=sdl
+DSL_CONFIGURE_ENABLE=	sdl
 
-.if ${PORT_OPTIONS:MSDL}
-USE_SDL=	sdl
-.else
-CONFIGURE_ARGS+=	--disable-sdl
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+NLS_USES=		gettext
+NLS_CONFIGURE_ENABLE=	nls
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|soundtracker.desktop||' \
@@ -67,10 +53,8 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|PREFIX"/share/soundtracker|DATADIR"|' \
 		${WRKSRC}/app/gui.c
 
-pre-build:
-.if ${PORT_OPTIONS:MNLS}
+pre-build-NLS-on:
 	cd ${WRKSRC}/po && ${LOCALBASE}/bin/msgfmt -c -o ja.gmo ja.po
-.endif
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/sharp.xpm \
diff --git a/audio/sox/Makefile b/audio/sox/Makefile
index b64b552..a9b0947 100644
--- a/audio/sox/Makefile
+++ b/audio/sox/Makefile
@@ -92,14 +92,10 @@ TWOLAME_LIB_DEPENDS=	libtwolame.so:${PORTSDIR}/audio/twolame
 OPUS_CONFIGURE_WITH=	opus
 OPUS_LIB_DEPENDS=	libopusfile.so:${PORTSDIR}/audio/opusfile
 
-.include <bsd.port.options.mk>
-
-.if ! ${PORT_OPTIONS:MGSM}
 # We cannot ask for gsm to be enabled without it trying to use external gsm,
 # so force the autoconf checks to fail
-CONFIGURE_ENV+=	ac_cv_header_gsm_h=no ac_cv_header_gsm_gsm_h=no \
+GSM_CONFIGURE_ENV_OFF=	ac_cv_header_gsm_h=no ac_cv_header_gsm_gsm_h=no \
 		ac_cv_lib_gsm_gsm_create=no
-.endif
 
 INSTALL_TARGET=		install-strip
 
diff --git a/audio/sphinxbase/Makefile b/audio/sphinxbase/Makefile
index 2b24099..3f83b74 100644
--- a/audio/sphinxbase/Makefile
+++ b/audio/sphinxbase/Makefile
@@ -28,21 +28,12 @@ OPTIONS_DEFAULT=	THREADS
 SNDFILE_DESC=	libsndfile support
 THREADS_DESC=	Build with thread safety support
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MSNDFILE}
-USES+=		pkgconfig
-LIB_DEPENDS+=	libsndfile.so:${PORTSDIR}/audio/libsndfile
-.else
-CONFIGURE_ENV+=	HAVE_PKGCONFIG=no
-.endif
-
-.if ${PORT_OPTIONS:MTHREADS}
-LDFLAGS+=		-lpthread
-CONFIGURE_ARGS+=	--enable-threads
-.else
-CONFIGURE_ARGS+=	--disable-threads
-.endif
+SNDFILE_USES=		pkgconfig
+SNDFILE_LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
+SNDFILE_CONFIGURE_ENV_OFF=	HAVE_PKGCONFIG=no
+
+THREADS_LDFLAGS=		-lpthread
+THREADS_CONFIGURE_ENABLE=	threads
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsphinx*.so
diff --git a/audio/spiralsynth/Makefile b/audio/spiralsynth/Makefile
index d6c31c7..db5c776 100644
--- a/audio/spiralsynth/Makefile
+++ b/audio/spiralsynth/Makefile
@@ -23,8 +23,6 @@ DOC_FILES=	CHANGES COPYING README
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-patch:
 .for ii in \
 	Makefile.in \
@@ -70,11 +68,10 @@ pre-install:
 .else
 	${ECHO_CMD} bin/SpiralSynth > ${PLIST}
 .endif
-.if ${PORT_OPTIONS:MDOCS}
+pre-install-DOCS-on:
 .for ii in ${DOC_FILES}
 	${ECHO_CMD} share/doc/spiralsynth/${ii} >> ${PLIST}
 .endfor
-.endif
 
 do-install:
 .if defined(PLUGIN)
@@ -83,11 +80,10 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/SpiralSynth ${STAGEDIR}${PREFIX}/bin
 .endif
 
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for ii in ${DOC_FILES}
 	${INSTALL_DATA} ${WRKSRC}/${ii} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/audio/squeezeboxserver/Makefile b/audio/squeezeboxserver/Makefile
index ce84aa3c..489301b 100644
--- a/audio/squeezeboxserver/Makefile
+++ b/audio/squeezeboxserver/Makefile
@@ -44,28 +44,14 @@ USERS=		${SLIMUSER}
 GROUPS=		${SLIMGROUP}
 USES=		perl5 tar:tgz
 
-.include <bsd.port.pre.mk>
-
 USE_MYSQL=	server
 
-.if ${PORT_OPTIONS:MAPE}
-RUN_DEPENDS+=	mac:${PORTSDIR}/audio/mac
-.endif
-.if ${PORT_OPTIONS:MFAAD}
-RUN_DEPENDS+=	faad:${PORTSDIR}/audio/faad
-.endif
-.if ${PORT_OPTIONS:MFLAC}
-RUN_DEPENDS+=	flac:${PORTSDIR}/audio/flac
-.endif
-.if ${PORT_OPTIONS:MLAME}
-RUN_DEPENDS+=	lame:${PORTSDIR}/audio/lame
-.endif
-.if ${PORT_OPTIONS:MSHORTEN}
-RUN_DEPENDS+=	shorten:${PORTSDIR}/audio/shorten
-.endif
-.if ${PORT_OPTIONS:MSOX}
-RUN_DEPENDS+=	sox:${PORTSDIR}/audio/sox
-.endif
+APE_RUN_DEPENDS=	mac:${PORTSDIR}/audio/mac
+FAAD_RUN_DEPENDS=	faad:${PORTSDIR}/audio/faad
+FLAC_RUN_DEPENDS=	flac:${PORTSDIR}/audio/flac
+LAME_RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame
+SHORTEN_RUN_DEPENDS=	shorten:${PORTSDIR}/audio/shorten
+SOX_RUN_DEPENDS=	sox:${PORTSDIR}/audio/sox
 
 USE_RC_SUBR=	squeezeboxserver
 TMP_SLIMDIR=	${WRKDIR}/_squeezeboxserver
@@ -187,10 +173,9 @@ do-build:
 .for _CONF in ${CONFFILES}
 	@cd ${WRKSRC} && ${INSTALL_DATA} ${_CONF} ${TMP_SLIMDIR}/${_CONF}.sample
 .endfor
-.if ${PORT_OPTIONS:MDOCS}
+do-build-DOCS-on:
 	@${MKDIR} ${TMP_DOCSDIR}
 	@cd ${WRKSRC} && ${INSTALL_DATA} ${DOCFILES} ${TMP_DOCSDIR}
-.endif
 
 pre-install:
 	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
@@ -208,9 +193,8 @@ do-install:
 	    ${LOCALBASE}/share/mysql/english/errmsg.sys \
 	    ${STAGEDIR}${PREFIX}/${SLIMDIR}/MySQL/
 	@${INSTALL_SCRIPT} ${WRKDIR}/softsqueeze.sh ${STAGEDIR}${PREFIX}/bin/softsqueeze
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@cd ${TMP_DOCSDIR} && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/streamripper/Makefile b/audio/streamripper/Makefile
index 45f555c..1e1c847 100644
--- a/audio/streamripper/Makefile
+++ b/audio/streamripper/Makefile
@@ -38,19 +38,11 @@ LDFLAGS+=	-Lcdk-${CDK_VERSION} -L${LOCALBASE}/lib
 
 CDK_VERSION=	5.0-20060507
 
-.include <bsd.port.options.mk>
-
-.if ! ${PORT_OPTIONS:MFAAD}
-CONFIGURE_ARGS+=ac_cv_lib_faad_NeAACDecDecode2=no
-.else
-LIB_DEPENDS+=	libfaad.so:${PORTSDIR}/audio/faad
-.endif
-
-.if ! ${PORT_OPTIONS:MVORBIS}
-CONFIGURE_ARGS+=--without-ogg
-.else
-LIB_DEPENDS+=	libvorbis.so:${PORTSDIR}/audio/libvorbis
-.endif
+FAAD_CONFIGURE_OFF=	ac_cv_lib_faad_NeAACDecDecode2=no
+FAAD_LIB_DEPENDS=	libfaad.so:${PORTSDIR}/audio/faad
+
+VORBIS_CONFIGURE_WITH=	ogg
+VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
 
 post-extract:
 	${MV} ${WRKDIR}/cdk-${CDK_VERSION} ${WRKSRC}
diff --git a/audio/swhplugins/Makefile b/audio/swhplugins/Makefile
index ffb1035..7ca8cc1 100644
--- a/audio/swhplugins/Makefile
+++ b/audio/swhplugins/Makefile
@@ -27,26 +27,17 @@ USE_LDCONFIG=	yes
 CFLAGS+=	-fPIC -DPIC
 
 OPTIONS_DEFINE=	NLS 3DNOW SSE
+OPTIONS_SUB=	yes
 3DNOW_DESC=	use 3DNow! instructions
 SSE_DESC=	use SSE instructions
 
-.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-LDFLAGS+=	-lintl
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:M3DNOW}
-CONFIGURE_ARGS+=	--enable-3dnow
-.endif
-
-.if ${PORT_OPTIONS:MSSE}
-CONFIGURE_ARGS+=	--enable-sse
-.endif
+NLS_USES=	gettext
+NLS_LDFLAGS=	-lintl
+NLS_CONFIGURE_ENABLE=	nls
+
+3DNOW_CONFIGURE_ENABLE=	3dnow
+
+SSE_CONFIGURE_ENABLE=	sse
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git a/audio/taglib/Makefile b/audio/taglib/Makefile
index b51fcb1..84ac073 100644
--- a/audio/taglib/Makefile
+++ b/audio/taglib/Makefile
@@ -35,15 +35,12 @@ RCC_EXTRA_PATCHES=	${FILESDIR}/extrapatch-rcc
 RCC_CFLAGS=		-I${LOCALBASE}/include
 RCC_LDFLAGS=		-L${LOCALBASE}/lib
 
-.include <bsd.port.options.mk>
-
-post-patch:
-.if ${PORT_OPTIONS:MRCC}
+post-patch-RCC-on:
 	@${REINPLACE_CMD} -e 's|-ltag|-ltag -lrcc|g' \
 		${WRKSRC}/taglib.pc.cmake ${WRKSRC}/taglib-config.cmake
 	@${REINPLACE_CMD} -e 's|-ltag_c|-ltag_c -lrcc|g' \
 		${WRKSRC}/bindings/c/taglib_c.pc.cmake
-.endif
+post-patch:
 	${REINPLACE_CMD} -e 's|$${LIB_INSTALL_DIR}/pkgconfig|libdata/pkgconfig|' \
 		${WRKSRC}/CMakeLists.txt ${WRKSRC}/bindings/c/CMakeLists.txt
 
diff --git a/audio/tempest_for_eliza/Makefile b/audio/tempest_for_eliza/Makefile
index 2ce3b75..ddebb4e 100644
--- a/audio/tempest_for_eliza/Makefile
+++ b/audio/tempest_for_eliza/Makefile
@@ -20,14 +20,11 @@ PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/tempest
 	${INSTALL_DATA} ${SONGS:S,^,${WRKSRC}/songs/,} ${STAGEDIR}${PREFIX}/share/tempest
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/audio/timemachine/Makefile b/audio/timemachine/Makefile
index 88f16a1..b12ff1a 100644
--- a/audio/timemachine/Makefile
+++ b/audio/timemachine/Makefile
@@ -23,13 +23,8 @@ USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-lm
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MLASH}
-LIB_DEPENDS+=	liblash.so:${PORTSDIR}/audio/lash
-.else
-CONFIGURE_ARGS+=--disable-lash
-.endif
+LASH_LIB_DEPENDS=	liblash.so:${PORTSDIR}/audio/lash
+LASH_CONFIGURE_OFF=	--disable-lash
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git a/audio/uade/Makefile b/audio/uade/Makefile
index dc8032e..cbb29f5 100644
--- a/audio/uade/Makefile
+++ b/audio/uade/Makefile
@@ -35,31 +35,18 @@ PORTDOCS=	BUGS PLANS REDUNDANT_REPLAYERS UAE-CREDITS UAE-README \
 		play_loop_state_diagram.txt uade.html
 
 OPTIONS_DEFINE=	TEXTSCOPE FUSE XMMS DOCS
+OPTIONS_SUB=	yes
 
 TEXTSCOPE_DESC=	Audio register debug mode
 XMMS_DESC=	XMMS plugin
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MTEXTSCOPE}
-CONFIGURE_ARGS+=--with-text-scope
-.endif
-
-.if ${PORT_OPTIONS:MFUSE}
-USES+=		fuse
-PLIST_SUB+=	FUSE=""
-.else
-CONFIGURE_ARGS+=--without-uadefs
-PLIST_SUB+=	FUSE="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MXMMS}
-LIB_DEPENDS+=	libxmms.so:${PORTSDIR}/multimedia/xmms
-PLIST_SUB+=	XMMS=""
-.else
-CONFIGURE_ARGS+=--without-xmms
-PLIST_SUB+=	XMMS="@comment "
-.endif
+TEXTSCOPE_CONFIGURE_WITH=	text-scope
+
+FUSE_USES=		fuse
+FUSE_CONFIGURE_WITH=	uadefs
+
+XMMS_LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms
+XMMS_CONFIGURE_WITH=	xmms
 
 post-extract:
 	@${RM} -rf ${WRKSRC}/players/S
diff --git a/audio/vagalume/Makefile b/audio/vagalume/Makefile
index 941112b..a313203 100644
--- a/audio/vagalume/Makefile
+++ b/audio/vagalume/Makefile
@@ -25,7 +25,6 @@ OPTIONS_DEFAULT=	DBUS TRAY
 OPTIONS_SUB=	NLS DBUS
 TRAY_DESC=	Tray icon and libnotify support
 
-.include <bsd.port.options.mk>
 
 DBUS_LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
 DBUS_CONFIGURE_ON=	--enable-dbus --enable-im-status
@@ -35,26 +34,21 @@ TRAY_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/libnotify.pc:${PORTSDIR}/deve
 TRAY_LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
 TRAY_CONFIGURE_ENABLE=	tray-icon
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-.else
-CONFIGURE_ARGS+=--disable-nls
-.endif
+NLS_USES=		gettext
+NLS_CPPFLAGS=	-I${LOCALBASE}/include
+NLS_LDFLAGS=	-L${LOCALBASE}/lib
+NLS_CONFIGURE_ENABLE=	nls
 
-.if ${PORT_OPTIONS:MGCONF}
-USE_GNOME+=	gconf2
-CONFIGURE_ARGS+=--enable-gconf
+GCONF_USE=	GNOME=gconf2
+GCONF_CONFIGURE_ENABLE=	gconf
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|serviceentrydir = @serviceentrydir@|serviceentrydir = ${PREFIX}/share/dbus-1/services|' \
 		${WRKSRC}/Makefile.in
-.if empty(PORT_OPTIONS:MNLS)
+post-patch-NLS-off:
 	@${REINPLACE_CMD} -e 's|SUBDIRS = src po|SUBDIRS = src|' \
 		${WRKSRC}/Makefile.in
-.endif
 
 post-install:
 	${CP} ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps
diff --git a/audio/voipong/Makefile b/audio/voipong/Makefile
index e66970c..c4986d1 100644
--- a/audio/voipong/Makefile
+++ b/audio/voipong/Makefile
@@ -16,10 +16,7 @@ MAKEFILE=	Makefile.bsd
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/users-manual
 	${INSTALL_DATA} ${WRKSRC}/docs/users-manual/*.html ${STAGEDIR}${DOCSDIR}/users-manual/
@@ -27,6 +24,5 @@ post-install:
 .for doc in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/audio/xmp/Makefile b/audio/xmp/Makefile
index f64c898..869312e 100644
--- a/audio/xmp/Makefile
+++ b/audio/xmp/Makefile
@@ -27,22 +27,12 @@ CONFIG_FILES=	xmp.conf modules.conf
 
 OPTIONS_DEFINE=	ALSA PULSEAUDIO
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MALSA}
-LIB_DEPENDS+=	libasound.so:${PORTSDIR}/audio/alsa-lib
-RUN_DEPENDS+=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins
-CONFIGURE_ARGS+=	--enable-alsa
-.else
-CONFIGURE_ARGS+=	--disable-alsa
-.endif
-
-.if ${PORT_OPTIONS:MPULSEAUDIO}
-LIB_DEPENDS+=	libpulse-simple.so:${PORTSDIR}/audio/pulseaudio
-CONFIGURE_ARGS+=	--enable-pulseaudio
-.else
-CONFIGURE_ARGS+=	--disable-pulseaudio
-.endif
+ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins
+ALSA_CONFIGURE_ENABLE=	alsa
+
+PULSEAUDIO_LIB_DEPENDS=	libpulse-simple.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_CONFIGURE_ENABLE=	pulseaudio
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|\ install-conf||' ${WRKSRC}/Makefile.in
diff --git a/audio/yell/Makefile b/audio/yell/Makefile
index 3b61612..dd67dbf 100644
--- a/audio/yell/Makefile
+++ b/audio/yell/Makefile
@@ -9,25 +9,19 @@ MASTER_SITES=	LOCAL/ehaupt
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Command-line pc speaker bell
 
-PLIST_FILES=	bin/yell
-
 ONLY_FOR_ARCHS=	i386 amd64
 
 OPTIONS_DEFINE=	SUID
 SUID_DESC=	Use suid to allow execution as non root
 
-.include <bsd.port.options.mk>
+SUID_PLIST_FILES=	"@(,,4110) bin/yell"
+SUID_PLIST_FILES_OFF=	"@(,,0100) bin/yell"
 
 do-build:
 	${CC} ${WRKSRC}/yell.c ${CFLAGS} -o ${WRKSRC}/${PORTNAME}
 
 do-install:
-.if ${PORT_OPTIONS:MSUID}
-	${INSTALL_PROGRAM} -m 4110 ${WRKSRC}/${PORTNAME} \
-		${STAGEDIR}/${PREFIX}/bin
-.else
-	${INSTALL_PROGRAM} -m 0100 ${WRKSRC}/${PORTNAME} \
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} \
 		${STAGEDIR}/${PREFIX}/bin
-.endif
 
 .include <bsd.port.mk>
diff --git a/benchmarks/expedite/Makefile b/benchmarks/expedite/Makefile
index 74ba9d6..eb605ab 100644
--- a/benchmarks/expedite/Makefile
+++ b/benchmarks/expedite/Makefile
@@ -24,24 +24,8 @@ OPENGL_DESC=	Enable OpenGL evas engine
 SDL_DESC=	Enable SDL evas engine
 X11_DESC=	Enable X11 evas engine
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MOPENGL}
-CONFIGURE_ARGS+=	--enable-opengl-x11
-.else
-CONFIGURE_ARGS+=	--disable-opengl-x11
-.endif
-
-.if ${PORT_OPTIONS:MSDL}
-CONFIGURE_ARGS+=	--enable-software-sdl
-.else
-CONFIGURE_ARGS+=	--disable-software-sdl
-.endif
-
-.if ${PORT_OPTIONS:MX11}
-CONFIGURE_ARGS+=	--enable-software-x11 --enable-xrender-x11
-.else
-CONFIGURE_ARGS+=	--disable-software-x11 --disable-xrender-x11
-.endif
+OPENGL_CONFIGURE_ENABLE=	opengl-x11
+SDL_CONFIGURE_ENABLE=		software-sdl
+X11_CONFIGURE_ENABLE=		software-x11 xrender-x11
 
 .include <bsd.port.mk>
diff --git a/benchmarks/fio/Makefile b/benchmarks/fio/Makefile
index 4dacc21..109b21b 100644
--- a/benchmarks/fio/Makefile
+++ b/benchmarks/fio/Makefile
@@ -16,20 +16,15 @@ USES=		gmake tar:bzip2
 OPTIONS_DEFINE=	GNUPLOT EXAMPLES
 GNUPLOT_DESC=	Support for plotting graphs
 
-.include <bsd.port.options.mk>
+GNUPLOT_BUILD_DEPENDS=	${LOCALBASE}/bin/gnuplot:${PORTSDIR}/math/gnuplot
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/fio ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/fio_generate_plots ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/fio.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
 	${INSTALL_MAN} ${WRKSRC}/tools/fio_generate_plots.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
-.if ${PORT_OPTIONS:MEXAMPLES}
+do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR})
-.endif
-
-.if ${PORT_OPTIONS:MGNUPLOT}
-BUILD_DEPENDS+=	${LOCALBASE}/bin/gnuplot:${PORTSDIR}/math/gnuplot
-.endif
 
 .include <bsd.port.mk>
diff --git a/benchmarks/gtkperf/Makefile b/benchmarks/gtkperf/Makefile
index e682322..36295a2 100644
--- a/benchmarks/gtkperf/Makefile
+++ b/benchmarks/gtkperf/Makefile
@@ -17,18 +17,11 @@ GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20 gnomeprefix
 
 OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext iconv
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ARGS+=	--enable-nls
-PLIST_SUB=		NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB=		NLS="@comment "
-.endif
+NLS_USES=		gettext iconv
+NLS_CPPFLAGS=	-I${LOCALBASE}/include
+NLS_LDFLAGS=	-L${LOCALBASE}/lib
+NLS_CONFIGURE_ENABLE=	nls
 
 .include <bsd.port.mk>
diff --git a/benchmarks/imb/Makefile b/benchmarks/imb/Makefile
index 33f680e..8b9d406 100644
--- a/benchmarks/imb/Makefile
+++ b/benchmarks/imb/Makefile
@@ -32,17 +32,12 @@ OPTIONS_DEFINE=	CHECK_RESULTS DOCS OPENMPI
 CHECK_RESULTS_DESC=	Check results (not valid as real benchmark data)
 CHECK_RESULTS_CFLAGS=	-DCHECK
 
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MOPENMPI}
-BUILD_DEPENDS+=	${LOCALBASE}/mpi/openmpi/lib/libmpi.so:${PORTSDIR}/net/openmpi
-RUN_DEPENDS+=	${LOCALBASE}/mpi/openmpi/bin/mpirun:${PORTSDIR}/net/openmpi
-MAKE_ENV+=	MPI_HOME=${LOCALBASE}/mpi/openmpi
-.else
-BUILD_DEPENDS+=	${LOCALBASE}/bin/mpicc:${PORTSDIR}/net/mpich2
-RUN_DEPENDS+=	${LOCALBASE}/bin/mpirun:${PORTSDIR}/net/mpich2
-MAKE_ENV+=	MPI_HOME=${LOCALBASE}
-.endif
+OPENMPI_BUILD_DEPENDS=	${LOCALBASE}/mpi/openmpi/lib/libmpi.so:${PORTSDIR}/net/openmpi
+OPENMPI_RUN_DEPENDS=	${LOCALBASE}/mpi/openmpi/bin/mpirun:${PORTSDIR}/net/openmpi
+OPENMPI_MAKE_ENV=	MPI_HOME=${LOCALBASE}/mpi/openmpi
+OPENMPI_BUILD_DEPENDS_OFF=	${LOCALBASE}/bin/mpicc:${PORTSDIR}/net/mpich2
+OPENMPI_RUN_DEPENDS_OFF=	${LOCALBASE}/bin/mpirun:${PORTSDIR}/net/mpich2
+OPENMPI_MAKE_ENV_OFF=	MPI_HOME=${LOCALBASE}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
@@ -53,4 +48,4 @@ do-install:
 	(cd ${WRKSRC} && ${INSTALL_PROGRAM} IMB-EXT IMB-IO IMB-MPI1 \
 		${STAGEDIR}${PREFIX}/bin)
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/benchmarks/iozone/Makefile b/benchmarks/iozone/Makefile
index 96993cb..f595c4b 100644
--- a/benchmarks/iozone/Makefile
+++ b/benchmarks/iozone/Makefile
@@ -28,19 +28,12 @@ OPTIONS_DEFAULT=SSH THREADS
 SSH_DESC=	Use ssh in distributed measurement
 THREADS_DESC=	Enable threading (uses pthreads)
 
-.include <bsd.port.options.mk>
+THREADS_LDFLAGS=	-lpthread
+THREADS_CFLAGS_OFF=	-DNO_THREADS
 
-.if ${PORT_OPTIONS:MTHREADS}
-LDFLAGS+=	-lpthread
-.else
-CFLAGS+=	-DNO_THREADS
-.endif
-
-post-patch:
-.if ${PORT_OPTIONS:MSSH}
+post-patch-SSH-on:
 	@${REINPLACE_CMD} -e 's|shell\,\"rsh\"|shell\,\"ssh\"|' \
 		${WRKSRC}/iozone.c
-.endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/iozone ${STAGEDIR}${PREFIX}/bin
diff --git a/benchmarks/netio/Makefile b/benchmarks/netio/Makefile
index ff78bb2..9f31a80 100644
--- a/benchmarks/netio/Makefile
+++ b/benchmarks/netio/Makefile
@@ -22,20 +22,16 @@ MAKE_ENV+=	OUT=-o
 OPTIONS_DEFINE=	IPV6
 IPV6_PLIST_FILES=	bin/netio6
 
-.include <bsd.port.options.mk>
-
 do-build:
 	@(cd ${WRKSRC} && \
 	${SETENV} ${MAKE_ENV} O=.o CFLAGS="${CFLAGS}" ${MAKE_CMD} all)
-.if ${PORT_OPTIONS:MIPV6}
+do-build-IPV6-on:
 	@(cd ${WRKSRC} && \
 	${MAKE_ENV} O=.6o X=6 CFLAGS="${CFLAGS} -DUSE_IPV6" ${MAKE_CMD} all)
-.endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/netio ${STAGEDIR}${PREFIX}/bin
-.if ${PORT_OPTIONS:MIPV6}
+do-install-IPV6-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/netio6 ${STAGEDIR}${PREFIX}/bin
-.endif
 
 .include <bsd.port.mk>
diff --git a/benchmarks/netperf/Makefile b/benchmarks/netperf/Makefile
index 837c480..2086a00 100644
--- a/benchmarks/netperf/Makefile
+++ b/benchmarks/netperf/Makefile
@@ -28,37 +28,11 @@ CONFIGURE_ARGS=	--program-prefix="" --program-suffix="" --enable-dirty \
 
 INFO=		netperf
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MSOCKETS}
-CONFIGURE_ARGS+=	--enable-unixdomain
-.else
-CONFIGURE_ARGS+=	--disable-unixdomain
-.endif
-
-.if ${PORT_OPTIONS:MSCTP}
-CONFIGURE_ARGS+=	--enable-sctp
-.else
-CONFIGURE_ARGS+=	--disable-sctp
-.endif
-
-.if ${PORT_OPTIONS:MEXS}
-CONFIGURE_ARGS+=	--enable-exs
-.else
-CONFIGURE_ARGS+=	--disable-exs
-.endif
-
-.if ${PORT_OPTIONS:MHISTOGRAM}
-CONFIGURE_ARGS+=	--enable-histogram
-.else
-CONFIGURE_ARGS+=	--disable-histogram
-.endif
-
-.if ${PORT_OPTIONS:MOMNI}
-CONFIGURE_ARGS+=	--enable-omni
-.else
-CONFIGURE_ARGS+=	--disable-omni
-.endif
+SOCKETS_CONFIGURE_ENABLE=	unixdomain
+SCTP_CONFIGURE_ENABLE=		sctp
+EXS_CONFIGURE_ENABLE=		exs
+HISTOGRAM_CONFIGURE_ENABLE=	histogram
+OMNI_CONFIGURE_ENABLE=		omni
 
 SCRIPTS=	arr_script packet_byte_script sctp_stream_script snapshot_script \
 		tcp_range_script tcp_rr_script tcp_stream_script udp_rr_script \
diff --git a/benchmarks/nqueens/Makefile b/benchmarks/nqueens/Makefile
index 290297e..b6ce2bd 100644
--- a/benchmarks/nqueens/Makefile
+++ b/benchmarks/nqueens/Makefile
@@ -40,10 +40,9 @@ post-extract:
 do-build:
 	cd ${WRKSRC} && \
 	${CC} ${CFLAGS} -o qn24b_base base/queens.c
-.if ${PORT_OPTIONS:MMPI}
+do-build-MPI-on:
 	cd ${WRKSRC} && \
 	${MPICC} ${CFLAGS} -o qn24b_mpi mpi/main.c
-.endif
 
 PLIST_FILES=	${PROGS:S/^/bin\//}
 
diff --git a/benchmarks/nuttcp/Makefile b/benchmarks/nuttcp/Makefile
index fbb4bb8..d6a0554 100644
--- a/benchmarks/nuttcp/Makefile
+++ b/benchmarks/nuttcp/Makefile
@@ -25,8 +25,6 @@ NUTTSCP_DESC=	Install script for copying files over nuttcp
 OPTIONS_SUB=	yes
 NUTTSCP_USES=	perl5
 
-.include <bsd.port.options.mk>
-
 post-extract:
 	${CP} ${DISTDIR}/beta/${NUTTSCPDISTFILE} ${WRKDIR}/nuttscp
 	${CP} ${DISTDIR}/beta/${PORTNAME}-${PORTVERSION}.c ${WRKDIR}/
@@ -38,12 +36,11 @@ post-extract:
 do-build:
 	cd ${WRKDIR} && ${CC} -o ${PORTNAME} nuttcp-${PORTVERSION}.c
 
-do-install:
-.	if ${PORT_OPTIONS:MNUTTSCP}
-		${INSTALL_SCRIPT} ${WRKDIR}/nuttscp ${STAGEDIR}${PREFIX}/bin/
-		( cd ${STAGEDIR}${PREFIX}/bin; ${LN} -sf nuttscp nuttrcp )
-.	endif
+do-install-NUTTSCP-on:
+	${INSTALL_SCRIPT} ${WRKDIR}/nuttscp ${STAGEDIR}${PREFIX}/bin/
+	( cd ${STAGEDIR}${PREFIX}/bin; ${LN} -sf nuttscp nuttrcp )
 
+do-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_MAN} ${WRKDIR}/${PORTNAME}.8 ${STAGEDIR}${MAN8PREFIX}/man/man8/
 
diff --git a/benchmarks/polygraph/Makefile b/benchmarks/polygraph/Makefile
index 5cac7c0..3a541f1 100644
--- a/benchmarks/polygraph/Makefile
+++ b/benchmarks/polygraph/Makefile
@@ -32,28 +32,17 @@ ZLIB_DESC=	Enable HTTP compression support
 
 OPTIONS_DEFAULT=	OPENSSL ZLIB
 
-.include <bsd.port.options.mk>
+GNUPLOT_RUN_DEPENDS=	 gnuplot:${PORTSDIR}/math/gnuplot
 
-.if ${PORT_OPTIONS:MGNUPLOT}
-RUN_DEPENDS+=	 gnuplot:${PORTSDIR}/math/gnuplot
-.endif
+OPENSSL_USE=		OPENSSL=yes
+PERL_USES=		perl5
+PERL_USE=		PERL5=run
+ZLIB_CONFIGURE_WITH=	zlib=/usr
+
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MOPENSSL}
-USE_OPENSSL=	yes
 CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE}
-.else
-CONFIGURE_ARGS+=	--without-ssl
-.endif
-
-.if ${PORT_OPTIONS:MPERL}
-USES+=		perl5
-USE_PERL5=	run
-.endif
-
-.if ${PORT_OPTIONS:MZLIB}
-CONFIGURE_ARGS+=	--with-zlib=/usr
-.else
-CONFIGURE_ARGS+=	--without-zlib
 .endif
 
 .include <bsd.port.mk>
diff --git a/biology/avida/Makefile b/biology/avida/Makefile
index 7ad734e..eabcb09 100644
--- a/biology/avida/Makefile
+++ b/biology/avida/Makefile
@@ -34,8 +34,6 @@ BROKEN_ia64=	Does not compile: invokes i386 asm
 BROKEN_powerpc=	Does not compile: invokes i386 asm
 BROKEN_sparc64=	Does not compile: invokes i386 asm
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${FIND} ${WRKSRC} -name "CMakeLists.txt" | ${XARGS} \
 		${REINPLACE_CMD} -e \
@@ -63,10 +61,9 @@ do-install:
 	(cd ${WRKSRC}/avida-core/support/config && ${INSTALL_DATA} *.org \
 		${STAGEDIR}${PREFIX}/lib/${PORTNAME})
 
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@(cd ${WRKSRC}/avida-core/documentation && ${COPYTREE_SHARE} . \
 		${STAGEDIR}${DOCSDIR})
-.endif
 
 .include <bsd.port.mk>
diff --git a/biology/gff2ps/Makefile b/biology/gff2ps/Makefile
index b0db3c3..f591aa5 100644
--- a/biology/gff2ps/Makefile
+++ b/biology/gff2ps/Makefile
@@ -35,9 +35,8 @@ do-extract:
 	@${MKDIR} ${WRKDIR}
 	@${GZCAT} ${DISTDIR}/${PORTNAME}_v${PORTVERSION}.gz \
 		> ${WRKDIR}/${PORTNAME}
-.if ${PORT_OPTIONS:MDOCS}
+do-extract-DOCS-on:
 	@${GZCAT} ${DISTDIR}/${GFF2PS_MAN}.gz > ${WRKDIR}/${GFF2PS_MAN}
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e \
@@ -46,9 +45,8 @@ post-patch:
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/gff2ps ${STAGEDIR}${PREFIX}/bin
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/${GFF2PS_MAN} ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/biology/ortep3/Makefile b/biology/ortep3/Makefile
index 32205a5..d0c8216 100644
--- a/biology/ortep3/Makefile
+++ b/biology/ortep3/Makefile
@@ -30,11 +30,7 @@ PORTEXAMPLES=	*
 OPTIONS_DEFINE=	DOCS EXAMPLES PGPLOT
 PGPLOT_DESC=	Fortran subroutine package for drawing graphs
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MPGPLOT}
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-aa
-.endif
+PGPLOT_EXTRA_PATCHES=	${FILESDIR}/extra-patch-aa
 
 post-extract:
 	${MV} ${WRKSRC}/ortep.f ${WRKSRC}/ortep.f-1.0
@@ -45,15 +41,13 @@ pre-build:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ortep3 ${STAGEDIR}${PREFIX}/bin
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/src
 	${INSTALL_DATA} ${WRKSRC}/../README.1st ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/../man/* ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/000readme.txt ${STAGEDIR}${DOCSDIR}/src
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
+do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/../examples/* ${STAGEDIR}${EXAMPLESDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/biology/platon/Makefile b/biology/platon/Makefile
index 143a65c..3a08dbb 100644
--- a/biology/platon/Makefile
+++ b/biology/platon/Makefile
@@ -28,8 +28,6 @@ OPTIONS_DEFINE=	DOCS
 
 MAKEFILE=	${FILESDIR}/Makefile
 
-.include <bsd.port.pre.mk>
-
 pre-patch:
 	${GUNZIP_CMD} ${WRKSRC}/platon.f.gz ${WRKSRC}/xdrvr.c.gz
 
@@ -37,7 +35,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/${DISTNAME}/platon \
 		${STAGEDIR}${PREFIX}/bin
 	${LN} -fs platon ${STAGEDIR}${PREFIX}/bin/pluton
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${MV} ${WRKDIR}/${DISTNAME}/README* ${STAGEDIR}${DOCSDIR}/
 	${MV} ${SAMPLES:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}/
@@ -46,6 +44,5 @@ do-install:
 	${MV} ${WRKSRC}/TEST ${STAGEDIR}${DOCSDIR}/
 	${FIND} ${STAGEDIR}${DOCSDIR} -type f -print0 |	\
 		${XARGS} -0 ${CHMOD} ${_SHAREMODE}
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/biology/protomol/Makefile b/biology/protomol/Makefile
index b6c722f..5710363 100644
--- a/biology/protomol/Makefile
+++ b/biology/protomol/Makefile
@@ -37,20 +37,16 @@ CXXFLAGS+=	-L${LOCALBASE}/lib
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-OPTIONS_DEFINE=	GLUT
+OPTIONS_DEFINE=	GLUT EXAMPLES
 OPTIONS_DEFAULT=	GLUT
 
 GLUT_CONFIGURE_ON=	--with-glut=yes
 GLUT_USE=	GL=glut
 GLUT_CONFIGURE_OFF=	--with-glut=no
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MEXAMPLES}
-post-install:
+post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples ; \
 		${COPYTREE_SHARE} .  ${STAGEDIR}${EXAMPLESDIR} "! -name .cvsignore"
-.endif
 
 .include <bsd.port.mk>
diff --git a/biology/tinker/Makefile b/biology/tinker/Makefile
index 91e799a..43163df 100644
--- a/biology/tinker/Makefile
+++ b/biology/tinker/Makefile
@@ -57,15 +57,13 @@ post-install:
 	(cd ${WRKSRC}/params && ${INSTALL_DATA} * ${STAGEDIR}${DATADIR}/params)
 	${MKDIR} ${STAGEDIR}${DATADIR}/test
 	(cd ${WRKSRC}/test && ${INSTALL_DATA} * ${STAGEDIR}${DATADIR}/test)
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc && ${INSTALL_DATA} 0README *.pdf *.txt ${STAGEDIR}${DOCSDIR})
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
+post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/example && ${INSTALL_DATA} \
 		0README *.make *.dyn *.int *.frac *.key *.seq *.pdb *.xyz \
 		${STAGEDIR}${EXAMPLESDIR})
-.endif
 
 .include <bsd.port.mk>
diff --git a/biology/xmolwt/Makefile b/biology/xmolwt/Makefile
index ae96c0c..d31361c 100644
--- a/biology/xmolwt/Makefile
+++ b/biology/xmolwt/Makefile
@@ -19,15 +19,11 @@ ALL_TARGET=	gmolwt
 PORTDOCS=	*
 PLIST_FILES=	bin/gmolwt bin/molwt
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MGTK2}
-USES+=		pkgconfig
-USE_GNOME=	gtk20
-MAKE_ENV+=	GTKCONFIG="pkg-config gtk+-2.0"
-.else
-USE_GNOME=	gtk12
-MAKE_ENV+=	GTKCONFIG="${GTK_CONFIG}"
+GTK2_USES=		pkgconfig
+GTK2_USE=	GNOME=gtk20
+GTK2_MAKE_ENV=	GTKCONFIG="pkg-config gtk+-2.0"
+GTK2_USE_OFF=	GNOME=gtk12
+GTK2_MAKE_ENV_OFF=	GTKCONFIG="${GTK_CONFIG}"
 .endif
 
 post-patch:
diff --git a/cad/admesh/Makefile b/cad/admesh/Makefile
index ea2d0d9f..6b054b5 100644
--- a/cad/admesh/Makefile
+++ b/cad/admesh/Makefile
@@ -20,16 +20,13 @@ GNU_CONFIGURE=	yes
 PORTDOCS=	admesh.doc
 PLIST_FILES=	bin/admesh
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2||' ${WRKSRC}/configure
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/admesh ${STAGEDIR}${PREFIX}/bin/
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/ADMESH.DOC ${STAGEDIR}${DOCSDIR}/admesh.doc
-.endif
 
 .include <bsd.port.mk>
diff --git a/cad/brickutils/Makefile b/cad/brickutils/Makefile
index f41b4f4..93519bc 100644
--- a/cad/brickutils/Makefile
+++ b/cad/brickutils/Makefile
@@ -40,12 +40,8 @@ SUB_FILES=	${PORTNAME} \
 INSTALLS_ICONS=	yes
 ICON_SIZES=	32x32 48x48 64x64 72x72 96x96 128x128
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-DISTFILES+=	${PORTNAME}-manual-it.pdf:docs \
+DOCS_DISTFILES=	${PORTNAME}-manual-it.pdf:docs \
 		${PORTNAME}-manual.pdf:docs
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/share/|${PREFIX}|' \
@@ -76,10 +72,9 @@ do-install:
 	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/
 
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR}
 	@(cd ${_DISTDIR} && ${CP} -a *.pdf ${STAGEDIR}${DOCSDIR})
-.endif
 
 .include <bsd.port.mk>
diff --git a/cad/cider/Makefile b/cad/cider/Makefile
index 7ae6af8..5bacfb5 100644
--- a/cad/cider/Makefile
+++ b/cad/cider/Makefile
@@ -19,8 +19,6 @@ OPTIONS_DEFINE=	EXAMPLES
 
 CFLAGS+=	-Wno-return-type
 
-.include <bsd.port.options.mk>
-
 pre-patch:
 	@${CP} -f ${WRKSRC}/spice/common/lib/helpdir/spice.txt \
 		${WRKSRC}/cider/common/lib/helpdir/spice.txt
@@ -71,12 +69,11 @@ do-install:
 		${STAGEDIR}${DATADIR}/spice3/scripts
 	${INSTALL_SCRIPT} ${WRKSRC}/spice/common/lib/scripts/spinit \
 		${STAGEDIR}${DATADIR}/cider/scripts
-.if ${PORT_OPTIONS:MEXAMPLES}
+do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/spice3
 	${INSTALL_DATA} ${WRKSRC}/spice/common/examples/*.cir \
 		${STAGEDIR}${EXAMPLESDIR}/spice3
 	cd ${WRKSRC}/cider/common/examples && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/cad/dinotrace/Makefile b/cad/dinotrace/Makefile
index 2401c75..85b4a3e 100644
--- a/cad/dinotrace/Makefile
+++ b/cad/dinotrace/Makefile
@@ -36,8 +36,7 @@ PLIST_FILES+=	${EMACS_SITE_LISPDIR}/${F}
 post-patch:
 	@${REINPLACE_CMD} -e 's|"-O3"|""|' ${WRKSRC}/configure
 
-post-install:
-.if ${PORT_OPTIONS:MEMACS}
+post-install-EMACS-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
 .for F in dinotrace.el sim-log.el
 	${INSTALL_DATA} ${WRKSRC}/lisp/${F} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
diff --git a/cad/fidocadj/Makefile b/cad/fidocadj/Makefile
index c42662e..f2cb44b 100644
--- a/cad/fidocadj/Makefile
+++ b/cad/fidocadj/Makefile
@@ -25,7 +25,7 @@ USE_JAVA=	yes
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
+DOCS_DISTFILES=	${PORTNAME}_manual_en.pdf:docs
 
 FDCJ_MANUAL=	${PORTNAME}_manual_en.pdf
 
@@ -33,13 +33,8 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${MKDIR} ${STAGEDIR}${DATADIR}; \
 	${INSTALL_DATA} ${DISTDIR}/${PORTNAME}.jar ${STAGEDIR}${DATADIR}/
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR} && \
 	${INSTALL_DATA} ${DISTDIR}/${FDCJ_MANUAL} ${STAGEDIR}${DOCSDIR}/
-.endif
-
-.if ${PORT_OPTIONS:MDOCS}
-DISTFILES+=	${PORTNAME}_manual_en.pdf:docs
-.endif
 
 .include <bsd.port.mk>
diff --git a/cad/geda-gattrib/Makefile b/cad/geda-gattrib/Makefile
index 6ded427..01b8505 100644
--- a/cad/geda-gattrib/Makefile
+++ b/cad/geda-gattrib/Makefile
@@ -31,16 +31,10 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+NLS_USES=		gettext
+NLS_CONFIGURE_ENABLE=	nls
 
 post-patch:
 	@${REINPLACE_CMD} -E \
diff --git a/cad/geda-gschem/Makefile b/cad/geda-gschem/Makefile
index f14a103..c78d17e 100644
--- a/cad/geda-gschem/Makefile
+++ b/cad/geda-gschem/Makefile
@@ -32,16 +32,10 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+NLS_USES=		gettext
+NLS_CONFIGURE_ENABLE=	nls
 
 post-patch:
 	@${REINPLACE_CMD} -E \
diff --git a/cad/gnucap/Makefile b/cad/gnucap/Makefile
index d44af86..54be520 100644
--- a/cad/gnucap/Makefile
+++ b/cad/gnucap/Makefile
@@ -24,13 +24,8 @@ PORTEXAMPLES=	*
 PLIST_FILES=	bin/gnucap bin/gnucap-modelgen \
 		man/man1/gnucap-ibis.1.gz man/man1/gnucap.1.gz
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MREADLINE}
-USES+=		readline
-.else
-CONFIGURE_ARGS+=--with-readline=no
-.endif
+READLINE_USES=		readline
+READLINE_CONFIGURE_OFF=	--with-readline=no
 
 post-patch:
 	@${REINPLACE_CMD} -e \
@@ -43,20 +38,18 @@ post-patch:
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${STAGEDIR}${MANPREFIX}/man/man1
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/acs-tutorial ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/history ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/relnotes.* ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/whatisit ${STAGEDIR}${DOCSDIR}
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
+post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/README ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/runall ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/*.c ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/*.ckt ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/*.doc ${STAGEDIR}${EXAMPLESDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/cad/gtkwave/Makefile b/cad/gtkwave/Makefile
index e09aeb8..becc452 100644
--- a/cad/gtkwave/Makefile
+++ b/cad/gtkwave/Makefile
@@ -19,22 +19,15 @@ INSTALLS_ICONS=	yes
 OPTIONS_DEFINE=	TCL GCONF
 TCL_DESC=	Enable support for TCL/TK
 TCL_USES=	tk
+TCL_CONFIGURE_ON=	--with-tcl=${TCL_LIBDIR} \
+			--with-tk=${TK_LIBDIR}
+TCL_CONFIGURE_OFF=	--disable-tcl
 
-PORTDOCS=	gtkwave.odt
+GCONF_CONFIGURE_WITH=	gconf
+GCONF_USE=		GNOME=gconf2
 
-.include	<bsd.port.options.mk>
+PORTDOCS=	gtkwave.odt
 
-.if ${PORT_OPTIONS:MTCL}
-CONFIGURE_ARGS+=	--with-tcl=${TCL_LIBDIR} \
-			--with-tk=${TK_LIBDIR}
-.else
-CONFIGURE_ARGS+=	--disable-tcl
-.endif
-
-.if ${PORT_OPTIONS:MGCONF}
-CONFIGURE_ARGS+=	--with-gconf
-USE_GNOME+=	gconf2
-.endif
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/cad/jspice3/Makefile b/cad/jspice3/Makefile
index 65ce624..87d515d 100644
--- a/cad/jspice3/Makefile
+++ b/cad/jspice3/Makefile
@@ -17,21 +17,16 @@ OPTIONS_DEFINE=	X11 EXAMPLES
 OPTIONS_DEFAULT=	X11
 WRKSRC=		${WRKDIR}/${PORTNAME}-2.5
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MX11}
-USE_XORG=	x11 xaw xt
-.endif
+X11_USE=	XORG=x11,xaw,xt
 
 pre-configure:
 	@${REINPLACE_CMD} -e 's+/usr/local+${PREFIX}+g;s+-O -g+${CFLAGS}+g;' \
 		${WRKSRC}/conf/unixconf/mkheader.0
-.if ${PORT_OPTIONS:MX11}
+pre-confiure-X11-on:
 	@${REINPLACE_CMD} -e 's+#%%WITH_X%%++g' \
 		${WRKSRC}/conf/unixconf/mkheader.0
-.else
+pre-configure-X11-off:
 	@${ECHO} "#undef HAVE_X11" >> ${WRKSRC}/src/include/spice.h
-.endif
 
 do-build:
 	(cd ${WRKSRC};${SETENV} ${MAKE_ENV} ${SH} build)
@@ -50,7 +45,7 @@ do-install:
 		${STAGEDIR}${PREFIX}/lib/jspice3/sced
 	${INSTALL_DATA} ${WRKSRC}/lib/scripts/* \
 		${STAGEDIR}${PREFIX}/lib/jspice3/scripts
-.if ${PORT_OPTIONS:MEXAMPLES}
+do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/examples/jspice3/cryocmos \
 		${STAGEDIR}${PREFIX}/share/examples/jspice3/josephson
 	${INSTALL_DATA} ${WRKSRC}/examples/*.* \
@@ -59,6 +54,5 @@ do-install:
 		${STAGEDIR}${PREFIX}/share/examples/jspice3/cryocmos
 	${INSTALL_DATA} ${WRKSRC}/examples/josephson/* \
 		${STAGEDIR}${PREFIX}/share/examples/jspice3/josephson
-.endif
 
 .include <bsd.port.mk>
diff --git a/cad/kicad/Makefile b/cad/kicad/Makefile
index 53efc8c..15d07d7 100644
--- a/cad/kicad/Makefile
+++ b/cad/kicad/Makefile
@@ -83,17 +83,15 @@ post-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC}/library && ${COPYTREE_SHARE} library ${STAGEDIR}${DATADIR})
 	(cd ${WRKSRC}/library && ${COPYTREE_SHARE} modules ${STAGEDIR}${DATADIR})
-.if ${PORT_OPTIONS:MNLS}
+post-install-NLS-on:
 	${MKDIR} ${STAGEDIR}${DATADIR}/internat
 	(cd ${WRKSRC}/doc/internat &&	\
 		${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/internat)
 	${RM} -f ${STAGEDIR}${DATADIR}/internat/CMakeLists.txt
 	${FIND} ${STAGEDIR}${DATADIR}/internat -name kicad.po -delete
-.endif
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 	(cd ${WRKSRC}/Documentation && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
-.endif
 
 .include <bsd.port.mk>
diff --git a/cad/libgeda/Makefile b/cad/libgeda/Makefile
index af66cb14..5e3ecb7 100644
--- a/cad/libgeda/Makefile
+++ b/cad/libgeda/Makefile
@@ -27,16 +27,10 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+NLS_USES=		gettext
+NLS_CONFIGURE_ENABLE=	nls
 
 post-patch:
 	@${REINPLACE_CMD} -E \
diff --git a/cad/netgen/Makefile b/cad/netgen/Makefile
index ce40258..8bf4ca3 100644
--- a/cad/netgen/Makefile
+++ b/cad/netgen/Makefile
@@ -31,18 +31,13 @@ FFMPEG_DESC=		video recording with FFmpeg
 OPTIONS_DEFAULT=	OCC
 
 BROKEN_sparc64=	internal gcc error (Bug 23159)
-.include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MOCC}
-LIB_DEPENDS+=	libTKernel.so:${PORTSDIR}/cad/opencascade
-CXXFLAGS+=	-DOCCGEOMETRY -DHAVE_CONFIG_H -D${ARCH} -I${LOCALBASE}/include/OpenCASCADE
-CONFIGURE_ARGS+=	--enable-occ
-.endif
+OCC_LIB_DEPENDS=	libTKernel.so:${PORTSDIR}/cad/opencascade
+OCC_CXXFLAGS=	-DOCCGEOMETRY -DHAVE_CONFIG_H -D${ARCH} -I${LOCALBASE}/include/OpenCASCADE
+OCC_CONFIGURE_ENABLE=	occ
 
-.if ${PORT_OPTIONS:MFFMPEG}
-LIB_DEPENDS+=	libavcodec0.so:${PORTSDIR}/multimedia/ffmpeg0
-CONFIGURE_ARGS+=	--enable-ffmpeg
-.endif
+FFMPEG_LIB_DEPENDS=	libavcodec0.so:${PORTSDIR}/multimedia/ffmpeg0
+FFMPEG_CONFIGURE_ENABLE=ffmpeg
 
 MACHINE=	${OPSYS:tu}
 
diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile
index 11566aa..c6e96ee 100644
--- a/cad/opencascade/Makefile
+++ b/cad/opencascade/Makefile
@@ -67,22 +67,18 @@ VIS_LIB_DEPENDS=	libftgl.so:${PORTSDIR}/graphics/ftgl		\
 			libgl2ps.so:${PORTSDIR}/print/gl2ps		\
 			libfreeimageplus.so:${PORTSDIR}/graphics/freeimage
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MVIS}
-CMAKE_ARGS+=	-D3RDPARTY_FREETYPE_DIR=${LOCALBASE}	\
+VIS_CMAKE_ON=	-D3RDPARTY_FREETYPE_DIR=${LOCALBASE}	\
 		-D3RDPARTY_FREEIMAGE_DIR=${LOCALBASE}	\
 		-D3RDPARTY_GL2PS_DIR=${LOCALBASE}
-.endif
 
-.if ${PORT_OPTIONS:MDOCS}
-USE_TEX+=	latex:build
-BUILD_DEPENDS+=	bash:${PORTSDIR}/shells/bash		\
-		doxygen:${PORTSDIR}/devel/doxygen	\
-		dot:${PORTSDIR}/graphics/graphviz	\
-		inkscape:${PORTSDIR}/graphics/inkscape
-RUN_DEPENDS+=	${LOCALBASE}/www/MathJax/MathJax.js:${PORTSDIR}/www/mathjax
-.endif
+DOCS_USE=	TEX=latex:build
+DOCS_BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash		\
+			doxygen:${PORTSDIR}/devel/doxygen	\
+			dot:${PORTSDIR}/graphics/graphviz	\
+			inkscape:${PORTSDIR}/graphics/inkscape
+DOCS_RUN_DEPENDS=	${LOCALBASE}/www/MathJax/MathJax.js:${PORTSDIR}/www/mathjax
+
+.include <bsd.port.options.mk>
 
 .if ${ARCH} == "i386"
 BITS=	32
@@ -106,10 +102,8 @@ pre-configure:
 	${REINPLACE_CMD} -e 's|lin|bsd|' ${WRKSRC}/${es}
 .endfor
 
-post-build:
-.if ${PORT_OPTIONS:MDOCS}
+post-build-DOCS-on:
 	(cd ${WRKSRC} && ./gendoc -overview)
-.endif
 
 post-install:
 	${MV} ${STAGEDIR}${OCCROOT}/bsd${BITS}/${COMPILER_TYPE}/bin/DRAWEXE	\
@@ -129,11 +123,10 @@ post-install:
 	${RM} -rf ${STAGEDIR}${OCCROOT}/inc
 	${LN} -sf ${PREFIX}/include/OpenCASCADE ${STAGEDIR}${OCCROOT}/inc
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} tests ${STAGEDIR}${OCCROOT})
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc/overview && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 	${RMDIR} ${STAGEDIR}${DOCSDIR}/latex
-.endif
 
 .if defined(MAINTAINER_MODE)
 regression-test:	install
diff --git a/cad/pcb/Makefile b/cad/pcb/Makefile
index 5daccd7..0201af3 100644
--- a/cad/pcb/Makefile
+++ b/cad/pcb/Makefile
@@ -64,10 +64,6 @@ NONE_CONFIGURE_ENV=	WISH=/usr/bin/true
 ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=	Uses x86 specific libc functions and has not been ported
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-INFO=		pcb
-.endif
+DOCS_INFO=		pcb
 
 .include <bsd.port.mk>
diff --git a/cad/pdnmesh/Makefile b/cad/pdnmesh/Makefile
index 8ff4aaa..cd7768d 100644
--- a/cad/pdnmesh/Makefile
+++ b/cad/pdnmesh/Makefile
@@ -25,23 +25,17 @@ LDFLAGS+=	-lm
 
 DESKTOP_ENTRIES="pdnMesh" "${COMMENT}" "" "${PORTNAME}" "" true
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MATLAS}
-USES+=		blaslapack:atlas
-CONFIGURE_ARGS+=--with-blas=cblas --with-lapack=alapack
-.else
-USES+=		blaslapack
-CONFIGURE_ARGS+=--with-blas=blas --with-lapack=lapack
-.endif
+ATLAS_USES=		blaslapack:atlas
+ATLAS_CONFIGURE_ON=--with-blas=cblas --with-lapack=alapack
+ATLAS_USES_OFF=		blaslapack
+ATLAS_CONFIGURE_OFF=--with-blas=blas --with-lapack=lapack
 
 post-patch:
 	@${REINPLACE_CMD}-e \
 		'/^SUBDIRS/s|doc|| ; \
 		 s|^pkgdata_DATA|#pkgdata_DATA|' ${WRKSRC}/Makefile.in
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} \
 		&& ${INSTALL_DATA} ChangeLog ${STAGEDIR}${DOCSDIR} \
@@ -50,11 +44,9 @@ post-install:
 	(cd ${WRKSRC}/doc/tutorial \
 		&& ${INSTALL_DATA} README ${STAGEDIR}${DOCSDIR}/tutorial \
 		&& ${INSTALL_DATA} tutorial.* ${STAGEDIR}${DOCSDIR}/tutorial)
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
+post-install-EXAMPLES-on:
 	(cd ${WRKSRC}/doc/examples && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 	${RM} ${STAGEDIR}${EXAMPLESDIR}/Makefile*
-.endif
 
 .include <bsd.port.mk>
diff --git a/cad/qfsm/Makefile b/cad/qfsm/Makefile
index 0c01cfb..ba694ae 100644
--- a/cad/qfsm/Makefile
+++ b/cad/qfsm/Makefile
@@ -24,23 +24,19 @@ GRAPHVIZ_BUILD_DEPENDS=	graphviz>=2.22:${PORTSDIR}/graphics/graphviz
 GRAPHVIZ_RUN_DEPENDS=	graphviz>=2.22:${PORTSDIR}/graphics/graphviz
 GRAPHVIZ_CMAKE_OFF=	-DQFSM_AVOID_GRAPHVIZ:BOOL=ON
 
-.include <bsd.port.options.mk>
-
 pre-configure:
 	${REINPLACE_CMD} -e \
 		'/\/usr\//d' ${WRKSRC}/FindGraphViz.cmake
 	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|'			\
 		-e '/examples/s|share/qfsm|share/examples/${PORTNAME}|'	\
 		${WRKSRC}/CMakeLists.txt
-.if ${PORT_OPTIONS:MDOCS}
+pre-configure-DOCS-on:
 	${REINPLACE_CMD} -e 's|%%PD%%||' ${WRKSRC}/CMakeLists.txt
-.else
+pre-configure-DOCS-off:
 	${REINPLACE_CMD} -e 's|%%PD%%|#|' ${WRKSRC}/CMakeLists.txt
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
+pre-configure-EXAMPLES-on:
 	${REINPLACE_CMD} -e 's|%%PE%%||' ${WRKSRC}/CMakeLists.txt
-.else
+pre-configure-EXAMPLES-off:
 	${REINPLACE_CMD} -e 's|%%PE%%|#|' ${WRKSRC}/CMakeLists.txt
-.endif
 
 .include <bsd.port.mk>
diff --git a/cad/scotch/Makefile b/cad/scotch/Makefile
index 3f01d8f..380a0dd 100644
--- a/cad/scotch/Makefile
+++ b/cad/scotch/Makefile
@@ -61,7 +61,7 @@ PLIST_SUB+=	MPI=""
 PLIST_SUB+=	MPI="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${ARCH} == "i386"
 MF=	i686
@@ -90,16 +90,14 @@ do-install:
 	${INSTALL_DATA} ${INCS:S|^|${WRKSRC}/include/|} ${STAGEDIR}${PREFIX}/include
 	${INSTALL_DATA} ${LIBS:S|^|${WRKSRC}/lib/|} ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_MAN} ${WRKSRC}/man/man1/* ${STAGEDIR}${MANPREFIX}/man/man1
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR}
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
+do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/grf ${STAGEDIR}${EXAMPLESDIR}/tgt
 	${INSTALL_DATA} ${EXAMPLES:S|^|${WRKSRC}/examples/|} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/grf/* ${STAGEDIR}${EXAMPLESDIR}/grf
 	${INSTALL_DATA} ${WRKSRC}/tgt/* ${STAGEDIR}${EXAMPLESDIR}/tgt
-.endif
 
 .if defined(MAINTAINER_MODE)
 regression-test:	install
@@ -115,4 +113,4 @@ regression-test:	install
 . endif
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/cad/spice/Makefile b/cad/spice/Makefile
index 5a84e68..7d8aa99 100644
--- a/cad/spice/Makefile
+++ b/cad/spice/Makefile
@@ -83,22 +83,19 @@ LICENSE:=	${LICENSE:O:u}
 
 post-extract:
 	@${DO_NADA}
-.if ${PORT_OPTIONS:MDEV_BSIM3}
+post-extract-DEV_BSIM3-on:
 	@${MKDIR} ${WRKSRC}/src/lib/dev/bsim3
 	${TAR} -xf ${DISTDIR}/${DIST_SUBDIR}/BSIM3v330.tar.Z \
 	    -C ${WRKSRC}/src/lib/dev/bsim3
-.endif
-.if ${PORT_OPTIONS:MDEV_BSIM4}
+post-extract-DEV_BSIM4-on:
 	@${MKDIR} ${WRKSRC}/src/lib/dev/bsim4
 	${UNZIP_CMD} -qo ${DISTDIR}/${DIST_SUBDIR}/BSIM480_Code.zip \
 	    -d ${WRKSRC}/src/lib/dev/bsim4
-.endif
-.if ${PORT_OPTIONS:MDEV_HISIM2}
+post-extract-DEV_HISIM2-on:
 	${UNZIP_CMD} -qo ${DISTDIR}/${DIST_SUBDIR}/HiSIM_2.8.0_Release_20140605.zip \
 	    -d ${WRKDIR}
 	${MV} ${WRKDIR}/HiSIM_2.8.0_Release_20140605/HiSIM_2.8.0_C-Code/hisim2 \
 	    ${WRKSRC}/src/lib/dev
-.endif
 
 ${CONFIGFILE}::
 	@${SETENV} ${CONFIGURE_ENV} ${MAKE} -f ${MAKEFILE} configure
@@ -112,16 +109,13 @@ ${CONFIGFILE}::
 do-configure: ${CONFIGFILE}
 	@${DO_NADA}
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${CAT} ${DISTDIR}/${DIST_SUBDIR}/*.ps | ${GZIP_CMD} > \
 	    ${STAGEDIR}${DOCSDIR}/${PORTDOCS}
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
+post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples && \
 	    ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/cad/tochnog/Makefile b/cad/tochnog/Makefile
index 33c0188..b6da439 100644
--- a/cad/tochnog/Makefile
+++ b/cad/tochnog/Makefile
@@ -71,13 +71,12 @@ pre-configure:
 	s,%%SUPERLU%%,${SUPERLU},g ; \
 	s,%%BLAS_LIBS%%,-L${LOCALBASE}/lib ${BLAS_LIBS},g' \
 	${WRKSRC}/makefile
-.if ${PORT_OPTIONS:MTHREADS}
+pre-configure-THREADS-on:
 	${REINPLACE_CMD} -e 's,SUPERLU_MT_USE 0,SUPERLU_MT_USE 1,' \
 	${WRKSRC}/tnsuplu.h
-.else	# Serial
+pre-configure-THREADS-off:
 	${REINPLACE_CMD} -e 's,SUPERLU_USE 0,SUPERLU_USE 1,' \
 	${WRKSRC}/tnsuplu.h
-.endif
 
 post-build:
 	(cd ${WRKDIR}/Sources/tools && ${CXX} ${CXXFLAGS} -o aba2tn aba2tn.cc)
@@ -93,10 +92,9 @@ do-install:
 	  ${STAGEDIR}${GID_PTYPES}/tochnog.gid
 	${INSTALL_SCRIPT} ${WRKDIR}/Sources/gid/tochnog.gid/tochnog.ba*	\
 	  ${STAGEDIR}${GID_PTYPES}/tochnog.gid
-.if ${PORT_OPTIONS:MEXAMPLES}
+do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${RM} -f ${WRKDIR}/Sources/test/*.orig
 	${INSTALL_DATA} ${WRKDIR}/Sources/test/* ${STAGEDIR}${EXAMPLESDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/chinese/auto-cn-l10n/Makefile b/chinese/auto-cn-l10n/Makefile
index 7c82164..ad95d80 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 b4d3ea7..b6824bf 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 b6b4a4a..21830a6 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 889e9ee..acae428 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 ed52033..471a228 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 f46bbfc..ffdc60f 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 8ae61aa..8dea415 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 89019d7..2612e16 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 3e43363..4856302 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 7ab33f9..d857437 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 1361694..af17c4a 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 d695aba..fed601e 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 c5f6d31..189c62d 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>
diff --git a/comms/anyremote/Makefile b/comms/anyremote/Makefile
index 1cacd99..62a1993 100644
--- a/comms/anyremote/Makefile
+++ b/comms/anyremote/Makefile
@@ -23,27 +23,18 @@ LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
 OPTIONS_DEFINE=	DOCS DBUS X11
 OPTIONS_DEFAULT=	DBUS X11
 
-.include <bsd.port.options.mk>
+DBUS_CONFIGURE_ENABLE=dbus
+DBUS_LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
 
-.if ! ${PORT_OPTIONS:MDBUS}
-CONFIGURE_ARGS+=--disable-dbus
-.else
-LIB_DEPENDS+=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
-.endif
-
-.if ! ${PORT_OPTIONS:MX11}
-CONFIGURE_ARGS+=--disable-xtest
-.else
-USE_XORG=	x11 xtst
-.endif
+X11_CONFIGURE_ENABLE=xtest
+X11_USE=	XORG=x11,xtst
 
 MAKE_ARGS+=	LDFLAGS="-L${LOCALBASE}/lib"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|(datadir)/man/man1|(mandir)/man1|g' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|xtext|xtest|g' ${WRKSRC}/configure
-.if ${PORT_OPTIONS:MDOCS}
+post-patch-DOCS-on:
 	@${REINPLACE_CMD} -e '/doc\/${PORTNAME}/d' ${WRKSRC}/Makefile.in
-.endif
 
 .include <bsd.port.mk>
diff --git a/comms/conserver-com/Makefile b/comms/conserver-com/Makefile
index 3226b72..bb06f74 100644
--- a/comms/conserver-com/Makefile
+++ b/comms/conserver-com/Makefile
@@ -22,25 +22,16 @@ OPTIONS_DEFINE=	UDS GSSAPI GSSAPIONLY STRIPREALM
 UDS_DESC=	Use Unix domain sockets for client/server
 STRIPREALM_DESC=Strip @REALM when using GSSAPI
 GSSAPIONLY_DESC=Never prompt for a password when using GSSAPI
-
-.include <bsd.port.options.mk>
+STRIPREALM_IMPLIES=	GSSAPI
+GSSAPIONLY_IMPLIES=	GSSAPI
 
 DEFAULTPORT?=	782
 DEFAULTHOST?=	localhost
 
-.if ${PORT_OPTIONS:MUDS}
-CONFIGURE_ARGS+=	--with-uds
-.endif
-
-.if ${PORT_OPTIONS:MGSSAPI}
-CONFIGURE_ARGS+=	--with-gssapi
-.if ${PORT_OPTIONS:MSTRIPREALM}
-CONFIGURE_ARGS+=	--with-striprealm
-.endif
-.if ${PORT_OPTIONS:MGSSAPIONLY}
-EXTRA_PATCHES=		${FILESDIR}/extra-patch-conserver__master.c
-.endif
-.endif
+UDS_CONFIGURE_WITH=	uds
+GSSAPI_CONFIGURE_WITH=	gssapi
+STRIPREALM_CONFIGURE_WITH=	striprealm
+GSSAPIONLY_EXTRA_PATCHES=		${FILESDIR}/extra-patch-conserver__master.c
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/conserver-convert
diff --git a/comms/dabstick-radio/Makefile b/comms/dabstick-radio/Makefile
index 77ec205..95d49a8 100644
--- a/comms/dabstick-radio/Makefile
+++ b/comms/dabstick-radio/Makefile
@@ -63,10 +63,9 @@ do-install:
 		${WRKSRC}/dabreceiver-V2/dabreceiver \
 		${WRKSRC}/spectrum-viewer/spectrum-viewer \
 		${STAGEDIR}${PREFIX}/bin
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/dabreceiver-V2 ${STAGEDIR}${DOCSDIR}/fmreceiver-dab
 	${INSTALL_DATA} ${WRKSRC}/dabreceiver-V2/README ${STAGEDIR}${DOCSDIR}/dabreceiver-V2
 	${INSTALL_DATA} ${WRKSRC}/fmreceiver-dab/README ${STAGEDIR}${DOCSDIR}/fmreceiver-dab
-.endif
 
 .include <bsd.port.mk>
diff --git a/comms/esmska/Makefile b/comms/esmska/Makefile
index 59d5f44..f735696 100644
--- a/comms/esmska/Makefile
+++ b/comms/esmska/Makefile
@@ -21,8 +21,6 @@ PORTDOCS=	readme.txt
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/esmska.jar ${STAGEDIR}${DATADIR}/
@@ -32,12 +30,10 @@ do-install:
 	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} license ${STAGEDIR}${DATADIR}/)
 	${INSTALL_SCRIPT} ${WRKDIR}/esmska ${STAGEDIR}${PREFIX}/bin/
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/comms/fl_moxgen/Makefile b/comms/fl_moxgen/Makefile
index 30d49b2..9295a63 100644
--- a/comms/fl_moxgen/Makefile
+++ b/comms/fl_moxgen/Makefile
@@ -22,14 +22,9 @@ OPTIONS_DEFINE=	PDF
 OPTIONS_DEFAULT=	PDF
 PDF_DESC=	Enable PDF Writing (requires libharu)
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MPDF}
- LIB_DEPENDS+=	libhpdf.so:${PORTSDIR}/print/libharu
- ALL_TARGET=	fl_moxgen
-.else
- ALL_TARGET=	fl_moxgen_no_pdf
-.endif
+PDF_LIB_DEPENDS=	libhpdf.so:${PORTSDIR}/print/libharu
+PDF_ALL_TARGET=	fl_moxgen
+PDF_ALL_TARGET_OFF=	fl_moxgen_no_pdf
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \
diff --git a/comms/fldigi/Makefile b/comms/fldigi/Makefile
index e5bf6c0..fdb0fdf 100644
--- a/comms/fldigi/Makefile
+++ b/comms/fldigi/Makefile
@@ -54,14 +54,8 @@ HAMLIB_LIB_DEPENDS=		libhamlib.so:${PORTSDIR}/comms/hamlib
 NLS_CONFIGURE_ENABLE=		nls
 NLS_USES=			gettext
 
-.include <bsd.port.pre.mk>
+BROKEN_sparc64=		Fails to install
 
-.if ${ARCH} == "sparc64"
-BROKEN=		Fails to install
-.endif
-.if ${PORT_OPTIONS:MFLARQ}
-MAN1+=		flarq.1
-.endif
 PLIST_SUB+=	XMLRPC=""
 # Always need asciidoc for man pages
 CONFIGURE_ARGS+=--with-asciidoc
@@ -83,4 +77,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/guide.html ${STAGEDIR}${DOCSDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/comms/gammu/Makefile b/comms/gammu/Makefile
index 896c694..c6ddb2c 100644
--- a/comms/gammu/Makefile
+++ b/comms/gammu/Makefile
@@ -41,14 +41,9 @@ post-install:
 	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
 		-d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;})
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MBASH}
-BUILD_DEPENDS+=	bash:${PORTSDIR}/shells/bash
-RUN_DEPENDS+=	bash:${PORTSDIR}/shells/bash
-PLIST_FILES+=	etc/bash_completion.d/gammu
-.else
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-contrib_CMakeLists.txt
-.endif
+BASH_BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
+BASH_RUN_DEPENDS=	${BASH_BUILD_DEPENDS}
+BASH_PLIST_FILES=	etc/bash_completion.d/gammu
+BASH_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-contrib_CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/comms/ge-x2212/Makefile b/comms/ge-x2212/Makefile
index c558699..ea80402 100644
--- a/comms/ge-x2212/Makefile
+++ b/comms/ge-x2212/Makefile
@@ -20,12 +20,8 @@ PORTDOCS=	schematic.txt
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${FILESDIR}/schematic.txt ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/comms/gmfsk/Makefile b/comms/gmfsk/Makefile
index 641b03a..2c304fe 100644
--- a/comms/gmfsk/Makefile
+++ b/comms/gmfsk/Makefile
@@ -33,18 +33,12 @@ OPTIONS_DEFINE=	HAMLIB
 HAMLIB_DESC=	Enable HAMLIB Support
 OPTIONS_DEFAULT=	HAMLIB
 
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MHAMLIB}
-LIB_DEPENDS+=	libhamlib.so:${PORTSDIR}/comms/hamlib
-CONFIGURE_ARGS+=	--enable-hamlib
-CONFIGURE_ENV+=	PKG_CONFIG_PATH=${LOCALBASE}/lib/pkgconfig
-.else
-CONFIGURE_ARGS+=	--disable-hamlib
-.endif
+HAMLIB_LIB_DEPENDS=	libhamlib.so:${PORTSDIR}/comms/hamlib
+HAMLIB_CONFIGURE_ENABLE=	hamlib
+HAMLIB_CONFIGURE_ENV=	PKG_CONFIG_PATH=${LOCALBASE}/lib/pkgconfig
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|[$$][(]localstatedir[)]/lib/scrollkeeper|${SCROLLKEEPER_DIR}|g' \
 		${WRKSRC}/omf.make ${WRKSRC}/help/gmfsk/C/Makefile.in
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile
index a54c3fc..d9978cb 100644
--- a/comms/gnuradio/Makefile
+++ b/comms/gnuradio/Makefile
@@ -66,39 +66,26 @@ PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 VP=		${GCC_DEFAULT:S/.//}
 GCC_LIBS=	${LOCALBASE}/lib/gcc${VP}
 
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen \
-		${LOCALBASE}/bin/sphinx-apidoc:${PORTSDIR}/textproc/py-sphinx \
-		dot:${PORTSDIR}/graphics/graphviz \
-		xmlto:${PORTSDIR}/textproc/xmlto \
-		freefont-ttf>0:${PORTSDIR}/x11-fonts/freefont-ttf
-CMAKE_ARGS+=	-DENABLE_DOXYGEN:STRING="ON"
-CMAKE_ARGS+=	-DENABLE_DOCS:STRING="ON"
-CMAKE_ARGS+=	-DENABLE_BAD_BOOST="ON"
+DOCS_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen \
+			${LOCALBASE}/bin/sphinx-apidoc:${PORTSDIR}/textproc/py-sphinx \
+			dot:${PORTSDIR}/graphics/graphviz \
+			xmlto:${PORTSDIR}/textproc/xmlto \
+			freefont-ttf>0:${PORTSDIR}/x11-fonts/freefont-ttf
+DOCS_CMAKE_ON=	-DENABLE_DOXYGEN:STRING="ON" \
+		-DENABLE_DOCS:STRING="ON" \
+		-DENABLE_BAD_BOOST="ON"
+DOCS_CMAKE_OFF=	-DENABLE_DOXYGEN:STRING="OFF" \
+		-DENABLE_DOCS:STRING="OFF" \
+		-DENABLE_BAD_BOOST="ON"
 HAVE_PORTDOCS=	YES
-.else
-CMAKE_ARGS+=	-DENABLE_DOXYGEN:STRING="OFF"
-CMAKE_ARGS+=	-DENABLE_DOCS:STRING="OFF"
-CMAKE_ARGS+=	-DENABLE_BAD_BOOST="ON"
-.endif
 
-.if ${PORT_OPTIONS:MUSRP}
-CMAKE_ARGS+=	-DENABLE_GR_UHD:STRING="ON"
-BUILD_DEPENDS+=	${LOCALBASE}/include/uhd/config.hpp:${PORTSDIR}/comms/usrp
-PLIST_SUB+=	UHD=""
-.else
-CMAKE_ARGS+=	-DENABLE_GR_UHD:STRING="OFF"
-PLIST_SUB+=	UHD="@comment "
-.endif
+USRP_CMAKE_ON=	-DENABLE_GR_UHD:STRING="ON"
+USRP_CMAKE_OFF=	-DENABLE_GR_UHD:STRING="OFF"
+USRP_BUILD_DEPENDS=	${LOCALBASE}/include/uhd/config.hpp:${PORTSDIR}/comms/usrp
 
-.if ${PORT_OPTIONS:MTESTING}
-CMAKE_ARGS+=	-DENABLE_TESTING:STRING="ON"
-BUILD_DEPENDS+=	cppunit-config:${PORTSDIR}/devel/cppunit
-.else
-CMAKE_ARGS+=	-DENABLE_TESTING:STRING="OFF"
-.endif
+TESTING_CMAKE_ON=	-DENABLE_TESTING:STRING="ON"
+TESTING_CMAKE_OFF=	-DENABLE_TESTING:STRING="OFF"
+TESTING_BUILD_DEPENDS=	cppunit-config:${PORTSDIR}/devel/cppunit
 
 post-patch:
 	@${FIND} ${WRKSRC}/.. -name CMakeLists.txt | \
@@ -110,4 +97,4 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		${WRKSRC}/cmake/Modules/FindPortaudio.cmake
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/comms/jerm/Makefile b/comms/jerm/Makefile
index 8389f96..d607c8a 100644
--- a/comms/jerm/Makefile
+++ b/comms/jerm/Makefile
@@ -17,11 +17,7 @@ OPTIONS_SUB=	yes
 
 PORTDOCS=	README
 
-.include <bsd.port.options.mk>
-
-.if ! ${PORT_OPTIONS:MJUPITER}
-MAKE_ARGS+=	JUPITER_FLAGS=
-.endif
+JUPITER_MAKE_ARGS_OFF=	JUPITER_FLAGS=
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|^CFLAGS=|CFLAGS?=|' \
@@ -34,12 +30,12 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tiocdtr ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_MAN} ${WRKSRC}/jerm.1 ${STAGEDIR}${PREFIX}/man/man1/
 
-.if ${PORT_OPTIONS:MJUPITER}
+do-install-JUPITER-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/jerm
 	${INSTALL_SCRIPT} ${WRKSRC}/init.sh ${STAGEDIR}${PREFIX}/libexec/jerm/
 	${INSTALL_SCRIPT} ${WRKSRC}/rock.pl ${STAGEDIR}${PREFIX}/libexec/jerm/
-.endif
 
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
diff --git a/comms/jsdr/Makefile b/comms/jsdr/Makefile
index e40926c..74fe73d 100644
--- a/comms/jsdr/Makefile
+++ b/comms/jsdr/Makefile
@@ -28,8 +28,6 @@ PLIST_FILES+=	bin/swreceiver bin/spectrum-viewer-${PORTVERSION} \
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.pre.mk>
-
 do-configure:
 	cd ${WRKSRC}/make-x64/swreceiver && ${SETENV} ${MAKE_ENV} \
 		${QMAKE} ${QMAKE_ARGS}
@@ -58,9 +56,9 @@ do-install:
 		${STAGEDIR}${PREFIX}/bin/spectrum-viewer-${PORTVERSION}
 	${INSTALL} ${WRKSRC}/make-x64/fmreceiver/fmreceiver \
 		${STAGEDIR}${PREFIX}/bin/fmreceiver-${PORTVERSION}
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/* ${STAGEDIR}${DOCSDIR}
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/comms/lirc/Makefile b/comms/lirc/Makefile
index 94f32dc..9f0f722 100644
--- a/comms/lirc/Makefile
+++ b/comms/lirc/Makefile
@@ -35,8 +35,6 @@ PORTDOCS=	html images irxevent.keys lirc.css lirc.hwdb
 PORTEXAMPLES=	remotes
 SUB_FILES=	pkg-message lircd.conf
 
-.include <bsd.port.pre.mk>
-
 .if exists(${LOCALBASE}/lib/libvga.so.1)
 LIB_DEPENDS+=	libvga.so:${PORTSDIR}/graphics/svgalib
 PLIST_SUB+=	SMODE2=
@@ -44,21 +42,14 @@ PLIST_SUB+=	SMODE2=
 PLIST_SUB+=	SMODE2="@comment "
 .endif
 
-.if empty(PORT_OPTIONS:MMINIMAL)
-LIB_DEPENDS+=		libftdi.so:${PORTSDIR}/devel/libftdi \
+MINIMAL_LIB_DEPENDS_OFF=		libftdi.so:${PORTSDIR}/devel/libftdi \
 			libirman.so:${PORTSDIR}/comms/libirman
-CONFIGURE_ARGS+=	--with-driver=userspace
-.else
-CONFIGURE_ARGS+=	--with-driver=dvico
-.endif
+MINIMAL_CONFIGURE_OFF=	--with-driver=userspace
+MINIMAL_CONFIGURE_ON=	--with-driver=dvico
 
-.if ${PORT_OPTIONS:MDEBUG}
-CONFIGURE_ARGS+=	--enable-debug
-.endif
+DEBUG_CONFIGURE_ENABLE=	debug
 
-.if ${PORT_OPTIONS:MUARTLIRC}
-RUN_DEPENDS+=		uartlirc>=0.3:${PORTSDIR}/comms/uartlirc
-.endif
+UARTLIRC_RUN_DEPENDS=		uartlirc>=0.3:${PORTSDIR}/comms/uartlirc
 
 post-patch:
 	@${REINPLACE_CMD} \
@@ -66,16 +57,14 @@ post-patch:
 		-e 's/`$${LIBUSB_CONFIG} --cflags`//' \
 		${WRKSRC}/configure.ac
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR}/)
 	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} images ${STAGEDIR}${DOCSDIR}/)
 	@(cd ${WRKSRC}/doc && ${INSTALL_DATA} irxevent.keys lirc.css lirc.hwdb ${STAGEDIR}${DOCSDIR}/)
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
+post-install-EXAMPLES-on:
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} remotes ${STAGEDIR}${EXAMPLESDIR}/)
-.endif
+post-install:
 	@${INSTALL_DATA} ${WRKDIR}/lircd.conf ${STAGEDIR}${PREFIX}/etc/lircd.conf.sample
 	@${MKDIR} ${STAGEDIR}/var/run/lirc
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/comms/lrzsz/Makefile b/comms/lrzsz/Makefile
index 211c6d9..f331a4d 100644
--- a/comms/lrzsz/Makefile
+++ b/comms/lrzsz/Makefile
@@ -17,13 +17,8 @@ ALL_TARGET=	all # vcheck
 
 OPTIONS_DEFINE=	NLS
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_FILES+=	share/locale/de/LC_MESSAGES/lrzsz.mo
-.else
-CONFIGURE_ARGS+=	--disable-nls
-.endif
+NLS_USES=		gettext
+NLS_PLIST_FILES=	share/locale/de/LC_MESSAGES/lrzsz.mo
+NLS_CONFIGURE_ENABLE=	nls
 
 .include <bsd.port.mk>
diff --git a/comms/mgetty+sendfax/Makefile b/comms/mgetty+sendfax/Makefile
index 8af7130..d568c18 100644
--- a/comms/mgetty+sendfax/Makefile
+++ b/comms/mgetty+sendfax/Makefile
@@ -28,15 +28,9 @@ OPTIONS_DEFINE=	FIDO
 
 FIDO_DESC=	Enable FIDO EMSI support
 
-.include <bsd.port.options.mk>
-
 CFLAGS+=	-DAUTO_PPP
 
-.if ${PORT_OPTIONS:MFIDO}
-CFLAGS+=	-DFIDO
-.endif
-
-.include <bsd.port.pre.mk>
+FIDO_CFLAGS=	-DFIDO
 
 pre-install:
 	@(cd ${WRKSRC}/doc; ${MAKE} manpages)
@@ -56,4 +50,4 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/mgettycfg ${STAGEDIR}${PREFIX}/bin
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mgetty+sendfax/faxq-helper
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/comms/ncid/Makefile b/comms/ncid/Makefile
index 0090419..27d7b62 100644
--- a/comms/ncid/Makefile
+++ b/comms/ncid/Makefile
@@ -31,8 +31,6 @@ PORTDOCS=	CHANGES CONTRIBUTORS.md Devices.md Documentation.md FAQ.md Gateways.md
 		NCID-API.odt NCID-SDK.md NCID_Documentation.md README.docdir ReleaseNotes.md \
 		TODO.md Verbose.md mk-epub ncid-1.jpg
 
-.include <bsd.port.options.mk>
-
 post-extract:
 	cd ${WRKSRC}/FreeBSD;for i in *.rc; do \
 		x=`echo $$i | cut -f 1 -d .`; ${CP} $$i $$x; done
@@ -74,15 +72,14 @@ ncid-alert ncid-yac ncid-initmodem ncid-notify ncid-wakeup
 ncid-page ncid-samba ncid-speak ncid-yac ncid-initmodem
 	${INSTALL_DATA} ${WRKSRC}/FreeBSD/${i} ${STAGEDIR}${PREFIX}/etc/rc.d
 .endfor
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for j in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/doc/${j} ${STAGEDIR}${DOCSDIR}
-.endfor
-.endif
 	${INSTALL_MAN} ${WRKSRC}/man/*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/man/*.5 ${STAGEDIR}${MAN5PREFIX}/man/man5
 	${INSTALL_MAN} ${WRKSRC}/man/*.7 ${STAGEDIR}${MAN7PREFIX}/man/man7
 	${INSTALL_MAN} ${WRKSRC}/man/*.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
+do-install-DOCS-on:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for j in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/doc/${j} ${STAGEDIR}${DOCSDIR}
+.endfor
 
 .include <bsd.port.mk>
diff --git a/comms/owfs/Makefile b/comms/owfs/Makefile
index b49b601..4ad1cf6 100644
--- a/comms/owfs/Makefile
+++ b/comms/owfs/Makefile
@@ -117,15 +117,12 @@ pre-configure:
 	@echo "Preparing build using autotools..."
 
 # Workarounds for different problems
-post-install:
-.if ${PORT_OPTIONS:MOWPYTHON}
+post-install-OWPYTHON-on:
 	(cd ${STAGEDIR}${PREFIX} \
 	 && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
 	 -d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;})
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/python2.7/site-packages/ow/_OW.so
-.endif
-.if ${PORT_OPTIONS:MOWPERL}
+post-install-OWPERL-on:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/OW/OW.so
-.endif
 
 .include <bsd.port.mk>
diff --git a/comms/pr/Makefile b/comms/pr/Makefile
index a2c8ebc..142cbeb 100644
--- a/comms/pr/Makefile
+++ b/comms/pr/Makefile
@@ -23,8 +23,6 @@ RCDFILES=	pr.sh.sample
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 do-install:
 	(cd ${WRKSRC}/sbin && \
 		${INSTALL_SCRIPT} ${PROGRAMS} ${STAGEDIR}${PREFIX}/sbin)
@@ -32,9 +30,8 @@ do-install:
 		${INSTALL_DATA} ${RCDFILES} ${STAGEDIR}${PREFIX}/etc/rc.d)
 	(cd ${WRKSRC}/etc && \
 		${INSTALL_DATA} ${ETCFLS} ${STAGEDIR}${PREFIX}/etc)
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/share/doc/pr/PR.html ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/comms/py-bulksms/Makefile b/comms/py-bulksms/Makefile
index fb1af01..60a4ea3 100644
--- a/comms/py-bulksms/Makefile
+++ b/comms/py-bulksms/Makefile
@@ -19,12 +19,8 @@ WRKSRC=		${WRKDIR}/bulksms
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@${INSTALL_MAN} ${WRKSRC}/README.html ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/comms/qpage/Makefile b/comms/qpage/Makefile
index 982c8ee..af925e5 100644
--- a/comms/qpage/Makefile
+++ b/comms/qpage/Makefile
@@ -18,11 +18,7 @@ GNU_CONFIGURE=	yes
 OPTIONS_DEFINE=	IDENT_PATCH
 IDENT_PATCH_DESC=	Disable libwrap ident lookups
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MIDENT_PATCH}
-EXTRA_PATCHES=${FILESDIR}/libwrap_ident_patch-srvrsnpp.c
-.endif
+IDENT_PATCH_EXTRA_PATCHES=${FILESDIR}/libwrap_ident_patch-srvrsnpp.c
 
 .if !defined(WITH_QPAGE_SYSLOG_FACILITY) || !defined(WITH_QPAGE_USER)
 .if !defined(WITH_QPAGE_SYSLOG_FACILITY) && !defined(WITH_QPAGE_USER)
diff --git a/comms/rtl-sdr/Makefile b/comms/rtl-sdr/Makefile
index 77c5385..521579b 100644
--- a/comms/rtl-sdr/Makefile
+++ b/comms/rtl-sdr/Makefile
@@ -24,13 +24,8 @@ DOCSDIR=	${PREFIX}/share/doc/librtlsdr
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
-.else
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-Makefile.am
-.endif
+DOCS_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOCS_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-Makefile.am
 
 post-patch:
 	@${REINPLACE_CMD} 's|^pkgdocdir=.*|pkgdocdir=${DOCSDIR}|' \
diff --git a/comms/scmxx/Makefile b/comms/scmxx/Makefile
index f164eb4..9989193 100644
--- a/comms/scmxx/Makefile
+++ b/comms/scmxx/Makefile
@@ -34,9 +34,8 @@ post-patch:
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples && ${INSTALL_DATA} ${EXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/comms/smstools3/Makefile b/comms/smstools3/Makefile
index 60b151f..d4d1ecd 100644
--- a/comms/smstools3/Makefile
+++ b/comms/smstools3/Makefile
@@ -42,14 +42,10 @@ SUB_FILES=	pkg-install pkg-deinstall
 PORTDOCS=	*
 PORTEXAMPLES=	.procmailrc .qmailrc *
 
-.include <bsd.port.options.mk>
+STATS_LIB_DEPENDS=	libmm.so:${PORTSDIR}/devel/mm
+STATS_CFLAGS=	-I${LOCALBASE}/include
+STATS_CFLAGS_OFF=	-DNOSTATS
 
-.if ${PORT_OPTIONS:MSTATS}
-LIB_DEPENDS+=	libmm.so:${PORTSDIR}/devel/mm
-CFLAGS+=	-I${LOCALBASE}/include
-.else
-CFLAGS+=	-DNOSTATS
-.endif
 SMSTOOLS_DEFAULT_COMPORT?=	/dev/cuau0
 
 post-patch:
diff --git a/comms/svxlink/Makefile b/comms/svxlink/Makefile
index 41e8f65..21213f4 100644
--- a/comms/svxlink/Makefile
+++ b/comms/svxlink/Makefile
@@ -55,8 +55,6 @@ DOCS_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen \
 OPTIONS_SUB=	yes
 PORTDOCS=	*
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${GREP} -lr /dev/ttyS0 ${WRKSRC} | ${GREP} -v .bak | ${GREP} -v .orig | ${XARGS} \
 		${REINPLACE_CMD} -e 's|/dev/ttyS0|/dev/ttyu0|'
@@ -70,12 +68,11 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/lib|${PREFIX}/lib|' \
 		${WRKSRC}/src/doc/man/svxlink.conf.5 \
 		${WRKSRC}/src/svxlink/svxlink/svxlink.conf.in
-.if ${PORT_OPTIONS:MOSS}
+post-patch-OSS-on:
 	@${GREP} -lr alsa:default ${WRKSRC} | ${GREP} -v .bak | ${GREP} -v .orig | ${XARGS} \
 		${REINPLACE_CMD} -e 's|alsa:default|oss:/dev/dsp|'
 	@${GREP} -lr alsa:plughw:0 ${WRKSRC} | ${GREP} -v .bak | ${GREP} -v .orig | ${XARGS} \
 		${REINPLACE_CMD} -e 's|alsa:plughw:0|oss:/dev/dsp|'
-.endif
 
 .if ${PORTNAME}==svxlink
 post-stage:
diff --git a/comms/trustedqsl/Makefile b/comms/trustedqsl/Makefile
index 1e44595..b473141 100644
--- a/comms/trustedqsl/Makefile
+++ b/comms/trustedqsl/Makefile
@@ -41,21 +41,14 @@ CONVERTER_CMAKE_ON=	-DBUILD_CONVERTER=ON
 
 OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
-
-post-stage:
-.if ${PORT_OPTIONS:MGEN_CRQ}
+post-stage-GEN_CRQ-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/gen_crq ${STAGEDIR}${PREFIX}/bin
-.endif
-.if ${PORT_OPTIONS:MLOAD_CERT}
+post-stage-LOAD_CERT-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/load_cert ${STAGEDIR}${PREFIX}/bin
-.endif
-.if ${PORT_OPTIONS:MSTATION_LOC}
+post-stage-STATION_LOC-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/station_loc ${STAGEDIR}${PREFIX}/bin
-.endif
-.if ${PORT_OPTIONS:MCONVERTER}
+post-stage-CONVERTER-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/converter ${STAGEDIR}${PREFIX}/bin
-.endif
 
 post-patch:
 	@${SED} -e 's:%%PREFIX%%:${PREFIX}:g' \
diff --git a/comms/vrflash/Makefile b/comms/vrflash/Makefile
index 0c3d9b4..2068758 100644
--- a/comms/vrflash/Makefile
+++ b/comms/vrflash/Makefile
@@ -16,15 +16,12 @@ DOCS=		agenda-flashing-overview.txt troubleshooting.txt \
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/vrflash ${STAGEDIR}${PREFIX}/bin/
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${STAGEDIR}${DOCSDIR}/
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/comms/xastir/Makefile b/comms/xastir/Makefile
index acb843c..6e85bd0 100644
--- a/comms/xastir/Makefile
+++ b/comms/xastir/Makefile
@@ -40,74 +40,38 @@ OPTCFLAGS_DESC=	Use optimized CFLAGS (-O2 -pipe)
 
 OPTIONS_DEFAULT=	SHAPELIB DBFAWK MAGICK CURL RTREE BDB
 
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MSHAPELIB}
-LIB_DEPENDS+=	libshp.so:${PORTSDIR}/devel/shapelib
-.else
-CONFIGURE_ARGS+=	--without-shapelib
-.endif
-
-.if ${PORT_OPTIONS:MMAGICK}
-LIB_DEPENDS+=	libGraphicsMagickWand.so:${PORTSDIR}/graphics/GraphicsMagick
-.else
-CONFIGURE_ARGS+=	--without-imagemagick --without-graphicsmagick
-.endif
-
-.if ${PORT_OPTIONS:MDBFAWK}
-LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre
-.else
-CONFIGURE_ARGS+=	--without-dbfawk
-.endif
-
-.if ${PORT_OPTIONS:MCURL}
-LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
-.endif
-
-.if ${PORT_OPTIONS:MGEOTIFF}
-LIB_DEPENDS+=	libgeotiff.so:${PORTSDIR}/graphics/libgeotiff
-.endif
-
-.if ${PORT_OPTIONS:MGDAL}
-LIB_DEPENDS+=	libgdal.so:${PORTSDIR}/graphics/gdal
-.else
-CONFIGURE_ARGS+=	--without-gdal
-.endif
-
-.if ${PORT_OPTIONS:MGPSMAN}
-BUILD_DEPENDS+=	${LOCALBASE}/share/doc/gpsmanshp/GPSManSHP.pdf:${PORTSDIR}/graphics/gpsmanshp
-SHAPELIB=	true
-.else
-CONFIGURE_ARGS+=	--without-gpsman
-.endif
-
-.if ${PORT_OPTIONS:MFESTIVAL}
-BUILD_DEPENDS+=	festival:${PORTSDIR}/audio/festival
-.else
-CONFIGURE_ARGS+=	--without-festival
-.endif
-
-.if ${PORT_OPTIONS:MRTREE}
-CONFIGURE_ARGS+=	--with-rtree
-.endif
-
-.if ${PORT_OPTIONS:MERRORPOP}
-CONFIGURE_ARGS+=	--with-errorpopups
-.endif
-
-.if ${PORT_OPTIONS:MBDB}
-USE_BDB=		41+
-WITH_BDB_HIGHEST=	${TRUE}
-INVALID_BDB_VER=	2 3 40
-CONFIGURE_ARGS+=	--with-bdb-incdir=${BDB_INCLUDE_DIR} --with-bdb-libdir=${BDB_LIB_DIR}
-.endif
-
-.if ${PORT_OPTIONS:MOPTCFLAGS}
-CFLAGS+=	-O2 -pipe
-.endif
-
-.if ${ARCH} == "sparc64"
-BROKEN=		Does not compile on sparc64
-.endif
+SHAPELIB_LIB_DEPENDS=	libshp.so:${PORTSDIR}/devel/shapelib
+SHAPELIB_CONFIGURE_WITH=	shapelib
+
+MAGICK_LIB_DEPENDS=	libGraphicsMagickWand.so:${PORTSDIR}/graphics/GraphicsMagick
+MAGICK_CONFIGURE_WITH=	imagemagick graphicsmagick
+
+DBFAWK_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+DBFAWK_CONFIGURE_WITH=	dbfawk
+
+CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+
+GEOTIFF_LIB_DEPENDS=	libgeotiff.so:${PORTSDIR}/graphics/libgeotiff
+
+GDAL_LIB_DEPENDS=	libgdal.so:${PORTSDIR}/graphics/gdal
+GDAL_CONFIGURE_WITH=	gdal
+
+GPSMAN_BUILD_DEPENDS=	${LOCALBASE}/share/doc/gpsmanshp/GPSManSHP.pdf:${PORTSDIR}/graphics/gpsmanshp
+GPSMAN_IMPLIES=		SHAPELIB
+GPSMAN_CONFIGURE_WITH=	gpsman
+
+FESTIVAL_BUILD_DEPENDS=	festival:${PORTSDIR}/audio/festival
+FESTIVAL_CONFIGURE_WITH=festival
+
+RTREE_CONFIGURE_WITH=	rtree
+
+ERRORPOP_CONFIGURE_WITH=	errorpopups
+
+BDB_USE=		BDB=41+
+BDB_CONFIGURE_ON=	--with-bdb-incdir=${BDB_INCLUDE_DIR} --with-bdb-libdir=${BDB_LIB_DIR}
+
+OPTCFLAGS_CFLAGS=	-O2 -pipe
+
+BROKEN_sparc64=		Does not compile on sparc64
 
 .include <bsd.port.post.mk>
diff --git a/converters/iconv/Makefile b/converters/iconv/Makefile
index a8449f5..acc89e8 100644
--- a/converters/iconv/Makefile
+++ b/converters/iconv/Makefile
@@ -22,13 +22,8 @@ OPTIONS_SUB=	yes
 
 CCSUTIL_DESC=	Install Coded character set (CCS) util
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MCCSUTIL}
-USE_PERL5+=	run
-.else
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-ccs_Makefile
-.endif
+CCSUTIL_USE=	PERL5=run
+CCSUTIL_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-ccs_Makefile
 
 .if defined(NO_PROFILE)
 PLIST_SUB+=	PROFILE="@comment "
diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index b233186..ac6c4ba 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -26,18 +26,11 @@ OPTIONS_DEFAULT=ENCODINGS
 ENCODINGS_DESC=	Include extra character sets
 PATCHES_DESC=	Apply patches to fix CP932, add EUCJP-MS
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MENCODINGS}
-CONFIGURE_ARGS+=	--enable-extra-encodings
-.endif
-
-.if ${PORT_OPTIONS:MPATCHES}
-PATCH_SITES+=	http://apolloron.org/software/libiconv-1.14-ja/
-PATCH_SITES+=	LOCAL/kwm
-PATCHFILES+=	${DISTNAME}-ja-1.patch.gz
-PATCH_DIST_STRIP+=	-p1
-.endif
+ENCODINGS_CONFIGURE_ENABLE=	extra-encodings
+
+PATCHES_PATCH_SITES=	http://apolloron.org/software/libiconv-1.14-ja/ \
+			LOCAL/kwm
+PATCHES_PATCHFILES=	${DISTNAME}-ja-1.patch.gz:-p1
 
 post-patch:
 	@${REINPLACE_CMD} -e 's:ei_ksc5601:ei_euc_kr:g' ${WRKSRC}/lib/aliases.h
diff --git a/converters/p5-LaTeXML/Makefile b/converters/p5-LaTeXML/Makefile
index ee0966d..9b7b72d 100644
--- a/converters/p5-LaTeXML/Makefile
+++ b/converters/p5-LaTeXML/Makefile
@@ -38,16 +38,13 @@ PORTDOCS=		Changes INSTALL MANIFEST README manual.pdf
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-install:
 	${FIND} ${STAGEDIR}/${PREFIX} -name .packlist | \
 		${XARGS} ${REINPLACE_CMD} -e 's|^${STAGEDIR}||'
 	${RM} ${STAGEDIR}${PREFIX}/share/texmf-local/tex/latex/latexml/.packlist.bak
 
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/converters/py-zfec/Makefile b/converters/py-zfec/Makefile
index 881207f..957d660 100644
--- a/converters/py-zfec/Makefile
+++ b/converters/py-zfec/Makefile
@@ -25,18 +25,14 @@ DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|share/doc|${DOCSDIR}|g ; \
 		s#(doc_loc, data_fnames)##g' ${WRKSRC}/setup.py
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for DOC in COPYING.GPL COPYING.TGPPL.html README.rst TODO changelog
 	${INSTALL_DATA} ${WRKSRC}/${DOC} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/converters/tnef/Makefile b/converters/tnef/Makefile
index 3adb8cf..5d78af3 100644
--- a/converters/tnef/Makefile
+++ b/converters/tnef/Makefile
@@ -19,13 +19,9 @@ PORTDOCS=	AUTHORS NEWS README THANKS TODO
 PLIST_FILES=	bin/tnef \
 		man/man1/tnef.1.gz
 
-.include <bsd.port.pre.mk>
-
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
 
 # This target is intended to be run by the port maintainer.
 x-test: build
@@ -33,4 +29,4 @@ x-test: build
 	@cd ${WRKSRC}/tests/${dir} && ${MAKE} check-TESTS
 .endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
author	mat <mat@FreeBSD.org>	2015-08-19 13:29:59 +0000
committer	mat <mat@FreeBSD.org>	2015-08-19 13:29:59 +0000
commit	df89b8efc8508ebed07f6e8f0a805a93eee0af58 (patch)
tree	ac5a462edc3d85d5f0b20a594802ce4b12f0bf9f
parent	4a1eea8e721008727b250a284a4ad8137f9bef91 (diff)
download	FreeBSD-ports-df89b8efc8508ebed07f6e8f0a805a93eee0af58.zip FreeBSD-ports-df89b8efc8508ebed07f6e8f0a805a93eee0af58.tar.gz