24 files changed, 53 insertions, 120 deletions

diff --git a/net/cf/Makefile b/net/cf/Makefile
index ffa9a6d0f491..0e5034709719 100644
--- a/net/cf/Makefile
+++ b/net/cf/Makefile
@@ -23,8 +23,6 @@ STRIP=		# stripping can break go binaries
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e "s/BUILT_FROM_SOURCE/${PORTVERSION}/g" ${WRKSRC}/cf/app_constants.go
 	@cd ${WRKSRC} ; ${MKDIR} Godeps/_workspace/src/github.com/${GH_ACCOUNT}/${GH_PROJECT} ; \
@@ -46,11 +44,11 @@ do-build:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/out/cf \
 		${STAGEDIR}${PREFIX}/bin/
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for x in ${PORTDOCS}
 	${INSTALL_MAN} ${WRKSRC}/${x} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/net/dhcp6/Makefile b/net/dhcp6/Makefile
index d96073872824..e4aa5ff8e53d 100644
--- a/net/dhcp6/Makefile
+++ b/net/dhcp6/Makefile
@@ -22,15 +22,13 @@ PORTDOCS=	README
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-install:
 	cd ${WRKSRC} && ${INSTALL_DATA} \
 	    dhcp6c.conf.sample dhcp6s.conf.sample \
 	    ${STAGEDIR}${PREFIX}/etc
-.if ${PORT_OPTIONS:MDOCS}
+
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/net/dshell/Makefile b/net/dshell/Makefile
index 7b685c4bed9a..82d51da70e50 100644
--- a/net/dshell/Makefile
+++ b/net/dshell/Makefile
@@ -21,6 +21,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_GITHUB=	yes
 USES=		python
+NO_ARCH=	yes
 
 GH_ACCOUNT=	USArmyResearchLab
 GH_PROJECT=	Dshell
@@ -30,8 +31,6 @@ OPTIONS_DEFINE=	DOCS
 
 MAKE_ENV+=	PYTHON_CMD=${PYTHON_CMD}
 
-.include <bsd.port.options.mk>
-
 post-patch:
 .for f in bin/generate-dshellrc.py doc/generate-doc.sh
 	${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash|' ${WRKSRC}/${f}
@@ -63,11 +62,11 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/.dshellrc ${STAGEDIR}/${PREFIX}/etc/dshell
 	(cd ${WRKSRC}/lib; ${COPYTREE_SHARE} . ${STAGEDIR}/${PYTHON_SITELIBDIR}/dshell)
 	(cd ${WRKSRC}/decoders; ${COPYTREE_SHARE} . ${STAGEDIR}/${PYTHON_SITELIBDIR}/dshell/decoders)
-.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}/${DATADIR}/GeoIP
+
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}/${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}/${DOCSDIR}
 	(cd ${WRKSRC}/doc; ${COPYTREE_SHARE} . ${STAGEDIR}/${DOCSDIR} "-name *\.html")
-.endif
-	${MKDIR} ${STAGEDIR}/${DATADIR}/GeoIP
 
 .include <bsd.port.mk>
diff --git a/net/findmtu/Makefile b/net/findmtu/Makefile
index ab5600da8962..9a7d8541e117 100644
--- a/net/findmtu/Makefile
+++ b/net/findmtu/Makefile
@@ -13,8 +13,6 @@ OPTIONS_DEFINE=	DOCS
 
 SUB_FILES=	findmtu
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|gcc|${CC}|' ${WRKSRC}/Makefile.rawsocket
 
@@ -24,10 +22,10 @@ do-configure:
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/findmtu ${STAGEDIR}${PREFIX}/bin/findmtu
 	${INSTALL_PROGRAM} ${WRKSRC}/findmtu ${STAGEDIR}${PREFIX}/bin/findmtu.real
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.freebsd ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/net/get_iplayer/Makefile b/net/get_iplayer/Makefile
index a7398677449c..66c8f053bffc 100644
--- a/net/get_iplayer/Makefile
+++ b/net/get_iplayer/Makefile
@@ -25,6 +25,7 @@ USE_PERL5=	run
 perl_OLD_CMD=	${SETENV} perl
 SHEBANG_FILES=	${PORTNAME} ${PORTNAME}.cgi
 NO_BUILD=	yes
+NO_ARCH=	yes
 
 USE_RC_SUBR=	${PORTNAME}
 
@@ -43,8 +44,6 @@ PORTDOCS=	CHANGELOG-get_iplayer.cgi.txt CHANGELOG.txt \
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	${REINPLACE_CMD} -e "s|/usr/bin/get_iplayer|${PREFIX}/bin/${PORTNAME}|" \
 		${WRKSRC}/README-get_iplayer.cgi.txt ${WRKSRC}/get_iplayer.cgi
@@ -61,9 +60,9 @@ do-install:
 .for DIR in html plugins
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} ${DIR} ${STAGEDIR}${WWWDIR})
 .endfor
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}; ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
-.endif
 
 .include <bsd.port.mk>
diff --git a/net/gnet2/Makefile b/net/gnet2/Makefile
index 4981265b49b8..24e8d2c84472 100644
--- a/net/gnet2/Makefile
+++ b/net/gnet2/Makefile
@@ -19,13 +19,8 @@ INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-CONFIGURE_ARGS+=	--with-html-dir=${DOCSDIR}
-.else
-CONFIGURE_ARGS+=	--without-html-dir
-.endif
+DOCS_CONFIGURE_ON=	--with-html-dir=${DOCSDIR}
+DOCS_CONFIGURE_OFF=	--without-html-dir
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|GNET_INTERFACE_AGE=0|GNET_INTERFACE_AGE=8|g' \
diff --git a/net/googlecl/Makefile b/net/googlecl/Makefile
index 34cfdab62c86..eead3fce6243 100644
--- a/net/googlecl/Makefile
+++ b/net/googlecl/Makefile
@@ -15,19 +15,18 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdata>0:${PORTSDIR}/devel/py-gdata
 
 USES=		python:2
 USE_PYTHON=	autoplist distutils
+NO_ARCH=	yes
 
 OPTIONS_DEFINE=	DOCS
 
 PLIST_FILES=	man/man1/google.1.gz
 PORTDOCS=	*
 
-.include <bsd.port.options.mk>
-
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
+	${INSTALL_MAN} ${WRKSRC}/man/google.1 ${STAGEDIR}${MANPREFIX}/man/man1
+
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.* ${STAGEDIR}${DOCSDIR}
-.endif
-	${INSTALL_MAN} ${WRKSRC}/man/google.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/net/ipgrab/Makefile b/net/ipgrab/Makefile
index 4d214199ffea..3a46120bd0d3 100644
--- a/net/ipgrab/Makefile
+++ b/net/ipgrab/Makefile
@@ -24,15 +24,13 @@ PORTDOCS=	README AUTHORS COPYING ChangeLog DEVELOPER-HOWTO \
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 do-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/ipgrab.8 ${STAGEDIR}${MANPREFIX}/man/man8/
 	${INSTALL_DATA} ${WRKSRC}/doc/ipgrab.info ${STAGEDIR}${PREFIX}/info/
 	${INSTALL_PROGRAM} ${WRKSRC}/src/ipgrab ${STAGEDIR}${PREFIX}/bin/
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
-.endif
 
 .include <bsd.port.mk>
diff --git a/net/ladvd/Makefile b/net/ladvd/Makefile
index 613c0758f17f..192aad549922 100644
--- a/net/ladvd/Makefile
+++ b/net/ladvd/Makefile
@@ -32,12 +32,8 @@ PLIST_FILES=	man/man8/ladvd.8.gz \
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-post-patch:
-.if ! ${PORT_OPTIONS:MDOCS}
+post-patch-DOCS-off:
 	@@${REINPLACE_CMD} 's|install-data-am: install-dist_docDATA|install-data-am:|' \
 		${WRKSRC}/doc/Makefile.in
-.endif
 
 .include <bsd.port.mk>
diff --git a/net/mrouted/Makefile b/net/mrouted/Makefile
index 6e862ab92b68..3bff7371c473 100644
--- a/net/mrouted/Makefile
+++ b/net/mrouted/Makefile
@@ -24,10 +24,6 @@ PLIST_FILES=	sbin/map-mbone sbin/mrouted sbin/mrinfo sbin/mtrace \
 		man/man8/mtrace.8.gz
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-MAKE_ARGS+=	datadir=${DOCSDIR} doc=yes
-.endif
+DOCS_MAKE_ARGS=	datadir=${DOCSDIR} doc=yes
 
 .include <bsd.port.mk>
diff --git a/net/netselect/Makefile b/net/netselect/Makefile
index 3813ecd0fed7..b7d4d33297fd 100644
--- a/net/netselect/Makefile
+++ b/net/netselect/Makefile
@@ -23,13 +23,11 @@ do-build:
 	${CC} ${CFLAGS} -o ${WRKSRC}/${PORTNAME} ${WRKSRC}/${PORTNAME}.c
 	${REINPLACE_CMD} -E -i "" -e 's|[[:blank:]]+$$||' ${WRKSRC}/README
 
-.include <bsd.port.options.mk>
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/net/pbnc/Makefile b/net/pbnc/Makefile
index 4189b84f9294..b2d811b02188 100644
--- a/net/pbnc/Makefile
+++ b/net/pbnc/Makefile
@@ -17,13 +17,12 @@ RUN_DEPENDS=	p5-Net-Netmask>=0:${PORTSDIR}/net-mgmt/p5-Net-Netmask
 USES=		perl5
 USE_PERL5=	run
 NO_BUILD=	yes
+NO_ARCH=	yes
 PLIST_FILES=	etc/pbnc.cfg bin/pbnc.pl
 PORTDOCS=	pbnc.readme
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 pre-install:
 	${REINPLACE_CMD} 's,^#!/usr/bin/perl,#!${PERL},' ${WRKSRC}/pbnc.pl
 
@@ -31,10 +30,8 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/pbnc.cfg ${STAGEDIR}${PREFIX}/etc/pbnc.cfg
 	${INSTALL_SCRIPT} ${WRKSRC}/pbnc.pl ${STAGEDIR}${PREFIX}/bin/pbnc.pl
 
-.if ${PORT_OPTIONS:MDOCS}
-post-install:
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/net/ptpd2/Makefile b/net/ptpd2/Makefile
index 1289d9513a41..2b800182c836 100644
--- a/net/ptpd2/Makefile
+++ b/net/ptpd2/Makefile
@@ -24,19 +24,17 @@ PORTDOCS=	*
 USE_RC_SUBR=	ptpd2
 
 OPTIONS_DEFINE=	DOCS SNMP
-OPTIONS_DEFAULT=DOCS SNMP
+OPTIONS_DEFAULT=SNMP
 
 SNMP_CONFIGURE_ENABLE=	snmp
 SNMP_LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
 
-.include <bsd.port.options.mk>
-
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKDIR}/ptpd-${DISTVERSION}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
-.endif
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${CP} ${FILESDIR}/*.sample ${STAGEDIR}${ETCDIR}
 
+post-install-DOCS-on:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKDIR}/ptpd-${DISTVERSION}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
+
 .include <bsd.port.mk>
diff --git a/net/py-s3cmd/Makefile b/net/py-s3cmd/Makefile
index 97a5ffdd8589..c3ee88fd80fd 100644
--- a/net/py-s3cmd/Makefile
+++ b/net/py-s3cmd/Makefile
@@ -12,21 +12,21 @@ COMMENT=	Unix-like tools to manipulate stored files from the command line
 
 LICENSE=	GPLv2
 
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:${PORTSDIR}/devel/py-dateutil
+
 USES=		python:2
 USE_PYTHON=	autoplist distutils
-
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dateutil>0:${PORTSDIR}/devel/py-dateutil
+NO_ARCH=	yes
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	${REINPLACE_CMD} -e 's,share/man,man,' ${WRKSRC}/setup.py
-.if ${PORT_OPTIONS:MDOCS}
+
+post-patch-DOCS-on:
 	${REINPLACE_CMD} -e 's,doc/packages,doc,' ${WRKSRC}/setup.py
-.else
+
+post-patch-DOCS-off:
 	${REINPLACE_CMD} -e '/(doc_path+/d' ${WRKSRC}/setup.py
-.endif
 
 .include <bsd.port.mk>
diff --git a/net/samplicator/Makefile b/net/samplicator/Makefile
index facbba891517..04b5d34d24cf 100644
--- a/net/samplicator/Makefile
+++ b/net/samplicator/Makefile
@@ -21,13 +21,11 @@ PORTDOCS=	NEWS README
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/samplicate ${STAGEDIR}${PREFIX}/bin
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/
 	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/net/skstream/Makefile b/net/skstream/Makefile
index 78234384ebaf..6e2ba8f43f3d 100644
--- a/net/skstream/Makefile
+++ b/net/skstream/Makefile
@@ -16,17 +16,13 @@ USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's| install-docdataDATA | |g'  ${WRKSRC}/Makefile.in
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in README COPYING AUTHORS NEWS README.FreeSockets
 	@${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/net/spoofer/Makefile b/net/spoofer/Makefile
index 1b018b690e60..6247693fb7b2 100644
--- a/net/spoofer/Makefile
+++ b/net/spoofer/Makefile
@@ -16,16 +16,13 @@ HAS_CONFIGURE=	yes
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/net/tcpflow/Makefile b/net/tcpflow/Makefile
index d2dfddce0d95..5d2c9ec6ea35 100644
--- a/net/tcpflow/Makefile
+++ b/net/tcpflow/Makefile
@@ -24,12 +24,8 @@ PORTDOCS=	AUTHORS ChangeLog NEWS README
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/net/tinyldap/Makefile b/net/tinyldap/Makefile
index 74476e837880..eb19a8f26066 100644
--- a/net/tinyldap/Makefile
+++ b/net/tinyldap/Makefile
@@ -30,8 +30,6 @@ TINYLDAP_DATA?=	${PREFIX}/tinyldap/data
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	${TOUCH} ${WRKSRC}/alloca.h
 	${REINPLACE_CMD} -e "s|\"data\"|\"${TINYLDAP_DATA}\"|" \
@@ -46,11 +44,11 @@ do-install:
 .for i in ${SBINFILES}
 	${INSTALL_PROGRAM} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/sbin/
 .endfor
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${DOCFILES}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/net/torsocks/Makefile b/net/torsocks/Makefile
index 0a3e1aedcbb1..c58d3de7205c 100644
--- a/net/torsocks/Makefile
+++ b/net/torsocks/Makefile
@@ -23,14 +23,9 @@ INSTALL_TARGET=	install-strip
 
 SUB_FILES=	pkg-message
 
-OPTIONS_DEFINE=	DOCS
-OPTIONS_DEFAULT=	DOCS
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	ChangeLog DEBUG SOCKS5 socks-extensions.txt
-.endif
+
+OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	${REINPLACE_CMD} -e 's,(defined(__linux__) || defined(__darwin__) || (defined(__FreeBSD_kernel__) && defined(__i386__))),defined(__FreeBSD__),' ${WRKSRC}/src/lib/syscall.c
diff --git a/net/uplog/Makefile b/net/uplog/Makefile
index 26f886ccd477..9324905f161e 100644
--- a/net/uplog/Makefile
+++ b/net/uplog/Makefile
@@ -18,19 +18,15 @@ PLIST_FILES=	bin/uplog
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	${REINPLACE_CMD} -e \
 	's|#include <malloc.h>||g' \
 		${WRKSRC}/${PORTNAME}.c
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in README
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile
index 708b5931c1f4..e1b91d950bbe 100644
--- a/net/vinagre/Makefile
+++ b/net/vinagre/Makefile
@@ -34,7 +34,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 GLIB_SCHEMAS=	org.gnome.Vinagre.gschema.xml
 
 OPTIONS_SUB=	yes
-OPTIONS_DEFINE=	TELEPATHY RDP
+OPTIONS_DEFINE=	TELEPATHY RDP DOCS
 OPTIONS_DEFAULT=TELEPATHY RDP
 TELEPATHY_DESC=	Telepathy integration
 RDP_DESC=	MS Windows remote desktop support
@@ -45,14 +45,10 @@ RDP_CONFIGURE_ENABLE=	rdp
 RDP_BUILD_DEPENDS=	xfreerdp:${PORTSDIR}/net/freerdp
 RDP_RUN_DEPENDS=	xfreerdp:${PORTSDIR}/net/freerdp
 
-.include <bsd.port.options.mk>
-
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in AUTHORS COPYING ChangeLog NEWS README
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/net/wmnetload/Makefile b/net/wmnetload/Makefile
index 78c5d70d86b2..47368ed10626 100644
--- a/net/wmnetload/Makefile
+++ b/net/wmnetload/Makefile
@@ -20,12 +20,8 @@ GNU_CONFIGURE=	yes
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/
-.endif
 
 .include <bsd.port.mk>
diff --git a/net/x11vnc/Makefile b/net/x11vnc/Makefile
index 668e8c4d0d19..be2af8c9af75 100644
--- a/net/x11vnc/Makefile
+++ b/net/x11vnc/Makefile
@@ -33,17 +33,13 @@ NLS_USES=	gettext
 AVAHI_LIB_DEPENDS=	libavahi-common.so:${PORTSDIR}/net/avahi-app
 AVAHI_CONFIGURE_OFF=	--without-avahi
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	${REINPLACE_CMD} -e 's|include_HEADERS = |noinst_HEADERS = |' \
 		-e 's|am__include_HEADERS_DIST|am__noinst_HEADERS_DIST|' \
 		-e 's|/include/rfb|/include|' ${WRKSRC}/Makefile.in
 
-.if ${PORT_OPTIONS:MDOCS}
-post-install:
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
-.endif
 
 .include <bsd.port.mk>