47 files changed, 131 insertions, 234 deletions

diff --git a/databases/apq/Makefile b/databases/apq/Makefile
index 7657892c073a..e00193077d6b 100644
--- a/databases/apq/Makefile
+++ b/databases/apq/Makefile
@@ -28,7 +28,6 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \
 OPTIONS_DEFINE=	DOCS
 
 .include "${.CURDIR}/Makefile.version"
-.include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e '/for Object_Dir/d' ${WRKSRC}/gnat/apq.gpr.in
@@ -48,9 +47,9 @@ do-install:
 		${STAGEDIR}${PREFIX}/lib/apq/static
 	${INSTALL_DATA} ${WRKPATH}/lib/gnat/apq.gpr \
 		${STAGEDIR}${PREFIX}/lib/gnat
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/HISTORY \
 		${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/devel/cmunge/Makefile b/devel/cmunge/Makefile
index 21967610847b..a3623a7b4213 100644
--- a/devel/cmunge/Makefile
+++ b/devel/cmunge/Makefile
@@ -20,8 +20,6 @@ PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|/vcpc_users/jhm/bin/cmunger|${PREFIX}|; \
@@ -31,9 +29,9 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/ctran ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/proc-incl ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/cmunge ${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/devel/cvsd/Makefile b/devel/cvsd/Makefile
index 90ff82ddb3af..ebbf293a16ef 100644
--- a/devel/cvsd/Makefile
+++ b/devel/cvsd/Makefile
@@ -41,9 +41,9 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/cvsd.conf-dist ${STAGEDIR}${PREFIX}/etc/cvsd/cvsd.conf.sample
 	${INSTALL_MAN} ${WRKSRC}/*.5 ${STAGEDIR}${MAN5PREFIX}/man/man5
 	${INSTALL_MAN} ${WRKSRC}/*.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/dcmtk/Makefile b/devel/dcmtk/Makefile
index de84388a4638..2ab4d6fe200b 100644
--- a/devel/dcmtk/Makefile
+++ b/devel/dcmtk/Makefile
@@ -31,18 +31,14 @@ PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "amd64"
-CFLAGS+=	-fPIC
-.endif
+CFLAGS_amd64=	-fPIC
 
 post-patch:
 	${FIND} ${WRKSRC} -name "*.h.orig" -delete
-.if !${PORT_OPTIONS:MDOCS}
+
+post-patch-DOCS-off:
 	${FIND} ${WRKSRC} -name CMakeLists.txt | ${XARGS} \
 	    ${REINPLACE_CMD} -e '/INSTALL_DOCDIR/d'
-.endif
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/doxygen/manpages/man1/*.1 ${STAGEDIR}${PREFIX}/man/man1/
@@ -51,4 +47,4 @@ post-install:
 	@${LN} -sf ${PREFIX}/lib/lib${shlib}.so.${SHLIBVER} ${STAGEDIR}${PREFIX}/lib/lib${shlib}.so
 .endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/dmalloc/Makefile b/devel/dmalloc/Makefile
index e20a85755f06..9f3a05345e32 100644
--- a/devel/dmalloc/Makefile
+++ b/devel/dmalloc/Makefile
@@ -25,11 +25,7 @@ INSTALL_TARGET=	install
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-INSTALL_TARGET+=installdocs
-.endif
+DOCS_INSTALL_TARGET=	installdocs
 
 post-install:
 	${CHMOD} 755 ${STAGEDIR}${PREFIX}/bin/dmalloc
diff --git a/devel/edb/Makefile b/devel/edb/Makefile
index 9613694af5a0..6fb6e03f5f7f 100644
--- a/devel/edb/Makefile
+++ b/devel/edb/Makefile
@@ -28,16 +28,14 @@ STRIP_FILES=	bin/${PORTNAME} libexec/${PORTNAME}/*.so
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
-.endif
 	${INSTALL_DATA} ${WRKSRC}/edb.desktop ${STAGEDIR}${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/src/images/edb48-logo.png ${STAGEDIR}${PREFIX}/share/pixmaps/edb.png
 	${INSTALL_MAN} ${WRKSRC}/edb.1 ${STAGEDIR}${MANPREFIX}/man/man1/edb.1
 	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 	${STRIP_CMD} ${STRIP_FILES:S,^,${STAGEDIR}${PREFIX}/,}
 
+post-install-DOCS-on:
+	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
+
 .include <bsd.port.mk>
diff --git a/devel/erlang-exmpp/Makefile b/devel/erlang-exmpp/Makefile
index cb7c695af4b7..1e00b9f59e17 100644
--- a/devel/erlang-exmpp/Makefile
+++ b/devel/erlang-exmpp/Makefile
@@ -37,13 +37,7 @@ USES=		autoreconf cpe libtool pkgconfig
 CPE_VENDOR=	process-one
 USE_OPENSSL=	yes
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-CONFIGURE_ARGS+=	--enable-documentation
-.else
-CONFIGURE_ARGS+=	--disable-documentation
-.endif
+DOCS_CONFIGURE_ENABLE=	documentation
 
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/devel/etcd/Makefile b/devel/etcd/Makefile
index 1d67f9935106..2f318e1617b1 100644
--- a/devel/etcd/Makefile
+++ b/devel/etcd/Makefile
@@ -24,8 +24,6 @@ PORTDOCS=	README.md
 OPTIONS_DEFINE=	DOCS
 DOCS_DESC=	Install etcd README file
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$VER|${DISTVERSION}|' ${WRKSRC}/scripts/release-version
 	@${REINPLACE_CMD} -e '/VER=/d' ${WRKSRC}/scripts/release-version
@@ -34,11 +32,11 @@ do-build:
 	cd ${WRKSRC}; ${SH} build
 
 do-install:
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/bench ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/etcd ${STAGEDIR}${PREFIX}/bin/
 
+do-install-DOCS-on:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+
 .include <bsd.port.mk>
diff --git a/devel/etcdctl/Makefile b/devel/etcdctl/Makefile
index 58e9a58ecf46..200f2b266eba 100644
--- a/devel/etcdctl/Makefile
+++ b/devel/etcdctl/Makefile
@@ -23,8 +23,6 @@ PORTDOCS=	README.md
 OPTIONS_DEFINE=	DOCS
 DOCS_DESC=	Install etcdctl README file
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$VER|${DISTVERSION}|' ${WRKSRC}/scripts/release-version
 	@${REINPLACE_CMD} -e '/VER=/d' ${WRKSRC}/scripts/release-version
@@ -33,10 +31,10 @@ do-build:
 	(cd ${WRKSRC}; ${SH} build)
 
 do-install:
-.if ${PORT_OPTIONS:MDOCS}
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
+
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
 
 .include <bsd.port.mk>
diff --git a/devel/flatzebra/Makefile b/devel/flatzebra/Makefile
index dc31d3129dff..6cef50b062b1 100644
--- a/devel/flatzebra/Makefile
+++ b/devel/flatzebra/Makefile
@@ -23,11 +23,7 @@ PORTDOCS=	AUTHORS COPYING INSTALL NEWS README TODO THANKS
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-post-patch:
-.if empty(PORT_OPTIONS:MDOCS)
+post-patch-DOCS-off:
 	@${REINPLACE_CMD} 's|^install-data-am: .*|install-data-am: install-pkgconfigDATA|' ${WRKSRC}/Makefile.in
-.endif
 
 .include <bsd.port.mk>
diff --git a/devel/fujaba/Makefile b/devel/fujaba/Makefile
index ba5308ddb475..c87da12e2233 100644
--- a/devel/fujaba/Makefile
+++ b/devel/fujaba/Makefile
@@ -15,6 +15,7 @@ USES=		zip
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 NO_BUILD=	yes
+NO_ARCH=	yes
 WRKSRC=		${WRKDIR}/Fujaba\ Tool\ Suite\ ${PORTVERSION}
 
 DATADIRS=	DTDs Templates libs plugins stylesheets
@@ -29,18 +30,16 @@ SUB_LIST=	LOCALBASE="${LOCALBASE}" DATADIR="${DATADIR}"
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/bin
 	${INSTALL_SCRIPT} ${WRKDIR}/fujaba.sh ${STAGEDIR}${DATADIR}/bin
 	${LN} -s ${DATADIR}/bin/fujaba.sh ${STAGEDIR}${PREFIX}/bin/fujaba
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} "${DATADIRS}" ${STAGEDIR}${DATADIR})
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${DATAFILES} ${STAGEDIR}${DATADIR})
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
-.if ${PORT_OPTIONS:MDOCS}
 	${LN} -s ${DOCSDIR} ${STAGEDIR}${DATADIR}/doc
-.endif
 
 .include <bsd.port.mk>
diff --git a/devel/gnome-js-common/Makefile b/devel/gnome-js-common/Makefile
index 74acf5d760a3..a4cdb660166b 100644
--- a/devel/gnome-js-common/Makefile
+++ b/devel/gnome-js-common/Makefile
@@ -15,21 +15,21 @@ COMMENT=	GNOME JavaScript common modules and tests
 GNU_CONFIGURE=	yes
 USE_GNOME=	intltool
 USES=		pathfix pkgconfig gettext gmake tar:bzip2
+NO_ARCH=	yes
 
 PORTDOCS=	AUTHORS COPYING INSTALL NEWS README ChangeLog
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|== x|= x|g' \
 		${WRKSRC}/configure
-.if ${PORT_OPTIONS:MDOCS}
+
+post-patch-DOCS-on:
 	@${REINPLACE_CMD} -e 's|$${prefix}/share/doc/gnome_js_common|${DOCSDIR}|' \
 		${WRKSRC}/Makefile.in
-.else
+
+post-patch-DOCS-off:
 	@${REINPLACE_CMD} -e 's|install-gnome_js_commondocDATA ||g' ${WRKSRC}/Makefile.in
-.endif
 
 .include <bsd.port.mk>
diff --git a/devel/go-bindata/Makefile b/devel/go-bindata/Makefile
index 90cab189c952..796982e32751 100644
--- a/devel/go-bindata/Makefile
+++ b/devel/go-bindata/Makefile
@@ -21,8 +21,6 @@ STRIP=		# stripping can break go binaries
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@cd ${WRKSRC} ; ${MKDIR} src/github.com/${GH_ACCOUNT}/${GH_PROJECT} ; \
 	${MV} CONTRIBUTING.md LICENSE README.md asset.go bytewriter.go \
@@ -38,11 +36,11 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} \
 		${STAGEDIR}${PREFIX}/bin/
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 .for x in ${PORTDOCS}
-	${INSTALL_MAN} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/${x} \
+	${INSTALL_DATA} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/${x} \
 		${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/devel/google-sparsehash/Makefile b/devel/google-sparsehash/Makefile
index 085d37180182..ebabb54a3d04 100644
--- a/devel/google-sparsehash/Makefile
+++ b/devel/google-sparsehash/Makefile
@@ -18,21 +18,20 @@ USES=		compiler:c++11-lang
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	${REINPLACE_CMD} -e \
 		's|^pkgconfigdir = .*|pkgconfigdir = ${LOCALBASE}/libdata/pkgconfig|' \
 		${WRKSRC}/Makefile.in
-.if ${PORT_OPTIONS:MDOCS}
+
+post-patch-DOCS-on:
 	${REINPLACE_CMD} -e \
 		's|^docdir = .*|docdir = ${DOCSDIR}|' \
 		${WRKSRC}/Makefile.in
-.else
+
+post-patch-DOCS-off:
 	${REINPLACE_CMD} -e \
 		'/install-data-am/ s|install-dist_docDATA||' \
 		${WRKSRC}/Makefile.in
-.endif
 
 regression-test: check
 
diff --git a/devel/hadoop/Makefile b/devel/hadoop/Makefile
index 80c9d69f8836..0a4c47b452a5 100644
--- a/devel/hadoop/Makefile
+++ b/devel/hadoop/Makefile
@@ -128,16 +128,16 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
 
-.if ${PORT_OPTIONS:MDOCS}
+	${INSTALL_SCRIPT} ${WRKDIR}/hadoop ${STAGEDIR}${PREFIX}/bin
+	cd ${WRKSRC} && ${COPYTREE_SHARE} conf ${STAGEDIR}${EXAMPLESDIR}
+	${MKDIR} ${STAGEDIR}${HADOOP_LOGDIR}
+	${MKDIR} ${STAGEDIR}${HADOOP_RUNDIR}
+
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR}
 .for f in ${DOC}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
-	${INSTALL_SCRIPT} ${WRKDIR}/hadoop ${STAGEDIR}${PREFIX}/bin
-	cd ${WRKSRC} && ${COPYTREE_SHARE} conf ${STAGEDIR}${EXAMPLESDIR}
-	${MKDIR} ${STAGEDIR}${HADOOP_LOGDIR}
-	${MKDIR} ${STAGEDIR}${HADOOP_RUNDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/kBuild/Makefile b/devel/kBuild/Makefile
index f084dc401579..45a8a7bb1985 100644
--- a/devel/kBuild/Makefile
+++ b/devel/kBuild/Makefile
@@ -45,9 +45,10 @@ ENV=
 .SHELL:		path="/bin/sh" unsetenv=true
 .endif
 
-OPTIONS_DEFINE=	DOCS
+BROKEN_ia64=	does not compile on ia64
+BROKEN_powerpc=	does not compile on powerpc
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	${REINPLACE_CMD} -e '11269d;11274d' ${WRKSRC}/src/sed/configure
@@ -68,17 +69,11 @@ do-install:
 .endfor
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC}/out/${KBUILD_TARGET}.${KBUILD_ARCH}/release/stage${PREFIX}/share/kBuild && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR})
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/out/${KBUILD_TARGET}.${KBUILD_ARCH}/release/stage${PREFIX}/share/doc/${PORTNAME}-${KBUILD_VERSION}/${doc} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "ia64" || ${ARCH} == "powerpc"
-BROKEN=		Does not compile on ia64 or powerpc
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/libatomic_ops/Makefile b/devel/libatomic_ops/Makefile
index 17f54ef03bdf..2c5ac3d05b87 100644
--- a/devel/libatomic_ops/Makefile
+++ b/devel/libatomic_ops/Makefile
@@ -19,20 +19,19 @@ USES=		libtool pathfix
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-patch:
 # Inhibit installation of extra copy of GPL
 	@${REINPLACE_CMD} -E 's,: (un)?install-dist_pkgdataDATA,:,' \
 		${WRKSRC}/Makefile.in
-.if ${PORT_OPTIONS:MDOCS}
+
+post-patch-DOCS-on:
 # Fix documentation installation directory
 	@${REINPLACE_CMD} -e 's,pkgdata,pkgdoc,g ; s,(datadir.*,(docdir),' \
 		${WRKSRC}/doc/Makefile.in
-.else
+
+post-patch-DOCS-off:
 # If documentation is not wanted, just disable it instead of fixing
 	@${REINPLACE_CMD} -E 's,: (un)?install-dist_pkgdataDATA,:,' \
 		${WRKSRC}/doc/Makefile.in
-.endif
 
 .include <bsd.port.mk>
diff --git a/devel/libbobcat/Makefile b/devel/libbobcat/Makefile
index a1f0c97ab3a3..e8fb27d9f96b 100644
--- a/devel/libbobcat/Makefile
+++ b/devel/libbobcat/Makefile
@@ -41,8 +41,6 @@ SHEBANG_FILES=	build \
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	${REINPLACE_CMD} -e 's|"/usr"|"${PREFIX}"| ; \
 		s|"/share/doc/libbobcat3"|"/share/doc/${PORTNAME}-${PORTVERSION}"| ; \
@@ -60,10 +58,10 @@ post-patch:
 		s|-lX11|-lX11 -L${LOCALBASE}/lib| ; \
 		s|-lmilter|-lmilter -lpthread|' \
 		${WRKSRC}/icmake/special
-.if ! ${PORT_OPTIONS:MDOCS}
+
+post-patch-DOCs-off:
 	@${REINPLACE_CMD} -e 's|#define DOCOTHER||' \
 		${WRKSRC}/INSTALL.im
-.endif
 
 do-build:
 	@cd ${WRKSRC} && ./build libraries all strip && ./build man
diff --git a/devel/libreadline-java/Makefile b/devel/libreadline-java/Makefile
index 37b8cd105976..dc43ed6cb6c1 100644
--- a/devel/libreadline-java/Makefile
+++ b/devel/libreadline-java/Makefile
@@ -29,20 +29,18 @@ MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/libreadline-java.jar ${STAGEDIR}${JAVAJARDIR}
 	${INSTALL_LIB} ${WRKSRC}/libJavaReadline.so ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_LIB} ${WRKSRC}/libJavaEditline.so ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_LIB} ${WRKSRC}/libJavaGetline.so ${STAGEDIR}${PREFIX}/lib
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.1st ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/jython.sh ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${FILESDIR}/JReadlineCompleter.py ${STAGEDIR}${DOCSDIR}
-.endif
 
 .if !defined(BATCH)
 test:
diff --git a/devel/nasm/Makefile b/devel/nasm/Makefile
index 7751a32c8ae6..87323e48514a 100644
--- a/devel/nasm/Makefile
+++ b/devel/nasm/Makefile
@@ -28,13 +28,9 @@ RDOFF_INSTALL_TARGET=	install_rdf
 DOCS_DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-xdoc${EXTRACT_SUFX}
 PORTDOCS=	*
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR})
 	${INSTALL_DATA} ${WRKSRC}/doc/nasmdoc.txt ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/devel/ocaml-ulex/Makefile b/devel/ocaml-ulex/Makefile
index 9830eab2591b..29be5d0da4ab 100644
--- a/devel/ocaml-ulex/Makefile
+++ b/devel/ocaml-ulex/Makefile
@@ -26,14 +26,10 @@ PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
+DOCS_ALL_TARGET=	doc
 
-.if ${PORT_OPTIONS:MDOCS}
-ALL_TARGET+=	doc
-
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.html ${WRKSRC}/*.css ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/devel/omake/Makefile b/devel/omake/Makefile
index 9f1532847e5b..f51dc3a22c25 100644
--- a/devel/omake/Makefile
+++ b/devel/omake/Makefile
@@ -19,14 +19,12 @@ MAKE_JOBS_UNSAFE=	yes
 
 INFO=		omake-doc
 
+BROKEN_powerpc=		does not build on powerpc
+
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "powerpc"
-BROKEN=		Does not build on powerpc
-.endif
-
 post-patch:
 #
 # Dirty hack for PREFIX safety
@@ -62,9 +60,9 @@ post-install:
 		${STAGEDIR}${PREFIX}/${INFO_PATH})
 	@(cd ${WRKSRC}/doc/info && ${INSTALL_DATA} omake-doc.info-* \
 		${STAGEDIR}${PREFIX}/${INFO_PATH})
-.if ${PORT_OPTIONS:MDOCS}
+
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@(cd ${WRKSRC}/doc/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Parse-RecDescent/Makefile b/devel/p5-Parse-RecDescent/Makefile
index a939022c6443..f676dbc1a51f 100644
--- a/devel/p5-Parse-RecDescent/Makefile
+++ b/devel/p5-Parse-RecDescent/Makefile
@@ -21,13 +21,10 @@ OPTIONS_DEFINE=	DOCS
 
 USES=		perl5
 USE_PERL5=	configure
+NO_ARCH=	yes
 
-.include <bsd.port.options.mk>
-
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/tutorial
 	${INSTALL_DATA} ${WRKSRC}/tutorial/* ${STAGEDIR}${DOCSDIR}/tutorial
-.endif
 
 .include <bsd.port.mk>
diff --git a/devel/pcsc-lite/Makefile b/devel/pcsc-lite/Makefile
index 30fc0ad921c0..41058ab179cb 100644
--- a/devel/pcsc-lite/Makefile
+++ b/devel/pcsc-lite/Makefile
@@ -43,9 +43,9 @@ post-patch:
 		s,libusb_strerror(ret),ret," ${WRKSRC}/configure \
 			${WRKSRC}/src/hotplug_libusb.c
 	${REINPLACE_CMD} -e "s,-ldl,," ${WRKSRC}/src/spy/Makefile.in
-.if ! ${PORT_OPTIONS:MDOCS}
+
+post-patch-DOCS-off:
 	${REINPLACE_CMD} -e '/^install-data-am: / s|install-docDATA||' ${WRKSRC}/doc/Makefile.in
-.endif
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
diff --git a/devel/perlconsole/Makefile b/devel/perlconsole/Makefile
index 3c9fda7997b5..6b66dc303022 100644
--- a/devel/perlconsole/Makefile
+++ b/devel/perlconsole/Makefile
@@ -19,6 +19,7 @@ RUN_DEPENDS=	p5-ReadLine-Gnu>=0:${PORTSDIR}/devel/p5-ReadLine-Gnu \
 USES=		perl5 shebangfix
 USE_PERL5=	configure
 SHEBANG_FILES=	perlconsole
+NO_ARCH=	yes
 
 PORTDOCS=	README \
 		AUTHORS \
@@ -32,15 +33,7 @@ PLIST_FILES=	bin/perlconsole \
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 do-install:
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for i in README AUTHORS CHANGES
-	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
-.endfor
-.endif
 	${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/PerlConsole/
 	${CP} -R ${WRKSRC}/lib/PerlConsole/ \
 		${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/PerlConsole/
@@ -48,4 +41,10 @@ do-install:
 		${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/PerlConsole.pm
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
 
+do-install-DOCS-on:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for i in README AUTHORS CHANGES
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
+.endfor
+
 .include <bsd.port.mk>
diff --git a/devel/py-durus/Makefile b/devel/py-durus/Makefile
index bd154559fe55..ed87723d3192 100644
--- a/devel/py-durus/Makefile
+++ b/devel/py-durus/Makefile
@@ -16,18 +16,14 @@ COMMENT=	Persistent object storage system for Python
 LICENSE=	MIT
 
 USES=		python
-USE_PYTHON=	distutils autoplist
+USE_PYTHON=	autoplist distutils
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@ ${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for docfile in ACKS.txt CHANGES.txt INSTALL.txt LICENSE.txt README.txt doc/FAQ.txt
 	@ ${INSTALL_DATA} ${WRKSRC}/${docfile} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/devel/py-dynrules/Makefile b/devel/py-dynrules/Makefile
index c85c88ed6166..a58211281cc3 100644
--- a/devel/py-dynrules/Makefile
+++ b/devel/py-dynrules/Makefile
@@ -14,16 +14,13 @@ LICENSE=	ZLIB
 
 USES=		python
 USE_PYTHON=	autoplist distutils
+NO_ARCH=	yes
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${INSTALL} -d ${STAGEDIR}${DOCSDIR}/html
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
 	@${TAR} -C ${WRKSRC}/doc/html -cf - . | \
 		${TAR} -C ${STAGEDIR}${DOCSDIR}/html -xf -
-.endif
 
 .include <bsd.port.mk>
diff --git a/devel/py-icalendar/Makefile b/devel/py-icalendar/Makefile
index 48fc288a888a..8758e8e5316c 100644
--- a/devel/py-icalendar/Makefile
+++ b/devel/py-icalendar/Makefile
@@ -17,18 +17,15 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:${PORTSDIR}/devel/py-dateutil \
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
+NO_ARCH=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 PORTDOCS=	*
 
 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.rst ${STAGEDIR}${DOCSDIR}/
-.endif
 
 .include <bsd.port.mk>
diff --git a/devel/py-jsmin/Makefile b/devel/py-jsmin/Makefile
index 8b48e811cb8b..3ec8d06eb6fc 100644
--- a/devel/py-jsmin/Makefile
+++ b/devel/py-jsmin/Makefile
@@ -14,19 +14,16 @@ LICENSE=	MIT
 
 USES=		python
 USE_PYTHON=	distutils autoplist
+NO_ARCH=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 PORTDOCS=	PKG-INFO
 
 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
 
 regression-test:
 	@(cd ${WRKSRC}/${PORTNAME} && ${PYTHON_CMD} test.py)
diff --git a/devel/py-sdl2/Makefile b/devel/py-sdl2/Makefile
index 7afee47a9157..8151e842518f 100644
--- a/devel/py-sdl2/Makefile
+++ b/devel/py-sdl2/Makefile
@@ -16,16 +16,13 @@ LICENSE=	ZLIB
 USES=		python
 USE_SDL=	sdl2 gfx2 image2 ttf2 mixer2
 USE_PYTHON=	autoplist distutils
+NO_ARCH=	yes
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${INSTALL} -d ${STAGEDIR}${DOCSDIR}/html
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
 	@${TAR} -C ${WRKSRC}/doc/html -cf - . | \
 		${TAR} -C ${STAGEDIR}${DOCSDIR}/html -xf -
-.endif
 
 .include <bsd.port.mk>
diff --git a/devel/py-watchdog/Makefile b/devel/py-watchdog/Makefile
index 40aeb476eed7..ff9c1d6d3080 100644
--- a/devel/py-watchdog/Makefile
+++ b/devel/py-watchdog/Makefile
@@ -29,17 +29,14 @@ PORTDOCS=	*
 USE_GITHUB=	yes
 USES=		python
 USE_PYTHON=	autoplist distutils
+NO_ARCH=	yes
 
-.include <bsd.port.options.mk>
+post-build-DOCS-on:
+	(cd ${WRKSRC}/docs ; ${MAKE_CMD} html)
 
-.if ${PORT_OPTIONS:MDOCS}
-post-build:
-	(cd ${WRKSRC}/docs ; ${MAKE} html)
-
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/docs/build/html ; \
 	${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} "-not -name .buildinfo")
-.endif
 
 .include <bsd.port.mk>
diff --git a/devel/pyst/Makefile b/devel/pyst/Makefile
index 969559477c61..d8b9c5f4b7e9 100644
--- a/devel/pyst/Makefile
+++ b/devel/pyst/Makefile
@@ -14,19 +14,16 @@ LICENSE_COMB=	dual
 
 USES=		python:2
 USE_PYTHON=	distutils
+NO_ARCH=	yes
 
 PORTDOCS=	README README.html ChangeLog
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in ${PORTDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/devel/quilt/Makefile b/devel/quilt/Makefile
index 91bbc1183f24..ff69426a466e 100644
--- a/devel/quilt/Makefile
+++ b/devel/quilt/Makefile
@@ -22,6 +22,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS} \
 		formail:${PORTSDIR}/mail/procmail
 
 USES=		desthack gmake perl5
+NO_ARCH=	yes
 
 OPTIONS_DEFINE=	RPMBUILD DOCS NLS
 OPTIONS_SUB=	yes
@@ -41,6 +42,8 @@ RPMBUILD_CONFIGURE_OFF=	--without-rpmbuild
 NLS_USES=		gettext
 NLS_CONFIGURE_OFF=	--disable-nls
 
+DOCS_EXTRA_PATCHES_OFF=	${PATCHDIR}/extra-patch-Makefile.in
+
 .include <bsd.port.options.mk>
 
 .if !exists(${LOCALBASE}/sbin/sendmail)
@@ -49,10 +52,6 @@ PLIST_SUB+=	SENDMAIL=""
 PLIST_SUB+=	SENDMAIL="@comment "
 .endif
 
-.if ! ${PORT_OPTIONS:MDOCS}
-EXTRA_PATCHES=	${PATCHDIR}/extra-patch-Makefile.in
-.endif
-
 post-extract:
 	@${REINPLACE_CMD} -e 's|$$(docdir)/$$(PACKAGE)-$$(VERSION)|$$(docdir)/$$(PACKAGE)|g' \
 		${WRKSRC}/Makefile.in
diff --git a/devel/seed/Makefile b/devel/seed/Makefile
index f50e5b9e3a4e..f8efb39b12b8 100644
--- a/devel/seed/Makefile
+++ b/devel/seed/Makefile
@@ -31,18 +31,16 @@ CONFIGURE_ARGS+=--enable-gtk-doc=no --with-webkit=3.0
 DATADIR=	share/seed-gtk3
 INSTALL_TARGET=	install-strip
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|== x|= x|g' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|-ldl||g' \
 		${WRKSRC}/libseed/Makefile.in
 	@${REINPLACE_CMD} -e 's|reference||g' ${WRKSRC}/doc/Makefile.in
-.if ! ${PORT_OPTIONS:MDOCS}
+
+post-patch-DOCS-off:
 	@${REINPLACE_CMD} -e 's| install-seeddocDATA||g ; s|doc$$||g' \
 		${WRKSRC}/Makefile.in
-.endif
 
 pre-build:
 	cd ${WRKSRC}/extensions && ${SETENV} ${MAKE_ENV} ${GMAKE} \
diff --git a/devel/tcltls/Makefile b/devel/tcltls/Makefile
index a01326a1119e..8e4d5bd18bca 100644
--- a/devel/tcltls/Makefile
+++ b/devel/tcltls/Makefile
@@ -32,8 +32,6 @@ PLIST_FILES=	include/tls.h \
 		lib/${TCLPKG}/tls.tcl
 PORTDOCS=	*
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	${REINPLACE_CMD} -e \
 		's,package require tls.*,load ${WRKSRC}/libtls.so.1;\
@@ -42,11 +40,9 @@ post-patch:
 	# The tests in ciphers.test are meaningless so far:
 	${MV} ${WRKSRC}/tests/ciphers.test ${WRKSRC}/tests/ciphers.test.broken
 
-.if ${PORT_OPTIONS:MDOCS}
-post-install:
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/tls.htm ${STAGEDIR}${DOCSDIR}
-.endif
 
 xregression-test test check: build
 	cd ${WRKSRC}/tests && ${SETENV} TCL_LIBRARY="${WRKSRC}" \
diff --git a/devel/tkcon/Makefile b/devel/tkcon/Makefile
index 58b4c00e802c..dc8fb99f497e 100644
--- a/devel/tkcon/Makefile
+++ b/devel/tkcon/Makefile
@@ -12,23 +12,22 @@ COMMENT=	Tk console for Tcl
 OPTIONS_DEFINE=	DOCS
 
 NO_BUILD=	yes
+NO_ARCH=	yes
 USES+=		tk
 
 PORTDOCS=	*
 PLIST_FILES=	bin/${PORTNAME}
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|%%DOCSDIR%%|${DOCSDIR}|g; s|%%WISH%%|${WISH}|g' ${WRKSRC}/${PORTNAME}.tcl
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.tcl ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.txt ${STAGEDIR}${DOCSDIR}/README.${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/docs/* ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/devel/xmltooling/Makefile b/devel/xmltooling/Makefile
index e8bfadbb245c..5acec7cafcb1 100644
--- a/devel/xmltooling/Makefile
+++ b/devel/xmltooling/Makefile
@@ -26,13 +26,11 @@ PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's,^pkgdocdir.*=.*,pkgdocdir = ${DOCSDIR},' \
 		${WRKSRC}/doc/Makefile.in
-.if empty(PORT_OPTIONS:MDOCS)
+
+post-patch-DOCS-off:
 	@${REINPLACE_CMD} -e '/^SUBDIRS/s,doc ,,' ${WRKSRC}/Makefile.in
-.endif
 
 .include <bsd.port.mk>
diff --git a/devel/zookeeper/Makefile b/devel/zookeeper/Makefile
index 08ce14e861d5..0bc742eade86 100644
--- a/devel/zookeeper/Makefile
+++ b/devel/zookeeper/Makefile
@@ -25,6 +25,7 @@ JAVA_RUN=	yes
 USE_RC_SUBR=	zookeeper
 
 NO_BUILD=	yes
+NO_ARCH=	yes
 
 SCRIPTS=	zkCleanup.sh \
 		zkCli.sh \
@@ -59,17 +60,15 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/*.jar ${STAGEDIR}${PREFIX}/${PORTNAME}
 	${LN} -s ${PREFIX}/${PORTNAME}/bin/zkCli.sh ${STAGEDIR}${PREFIX}/bin/zkCli.sh
 
-.include <bsd.port.options.mk>
-
 post-install:
 	@${MKDIR} ${STAGEDIR}${ZOOKEEPER_LOGDIR}
 	@${MKDIR} ${STAGEDIR}${ZOOKEEPER_RUNDIR}
-.if ${PORT_OPTIONS:MDOCS}
+
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 	${RM} -r ${STAGEDIR}${DOCSDIR}/skin/translations
 	${RM} -r ${STAGEDIR}${DOCSDIR}/skin/scripts
 	${RM} -r ${STAGEDIR}${DOCSDIR}/skin/css
-.endif
 
 .include <bsd.port.mk>
diff --git a/net-p2p/ctorrent/Makefile b/net-p2p/ctorrent/Makefile
index 566f2e16378f..39bef6f85436 100644
--- a/net-p2p/ctorrent/Makefile
+++ b/net-p2p/ctorrent/Makefile
@@ -18,14 +18,10 @@ PORTDOCS=	README-DNH.TXT UserGuide
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-post-install:
+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/net-p2p/qbittorrent/Makefile b/net-p2p/qbittorrent/Makefile
index ab61a56a5394..38e0faa0e91e 100644
--- a/net-p2p/qbittorrent/Makefile
+++ b/net-p2p/qbittorrent/Makefile
@@ -58,11 +58,6 @@ CONFIGURE_ARGS+=	--disable-gui
 .endif
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
-.endif
-
 .if defined(SLAVE_PORT) && ${SLAVE_PORT:tl} == "no"
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qbittorrent
 	${INSTALL_MAN} ${WRKSRC}/doc/qbittorrent.1 \
@@ -74,4 +69,8 @@ post-install:
 .endif
 	@${RM} -rf ${STAGEDIR}${PREFIX}/share/man
 
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+
 .include <bsd.port.mk>
diff --git a/net-p2p/twister/Makefile b/net-p2p/twister/Makefile
index 91533697c21d..b09bb75488a4 100644
--- a/net-p2p/twister/Makefile
+++ b/net-p2p/twister/Makefile
@@ -59,9 +59,9 @@ pre-configure:
 
 do-install:
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/twisterd ${STAGEDIR}${PREFIX}/bin
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/news/golded+/Makefile b/news/golded+/Makefile
index 54f8e8bd9e7b..29e37a2e7c04 100644
--- a/news/golded+/Makefile
+++ b/news/golded+/Makefile
@@ -24,13 +24,8 @@ SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-SUB_LIST=	NOTEWORK="Please read the ${DOCSDIR}/notework.txt before using ${PORTNAME}"
-.else
-SUB_LIST=	NOTEWORK=""
-.endif
+DOCS_SUB_LIST=	NOTEWORK="Please read the ${DOCSDIR}/notework.txt before using ${PORTNAME}"
+DOCS_SUB_LIST_OFF=	NOTEWORK=""
 
 post-patch:
 	@${SED}\
@@ -52,6 +47,8 @@ do-install:
 	${FIND} ${WRKSRC}/cfgs/$i -maxdepth 1 -type f |\
 		${XARGS} -n 1 -J @ ${INSTALL_DATA} @ ${STAGEDIR}${EXAMPLESDIR}/$i
 .endfor
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/manuals/gold_ref.txt ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/manuals/gold_usr.txt ${STAGEDIR}${DOCSDIR}
diff --git a/palm/pilrc/Makefile b/palm/pilrc/Makefile
index e1faca1b91ea..910ae244693b 100644
--- a/palm/pilrc/Makefile
+++ b/palm/pilrc/Makefile
@@ -12,20 +12,18 @@ COMMENT=	Resource compiler for Pilot applications
 LICENSE=	GPLv2
 
 WRKSRC=		${WRKDIR}/pilrc-${PORTVERSION}/unix
-CONFIGURE_ARGS+=	--enable-pilrcui
+CONFIGURE_ARGS=	--enable-pilrcui
 
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pilrc ${WRKSRC}/pilrcui ${STAGEDIR}${PREFIX}/bin
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${CP} -R ${WRKSRC}/../doc/* ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/ports-mgmt/pkg_jail/Makefile b/ports-mgmt/pkg_jail/Makefile
index f5aef5c1d1f9..3292b50fda6d 100644
--- a/ports-mgmt/pkg_jail/Makefile
+++ b/ports-mgmt/pkg_jail/Makefile
@@ -10,6 +10,7 @@ MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Manage your own package jail
 
 NO_BUILD=	yes
+NO_ARCH=	yes
 
 PLIST_FILES=	bin/pkg_jail bin/pkg_update \
 		man/man1/pkg_jail.1.gz man/man1/pkg_update.1.gz
@@ -18,18 +19,16 @@ LMAN1=		pkg_jail.1 pkg_update.1
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 do-install:
 	${INSTALL_SCRIPT} ${FILESDIR}/pkg_jail ${FILESDIR}/pkg_update \
 		${STAGEDIR}${PREFIX}/bin/
 .for i in ${LMAN1}
 	${INSTALL_MAN} ${FILESDIR}/${i} ${STAGEDIR}${PREFIX}/man/man1/
 .endfor
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${FILESDIR}/README ${STAGEDIR}${DOCSDIR}/
-.endif
 
 install-ports:
 	-${MKDIR} ${PORTSDIR}/local/update/data
diff --git a/print/flpsed/Makefile b/print/flpsed/Makefile
index 2efd097aa244..215682410e7c 100644
--- a/print/flpsed/Makefile
+++ b/print/flpsed/Makefile
@@ -33,10 +33,10 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/flpsed.desktop ${STAGEDIR}${PREFIX}/share/applications
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons
 	${INSTALL_DATA} ${WRKSRC}/flpsed.png ${WRKSRC}/flpsed.svg ${STAGEDIR}${PREFIX}/share/icons
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
-.endif
 
 post-install:
 .if !exists(${LOCALBASE}/bin/pdftops)
diff --git a/textproc/adabrowse/Makefile b/textproc/adabrowse/Makefile
index d052ada91fc9..304b6acfff7a 100644
--- a/textproc/adabrowse/Makefile
+++ b/textproc/adabrowse/Makefile
@@ -22,8 +22,6 @@ PORTDOCS=	*.html *.css
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-extract:
 	${CP} ${FILESDIR}/ad-* ${FILESDIR}/build.gpr ${WRKSRC}
 	${RM} ${WRKSRC}/sdefault.adb
@@ -37,10 +35,10 @@ do-build:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/adabrowse ${STAGEDIR}${PREFIX}/bin/adabrowse
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}/${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${WRKSRC}/doc/*.css \
 		${STAGEDIR}/${DOCSDIR}/
-.endif
 
 .include <bsd.port.mk>
diff --git a/textproc/agrep/Makefile b/textproc/agrep/Makefile
index ef0c2f018a36..0ee105449a73 100644
--- a/textproc/agrep/Makefile
+++ b/textproc/agrep/Makefile
@@ -22,17 +22,15 @@ PORTDOCS=	COPYRIGHT agrep.algorithms agrep.ps.1.Z agrep.ps.2.Z
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-extract:
 	${CP} ${DISTDIR}/agrep.ps.1.Z ${DISTDIR}/agrep.ps.2.Z ${WRKSRC}/
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/agrep ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_MAN} ${WRKSRC}/agrep.1 ${STAGEDIR}${PREFIX}/man/man1/
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
-.endif
 
 .include <bsd.port.mk>