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

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

27 files changed, 120 insertions, 286 deletions

diff --git a/comms/anyremote/Makefile b/comms/anyremote/Makefile
index 1cacd997e4b..62a1993871c 100644
--- a/comms/anyremote/Makefile
+++ b/comms/anyremote/Makefile
@@ -23,27 +23,18 @@ LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
 OPTIONS_DEFINE=	DOCS DBUS X11
 OPTIONS_DEFAULT=	DBUS X11
 
-.include <bsd.port.options.mk>
+DBUS_CONFIGURE_ENABLE=dbus
+DBUS_LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
 
-.if ! ${PORT_OPTIONS:MDBUS}
-CONFIGURE_ARGS+=--disable-dbus
-.else
-LIB_DEPENDS+=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
-.endif
-
-.if ! ${PORT_OPTIONS:MX11}
-CONFIGURE_ARGS+=--disable-xtest
-.else
-USE_XORG=	x11 xtst
-.endif
+X11_CONFIGURE_ENABLE=xtest
+X11_USE=	XORG=x11,xtst
 
 MAKE_ARGS+=	LDFLAGS="-L${LOCALBASE}/lib"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|(datadir)/man/man1|(mandir)/man1|g' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|xtext|xtest|g' ${WRKSRC}/configure
-.if ${PORT_OPTIONS:MDOCS}
+post-patch-DOCS-on:
 	@${REINPLACE_CMD} -e '/doc\/${PORTNAME}/d' ${WRKSRC}/Makefile.in
-.endif
 
 .include <bsd.port.mk>
diff --git a/comms/conserver-com/Makefile b/comms/conserver-com/Makefile
index 3226b725944..bb06f74d699 100644
--- a/comms/conserver-com/Makefile
+++ b/comms/conserver-com/Makefile
@@ -22,25 +22,16 @@ OPTIONS_DEFINE=	UDS GSSAPI GSSAPIONLY STRIPREALM
 UDS_DESC=	Use Unix domain sockets for client/server
 STRIPREALM_DESC=Strip @REALM when using GSSAPI
 GSSAPIONLY_DESC=Never prompt for a password when using GSSAPI
-
-.include <bsd.port.options.mk>
+STRIPREALM_IMPLIES=	GSSAPI
+GSSAPIONLY_IMPLIES=	GSSAPI
 
 DEFAULTPORT?=	782
 DEFAULTHOST?=	localhost
 
-.if ${PORT_OPTIONS:MUDS}
-CONFIGURE_ARGS+=	--with-uds
-.endif
-
-.if ${PORT_OPTIONS:MGSSAPI}
-CONFIGURE_ARGS+=	--with-gssapi
-.if ${PORT_OPTIONS:MSTRIPREALM}
-CONFIGURE_ARGS+=	--with-striprealm
-.endif
-.if ${PORT_OPTIONS:MGSSAPIONLY}
-EXTRA_PATCHES=		${FILESDIR}/extra-patch-conserver__master.c
-.endif
-.endif
+UDS_CONFIGURE_WITH=	uds
+GSSAPI_CONFIGURE_WITH=	gssapi
+STRIPREALM_CONFIGURE_WITH=	striprealm
+GSSAPIONLY_EXTRA_PATCHES=		${FILESDIR}/extra-patch-conserver__master.c
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/conserver-convert
diff --git a/comms/dabstick-radio/Makefile b/comms/dabstick-radio/Makefile
index 77ec20572ba..95d49a80948 100644
--- a/comms/dabstick-radio/Makefile
+++ b/comms/dabstick-radio/Makefile
@@ -63,10 +63,9 @@ do-install:
 		${WRKSRC}/dabreceiver-V2/dabreceiver \
 		${WRKSRC}/spectrum-viewer/spectrum-viewer \
 		${STAGEDIR}${PREFIX}/bin
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/dabreceiver-V2 ${STAGEDIR}${DOCSDIR}/fmreceiver-dab
 	${INSTALL_DATA} ${WRKSRC}/dabreceiver-V2/README ${STAGEDIR}${DOCSDIR}/dabreceiver-V2
 	${INSTALL_DATA} ${WRKSRC}/fmreceiver-dab/README ${STAGEDIR}${DOCSDIR}/fmreceiver-dab
-.endif
 
 .include <bsd.port.mk>
diff --git a/comms/esmska/Makefile b/comms/esmska/Makefile
index 59d5f4414d6..f7356968a3c 100644
--- a/comms/esmska/Makefile
+++ b/comms/esmska/Makefile
@@ -21,8 +21,6 @@ PORTDOCS=	readme.txt
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/esmska.jar ${STAGEDIR}${DATADIR}/
@@ -32,12 +30,10 @@ do-install:
 	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} license ${STAGEDIR}${DATADIR}/)
 	${INSTALL_SCRIPT} ${WRKDIR}/esmska ${STAGEDIR}${PREFIX}/bin/
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/comms/fl_moxgen/Makefile b/comms/fl_moxgen/Makefile
index 30d49b2ea3b..9295a63cfdb 100644
--- a/comms/fl_moxgen/Makefile
+++ b/comms/fl_moxgen/Makefile
@@ -22,14 +22,9 @@ OPTIONS_DEFINE=	PDF
 OPTIONS_DEFAULT=	PDF
 PDF_DESC=	Enable PDF Writing (requires libharu)
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MPDF}
- LIB_DEPENDS+=	libhpdf.so:${PORTSDIR}/print/libharu
- ALL_TARGET=	fl_moxgen
-.else
- ALL_TARGET=	fl_moxgen_no_pdf
-.endif
+PDF_LIB_DEPENDS=	libhpdf.so:${PORTSDIR}/print/libharu
+PDF_ALL_TARGET=	fl_moxgen
+PDF_ALL_TARGET_OFF=	fl_moxgen_no_pdf
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \
diff --git a/comms/fldigi/Makefile b/comms/fldigi/Makefile
index e5bf6c01faa..fdb0fdf4c8b 100644
--- a/comms/fldigi/Makefile
+++ b/comms/fldigi/Makefile
@@ -54,14 +54,8 @@ HAMLIB_LIB_DEPENDS=		libhamlib.so:${PORTSDIR}/comms/hamlib
 NLS_CONFIGURE_ENABLE=		nls
 NLS_USES=			gettext
 
-.include <bsd.port.pre.mk>
+BROKEN_sparc64=		Fails to install
 
-.if ${ARCH} == "sparc64"
-BROKEN=		Fails to install
-.endif
-.if ${PORT_OPTIONS:MFLARQ}
-MAN1+=		flarq.1
-.endif
 PLIST_SUB+=	XMLRPC=""
 # Always need asciidoc for man pages
 CONFIGURE_ARGS+=--with-asciidoc
@@ -83,4 +77,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/guide.html ${STAGEDIR}${DOCSDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/comms/gammu/Makefile b/comms/gammu/Makefile
index 896c6949478..c6ddb2c523b 100644
--- a/comms/gammu/Makefile
+++ b/comms/gammu/Makefile
@@ -41,14 +41,9 @@ post-install:
 	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
 		-d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;})
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MBASH}
-BUILD_DEPENDS+=	bash:${PORTSDIR}/shells/bash
-RUN_DEPENDS+=	bash:${PORTSDIR}/shells/bash
-PLIST_FILES+=	etc/bash_completion.d/gammu
-.else
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-contrib_CMakeLists.txt
-.endif
+BASH_BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
+BASH_RUN_DEPENDS=	${BASH_BUILD_DEPENDS}
+BASH_PLIST_FILES=	etc/bash_completion.d/gammu
+BASH_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-contrib_CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/comms/ge-x2212/Makefile b/comms/ge-x2212/Makefile
index c558699098e..ea80402b11a 100644
--- a/comms/ge-x2212/Makefile
+++ b/comms/ge-x2212/Makefile
@@ -20,12 +20,8 @@ PORTDOCS=	schematic.txt
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${FILESDIR}/schematic.txt ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/comms/gmfsk/Makefile b/comms/gmfsk/Makefile
index 641b03a0cc4..2c304fecc60 100644
--- a/comms/gmfsk/Makefile
+++ b/comms/gmfsk/Makefile
@@ -33,18 +33,12 @@ OPTIONS_DEFINE=	HAMLIB
 HAMLIB_DESC=	Enable HAMLIB Support
 OPTIONS_DEFAULT=	HAMLIB
 
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MHAMLIB}
-LIB_DEPENDS+=	libhamlib.so:${PORTSDIR}/comms/hamlib
-CONFIGURE_ARGS+=	--enable-hamlib
-CONFIGURE_ENV+=	PKG_CONFIG_PATH=${LOCALBASE}/lib/pkgconfig
-.else
-CONFIGURE_ARGS+=	--disable-hamlib
-.endif
+HAMLIB_LIB_DEPENDS=	libhamlib.so:${PORTSDIR}/comms/hamlib
+HAMLIB_CONFIGURE_ENABLE=	hamlib
+HAMLIB_CONFIGURE_ENV=	PKG_CONFIG_PATH=${LOCALBASE}/lib/pkgconfig
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|[$$][(]localstatedir[)]/lib/scrollkeeper|${SCROLLKEEPER_DIR}|g' \
 		${WRKSRC}/omf.make ${WRKSRC}/help/gmfsk/C/Makefile.in
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile
index a54c3fc7e42..d9978cb93b1 100644
--- a/comms/gnuradio/Makefile
+++ b/comms/gnuradio/Makefile
@@ -66,39 +66,26 @@ PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 VP=		${GCC_DEFAULT:S/.//}
 GCC_LIBS=	${LOCALBASE}/lib/gcc${VP}
 
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen \
-		${LOCALBASE}/bin/sphinx-apidoc:${PORTSDIR}/textproc/py-sphinx \
-		dot:${PORTSDIR}/graphics/graphviz \
-		xmlto:${PORTSDIR}/textproc/xmlto \
-		freefont-ttf>0:${PORTSDIR}/x11-fonts/freefont-ttf
-CMAKE_ARGS+=	-DENABLE_DOXYGEN:STRING="ON"
-CMAKE_ARGS+=	-DENABLE_DOCS:STRING="ON"
-CMAKE_ARGS+=	-DENABLE_BAD_BOOST="ON"
+DOCS_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen \
+			${LOCALBASE}/bin/sphinx-apidoc:${PORTSDIR}/textproc/py-sphinx \
+			dot:${PORTSDIR}/graphics/graphviz \
+			xmlto:${PORTSDIR}/textproc/xmlto \
+			freefont-ttf>0:${PORTSDIR}/x11-fonts/freefont-ttf
+DOCS_CMAKE_ON=	-DENABLE_DOXYGEN:STRING="ON" \
+		-DENABLE_DOCS:STRING="ON" \
+		-DENABLE_BAD_BOOST="ON"
+DOCS_CMAKE_OFF=	-DENABLE_DOXYGEN:STRING="OFF" \
+		-DENABLE_DOCS:STRING="OFF" \
+		-DENABLE_BAD_BOOST="ON"
 HAVE_PORTDOCS=	YES
-.else
-CMAKE_ARGS+=	-DENABLE_DOXYGEN:STRING="OFF"
-CMAKE_ARGS+=	-DENABLE_DOCS:STRING="OFF"
-CMAKE_ARGS+=	-DENABLE_BAD_BOOST="ON"
-.endif
 
-.if ${PORT_OPTIONS:MUSRP}
-CMAKE_ARGS+=	-DENABLE_GR_UHD:STRING="ON"
-BUILD_DEPENDS+=	${LOCALBASE}/include/uhd/config.hpp:${PORTSDIR}/comms/usrp
-PLIST_SUB+=	UHD=""
-.else
-CMAKE_ARGS+=	-DENABLE_GR_UHD:STRING="OFF"
-PLIST_SUB+=	UHD="@comment "
-.endif
+USRP_CMAKE_ON=	-DENABLE_GR_UHD:STRING="ON"
+USRP_CMAKE_OFF=	-DENABLE_GR_UHD:STRING="OFF"
+USRP_BUILD_DEPENDS=	${LOCALBASE}/include/uhd/config.hpp:${PORTSDIR}/comms/usrp
 
-.if ${PORT_OPTIONS:MTESTING}
-CMAKE_ARGS+=	-DENABLE_TESTING:STRING="ON"
-BUILD_DEPENDS+=	cppunit-config:${PORTSDIR}/devel/cppunit
-.else
-CMAKE_ARGS+=	-DENABLE_TESTING:STRING="OFF"
-.endif
+TESTING_CMAKE_ON=	-DENABLE_TESTING:STRING="ON"
+TESTING_CMAKE_OFF=	-DENABLE_TESTING:STRING="OFF"
+TESTING_BUILD_DEPENDS=	cppunit-config:${PORTSDIR}/devel/cppunit
 
 post-patch:
 	@${FIND} ${WRKSRC}/.. -name CMakeLists.txt | \
@@ -110,4 +97,4 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		${WRKSRC}/cmake/Modules/FindPortaudio.cmake
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/comms/jerm/Makefile b/comms/jerm/Makefile
index 8389f96d3ad..d607c8af753 100644
--- a/comms/jerm/Makefile
+++ b/comms/jerm/Makefile
@@ -17,11 +17,7 @@ OPTIONS_SUB=	yes
 
 PORTDOCS=	README
 
-.include <bsd.port.options.mk>
-
-.if ! ${PORT_OPTIONS:MJUPITER}
-MAKE_ARGS+=	JUPITER_FLAGS=
-.endif
+JUPITER_MAKE_ARGS_OFF=	JUPITER_FLAGS=
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|^CFLAGS=|CFLAGS?=|' \
@@ -34,12 +30,12 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tiocdtr ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_MAN} ${WRKSRC}/jerm.1 ${STAGEDIR}${PREFIX}/man/man1/
 
-.if ${PORT_OPTIONS:MJUPITER}
+do-install-JUPITER-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/jerm
 	${INSTALL_SCRIPT} ${WRKSRC}/init.sh ${STAGEDIR}${PREFIX}/libexec/jerm/
 	${INSTALL_SCRIPT} ${WRKSRC}/rock.pl ${STAGEDIR}${PREFIX}/libexec/jerm/
-.endif
 
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
diff --git a/comms/jsdr/Makefile b/comms/jsdr/Makefile
index e40926cb752..74fe73d6fac 100644
--- a/comms/jsdr/Makefile
+++ b/comms/jsdr/Makefile
@@ -28,8 +28,6 @@ PLIST_FILES+=	bin/swreceiver bin/spectrum-viewer-${PORTVERSION} \
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.pre.mk>
-
 do-configure:
 	cd ${WRKSRC}/make-x64/swreceiver && ${SETENV} ${MAKE_ENV} \
 		${QMAKE} ${QMAKE_ARGS}
@@ -58,9 +56,9 @@ do-install:
 		${STAGEDIR}${PREFIX}/bin/spectrum-viewer-${PORTVERSION}
 	${INSTALL} ${WRKSRC}/make-x64/fmreceiver/fmreceiver \
 		${STAGEDIR}${PREFIX}/bin/fmreceiver-${PORTVERSION}
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/* ${STAGEDIR}${DOCSDIR}
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/comms/lirc/Makefile b/comms/lirc/Makefile
index 94f32dc8864..9f0f72254d7 100644
--- a/comms/lirc/Makefile
+++ b/comms/lirc/Makefile
@@ -35,8 +35,6 @@ PORTDOCS=	html images irxevent.keys lirc.css lirc.hwdb
 PORTEXAMPLES=	remotes
 SUB_FILES=	pkg-message lircd.conf
 
-.include <bsd.port.pre.mk>
-
 .if exists(${LOCALBASE}/lib/libvga.so.1)
 LIB_DEPENDS+=	libvga.so:${PORTSDIR}/graphics/svgalib
 PLIST_SUB+=	SMODE2=
@@ -44,21 +42,14 @@ PLIST_SUB+=	SMODE2=
 PLIST_SUB+=	SMODE2="@comment "
 .endif
 
-.if empty(PORT_OPTIONS:MMINIMAL)
-LIB_DEPENDS+=		libftdi.so:${PORTSDIR}/devel/libftdi \
+MINIMAL_LIB_DEPENDS_OFF=		libftdi.so:${PORTSDIR}/devel/libftdi \
 			libirman.so:${PORTSDIR}/comms/libirman
-CONFIGURE_ARGS+=	--with-driver=userspace
-.else
-CONFIGURE_ARGS+=	--with-driver=dvico
-.endif
+MINIMAL_CONFIGURE_OFF=	--with-driver=userspace
+MINIMAL_CONFIGURE_ON=	--with-driver=dvico
 
-.if ${PORT_OPTIONS:MDEBUG}
-CONFIGURE_ARGS+=	--enable-debug
-.endif
+DEBUG_CONFIGURE_ENABLE=	debug
 
-.if ${PORT_OPTIONS:MUARTLIRC}
-RUN_DEPENDS+=		uartlirc>=0.3:${PORTSDIR}/comms/uartlirc
-.endif
+UARTLIRC_RUN_DEPENDS=		uartlirc>=0.3:${PORTSDIR}/comms/uartlirc
 
 post-patch:
 	@${REINPLACE_CMD} \
@@ -66,16 +57,14 @@ post-patch:
 		-e 's/`$${LIBUSB_CONFIG} --cflags`//' \
 		${WRKSRC}/configure.ac
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR}/)
 	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} images ${STAGEDIR}${DOCSDIR}/)
 	@(cd ${WRKSRC}/doc && ${INSTALL_DATA} irxevent.keys lirc.css lirc.hwdb ${STAGEDIR}${DOCSDIR}/)
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
+post-install-EXAMPLES-on:
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} remotes ${STAGEDIR}${EXAMPLESDIR}/)
-.endif
+post-install:
 	@${INSTALL_DATA} ${WRKDIR}/lircd.conf ${STAGEDIR}${PREFIX}/etc/lircd.conf.sample
 	@${MKDIR} ${STAGEDIR}/var/run/lirc
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/comms/lrzsz/Makefile b/comms/lrzsz/Makefile
index 211c6d9ee27..f331a4d414b 100644
--- a/comms/lrzsz/Makefile
+++ b/comms/lrzsz/Makefile
@@ -17,13 +17,8 @@ ALL_TARGET=	all # vcheck
 
 OPTIONS_DEFINE=	NLS
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_FILES+=	share/locale/de/LC_MESSAGES/lrzsz.mo
-.else
-CONFIGURE_ARGS+=	--disable-nls
-.endif
+NLS_USES=		gettext
+NLS_PLIST_FILES=	share/locale/de/LC_MESSAGES/lrzsz.mo
+NLS_CONFIGURE_ENABLE=	nls
 
 .include <bsd.port.mk>
diff --git a/comms/mgetty+sendfax/Makefile b/comms/mgetty+sendfax/Makefile
index 8af7130bee2..d568c188661 100644
--- a/comms/mgetty+sendfax/Makefile
+++ b/comms/mgetty+sendfax/Makefile
@@ -28,15 +28,9 @@ OPTIONS_DEFINE=	FIDO
 
 FIDO_DESC=	Enable FIDO EMSI support
 
-.include <bsd.port.options.mk>
-
 CFLAGS+=	-DAUTO_PPP
 
-.if ${PORT_OPTIONS:MFIDO}
-CFLAGS+=	-DFIDO
-.endif
-
-.include <bsd.port.pre.mk>
+FIDO_CFLAGS=	-DFIDO
 
 pre-install:
 	@(cd ${WRKSRC}/doc; ${MAKE} manpages)
@@ -56,4 +50,4 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/mgettycfg ${STAGEDIR}${PREFIX}/bin
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mgetty+sendfax/faxq-helper
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/comms/ncid/Makefile b/comms/ncid/Makefile
index 0090419894c..27d7b62a4ce 100644
--- a/comms/ncid/Makefile
+++ b/comms/ncid/Makefile
@@ -31,8 +31,6 @@ PORTDOCS=	CHANGES CONTRIBUTORS.md Devices.md Documentation.md FAQ.md Gateways.md
 		NCID-API.odt NCID-SDK.md NCID_Documentation.md README.docdir ReleaseNotes.md \
 		TODO.md Verbose.md mk-epub ncid-1.jpg
 
-.include <bsd.port.options.mk>
-
 post-extract:
 	cd ${WRKSRC}/FreeBSD;for i in *.rc; do \
 		x=`echo $$i | cut -f 1 -d .`; ${CP} $$i $$x; done
@@ -74,15 +72,14 @@ ncid-alert ncid-yac ncid-initmodem ncid-notify ncid-wakeup
 ncid-page ncid-samba ncid-speak ncid-yac ncid-initmodem
 	${INSTALL_DATA} ${WRKSRC}/FreeBSD/${i} ${STAGEDIR}${PREFIX}/etc/rc.d
 .endfor
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for j in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/doc/${j} ${STAGEDIR}${DOCSDIR}
-.endfor
-.endif
 	${INSTALL_MAN} ${WRKSRC}/man/*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/man/*.5 ${STAGEDIR}${MAN5PREFIX}/man/man5
 	${INSTALL_MAN} ${WRKSRC}/man/*.7 ${STAGEDIR}${MAN7PREFIX}/man/man7
 	${INSTALL_MAN} ${WRKSRC}/man/*.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
+do-install-DOCS-on:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for j in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/doc/${j} ${STAGEDIR}${DOCSDIR}
+.endfor
 
 .include <bsd.port.mk>
diff --git a/comms/owfs/Makefile b/comms/owfs/Makefile
index b49b6010b63..4ad1cf6b380 100644
--- a/comms/owfs/Makefile
+++ b/comms/owfs/Makefile
@@ -117,15 +117,12 @@ pre-configure:
 	@echo "Preparing build using autotools..."
 
 # Workarounds for different problems
-post-install:
-.if ${PORT_OPTIONS:MOWPYTHON}
+post-install-OWPYTHON-on:
 	(cd ${STAGEDIR}${PREFIX} \
 	 && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
 	 -d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;})
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/python2.7/site-packages/ow/_OW.so
-.endif
-.if ${PORT_OPTIONS:MOWPERL}
+post-install-OWPERL-on:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/OW/OW.so
-.endif
 
 .include <bsd.port.mk>
diff --git a/comms/pr/Makefile b/comms/pr/Makefile
index a2c8ebc52c3..142cbeb685d 100644
--- a/comms/pr/Makefile
+++ b/comms/pr/Makefile
@@ -23,8 +23,6 @@ RCDFILES=	pr.sh.sample
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 do-install:
 	(cd ${WRKSRC}/sbin && \
 		${INSTALL_SCRIPT} ${PROGRAMS} ${STAGEDIR}${PREFIX}/sbin)
@@ -32,9 +30,8 @@ do-install:
 		${INSTALL_DATA} ${RCDFILES} ${STAGEDIR}${PREFIX}/etc/rc.d)
 	(cd ${WRKSRC}/etc && \
 		${INSTALL_DATA} ${ETCFLS} ${STAGEDIR}${PREFIX}/etc)
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/share/doc/pr/PR.html ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/comms/py-bulksms/Makefile b/comms/py-bulksms/Makefile
index fb1af011efa..60a4ea3f540 100644
--- a/comms/py-bulksms/Makefile
+++ b/comms/py-bulksms/Makefile
@@ -19,12 +19,8 @@ WRKSRC=		${WRKDIR}/bulksms
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@${INSTALL_MAN} ${WRKSRC}/README.html ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/comms/qpage/Makefile b/comms/qpage/Makefile
index 982c8eea350..af925e51740 100644
--- a/comms/qpage/Makefile
+++ b/comms/qpage/Makefile
@@ -18,11 +18,7 @@ GNU_CONFIGURE=	yes
 OPTIONS_DEFINE=	IDENT_PATCH
 IDENT_PATCH_DESC=	Disable libwrap ident lookups
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MIDENT_PATCH}
-EXTRA_PATCHES=${FILESDIR}/libwrap_ident_patch-srvrsnpp.c
-.endif
+IDENT_PATCH_EXTRA_PATCHES=${FILESDIR}/libwrap_ident_patch-srvrsnpp.c
 
 .if !defined(WITH_QPAGE_SYSLOG_FACILITY) || !defined(WITH_QPAGE_USER)
 .if !defined(WITH_QPAGE_SYSLOG_FACILITY) && !defined(WITH_QPAGE_USER)
diff --git a/comms/rtl-sdr/Makefile b/comms/rtl-sdr/Makefile
index 77c5385ab74..521579ba010 100644
--- a/comms/rtl-sdr/Makefile
+++ b/comms/rtl-sdr/Makefile
@@ -24,13 +24,8 @@ DOCSDIR=	${PREFIX}/share/doc/librtlsdr
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
-.else
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-Makefile.am
-.endif
+DOCS_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOCS_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-Makefile.am
 
 post-patch:
 	@${REINPLACE_CMD} 's|^pkgdocdir=.*|pkgdocdir=${DOCSDIR}|' \
diff --git a/comms/scmxx/Makefile b/comms/scmxx/Makefile
index f164eb49c97..9989193bdee 100644
--- a/comms/scmxx/Makefile
+++ b/comms/scmxx/Makefile
@@ -34,9 +34,8 @@ post-patch:
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples && ${INSTALL_DATA} ${EXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/comms/smstools3/Makefile b/comms/smstools3/Makefile
index 60b151f0224..d4d1ecd689c 100644
--- a/comms/smstools3/Makefile
+++ b/comms/smstools3/Makefile
@@ -42,14 +42,10 @@ SUB_FILES=	pkg-install pkg-deinstall
 PORTDOCS=	*
 PORTEXAMPLES=	.procmailrc .qmailrc *
 
-.include <bsd.port.options.mk>
+STATS_LIB_DEPENDS=	libmm.so:${PORTSDIR}/devel/mm
+STATS_CFLAGS=	-I${LOCALBASE}/include
+STATS_CFLAGS_OFF=	-DNOSTATS
 
-.if ${PORT_OPTIONS:MSTATS}
-LIB_DEPENDS+=	libmm.so:${PORTSDIR}/devel/mm
-CFLAGS+=	-I${LOCALBASE}/include
-.else
-CFLAGS+=	-DNOSTATS
-.endif
 SMSTOOLS_DEFAULT_COMPORT?=	/dev/cuau0
 
 post-patch:
diff --git a/comms/svxlink/Makefile b/comms/svxlink/Makefile
index 41e8f650d9e..21213f45f95 100644
--- a/comms/svxlink/Makefile
+++ b/comms/svxlink/Makefile
@@ -55,8 +55,6 @@ DOCS_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen \
 OPTIONS_SUB=	yes
 PORTDOCS=	*
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${GREP} -lr /dev/ttyS0 ${WRKSRC} | ${GREP} -v .bak | ${GREP} -v .orig | ${XARGS} \
 		${REINPLACE_CMD} -e 's|/dev/ttyS0|/dev/ttyu0|'
@@ -70,12 +68,11 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/lib|${PREFIX}/lib|' \
 		${WRKSRC}/src/doc/man/svxlink.conf.5 \
 		${WRKSRC}/src/svxlink/svxlink/svxlink.conf.in
-.if ${PORT_OPTIONS:MOSS}
+post-patch-OSS-on:
 	@${GREP} -lr alsa:default ${WRKSRC} | ${GREP} -v .bak | ${GREP} -v .orig | ${XARGS} \
 		${REINPLACE_CMD} -e 's|alsa:default|oss:/dev/dsp|'
 	@${GREP} -lr alsa:plughw:0 ${WRKSRC} | ${GREP} -v .bak | ${GREP} -v .orig | ${XARGS} \
 		${REINPLACE_CMD} -e 's|alsa:plughw:0|oss:/dev/dsp|'
-.endif
 
 .if ${PORTNAME}==svxlink
 post-stage:
diff --git a/comms/trustedqsl/Makefile b/comms/trustedqsl/Makefile
index 1e445950d65..b47314180e8 100644
--- a/comms/trustedqsl/Makefile
+++ b/comms/trustedqsl/Makefile
@@ -41,21 +41,14 @@ CONVERTER_CMAKE_ON=	-DBUILD_CONVERTER=ON
 
 OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
-
-post-stage:
-.if ${PORT_OPTIONS:MGEN_CRQ}
+post-stage-GEN_CRQ-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/gen_crq ${STAGEDIR}${PREFIX}/bin
-.endif
-.if ${PORT_OPTIONS:MLOAD_CERT}
+post-stage-LOAD_CERT-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/load_cert ${STAGEDIR}${PREFIX}/bin
-.endif
-.if ${PORT_OPTIONS:MSTATION_LOC}
+post-stage-STATION_LOC-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/station_loc ${STAGEDIR}${PREFIX}/bin
-.endif
-.if ${PORT_OPTIONS:MCONVERTER}
+post-stage-CONVERTER-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/converter ${STAGEDIR}${PREFIX}/bin
-.endif
 
 post-patch:
 	@${SED} -e 's:%%PREFIX%%:${PREFIX}:g' \
diff --git a/comms/vrflash/Makefile b/comms/vrflash/Makefile
index 0c3d9b49c45..20687587cd5 100644
--- a/comms/vrflash/Makefile
+++ b/comms/vrflash/Makefile
@@ -16,15 +16,12 @@ DOCS=		agenda-flashing-overview.txt troubleshooting.txt \
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/vrflash ${STAGEDIR}${PREFIX}/bin/
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${STAGEDIR}${DOCSDIR}/
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/comms/xastir/Makefile b/comms/xastir/Makefile
index acb843cccd5..6e85bd03e14 100644
--- a/comms/xastir/Makefile
+++ b/comms/xastir/Makefile
@@ -40,74 +40,38 @@ OPTCFLAGS_DESC=	Use optimized CFLAGS (-O2 -pipe)
 
 OPTIONS_DEFAULT=	SHAPELIB DBFAWK MAGICK CURL RTREE BDB
 
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MSHAPELIB}
-LIB_DEPENDS+=	libshp.so:${PORTSDIR}/devel/shapelib
-.else
-CONFIGURE_ARGS+=	--without-shapelib
-.endif
-
-.if ${PORT_OPTIONS:MMAGICK}
-LIB_DEPENDS+=	libGraphicsMagickWand.so:${PORTSDIR}/graphics/GraphicsMagick
-.else
-CONFIGURE_ARGS+=	--without-imagemagick --without-graphicsmagick
-.endif
-
-.if ${PORT_OPTIONS:MDBFAWK}
-LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre
-.else
-CONFIGURE_ARGS+=	--without-dbfawk
-.endif
-
-.if ${PORT_OPTIONS:MCURL}
-LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
-.endif
-
-.if ${PORT_OPTIONS:MGEOTIFF}
-LIB_DEPENDS+=	libgeotiff.so:${PORTSDIR}/graphics/libgeotiff
-.endif
-
-.if ${PORT_OPTIONS:MGDAL}
-LIB_DEPENDS+=	libgdal.so:${PORTSDIR}/graphics/gdal
-.else
-CONFIGURE_ARGS+=	--without-gdal
-.endif
-
-.if ${PORT_OPTIONS:MGPSMAN}
-BUILD_DEPENDS+=	${LOCALBASE}/share/doc/gpsmanshp/GPSManSHP.pdf:${PORTSDIR}/graphics/gpsmanshp
-SHAPELIB=	true
-.else
-CONFIGURE_ARGS+=	--without-gpsman
-.endif
-
-.if ${PORT_OPTIONS:MFESTIVAL}
-BUILD_DEPENDS+=	festival:${PORTSDIR}/audio/festival
-.else
-CONFIGURE_ARGS+=	--without-festival
-.endif
-
-.if ${PORT_OPTIONS:MRTREE}
-CONFIGURE_ARGS+=	--with-rtree
-.endif
-
-.if ${PORT_OPTIONS:MERRORPOP}
-CONFIGURE_ARGS+=	--with-errorpopups
-.endif
-
-.if ${PORT_OPTIONS:MBDB}
-USE_BDB=		41+
-WITH_BDB_HIGHEST=	${TRUE}
-INVALID_BDB_VER=	2 3 40
-CONFIGURE_ARGS+=	--with-bdb-incdir=${BDB_INCLUDE_DIR} --with-bdb-libdir=${BDB_LIB_DIR}
-.endif
-
-.if ${PORT_OPTIONS:MOPTCFLAGS}
-CFLAGS+=	-O2 -pipe
-.endif
-
-.if ${ARCH} == "sparc64"
-BROKEN=		Does not compile on sparc64
-.endif
+SHAPELIB_LIB_DEPENDS=	libshp.so:${PORTSDIR}/devel/shapelib
+SHAPELIB_CONFIGURE_WITH=	shapelib
+
+MAGICK_LIB_DEPENDS=	libGraphicsMagickWand.so:${PORTSDIR}/graphics/GraphicsMagick
+MAGICK_CONFIGURE_WITH=	imagemagick graphicsmagick
+
+DBFAWK_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+DBFAWK_CONFIGURE_WITH=	dbfawk
+
+CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+
+GEOTIFF_LIB_DEPENDS=	libgeotiff.so:${PORTSDIR}/graphics/libgeotiff
+
+GDAL_LIB_DEPENDS=	libgdal.so:${PORTSDIR}/graphics/gdal
+GDAL_CONFIGURE_WITH=	gdal
+
+GPSMAN_BUILD_DEPENDS=	${LOCALBASE}/share/doc/gpsmanshp/GPSManSHP.pdf:${PORTSDIR}/graphics/gpsmanshp
+GPSMAN_IMPLIES=		SHAPELIB
+GPSMAN_CONFIGURE_WITH=	gpsman
+
+FESTIVAL_BUILD_DEPENDS=	festival:${PORTSDIR}/audio/festival
+FESTIVAL_CONFIGURE_WITH=festival
+
+RTREE_CONFIGURE_WITH=	rtree
+
+ERRORPOP_CONFIGURE_WITH=	errorpopups
+
+BDB_USE=		BDB=41+
+BDB_CONFIGURE_ON=	--with-bdb-incdir=${BDB_INCLUDE_DIR} --with-bdb-libdir=${BDB_LIB_DIR}
+
+OPTCFLAGS_CFLAGS=	-O2 -pipe
+
+BROKEN_sparc64=		Does not compile on sparc64
 
 .include <bsd.port.post.mk>