*/*: sync with upstream

Taken from: FreeBSD
2015-08-20 11:30:38 +02:00 · 2015-08-20 11:30:38 +02:00 · 2ccf9bb41e
parent 60c15c97d0
commit 2ccf9bb41e
391 changed files with 1453 additions and 2357 deletions
--- a/archivers/Makefile
+++ b/archivers/Makefile
@ -136,6 +136,7 @@
    SUBDIR += pear-Horde_Compress_Fast
    SUBDIR += pear-Horde_Pack
    SUBDIR += pear-PHP_Archive
+    SUBDIR += peazip
    SUBDIR += pecl-lzf
    SUBDIR += pecl-phk
    SUBDIR += pecl-rar
--- 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>
--- a/archivers/peazip/Makefile
+++ b/archivers/peazip/Makefile
@ -0,0 +1,115 @@
+# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	peazip
+PORTVERSION=	5.7.1
+CATEGORIES=	archivers
+MASTER_SITES=	https://github.com/giorgiotani/PeaZip/releases/download/${PORTVERSION}/
+DISTNAME=	${PORTNAME}-${PORTVERSION}.src
+
+MAINTAINER=	acm@FreeBSD.org
+COMMENT=	Free archiver and file compressor
+
+BUILD_DEPENDS=	lazbuild:${PORTSDIR}/editors/lazarus \
+		fpcres:${PORTSDIR}/lang/fpc-utils
+
+USES=		dos2unix zip
+USE_FPC=	cairo fcl-base fcl-image fcl-process hash pasjpeg paszlib x11
+USE_GNOME=	#
+
+SUB_FILES=	pea pealauncher peazip
+
+DOS2UNIX_REGEX=		.*\.([txt]|pas|lpi|txt)
+LAZARUS_PROJECT_FILES=	project_pea.lpi project_peach.lpi project_gwrap.lpi
+LAZBUILD_CMD=		${LOCALBASE}/bin/lazbuild -d
+LCL_UNITS_DIR=		${LOCALBASE}/share/lazarus-${LAZARUS_VER}/lcl/units/${BUILDNAME}
+LAZARUS_VER=		1.4.2
+LAZARUS_DIR=		${LOCALBASE}/share/lazarus-${LAZARUS_VER}
+ARCHIVER_FILES=		#
+
+OPTIONS_DEFINE=		7Z ARC ZPAQ UNACE
+OPTIONS_SINGLE=		LCL
+OPTIONS_SINGLE_LCL=	GTK2 QT4
+
+7Z_DESC=		7z file archiver support
+ARC_DESC=		Arc file archiver support
+ZPAQ_DESC=		Zpaq file archiver support
+UNACE_DESC=		Unace file archiver support
+GTK2_DESC=		Use gtk20 interface
+QT4_DESC=		Use qt4 interface
+
+OPTIONS_DEFAULT=	GTK2 7Z
+
+.include <bsd.port.pre.mk>
+
+.if ${PORT_OPTIONS:MGTK2}
+USE_FPC+=	gtk2
+USE_GNOME=	gtk20
+LCL_PLATFORM=	gtk2
+BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-gtk2
+.endif
+
+.if ${PORT_OPTIONS:MQT4}
+LIB_DEPENDS+=	libQt4Pas.so:${PORTSDIR}/x11-toolkits/qt4pas
+LCL_PLATFORM=	qt
+BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-qt
+.endif
+
+.if ${PORT_OPTIONS:M7Z}
+RUN_DEPENDS+=	7z:${PORTSDIR}/archivers/p7zip
+ARCHIVER_FILES+=7z
+PLIST_SUB+=	7Z=""
+.else
+PLIST_SUB+=	7Z="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MARC}
+RUN_DEPENDS+=	arc:${PORTSDIR}/archivers/arc
+ARCHIVER_FILES+=arc
+PLIST_SUB+=	ARC=""
+.else
+PLIST_SUB+=	ARC="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MZPAQ}
+RUN_DEPENDS+=	zpaq:${PORTSDIR}/archivers/paq
+ARCHIVER_FILES+=zpaq
+PLIST_SUB+=	ZPAQ=""
+.else
+PLIST_SUB+=	ZPAQ="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MUNACE}
+RUN_DEPENDS+=	unace:${PORTSDIR}/archivers/unace
+ARCHIVER_FILES+=unace
+PLIST_SUB+=	UNACE=""
+.else
+PLIST_SUB+=	UNACE="@comment "
+.endif
+
+do-build:
+.for PROJECT_FILE in ${LAZARUS_PROJECT_FILES}
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
+		${LAZBUILD_CMD} --ws=${LCL_PLATFORM} --lazarusdir=${LAZARUS_DIR} ${PROJECT_FILE}
+.endfor
+
+pre-install:
+	@${ECHO_CMD} "#" > ${WRKSRC}/altconf.txt
+	@${ECHO_CMD} "appdata" >> ${WRKSRC}/altconf.txt
+
+do-install:
+	@${MKDIR} ${STAGEDIR}${DATADIR}/res
+.for ARCHIVER in ${ARCHIVER_FILES}
+	@${MKDIR} ${STAGEDIR}${DATADIR}/res/${ARCHIVER}
+	@${LN} -s ${LOCALBASE}/bin/${ARCHIVER} ${STAGEDIR}${DATADIR}/res/${ARCHIVER}/${ARCHIVER}
+.endfor
+	@cd ${WRKSRC}/res && ${COPYTREE_SHARE} "icons lang themes" ${STAGEDIR}${DATADIR}/res
+	@cd ${WRKSRC} && ${INSTALL_DATA} altconf.txt ${STAGEDIR}${DATADIR}/res && \
+			${INSTALL_PROGRAM} pea pealauncher ${STAGEDIR}${DATADIR}/res && \
+			${INSTALL_PROGRAM} peazip ${STAGEDIR}${DATADIR}
+	@cd ${WRKSRC}/FreeDesktop_integration && \
+		${INSTALL_DATA} peazip.desktop ${STAGEDIR}${DESKTOPDIR} && \
+		${INSTALL_DATA} peazip.png ${STAGEDIR}${PREFIX}/share/pixmaps/		
+	${INSTALL_SCRIPT} ${WRKDIR}/pea ${WRKDIR}/pealauncher ${WRKDIR}/peazip ${STAGEDIR}${PREFIX}/bin/
+
+.include <bsd.port.post.mk>
--- a/archivers/peazip/distinfo
+++ b/archivers/peazip/distinfo
@ -0,0 +1,2 @@
+SHA256 (peazip-5.7.1.src.zip) = d32c1427f911a03974ee619096267eaf289afe4652f9abebbf18d55971b5e5f3
+SIZE (peazip-5.7.1.src.zip) = 4045028
--- a/archivers/peazip/files/patch-peach.pas
+++ b/archivers/peazip/files/patch-peach.pas
@ -0,0 +1,26 @@
+--- peach.pas.orig	2015-08-10 00:54:42.122935000 -0500
+++ peach.pas	2015-08-10 00:56:11.788970000 -0500
+@@ -4320,6 +4320,7 @@
+   APPLICATION5  = '';
+   APPLICATION6  = '';
+   APPLICATION7  = '';
+  APPLICATION8  = '';
+   {$ENDIF}
+   {$IFDEF NETBSD}
+   EXEEXT        = '';
+@@ -4330,6 +4331,7 @@
+   APPLICATION5  = '';
+   APPLICATION6  = '';
+   APPLICATION7  = '';
+  APPLICATION8  = '';
+   {$ENDIF}
+   {$IFDEF DARWIN}
+   EXEEXT        = '';
+@@ -4340,6 +4342,7 @@
+   APPLICATION5  = '';
+   APPLICATION6  = '';
+   APPLICATION7  = '';
+  APPLICATION8  = '';
+   {$ENDIF}
+ 
+ var
--- a/archivers/peazip/files/pea.in
+++ b/archivers/peazip/files/pea.in
@ -0,0 +1,3 @@
+#!/bin/sh
+
+cd %%DATADIR%%/res && exec %%DATADIR%%/res/pea "$@"
--- a/archivers/peazip/files/pealauncher.in
+++ b/archivers/peazip/files/pealauncher.in
@ -0,0 +1,3 @@
+#!/bin/sh
+
+cd %%DATADIR%%/res && exec %%DATADIR%%/res/pealauncher "$@"
--- a/archivers/peazip/files/peazip.in
+++ b/archivers/peazip/files/peazip.in
@ -0,0 +1,3 @@
+#!/bin/sh
+
+cd %%DATADIR%% && exec %%DATADIR%%/peazip "$@"
--- a/archivers/peazip/pkg-descr
+++ b/archivers/peazip/pkg-descr
@ -0,0 +1,9 @@
+PeaZip, free archiver utility, Open Source WinRar / WinZip alternative for 
+Windows, Linux and FreeBSD. Compress to 7Z, ARC, BZ2, GZip, PAQ, PEA, 
+self-extracting archives, TAR, WIM, XZ, ZIP files. Open 150+ file types, 
+including ACE, CAB, DMG, ISO, RAR, UDF, ZIPX format. Extract, create and 
+convert archives, split / join files, strong encryption, encrypted password 
+manager, secure delete, find duplicate files, compute hash, export job 
+definition as script to automate backup / restore.
+
+WWW: http://www.peazip.org
--- a/archivers/peazip/pkg-plist
+++ b/archivers/peazip/pkg-plist
@ -0,0 +1,78 @@
+bin/pea
+bin/pealauncher
+bin/peazip
+share/applications/peazip.desktop
+share/pixmaps/peazip.png
+%%DATADIR%%/peazip
+%%DATADIR%%/res/altconf.txt
+%%DATADIR%%/res/icons/PeaZip.ico
+%%DATADIR%%/res/icons/PeaZip_7z.ico
+%%DATADIR%%/res/icons/PeaZip_block.ico
+%%DATADIR%%/res/icons/PeaZip_cd.ico
+%%DATADIR%%/res/icons/PeaZip_package.ico
+%%DATADIR%%/res/icons/PeaZip_rar.ico
+%%DATADIR%%/res/icons/PeaZip_zip.ico
+%%DATADIR%%/res/icons/new installer/peazip-256.bmp
+%%DATADIR%%/res/icons/new installer/peazip-icon-green.ico
+%%DATADIR%%/res/icons/new installer/peazip-icon-yellow.ico
+%%DATADIR%%/res/icons/new installer/peazip-installer-green-16.bmp
+%%DATADIR%%/res/icons/new installer/peazip-installer-green-24.bmp
+%%DATADIR%%/res/icons/new installer/peazip-installer-green-256.bmp
+%%DATADIR%%/res/icons/new installer/peazip-installer-green-32.bmp
+%%DATADIR%%/res/icons/new installer/peazip-installer-green-48.bmp
+%%DATADIR%%/res/icons/new installer/peazip-installer-yellow-16.bmp
+%%DATADIR%%/res/icons/new installer/peazip-installer-yellow-24.bmp
+%%DATADIR%%/res/icons/new installer/peazip-installer-yellow-256.bmp
+%%DATADIR%%/res/icons/new installer/peazip-installer-yellow-32.bmp
+%%DATADIR%%/res/icons/new installer/peazip-installer-yellow-48.bmp
+%%DATADIR%%/res/icons/new installer/peazip-installer.png
+%%DATADIR%%/res/icons/peazip_seven.icl
+%%DATADIR%%/res/lang/ar.txt
+%%DATADIR%%/res/lang/bg.txt
+%%DATADIR%%/res/lang/by-cr.txt
+%%DATADIR%%/res/lang/by-lt.txt
+%%DATADIR%%/res/lang/chs.txt
+%%DATADIR%%/res/lang/cht.txt
+%%DATADIR%%/res/lang/cz.txt
+%%DATADIR%%/res/lang/de-uml.txt
+%%DATADIR%%/res/lang/default.txt
+%%DATADIR%%/res/lang/en-gb.txt
+%%DATADIR%%/res/lang/en.txt
+%%DATADIR%%/res/lang/es-es.txt
+%%DATADIR%%/res/lang/es-la.txt
+%%DATADIR%%/res/lang/eu.txt
+%%DATADIR%%/res/lang/fi.txt
+%%DATADIR%%/res/lang/fr.txt
+%%DATADIR%%/res/lang/gl.txt
+%%DATADIR%%/res/lang/gr.txt
+%%DATADIR%%/res/lang/hu.txt
+%%DATADIR%%/res/lang/it.txt
+%%DATADIR%%/res/lang/ja.txt
+%%DATADIR%%/res/lang/ko.txt
+%%DATADIR%%/res/lang/nl.txt
+%%DATADIR%%/res/lang/no.txt
+%%DATADIR%%/res/lang/pl.txt
+%%DATADIR%%/res/lang/pt-br.txt
+%%DATADIR%%/res/lang/pt-pt.txt
+%%DATADIR%%/res/lang/ro.txt
+%%DATADIR%%/res/lang/ru.txt
+%%DATADIR%%/res/lang/si.txt
+%%DATADIR%%/res/lang/sk.txt
+%%DATADIR%%/res/lang/sv.txt
+%%DATADIR%%/res/lang/tj.txt
+%%DATADIR%%/res/lang/tr.txt
+%%DATADIR%%/res/lang/uk.txt
+%%DATADIR%%/res/lang/uz.txt
+%%DATADIR%%/res/lang/vn.txt
+%%DATADIR%%/res/pea
+%%DATADIR%%/res/pealauncher
+%%DATADIR%%/res/themes/firecrystal.theme.7z
+%%DATADIR%%/res/themes/nographic-embedded/fm-theme.bmp
+%%DATADIR%%/res/themes/nographic-embedded/note.readme
+%%DATADIR%%/res/themes/seven-embedded/fm-theme.bmp
+%%DATADIR%%/res/themes/seven-embedded/note.readme
+%%DATADIR%%/res/themes/seven.theme.7z
+%%7Z%%%%DATADIR%%/res/7z/7z
+%%ARC%%%%DATADIR%%/res/arc/arc
+%%UNACE%%%%DATADIR%%/res/unace/unace
+%%ZPAQ%%%%DATADIR%%/res/zpaq/zpaq
--- 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>
--- 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>
--- 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>
--- a/astro/boinc-setiathome-v7/Makefile
+++ b/astro/boinc-setiathome-v7/Makefile
@ -45,16 +45,10 @@ 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>
+X11_BUILD_DEPENDS_OFF=	${LOCALBASE}/include/boinc/std_fixes.h:${PORTSDIR}/net/boinc-client

-.if ! ${PORT_OPTIONS:MX11}
-BUILD_DEPENDS+=	${LOCALBASE}/include/boinc/std_fixes.h:${PORTSDIR}/net/boinc-client
-.endif
-
-.if ${ARCH} == i386 || ${ARCH} == amd64
-# comment out if world is built with clang and port with gcc
-CFLAGS+=	-mtune=native
-.endif
+CFLAGS_i386=	-mtune=native
+CFLAGS_amd64=	-mtune=native

 .if !empty(MACHINE_CPU:Maltivec)
 CONFIGURE_ARGS+=	--enable-altivec
@ -101,8 +95,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>
--- 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>
--- 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
--- 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>
--- 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>
--- 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

+NLS_USE=	QT4=linguist_build
+
 OPTIONS_SUB=	yes

-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MZBAR}
-BROKEN=	Does not build with option ZBAR selected
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-USE_QT4+=	linguist_build
-
-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>
--- 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>
--- 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;|' \
--- 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>
--- 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}
--- 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' \
--- 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}
--- 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>
+AVAHI_LIB_DEPENDS=	libavahi-client.so:${PORTSDIR}/net/avahi-app
+AVAHI_CONFIGURE_ENABLE=	avahi

-.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
+NLS_USES=		gettext
+NLS_CONFIGURE_ENABLE=	nls

 post-patch:
 	@${REINPLACE_CMD} -e 's|glib/gslist.h|glib.h|g ; \
--- 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>
--- 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>
--- 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>
+DROPBOX_CMAKE_ON=	-DENABLE_DROPBOX=ON
+DROPBOX_CMAKE_OFF=	-DENABLE_DROPBOX=OFF

-.if ${PORT_OPTIONS:MDROPBOX}
-CMAKE_ARGS+=	-DENABLE_DROPBOX=ON
-.else
-CMAKE_ARGS+=	-DENABLE_DROPBOX=OFF
-.endif
+MOODBAR_CMAKE_ON=	-DENABLE_MOODBAR=ON
+MOODBAR_CMAKE_OFF=	-DENABLE_MOODBAR=OFF

-.if ${PORT_OPTIONS:MMOODBAR}
-CMAKE_ARGS+=	-DENABLE_MOODBAR=ON
-.else
-CMAKE_ARGS+=	-DENABLE_MOODBAR=OFF
-.endif
+AUDIOCD_LIB_DEPENDS=	libcdio.so:${PORTSDIR}/sysutils/libcdio
+AUDIOCD_CMAKE_ON=	-DENABLE_AUDIOCD=ON
+AUDIOCD_CMAKE_OFF=	-DENABLE_AUDIOCD=OFF

-.if ${PORT_OPTIONS:MAUDIOCD}
-CMAKE_ARGS+=	-DENABLE_AUDIOCD=ON
-LIB_DEPENDS+=	libcdio.so:${PORTSDIR}/sysutils/libcdio
-.else
-CMAKE_ARGS+=	-DENABLE_AUDIOCD=OFF
-.endif
+BOX_CMAKE_ON=	-DENABLE_BOX=ON
+BOX_CMAKE_OFF=	-DENABLE_BOX=OFF

-.if ${PORT_OPTIONS:MBOX}
-CMAKE_ARGS+=	-DENABLE_BOX=ON
-.else
-CMAKE_ARGS+=	-DENABLE_BOX=OFF
-.endif
+BREAKPAD_CMAKE_ON=	-DENABLE_BREAKPAD=ON
+BREAKPAD_CMAKE_OFF=	-DENABLE_BREAKPAD=OFF

-.if ${PORT_OPTIONS:MBREAKPAD}
-CMAKE_ARGS+=	-DENABLE_BREAKPAD=ON
-.else
-CMAKE_ARGS+=	-DENABLE_BREAKPAD=OFF
-.endif
+DEVICEKIT_CMAKE_ON=	-DENABLE_DEVICEKIT=ON
+DEVICEKIT_CMAKE_OFF=	-DENABLE_DEVICEKIT=OFF

-.if ${PORT_OPTIONS:MDEVICEKIT}
-CMAKE_ARGS+=	-DENABLE_DEVICEKIT=ON
-.else
-CMAKE_ARGS+=	-DENABLE_DEVICEKIT=OFF
-.endif
+GIO_USE=	GNOME=glib20
+GIO_CMAKE_ON=	-DENABLE_GIO=ON
+GIO_CMAKE_OFF=	-DENABLE_GIO=OFF

-.if ${PORT_OPTIONS:MGIO}
-CMAKE_ARGS+=	-DENABLE_GIO=ON
-USE_GNOME=	glib20
-.else
-CMAKE_ARGS+=	-DENABLE_GIO=OFF
-.endif
+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

-.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
+GPOD_LIB_DEPENDS=	libgpod.so:${PORTSDIR}/audio/libgpod
+GPOD_CMAKE_ON=	-DENABLE_LIBGPOD=ON
+GPOD_CMAKE_OFF=	-DENABLE_LIBGPOD=OFF

-.if ${PORT_OPTIONS:MGPOD}
-CMAKE_ARGS+=	-DENABLE_LIBGPOD=ON
-LIB_DEPENDS+=	libgpod.so:${PORTSDIR}/audio/libgpod
-.else
-CMAKE_ARGS+=	-DENABLE_LIBGPOD=OFF
-.endif
+LASTFM_LIB_DEPENDS=	liblastfm.so:${PORTSDIR}/audio/liblastfm
+LASTFM_CMAKE_ON=	-DENABLE_LIBLASTFM=ON
+LASTFM_CMAKE_OFF=	-DENABLE_LIBLASTFM=OFF

-.if ${PORT_OPTIONS:MLASTFM}
-CMAKE_ARGS+=	-DENABLE_LIBLASTFM=ON
-LIB_DEPENDS+=	liblastfm.so:${PORTSDIR}/audio/liblastfm
-.else
-CMAKE_ARGS+=	-DENABLE_LIBLASTFM=OFF
-.endif
+MPT_LIB_DEPENDS=	libmtp.so:${PORTSDIR}/multimedia/libmtp
+MTP_CMAKE_ON=	-DENABLE_LIBMTP=ON
+MTP_CMAKE_OFF=	-DENABLE_LIBMTP=OFF

-.if ${PORT_OPTIONS:MMTP}
-CMAKE_ARGS+=	-DENABLE_LIBMTP=ON
-LIB_DEPENDS+=	libmtp.so:${PORTSDIR}/multimedia/libmtp
-.else
-CMAKE_ARGS+=	-DENABLE_LIBMTP=OFF
-.endif
+VISUALISATION_CMAKE_ON=	-DENABLE_VISUALISATIONS=ON
+VISUALISATION_CMAKE_OFF=	-DENABLE_VISUALISATIONS=OFF

-.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
+WIIMOTEDEV_CMAKE_ON=	-DENABLE_WIIMOTEDEV=ON
+WIIMOTEDEV_CMAKE_OFF=	-DENABLE_WIIMOTEDEV=OFF

 .include <bsd.port.mk>
--- 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>
--- 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>
--- 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++,,' \
--- 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"
--- 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>
+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]*

-.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
+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>
--- 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' \
--- 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}
--- 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}
--- 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>
--- 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:
--- 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>
--- 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

--- 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
--- 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>
+MMKEYS_CONFIGURE_ON=--disable-mmkeys

-.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
+XSPF_LIB_DEPENDS=	libxspf.so:${PORTSDIR}/multimedia/libxspf
+XSPF_CONFIGURE_ENABLE=	libxspf

 .include <bsd.port.mk>
--- 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>
--- 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' \
--- 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
--- 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>
--- 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
--- 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|' \
--- 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>
--- 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>
--- 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
--- 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>
--- 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>
--- 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}
--- 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
--- 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>
--- 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>
--- 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>
--- a/audio/liblo/Makefile
+++ b/audio/liblo/Makefile
@ -39,13 +39,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>
--- 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
+DOXYGEN_CONFIGURE_OFF=	--disable-documentation

 .include <bsd.port.mk>
--- 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 \
--- 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>
--- 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>
--- 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>
--- 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} && \
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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}
--- 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
--- 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,18 +49,16 @@ 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 \
 		${STAGEDIR}${PREFIX}/lib/ncmpc/lyrics)
-.endif

 .include <bsd.port.mk>
--- a/audio/ncmpcpp/Makefile
+++ b/audio/ncmpcpp/Makefile
@ -59,10 +59,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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- a/audio/py-speex/Makefile
+++ b/audio/py-speex/Makefile
@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pySpeex-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
 DIST_SUBDIR=	python

-MAINTAINER=	cjg@bsdmail.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python bindings for the Speex compressor/decompressor audio codec

 BUILD_DEPENDS=	pyrex>=0.9.6.2:${PORTSDIR}/devel/pyrex
--- a/audio/rubygem-ruby-mp3info/Makefile
+++ b/audio/rubygem-ruby-mp3info/Makefile
@ -6,9 +6,11 @@ PORTVERSION=	0.8
 CATEGORIES=	audio rubygems
 MASTER_SITES=	RG

-MAINTAINER=	tha_walka@hotmail.com
+MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby library to access information on mp3 files

+LICENSE=	MIT
+
 NO_ARCH=	yes

 USE_RUBY=	yes
--- 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>
--- 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>
--- 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

@ -60,12 +61,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 +75,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 +123,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>
--- 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 \
--- 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

--- 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>
+SNDFILE_USES=		pkgconfig
+SNDFILE_LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
+SNDFILE_CONFIGURE_ENV_OFF=	HAVE_PKGCONFIG=no

-.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
+THREADS_LDFLAGS=		-lpthread
+THREADS_CONFIGURE_ENABLE=	threads

 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsphinx*.so
--- 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>
--- 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>
--- 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>
+FAAD_CONFIGURE_OFF=	ac_cv_lib_faad_NeAACDecDecode2=no
+FAAD_LIB_DEPENDS=	libfaad.so:${PORTSDIR}/audio/faad

-.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
+VORBIS_CONFIGURE_WITH=	ogg
+VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis

 post-extract:
 	${MV} ${WRKDIR}/cdk-${CDK_VERSION} ${WRKSRC}
--- 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
+NLS_USES=	gettext
+NLS_LDFLAGS=	-lintl
+NLS_CONFIGURE_ENABLE=	nls

-.if ${PORT_OPTIONS:M3DNOW}
-CONFIGURE_ARGS+=	--enable-3dnow
-.endif
+3DNOW_CONFIGURE_ENABLE=	3dnow

-.if ${PORT_OPTIONS:MSSE}
-CONFIGURE_ARGS+=	--enable-sse
-.endif
+SSE_CONFIGURE_ENABLE=	sse

 post-patch:
 	@${REINPLACE_CMD} -e \
--- 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

--- 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>
--- 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 \
--- 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>
+TEXTSCOPE_CONFIGURE_WITH=	text-scope

-.if ${PORT_OPTIONS:MTEXTSCOPE}
-CONFIGURE_ARGS+=--with-text-scope
-.endif
+FUSE_USES=		fuse
+FUSE_CONFIGURE_WITH=	uadefs

-.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
+XMMS_LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms
+XMMS_CONFIGURE_WITH=	xmms

 post-extract:
 	@${RM} -rf ${WRKSRC}/players/S
--- 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,20 @@ 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
-.endif
+GCONF_USE=	GNOME=gconf2
+GCONF_CONFIGURE_ENABLE=	gconf

 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
--- 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>
--- 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>
+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

-.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
+PULSEAUDIO_LIB_DEPENDS=	libpulse-simple.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_CONFIGURE_ENABLE=	pulseaudio

 post-patch:
 	@${REINPLACE_CMD} -e 's|\ install-conf||' ${WRKSRC}/Makefile.in
--- a/Show More
+++ b/Show More