When there is a do-install target, do not use a post-install target, do

everything at once. Sometime, rename post-install into a options helper target. I did not fix ports that were such a mess that I could not figure out what they really wanted to do. I also did not change ports that had some version of an auto-plist code in post-install, for the same reason. With hat: portmgr Sponsored by: Absolight
author: Mathieu Arnold <mat@FreeBSD.org> 2016-07-19 11:04:13 +0000
committer: Mathieu Arnold <mat@FreeBSD.org> 2016-07-19 11:04:13 +0000
commit: f899c758a653ca8ff2f8a63aafcb2519a0b524ed (patch)
tree: be6eebf3e77ddf9fcf383081091d8b8b336dd71c
parent: Update devel/erlang-gpb to version 3.23.1. (diff)
174 files changed, 121 insertions, 326 deletions
diff --git a/archivers/lbzip2/Makefile b/archivers/lbzip2/Makefile
index c3afd33c4385..46d5675893f9 100644
--- a/archivers/lbzip2/Makefile
+++ b/archivers/lbzip2/Makefile
@@ -21,7 +21,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/lbzip2 ${STAGEDIR}${PREFIX}/bin/lbzip2
 	${INSTALL_MAN} ${WRKSRC}/lbzip2.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
diff --git a/archivers/rar/Makefile b/archivers/rar/Makefile
index 0371a0243170..9b47a542e156 100644
--- a/archivers/rar/Makefile
+++ b/archivers/rar/Makefile
@@ -47,7 +47,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/rarfiles.lst ${STAGEDIR}${PREFIX}/etc
 	${INSTALL_DATA} ${WRKSRC}/default.sfx ${STAGEDIR}${PREFIX}/lib
 
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
diff --git a/archivers/star/Makefile b/archivers/star/Makefile
index 5046b4f5f869..2a1909ec654a 100644
--- a/archivers/star/Makefile
+++ b/archivers/star/Makefile
@@ -31,8 +31,6 @@ PORTDOCS=	README README.crash README.mtio README.pattern STARvsGNUTAR \
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${FIND} ${WRKSRC} -type f -print \
 		| ${XARGS} ${REINPLACE_CMD} -e "s@/etc/default@${PREFIX}/etc@g"
@@ -56,12 +54,10 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/star/star.dfl ${STAGEDIR}${PREFIX}/etc/star.sample
 	${INSTALL_DATA} ${WRKSRC}/rmt/rmt.dfl ${STAGEDIR}${PREFIX}/etc/rmt.sample
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for FILE in ${PORTDOCS}
 	(cd ${WRKSRC}/star && ${INSTALL_DATA} ${FILE} ${STAGEDIR}${DOCSDIR}/${FILE})
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/audio/baresip/Makefile b/audio/baresip/Makefile
index b2e5bdeb7b47..6c12eb6c4fd4 100644
--- a/audio/baresip/Makefile
+++ b/audio/baresip/Makefile
@@ -113,8 +113,6 @@ do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/share/* ${STAGEDIR}${DATADIR}
 
-# Install modules and add to plist
-post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/modules
 	for m in $$(${SETENV} ${MAKE_ENV} ${MAKE_CMD} -sC ${WRKSRC} ${MAKE_ARGS} showmodules); \
 	do ${INSTALL_LIB} ${WRKSRC}/$$m.so \
diff --git a/audio/id3ren/Makefile b/audio/id3ren/Makefile
index 60759de53829..65bbd4a96e08 100644
--- a/audio/id3ren/Makefile
+++ b/audio/id3ren/Makefile
@@ -30,7 +30,7 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1.gz \
 		${STAGEDIR}${PREFIX}/man/man1/
 
-post-install:
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
diff --git a/audio/mma/Makefile b/audio/mma/Makefile
index 37a3b0c712e6..3ffa32731fbe 100644
--- a/audio/mma/Makefile
+++ b/audio/mma/Makefile
@@ -58,7 +58,6 @@ do-install:
 	${COPYTREE_SHARE} . ${STAGEDIR}${MANPREFIX}/man/man1/ "! -name mma-libdoc.8" && \
 	${INSTALL_MAN} mma-libdoc.8 ${STAGEDIR}${MANPREFIX}/man/man8/)
 
-post-install:
 	# update mma library (mma -g) to use ${DATADIR} path
 	@(cd ${STAGEDIR}${DATADIR} && \
 	${PYTHON_CMD} ${WRKDIR}/mma_g.py)
diff --git a/audio/teamspeak3-server/Makefile b/audio/teamspeak3-server/Makefile
index ee84420c07d8..845ebc5502db 100644
--- a/audio/teamspeak3-server/Makefile
+++ b/audio/teamspeak3-server/Makefile
@@ -87,9 +87,8 @@ do-install:
 		${INSTALL_DATA} ${WRKSRC}/doc/${DOCFILE} ${STAGEDIR}${DOCSDIR}
 .	endfor
 
-post-install:
 	${INSTALL} -d ${STAGEDIR}${DBDIR}
 	${INSTALL} -d ${STAGEDIR}${LOGDIR}
-	@${MKDIR} ${STAGEDIR}${ETCDIR}
+	${INSTALL} -d ${STAGEDIR}${ETCDIR}
 
 .include <bsd.port.mk>
diff --git a/biology/biojava/Makefile b/biology/biojava/Makefile
index 45d22d8cb547..de1403f37d33 100644
--- a/biology/biojava/Makefile
+++ b/biology/biojava/Makefile
@@ -51,7 +51,6 @@ do-install:
 	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} demos ${STAGEDIR}${EXAMPLESDIR})
 	@${ECHO_MSG} " [ DONE ]"
 
-post-install:
 .if !defined(BATCH)
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Libraries installed at: ${JAVAJARDIR}"
diff --git a/biology/recombine/Makefile b/biology/recombine/Makefile
index 7889cad023b0..0cb9d919acf6 100644
--- a/biology/recombine/Makefile
+++ b/biology/recombine/Makefile
@@ -26,7 +26,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/filetran ${STAGEDIR}${PREFIX}/bin
 
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/recombine.txt ${STAGEDIR}${DOCSDIR}
 
diff --git a/biology/seqan1/Makefile b/biology/seqan1/Makefile
index d5222cac07b2..a256864ec0d9 100644
--- a/biology/seqan1/Makefile
+++ b/biology/seqan1/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	seqan
 PORTVERSION=	1.3.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	biology
 MASTER_SITES=	http://ftp.seqan.de/releases/
 PKGNAMESUFFIX=	1
@@ -19,12 +19,14 @@ NO_BUILD=	yes
 
 CONFLICTS=	seqan-[2-9]*
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${MKDIR} ${STAGEDIR}/${PREFIX}/include/${PORTNAME}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} ./${PORTNAME} ${STAGEDIR}/${PREFIX}/include
 	cd ${WRKSRC} && ${INSTALL_DATA} ./${PORTNAME}.h ${STAGEDIR}/${PREFIX}/include
 
-post-install:
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} ./ ${STAGEDIR}${DOCSDIR}
 
diff --git a/chinese/phpbb-tw/Makefile b/chinese/phpbb-tw/Makefile
index efa85c1dad42..ad1bf6c8b1de 100644
--- a/chinese/phpbb-tw/Makefile
+++ b/chinese/phpbb-tw/Makefile
@@ -83,7 +83,6 @@ do-install:
 	@ cd ${WRKSRC} && ${INSTALL_DATA} ${EXCEPTFILES} ${STAGEDIR}${DATADIR}
 	@ cd ${WRKSRC}/contrib && ${INSTALL_DATA} * ${STAGEDIR}${DATADIR}/contrib
 
-post-install:
 #	@ cd ${DATADIR} && ${INSTALL} -c -o ${WWWOWN} -g ${WWWGRP} \
 #	  ${EXCEPTFILES} ${PREFIX}/${PHPBBDIR}
 	@ ${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/chinese/phpbb3-tw/Makefile b/chinese/phpbb3-tw/Makefile
index ea22a32f7ea4..43f15f7ca968 100644
--- a/chinese/phpbb3-tw/Makefile
+++ b/chinese/phpbb3-tw/Makefile
@@ -60,7 +60,7 @@ do-install:
 	@ ${TOUCH} ${STAGEDIR}${PREFIX}/${PHPBBDIR}/config.php.sample
 	@ ${CHMOD} -R 0755 ${STAGEDIR}${PREFIX}/${PHPBBDIR}
 
-post-install:
+post-install-DOCS-on:
 	@ ${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@ cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 
diff --git a/comms/wsjt/Makefile b/comms/wsjt/Makefile
index 441b4054a4ba..ba6366b8d7fb 100644
--- a/comms/wsjt/Makefile
+++ b/comms/wsjt/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	wsjt
 DISTVERSION=	${VERSION}.r${SVN_REV}
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	LOCAL/db
 DISTNAME=	wsjt-r${SVN_REV}
@@ -40,6 +41,8 @@ VERSION=	10
 PLIST_SUB=	PYVER=${PYTHON_VERSION:S/python//} \
 		VERSION=${VERSION}
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.pre.mk>
 
 .if defined(BOOTSTRAP) || defined(SVN_FETCH)
@@ -71,13 +74,8 @@ post-patch:
 	    -e 's|%%PYTHON_VER%%|${PYTHON_VER}|'\
 	    ${WRKSRC}/configure.ac
 
-post-install:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for d in WSJT_Source_Code.txt UpdateHistory.txt LICENSE.TXT call_to.txt \
-	calledby.txt wsjt7a.txt
-	${INSTALL_DATA} ${WRKSRC}/${d} ${STAGEDIR}${DOCSDIR}
-.endfor
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/wsjt/WsjtMod/Audio.so
+do-build:
+	(cd ${WRKSRC};${GMAKE})
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
@@ -96,8 +94,14 @@ do-install:
 	dmet_20_-3_2.dat wsjtrc wsjt.py Pmw.py PmwColor.py PmwBlt.py
 	${INSTALL_DATA} ${WRKSRC}/${d} ${STAGEDIR}${DATADIR}
 .endfor
-do-build:
-	(cd ${WRKSRC};${GMAKE})
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/wsjt/WsjtMod/Audio.so
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for d in WSJT_Source_Code.txt UpdateHistory.txt LICENSE.TXT call_to.txt \
+	calledby.txt wsjt7a.txt
+	${INSTALL_DATA} ${WRKSRC}/${d} ${STAGEDIR}${DOCSDIR}
+.endfor
 
 .if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT}
 IGNORE=	you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER}
diff --git a/databases/galera/Makefile b/databases/galera/Makefile
index 0dc085444802..49810e57157a 100644
--- a/databases/galera/Makefile
+++ b/databases/galera/Makefile
@@ -198,14 +198,12 @@ do-install:
 		${FIND} -H -s man/man*/ -maxdepth 1 -type f -print | \
 		${SED} 's|$$|.gz|' >> ${TMPPLIST}
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${DOCSDIR4}
 	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR}
 	(cd ${DOCSRCDIR2} && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 	${INSTALL_DATA} ${DOC_FILES3:S|^|${DOCSRCDIR3}/|} ${STAGEDIR}${DOCSDIR3}
 	${INSTALL_DATA} ${DOC_FILES4:S|^|${DOCSRCDIR4}/|} ${STAGEDIR}${DOCSDIR4}
 	${INSTALL_DATA} ${DOC_FILES5:S|^|${DOCSRCDIR5}/|} ${STAGEDIR}${DOCSDIR5}
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/databases/hbase/Makefile b/databases/hbase/Makefile
index 6eba978555bf..d32ecff5872d 100644
--- a/databases/hbase/Makefile
+++ b/databases/hbase/Makefile
@@ -83,8 +83,6 @@ do-install:
 	cd ${HBASE_DIST} && ${COPYTREE_SHARE} lib ${STAGEDIR}${PREFIX}/hbase/ "! -name hadoop-*.jar"
 	${MKDIR} ${STAGEDIR}${HBASE_LOGDIR}
 	${MKDIR} ${STAGEDIR}${HBASE_RUNDIR}
-
-post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/hbase/lib/native/libmlockall_agent.so
 
 .include <bsd.port.post.mk>
diff --git a/databases/hsqldb/Makefile b/databases/hsqldb/Makefile
index e9f995e4b773..9ba9cbf04c92 100644
--- a/databases/hsqldb/Makefile
+++ b/databases/hsqldb/Makefile
@@ -30,7 +30,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/lib/sqltool.jar \
 		${STAGEDIR}${JAVAJARDIR}/sqltool.jar
 
-post-install:
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/readme.txt ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR})
diff --git a/databases/influxdb/Makefile b/databases/influxdb/Makefile
index 7597864b8a5b..7f49adaff8c0 100644
--- a/databases/influxdb/Makefile
+++ b/databases/influxdb/Makefile
@@ -120,8 +120,6 @@ do-install:
 		${MKDIR} ${STAGEDIR}${INFLUXD_DBDIR} \
 		${STAGEDIR}${INFLUXD_PIDDIR} \
 		${STAGEDIR}${INFLUXD_LOGDIR}
-
-post-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/bin/influxd ${STAGEDIR}${PREFIX}/bin/influxd
 		${INSTALL_PROGRAM} ${WRKSRC}/bin/influx ${STAGEDIR}${PREFIX}/bin/influx
 		${INSTALL_PROGRAM} ${WRKSRC}/bin/influx_inspect ${STAGEDIR}${PREFIX}/bin/influx_inspect
diff --git a/databases/mongodb32-tools/Makefile b/databases/mongodb32-tools/Makefile
index 557290369af4..4bb45eb5a409 100644
--- a/databases/mongodb32-tools/Makefile
+++ b/databases/mongodb32-tools/Makefile
@@ -63,7 +63,6 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${x} ${STAGEDIR}${PREFIX}/bin/
 .endfor
 
-post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for x in LICENSE.md README.md THIRD-PARTY-NOTICES
 	${INSTALL_MAN} ${WRKSRC}/${x} ${STAGEDIR}${DOCSDIR}
diff --git a/databases/sqlite-ext-miscfuncs/Makefile b/databases/sqlite-ext-miscfuncs/Makefile
index 08fcb2dc3189..2c6d35268485 100644
--- a/databases/sqlite-ext-miscfuncs/Makefile
+++ b/databases/sqlite-ext-miscfuncs/Makefile
@@ -44,7 +44,7 @@ do-install:
 	@${INSTALL} -d ${STAGEDIR}${PREFIX}/libexec/${DIST_SUBDIR}
 	@${INSTALL_PROGRAM} ${WRKSRC}/${LIBFILE} ${STAGEDIR}${INST_DIR}
 
-post-install:
+post-install-DOCS-on:
 	@${INSTALL} -d ${STAGEDIR}${DOCSDIR}
 	@${CP} ${WRKDIR}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
diff --git a/deskutils/myitcrm/Makefile b/deskutils/myitcrm/Makefile
index 2ffd827ae0b4..c815f2c7204f 100644
--- a/deskutils/myitcrm/Makefile
+++ b/deskutils/myitcrm/Makefile
@@ -76,7 +76,6 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
 .endfor
 
-post-install:
 .if defined(MAINTAINER_MODE)
 	@${MAKE} -C ${.CURDIR} rm-install
 .endif
diff --git a/deskutils/plan/Makefile b/deskutils/plan/Makefile
index 9bb5fc2b1d89..8fd067c9b9e7 100644
--- a/deskutils/plan/Makefile
+++ b/deskutils/plan/Makefile
@@ -43,9 +43,6 @@ do-install:
 	      holiday_quebec holiday_slovak holiday_spain holiday_swedish holiday_uk		\
 	      holiday_us ${STAGEDIR}${EXAMPLESDIR}
 
-.if !target(post-install)
-post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/netplan.dir
-.endif
 
 .include <bsd.port.mk>
diff --git a/devel/api-sanity-autotest/Makefile b/devel/api-sanity-autotest/Makefile
index 7576f7ae47f4..f5edefa653f0 100644
--- a/devel/api-sanity-autotest/Makefile
+++ b/devel/api-sanity-autotest/Makefile
@@ -63,7 +63,7 @@ check regression-test test: build
 
 PORTDOCS=	Changes.html Descriptor.html Options.html Readme.html SpecType.html
 
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@(cd ${WRKSRC}/doc; ${INSTALL_MAN} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 
diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile
index 613dc97ef960..529f47e09733 100644
--- a/devel/apr1/Makefile
+++ b/devel/apr1/Makefile
@@ -204,7 +204,6 @@ do-install:
 	@${ECHO_MSG} "# ===> ${.TARGET} apr-util-${APU_VERSION}"
 	(cd ${APU_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${INSTALL_TARGET} ${MAKE_ARGS})
 
-post-install:
 	-${FIND} ${STAGEDIR}${PREFIX}/lib/ -name \*.so | ${XARGS} ${STRIP_CMD}
 
 test: build
diff --git a/devel/lockfree-malloc/Makefile b/devel/lockfree-malloc/Makefile
index cad2777c3215..04705ffd6386 100644
--- a/devel/lockfree-malloc/Makefile
+++ b/devel/lockfree-malloc/Makefile
@@ -26,21 +26,15 @@ PLIST_FILES=	lib/liblite-malloc-shared.so \
 
 MAKE_ARGS+=	CXX=${CXX}
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-PLIST_FILES+=	share/doc/${PORTNAME}/README
-.endif
+DOCS_PLIST_FILES=	share/doc/${PORTNAME}/README
 
 do-install:
 .for i in shared.so static.a
 	${INSTALL_LIB} ${WRKSRC}/liblite-malloc-${i} ${STAGEDIR}${PREFIX}/lib/liblite-malloc-${i}
 .endfor
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} README ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/devel/ruby-gems/Makefile b/devel/ruby-gems/Makefile
index cb0cd58724b8..144aee48446a 100644
--- a/devel/ruby-gems/Makefile
+++ b/devel/ruby-gems/Makefile
@@ -57,7 +57,6 @@ DOCS_VARS=		RUBY_SETUP_OPTIONS="--destdir=${STAGEDIR}"
 do-install:
 	cd ${WRKSRC}/ && ${SETENV} ${GEM_ENV} ${RUBY} ${RUBY_SETUP} ${RUBY_SETUP_OPTIONS}
 
-post-install:
 	@${LN} -sf gem${RUBY_VER_SHORT} ${STAGEDIR}${PREFIX}/bin/gem
 
 #
diff --git a/devel/ruby-wirble/Makefile b/devel/ruby-wirble/Makefile
index 60fa6eba0112..e46d557bf744 100644
--- a/devel/ruby-wirble/Makefile
+++ b/devel/ruby-wirble/Makefile
@@ -21,7 +21,7 @@ do-install:
 	${MKDIR} ${STAGEDIR}${RUBY_SITELIBDIR}
 	${INSTALL_DATA} ${WRKSRC}/lib/wirble.rb ${STAGEDIR}${RUBY_SITELIBDIR}/
 
-post-install:
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${RUBY_MODDOCDIR}
 .for f in ${DOCS_EN}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${RUBY_MODDOCDIR}/
diff --git a/devel/staf/Makefile b/devel/staf/Makefile
index 39b4114f6ff1..ac349f54d095 100644
--- a/devel/staf/Makefile
+++ b/devel/staf/Makefile
@@ -165,6 +165,7 @@ do-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${INSTALL_WRKSRC}/samples && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
+	${MKDIR} ${STAGEDIR}${STAF_VAR_DIR}
 
 do-install-DOCS-on:
 	[ -d ${INSTALL_WRKSRC}/docs/staf ] && \
@@ -217,7 +218,4 @@ do-install-PYTHON-on:
 		${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}
 	${ECHO} ${PORTNAME} > ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}.pth
 
-post-install:
-	${MKDIR} ${STAGEDIR}${STAF_VAR_DIR}
-
 .include <bsd.port.post.mk>
diff --git a/dns/dnsflood/Makefile b/dns/dnsflood/Makefile
index e527cbb99d99..eb17c0bcd1aa 100644
--- a/dns/dnsflood/Makefile
+++ b/dns/dnsflood/Makefile
@@ -27,7 +27,7 @@ pre-patch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/dns_flood_detector ${STAGEDIR}${PREFIX}/sbin
 
-post-install:
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in README
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
diff --git a/dns/mDNSResponder_nss/Makefile b/dns/mDNSResponder_nss/Makefile
index cf9c4c04f687..69e17ccd8bfa 100644
--- a/dns/mDNSResponder_nss/Makefile
+++ b/dns/mDNSResponder_nss/Makefile
@@ -48,7 +48,6 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/mDNSPosix/nss_mdns.conf.5 \
 		${STAGEDIR}${MANPREFIX}/man/man5
 
-post-install:
 	${INSTALL_DATA} ${WRKSRC}/mDNSPosix/nss_mdns.conf \
 		${STAGEDIR}${PREFIX}/etc/nss_mdns.conf.sample
 
diff --git a/dns/udns/Makefile b/dns/udns/Makefile
index b824341501c6..9eb40a2b53c9 100644
--- a/dns/udns/Makefile
+++ b/dns/udns/Makefile
@@ -23,13 +23,7 @@ PORTDOCS=	*
 
 SHLIB_MAJOR=	0
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MIPV6}
-CONFIGURE_ARGS+=	--enable-ipv6
-.else
-CONFIGURE_ARGS+=	--disable-ipv6
-.endif
+IPV6_CONFIGURE_ENABLE=	ipv6
 
 post-build:
 	@cd ${WRKSRC} && ${STRIP_CMD} dnsget_s ex-rdns_s rblcheck_s
@@ -50,12 +44,10 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/${FILE} ${STAGEDIR}${MANPREFIX}/man/man3/${FILE}
 .endfor
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for FILE in NEWS NOTES TODO
 	${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR}/${FILE}
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/emulators/dynamips-community/Makefile b/emulators/dynamips-community/Makefile
index d2d8d4e8ed85..8721be0cbfd5 100644
--- a/emulators/dynamips-community/Makefile
+++ b/emulators/dynamips-community/Makefile
@@ -54,7 +54,6 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/man/nvram_export.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/man/hypervisor_mode.7 ${STAGEDIR}${MANPREFIX}/man/man7
 
-post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in README README.hypervisor RELEASE-NOTES ChangeLog MAINTAINERS
 	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
diff --git a/emulators/o2em/Makefile b/emulators/o2em/Makefile
index a4bb1c182022..9e34f53c3280 100644
--- a/emulators/o2em/Makefile
+++ b/emulators/o2em/Makefile
@@ -38,8 +38,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/docs/O2EM.txt ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/changelog.txt ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/license.txt ${STAGEDIR}${DOCSDIR}
-
-post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/o2em/roms
 
 .include <bsd.port.mk>
diff --git a/emulators/yape/Makefile b/emulators/yape/Makefile
index 2be966b04666..5a8b283ccec1 100644
--- a/emulators/yape/Makefile
+++ b/emulators/yape/Makefile
@@ -38,7 +38,7 @@ post-patch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/yape ${STAGEDIR}${PREFIX}/bin
 
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.SDL ${STAGEDIR}${DOCSDIR}
 
diff --git a/games/jfsw/Makefile b/games/jfsw/Makefile
index ea3075c958e5..3b47fbfc10f6 100644
--- a/games/jfsw/Makefile
+++ b/games/jfsw/Makefile
@@ -69,8 +69,6 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/build ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-build
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
-
-post-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/games/linux-darwinia-demo/Makefile b/games/linux-darwinia-demo/Makefile
index 64a2e4501394..425f4e9292de 100644
--- a/games/linux-darwinia-demo/Makefile
+++ b/games/linux-darwinia-demo/Makefile
@@ -51,7 +51,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/LICENSE ${STAGEDIR}${DOCSDIR}/LICENSE
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/README
 
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.mk>
diff --git a/games/linux-defcon/Makefile b/games/linux-defcon/Makefile
index 6acf72dc16ec..c7ae7d9f9459 100644
--- a/games/linux-defcon/Makefile
+++ b/games/linux-defcon/Makefile
@@ -46,7 +46,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/license.txt ${STAGEDIR}${DOCSDIR}/license.txt
 	${INSTALL_DATA} ${WRKSRC}/manual.pdf ${STAGEDIR}${DOCSDIR}/manual.pdf
 
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.mk>
diff --git a/games/sokoban/Makefile b/games/sokoban/Makefile
index 1148435a96c1..52e24cf3dad1 100644
--- a/games/sokoban/Makefile
+++ b/games/sokoban/Makefile
@@ -19,8 +19,6 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sokoban ${STAGEDIR}${PREFIX}/bin/sokoban
 	@${MKDIR} ${STAGEDIR}${DATADIR}/screens
 	${INSTALL_DATA} ${WRKSRC}/screens/* ${STAGEDIR}${DATADIR}/screens
-
-post-install:
 	@${MKDIR} ${STAGEDIR}/var/games/sokoban
 	truncate -s 512 ${STAGEDIR}/var/games/sokoban/scores.sample
 
diff --git a/games/tuxfighter/Makefile b/games/tuxfighter/Makefile
index 042920ff954f..52ee375c15f4 100644
--- a/games/tuxfighter/Makefile
+++ b/games/tuxfighter/Makefile
@@ -48,7 +48,6 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${f} ${STAGEDIR}${DATADIR}
 .endfor
 
-post-install:
 .for s in ${ICON_SIZES}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/
 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}_${s}.png \
diff --git a/games/uqm/Makefile b/games/uqm/Makefile
index b2da80ea88e0..bf1299a3f2a4 100644
--- a/games/uqm/Makefile
+++ b/games/uqm/Makefile
@@ -97,8 +97,6 @@ do-build:
 
 do-install:
 	@(cd ${WRKSRC} && ${SETENV} STAGEDIR="${STAGEDIR}" ./build.sh uqm install)
-
-post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/uqm/uqm
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/users/manual.txt ${STAGEDIR}${DOCSDIR}
diff --git a/graphics/SciPlot/Makefile b/graphics/SciPlot/Makefile
index 4c1f6fd49b53..d8f1be45e452 100644
--- a/graphics/SciPlot/Makefile
+++ b/graphics/SciPlot/Makefile
@@ -34,9 +34,11 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${LIBNAME}.so.0 ${STAGEDIR}${PREFIX}/lib
 	${LN} -sf ${LIBNAME}.so.0 ${STAGEDIR}${PREFIX}/lib/${LIBNAME}.so
 
-post-install:
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+
+post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${EXDATA:S|^|${WRKSRC}/|} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_PROGRAM} ${EXBINS:S|^|${WRKSRC}/|} ${STAGEDIR}${EXAMPLESDIR}
diff --git a/graphics/argyllcms/Makefile b/graphics/argyllcms/Makefile
index c2fe55c70130..65d1394d1135 100644
--- a/graphics/argyllcms/Makefile
+++ b/graphics/argyllcms/Makefile
@@ -35,8 +35,6 @@ do-install:
 		jam -q -fJambase -j${MAKE_JOBS_NUMBER} install
 	@${MV} ${STAGEDIR}${PREFIX}/bin/License.txt \
 		${STAGEDIR}${PREFIX}/share/argyll/
-
-post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
 
 .include <bsd.port.mk>
diff --git a/graphics/gimpfx-foundry/Makefile b/graphics/gimpfx-foundry/Makefile
index fbac1559503b..39d9fe958085 100644
--- a/graphics/gimpfx-foundry/Makefile
+++ b/graphics/gimpfx-foundry/Makefile
@@ -27,7 +27,7 @@ do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/gimp/scripts/
 	${INSTALL_DATA} ${WRKSRC}/*.scm ${STAGEDIR}${PREFIX}/share/gimp/scripts/
 
-post-install:
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/release-notes.txt ${STAGEDIR}${DOCSDIR}
 
diff --git a/graphics/libgltext/Makefile b/graphics/libgltext/Makefile
index 73856300d059..08fb5bb5154d 100644
--- a/graphics/libgltext/Makefile
+++ b/graphics/libgltext/Makefile
@@ -27,7 +27,6 @@ EXAMPLES_DESC=	Compile examples, need libglut
 .if ${PORT_OPTIONS:MEXAMPLES}
 USE_GL+=	glut
 USE_XORG=	xmu
-FLAG_EXAMPLES=	true
 PLIST_SUB+=	EXAMPLES=""
 .else
 PLIST_SUB+=	EXAMPLES="@comment "
@@ -45,13 +44,13 @@ do-install:
 	@cd ${STAGEDIR}${PREFIX}/lib && \
 		${LN} -s ${PORTNAME}.so.0 ${PORTNAME}.so
 
-post-install:
+post-install-DOCS-on:
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/doc/tutorial.txt ${STAGEDIR}${DOCSDIR}
 .endif
 
-.if defined(FLAG_EXAMPLES)
+post-install-EXAMPLES-on:
 .for DIRE in alpha fps simple sizes
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/${DIRE}
 	@cd ${WRKSRC}/examples && \
@@ -60,6 +59,5 @@ post-install:
 	@${ECHO_MSG}	""
 	@${ECHO_MSG}	"		Examples source and binary on ${STAGEDIR}${EXAMPLESDIR}"
 	@${ECHO_MSG}	""
-.endif
 
 .include <bsd.port.mk>
diff --git a/graphics/mapserver/Makefile b/graphics/mapserver/Makefile
index 02cbe9d0de3f..ed167da594e3 100644
--- a/graphics/mapserver/Makefile
+++ b/graphics/mapserver/Makefile
@@ -199,7 +199,6 @@ do-install:
 	(cd ${BUILD_WRKSRC}/mapscript/python && ${CP} mapscript.py _mapscript.so ${STAGEDIR}${PYTHON_SITELIBDIR}/)
 .endif
 
-post-install:
 	@${LN} -s ${PREFIX}/lib/libmapserver.so.7.0.1 ${STAGEDIR}${PREFIX}/lib/libmapserver.so.2
 	@${LN} -s ${PREFIX}/lib/libmapserver.so.2 ${STAGEDIR}${PREFIX}/lib/libmapserver.so
 
diff --git a/graphics/openjump/Makefile b/graphics/openjump/Makefile
index 0bb5a630801a..7beb9e55ad77 100644
--- a/graphics/openjump/Makefile
+++ b/graphics/openjump/Makefile
@@ -66,7 +66,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/bin/log4j.xml ${TARGET_DIR}/bin/
 	${INSTALL_DATA} ${WRKSRC}/readme.txt ${TARGET_DIR}/bin/
 
-post-install:
 	@${ECHO_MSG} "--->  Installing documentation"
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/Changes.txt ${STAGEDIR}${DOCSDIR}
diff --git a/graphics/optipng/Makefile b/graphics/optipng/Makefile
index 736fb4667fa8..a896e7829d8a 100644
--- a/graphics/optipng/Makefile
+++ b/graphics/optipng/Makefile
@@ -36,7 +36,6 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/optipng/optipng ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_MAN} ${WRKSRC}/src/optipng/man/optipng.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
 
-post-install:
 	${INSTALL} -d ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/doc/,} ${STAGEDIR}${DOCSDIR}/
 
diff --git a/graphics/ruby-image_size/Makefile b/graphics/ruby-image_size/Makefile
index 52a60c5a281a..bba09d889414 100644
--- a/graphics/ruby-image_size/Makefile
+++ b/graphics/ruby-image_size/Makefile
@@ -32,7 +32,7 @@ do-install:
 	${MKDIR} ${STAGEDIR}${RUBY_SITELIBDIR}/
 	${INSTALL_DATA} ${WRKSRC}/lib/image_size.rb ${STAGEDIR}${RUBY_SITELIBDIR}/
 
-post-install:
+post-install-DOCS-on::
 	${MKDIR} ${STAGEDIR}${RUBY_MODDOCDIR}/ja
 .for f in ${DOCS_EN}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${RUBY_MODDOCDIR}/
diff --git a/irc/libircclient/Makefile b/irc/libircclient/Makefile
index a73efaa324fc..30c6aedb4f75 100644
--- a/irc/libircclient/Makefile
+++ b/irc/libircclient/Makefile
@@ -36,9 +36,7 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/include/libirc_rfcnumeric.h ${STAGEDIR}${PREFIX}/include
 	@${INSTALL_DATA} ${WRKSRC}/src/libircclient.a ${STAGEDIR}${PREFIX}/lib
 
-post-install:
-.if ${PORT_OPTIONS:MEXAMPLES}
+post-install-EXAMPLES-on:
 	(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR})
-.endif
 
 .include <bsd.port.mk>
diff --git a/irc/psybnc/Makefile b/irc/psybnc/Makefile
index f58d571a6fe9..1145b286c3f4 100644
--- a/irc/psybnc/Makefile
+++ b/irc/psybnc/Makefile
@@ -59,8 +59,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/help/*.ITA ${STAGEDIR}${PSYBASE}/help/
 	${INSTALL_PROGRAM} ${WRKSRC}/psybnc ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_DATA} ${WRKSRC}/psybnc.conf ${STAGEDIR}${PREFIX}/etc/psybnc.conf.sample
-
-post-install:
 	if [ -f ${WRKSRC}/key/psybnc.req.pem ]; then \
 	    ${INSTALL_DATA} ${WRKSRC}/key/psybnc.cert.pem ${STAGEDIR}${PSYBASE}/key/; \
 	    ${INSTALL_DATA} ${WRKSRC}/key/psybnc.key.pem ${STAGEDIR}${PSYBASE}/key/; \
diff --git a/irc/unreal/Makefile b/irc/unreal/Makefile
index abafc5f1fda2..6a8f7a3d3977 100644
--- a/irc/unreal/Makefile
+++ b/irc/unreal/Makefile
@@ -133,7 +133,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
 .endfor
 
-post-install:
 .if defined(WITH_SQLMOD)
 	@${CP} ${WRKSRC}/SQLMod/sample.conf ${STAGEDIR}${CONFIGDIR}/m_sqlmod.conf
 	@${CP} ${WRKSRC}/SQLMod/Changes ${STAGEDIR}${DOCSDIR}/Changes.sqlmod
diff --git a/japanese/font-mikachan/Makefile b/japanese/font-mikachan/Makefile
index 20a78ea372fa..7f18874bdc9d 100644
--- a/japanese/font-mikachan/Makefile
+++ b/japanese/font-mikachan/Makefile
@@ -38,7 +38,6 @@ do-install:
 	    ${WRKSRC}/mika.ttf ${FILESDIR}/fonts.dir \
 	    ${STAGEDIR}${DATADIR}
 
-post-install:
 	@${MKDIR} ${STAGEDIR}${FONTSDIR}
 	cd ${STAGEDIR}${FONTSDIR} && \
 	    ${LN} -s ../../../${DATADIR_REL}/*.ttf .
diff --git a/japanese/font-mona-ttf/Makefile b/japanese/font-mona-ttf/Makefile
index 782b9124ff0a..d7ab0d1f58ae 100644
--- a/japanese/font-mona-ttf/Makefile
+++ b/japanese/font-mona-ttf/Makefile
@@ -31,7 +31,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/mona.ttf ${FILESDIR}/fonts.dir \
 	    ${STAGEDIR}${DATADIR}
 
-post-install:
 	@${MKDIR} ${STAGEDIR}${FONTSDIR}
 	cd ${STAGEDIR}${FONTSDIR} && \
 	    ${LN} -s ../../../${DATADIR_REL}/*.ttf .
diff --git a/japanese/ruby-romkan/Makefile b/japanese/ruby-romkan/Makefile
index cb56e4641982..abc760bcd080 100644
--- a/japanese/ruby-romkan/Makefile
+++ b/japanese/ruby-romkan/Makefile
@@ -35,7 +35,6 @@ do-install:
 	${MKDIR} ${STAGEDIR}/${RUBY_SITELIBDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/romkan.rb ${STAGEDIR}${RUBY_SITELIBDIR}/
 
-post-install:
 	${MKDIR} ${STAGEDIR}${RUBY_MODEXAMPLESDIR}/ja
 .for f in ${EXAMPLES_JA}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${RUBY_MODEXAMPLESDIR}/ja/
diff --git a/java/java3d/Makefile b/java/java3d/Makefile
index 4546dbe7e212..5b1eab76b51a 100644
--- a/java/java3d/Makefile
+++ b/java/java3d/Makefile
@@ -28,8 +28,6 @@ PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	${REINPLACE_CMD} -e "s/gcc/${CC}/g" \
 		${WRKSRC}/j3d-core/src/native/ogl/build-freebsd.xml
@@ -41,12 +39,12 @@ do-build:
 						-Dis${OPSYS}=yes \
 						-Dports.localbase=${LOCALBASE} \
 						jar-opt
-.if ${PORT_OPTIONS:MDOCS}
+
+post-build-DOCS-on:
 	cd ${WRKSRC}/j3d-core \
 		&& ${SETENV} ${MAKE_ENV} ${ANT} -Dbuild.type=fcs \
 						-Dis${OPSYS}=yes \
 						docs-public
-.endif
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${JAVA_HOME}/jre/lib/ext
@@ -60,10 +58,8 @@ do-install:
 		${WRKSRC}/j3d-core/build/default/opt/native/libj3dcore-ogl.so \
 		${STAGEDIR}${JAVA_HOME}/jre/lib/${ARCH}
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${DOCSSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR})
-.endif
 
 .include <bsd.port.mk>
diff --git a/java/netbeans/Makefile b/java/netbeans/Makefile
index c179362ba727..c5634e42cc3a 100644
--- a/java/netbeans/Makefile
+++ b/java/netbeans/Makefile
@@ -45,7 +45,6 @@ do-install:
 	${CHMOD} ${BINMODE} ${STAGEDIR}${DATADIR}/bin/netbeans
 	${LN} -sf ${DATADIR}/bin/netbeans ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-${PORTVERSION}
 
-post-install:
 	${FIND} ${STAGEDIR}${DATADIR} -type f -ipath "*/bin/*" | ${XARGS} ${CHMOD} ${BINMODE}
 
 .include <bsd.port.mk>
diff --git a/java/netrexx/Makefile b/java/netrexx/Makefile
index 2aa42e13c231..98b48a7f6bdf 100644
--- a/java/netrexx/Makefile
+++ b/java/netrexx/Makefile
@@ -37,7 +37,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/bin/hello.nrx ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/browse && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
-post-install:
 	@${ECHO} "====================  IBM LICENSE  ===================="
 	@${CAT} ${WRKSRC}/browse/license.txt
 	@${ECHO} "-------------------------------------------------------"
diff --git a/java/openjfx8-devel/Makefile b/java/openjfx8-devel/Makefile
index a642f76aa9de..553f128438a6 100644
--- a/java/openjfx8-devel/Makefile
+++ b/java/openjfx8-devel/Makefile
@@ -56,7 +56,6 @@ do-install:
 		&& ${TAR} -C ${STAGEDIR}${JAVA_HOME} \
 			-xf ${WRKSRC}/build/bundles/javafx-sdk-overlay.zip)
 
-post-install:
 	@${FIND} ${STAGEDIR}${JAVA_HOME}/jre -name '*.so' -exec ${STRIP_CMD} \{\} \;
 
 .include <bsd.port.mk>
diff --git a/lang/f2c/Makefile b/lang/f2c/Makefile
index 3b103a39a994..328356a36184 100644
--- a/lang/f2c/Makefile
+++ b/lang/f2c/Makefile
@@ -75,7 +75,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/libf2c/libf2c.so.2 ${STAGEDIR}${PREFIX}/lib
 	${LN} -sf libf2c.so.2 ${STAGEDIR}${PREFIX}/lib/libf2c.so
 
-post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
diff --git a/lang/linux-j/Makefile b/lang/linux-j/Makefile
index 9c7e233f9884..e1b623395c3d 100644
--- a/lang/linux-j/Makefile
+++ b/lang/linux-j/Makefile
@@ -41,7 +41,6 @@ do-install:
 	${BRANDELF} -t Linux ${WRKSRC}/j${PORTVERSION:S/b//g}/jconsole
 	${INSTALL_PROGRAM} ${WRKSRC}/j${PORTVERSION:S/b//g}/jconsole ${STAGEDIR}${PREFIX}/lib/j/jconsole
 
-post-install:
 	${MV} ${STAGEDIR}${PREFIX}/man/man1/jconsole.1 ${STAGEDIR}${PREFIX}/man/man1/j-jconsole.1
 
 .include <bsd.port.mk>
diff --git a/lang/nim/Makefile b/lang/nim/Makefile
index 2cd852a3a359..1399279aaa54 100644
--- a/lang/nim/Makefile
+++ b/lang/nim/Makefile
@@ -35,8 +35,6 @@ do-build:
 
 do-install:
 	cd ${WRKSRC} && ${SH} install.sh ${STAGEDIR}${PREFIX}
-
-post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/nim
 
 .include <bsd.port.post.mk>
diff --git a/lang/nml/Makefile b/lang/nml/Makefile
index dabac5cf9e2b..2eac2069544d 100644
--- a/lang/nml/Makefile
+++ b/lang/nml/Makefile
@@ -35,10 +35,6 @@ post-patch:
 do-install:
 	${DO_MAKE_BUILD} -C ${WRKSRC} PREFIX="${STAGEDIR}${PREFIX}" ${INSTALL_TARGET}
 	@${REINPLACE_CMD} -i '' -e 's|${STAGEDIR}||' ${STAGEDIR}${PREFIX}/lib/nml/ld.conf
-
-post-install:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/Changes ${WRKSRC}/LICENSE ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/contrib/emacs
 	@${MKDIR} ${STAGEDIR}${DATADIR}/contrib/vim
 	${INSTALL_DATA} ${WRKSRC}/contrib/emacs/* ${STAGEDIR}${DATADIR}/contrib/emacs
@@ -47,4 +43,8 @@ post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/$i
 .endfor
 
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/Changes ${WRKSRC}/LICENSE ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+
 .include <bsd.port.mk>
diff --git a/lang/pike78/Makefile b/lang/pike78/Makefile
index a08f729b8149..45103fe9448f 100644
--- a/lang/pike78/Makefile
+++ b/lang/pike78/Makefile
@@ -102,8 +102,6 @@ post-patch:
 
 do-install:
 	@cd ${WRKSRC} && ${MAKE_CMD} ${INSTALL_TARGET} buildroot=${STAGEDIR}
-
-post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/pike/${PORTVERSION}/bin/pike
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/hilfe ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/man/pike.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
diff --git a/mail/amavis-logwatch/Makefile b/mail/amavis-logwatch/Makefile
index ccb0d2bf7981..daa487ab2d3a 100644
--- a/mail/amavis-logwatch/Makefile
+++ b/mail/amavis-logwatch/Makefile
@@ -33,9 +33,10 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf.sample ${STAGEDIR}${ETCDIR}
 
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_MAN} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
 
diff --git a/mail/archivesmtp/Makefile b/mail/archivesmtp/Makefile
index b5597450d559..540ea73968a8 100644
--- a/mail/archivesmtp/Makefile
+++ b/mail/archivesmtp/Makefile
@@ -36,8 +36,6 @@ pre-build:
 do-install:
 	${INSTALL} -s ${WRKSRC}/src/archivesmtp ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_MAN} ${WRKSRC}/src/archivesmtp.8 ${STAGEDIR}${PREFIX}/man/man8
-
-post-install:
 	# Install sample configuration file
 	${INSTALL_DATA} ${WRKSRC}/src/archivesmtp.conf.sample ${STAGEDIR}${PREFIX}/etc
 	# Create socket directory
diff --git a/mail/ez-pine-gpg/Makefile b/mail/ez-pine-gpg/Makefile
index 8155a800a84a..4992e2baad28 100644
--- a/mail/ez-pine-gpg/Makefile
+++ b/mail/ez-pine-gpg/Makefile
@@ -24,7 +24,7 @@ OPTIONS_DEFINE=	DOCS
 do-install:
 	(cd ${WRKSRC} && ${SETENV} DESTDIR="${STAGEDIR}" ./install ${PREFIX}/bin)
 
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
diff --git a/mail/gubby/Makefile b/mail/gubby/Makefile
index eec918fd9ec3..16869fefd01d 100644
--- a/mail/gubby/Makefile
+++ b/mail/gubby/Makefile
@@ -42,7 +42,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gubby ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/doc/gubby.1 ${STAGEDIR}${PREFIX}/man/man1
 
-post-install:
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.TXT ${STAGEDIR}${DOCSDIR}/README
 
diff --git a/mail/james/Makefile b/mail/james/Makefile
index df06279c2249..90e9024b69bb 100644
--- a/mail/james/Makefile
+++ b/mail/james/Makefile
@@ -57,7 +57,6 @@ do-install:
 	@${LN} -sf ${JAVA_HOME}/lib/tools.jar ${STAGEDIR}${APP_HOME}/lib/tools.jar
 	@${ECHO_MSG} " [ DONE ]"
 
-post-install:
 	@${ECHO_MSG} "${PORTNAME} ${PORTVERSION} has been installed in ${APP_HOME}."
 
 .include <bsd.port.mk>
diff --git a/mail/openemm2013/Makefile b/mail/openemm2013/Makefile
index df15543eb657..eb9f061eeff9 100644
--- a/mail/openemm2013/Makefile
+++ b/mail/openemm2013/Makefile
@@ -213,7 +213,6 @@ do-install:
 	(cd ${STAGEDIR}${PREFIX}/${PORTNAME}/webapps/ && \
 		${LN} -sf openemm/assets openemmassets)
 
-post-install:
 	# as needed from Running Q/A tests (stage-qa)
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/bav
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/smctrl
diff --git a/mail/openemm2015/Makefile b/mail/openemm2015/Makefile
index 81a8a2675cd6..d70b53775b6a 100644
--- a/mail/openemm2015/Makefile
+++ b/mail/openemm2015/Makefile
@@ -197,7 +197,6 @@ do-install:
 	(cd ${STAGEDIR}${PREFIX}/${PORTNAME}/webapps/ && \
 		${LN} -sf openemm/assets openemmassets)
 
-post-install:
 
 	# as needed from Running Q/A tests (stage-qa)
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/bav
diff --git a/mail/postfix-logwatch/Makefile b/mail/postfix-logwatch/Makefile
index d58060cc1356..2d61b3f2f2c7 100644
--- a/mail/postfix-logwatch/Makefile
+++ b/mail/postfix-logwatch/Makefile
@@ -33,9 +33,10 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf ${STAGEDIR}${ETCDIR}/${PORTNAME}.conf.sample
 
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
+post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR})
 
diff --git a/mail/postfix-postfwd/Makefile b/mail/postfix-postfwd/Makefile
index 3a4d045348fe..06df96251f16 100644
--- a/mail/postfix-postfwd/Makefile
+++ b/mail/postfix-postfwd/Makefile
@@ -40,9 +40,10 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/etc/${PORTNAME}.cf.sample ${STAGEDIR}${ETCDIR}
 	@${INSTALL_MAN} ${WRKSRC}/man/man8/* ${STAGEDIR}${MANPREFIX}/man/man8
 
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
+post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/tools/request.sample ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/plugins/postfwd.plugins.sample ${STAGEDIR}${EXAMPLESDIR}
diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index 9b1d2d9dad0a..a465db8a723d 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -167,7 +167,6 @@ do-install:
 
 # based on original from op port, written by Cyrille Lefevre
 # <clefevre@citeweb.net>.
-post-install:
 	@if [ ! -f ${CONF_DIR}/${CONF_FILE}${SAMP_SUFX} ]; then \
 		${MKDIR} ${STAGEDIR}${ETCDIR} ; \
 		if [ -f /etc/ftpusers ] && [ -n "${PORT_OPTIONS:MSAMPLE_POPUSERS}" ]; then \
diff --git a/math/bargraph/Makefile b/math/bargraph/Makefile
index 1988dc2f8c5a..b31584c7decb 100644
--- a/math/bargraph/Makefile
+++ b/math/bargraph/Makefile
@@ -26,9 +26,10 @@ OPTIONS_DEFINE=	DOCS EXAMPLES
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/bargraph.pl ${STAGEDIR}${PREFIX}/bin/bargraph
 
-post-install:
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${CP} ${WRKSRC}/samples/*.perf  ${WRKSRC}/samples/*.png ${STAGEDIR}${EXAMPLESDIR}
 
diff --git a/math/convertall/Makefile b/math/convertall/Makefile
index 8b9e46a393a4..4bb6d5964f7d 100644
--- a/math/convertall/Makefile
+++ b/math/convertall/Makefile
@@ -40,8 +40,6 @@ do-install:
 	(cd ${STAGEDIR}${PREFIX} && \
 		${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
 		-d ${DATADIR} -f ${DATADIR_REL})
-
-post-install:
 	(cd ${STAGEDIR}${DOCSDIR} && ${RM} INSTALL LICENSE)
 
 .include <bsd.port.pre.mk>
diff --git a/math/ntl/Makefile b/math/ntl/Makefile
index 3c848e1e312f..68662e9d48f2 100644
--- a/math/ntl/Makefile
+++ b/math/ntl/Makefile
@@ -37,7 +37,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/../include/NTL/* ${STAGEDIR}${PREFIX}/include/NTL/
 	${INSTALL_DATA} ${WRKSRC}/ntl.a ${STAGEDIR}${PREFIX}/lib/libntl.a
 
-post-install:
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/../doc/* ${STAGEDIR}${DOCSDIR}
 
diff --git a/misc/digitemp/Makefile b/misc/digitemp/Makefile
index ad851714da0c..634d355e7044 100644
--- a/misc/digitemp/Makefile
+++ b/misc/digitemp/Makefile
@@ -34,8 +34,6 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/digitemp_DS9097 ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/digitemp_DS9097U ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1
-
-post-install:
 	${INSTALL_DATA} ${FILESDIR}/digitemp.conf.sample ${STAGEDIR}${PREFIX}/etc/
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Sample config installed at ${PREFIX}/etc/digitemp.conf.sample"
diff --git a/misc/estic/Makefile b/misc/estic/Makefile
index dec038b02029..75a40fd6f6d9 100644
--- a/misc/estic/Makefile
+++ b/misc/estic/Makefile
@@ -97,8 +97,6 @@ do-install:
 	${TOUCH} ${PBX_ETC}/config ${PBX_VAR}/debug
 	${CHMOD} 600 ${PBX_VAR}/debug ${PBX_ETC}/config
 	${CHMOD} 700 ${PBX_VAR} # estic will create ./1996.11 etc
-
-post-install:
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} " Suggestion, try:	make demo"
 
diff --git a/misc/gnustep-examples/Makefile b/misc/gnustep-examples/Makefile
index 1797f15f7dfa..9faaa4408d71 100644
--- a/misc/gnustep-examples/Makefile
+++ b/misc/gnustep-examples/Makefile
@@ -31,8 +31,6 @@ do-install:
 	@(cd ${INSTALL_WRKSRC}/${i}; . ${GNUSTEP_MAKEFILES}/GNUstep.sh; \
 	    ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
 .endfor
-
-post-install:
 	${STRIP_CMD} \
 		${STAGEDIR}${PREFIX}/GNUstep/System/Applications/Calculator.app/Calculator \
 		${STAGEDIR}${PREFIX}/GNUstep/System/Applications/CurrencyConverter.app/CurrencyConverter \
diff --git a/misc/libeatmydata/Makefile b/misc/libeatmydata/Makefile
index 542d65547bbf..54d840eec367 100644
--- a/misc/libeatmydata/Makefile
+++ b/misc/libeatmydata/Makefile
@@ -23,8 +23,6 @@ post-patch:
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}/libeatmydata.so.1.0 ${STAGEDIR}${PREFIX}/lib
-
-post-install:
 	${LN} -sf libeatmydata.so.1.0 ${STAGEDIR}${PREFIX}/lib/libeatmydata.so.1
 	${LN} -sf libeatmydata.so.1.0 ${STAGEDIR}${PREFIX}/lib/libeatmydata.so
 
diff --git a/misc/py-qt4-demo/Makefile b/misc/py-qt4-demo/Makefile
index 6bf583f6ce3b..637a0500c103 100644
--- a/misc/py-qt4-demo/Makefile
+++ b/misc/py-qt4-demo/Makefile
@@ -29,8 +29,6 @@ do-install:
 	${RM} -f ${WRKSRC}/examples/designer/plugins/plugins.py.orig
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}
-
-post-install:
 	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
 		-f -d ${PYTHONPREFIX_SITELIBDIR} \
 		${STAGEDIR}${EXAMPLESDIR}
diff --git a/misc/py-qt5-demo/Makefile b/misc/py-qt5-demo/Makefile
index c1ea452317de..c2eecad2ea83 100644
--- a/misc/py-qt5-demo/Makefile
+++ b/misc/py-qt5-demo/Makefile
@@ -28,8 +28,6 @@ USE_PYQT=	core_run dbus_run designer_run \
 do-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}
-
-post-install:
 	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
 		-f -d ${PYTHONPREFIX_SITELIBDIR} \
 		${STAGEDIR}${EXAMPLESDIR}
diff --git a/misc/sent/Makefile b/misc/sent/Makefile
index a1ae11c2a559..764a0eda7c90 100644
--- a/misc/sent/Makefile
+++ b/misc/sent/Makefile
@@ -22,8 +22,6 @@ PLIST_FILES=	bin/${PORTNAME} ${EXAMPLESDIR}/example ${EXAMPLESDIR}/nyan.png
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sent ${STAGEDIR}${PREFIX}/bin
-
-post-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/example ${STAGEDIR}${EXAMPLESDIR}/example
 	${INSTALL_DATA} ${WRKSRC}/nyan.png ${STAGEDIR}${EXAMPLESDIR}/nyan.png
diff --git a/misc/zoneinfo/Makefile b/misc/zoneinfo/Makefile
index 715553398cbb..daf17603ccb1 100644
--- a/misc/zoneinfo/Makefile
+++ b/misc/zoneinfo/Makefile
@@ -50,8 +50,6 @@ do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/zoneinfo
 	${CP} -R -p ${WRKSRC}/zoneinfo/ ${STAGEDIR}${PREFIX}/share/zoneinfo
 	${INSTALL_DATA} ${WRKSRC}/zone.tab ${STAGEDIR}${PREFIX}/share/zoneinfo
-
-post-install:
 	@if [ -f /var/db/zoneinfo -a -O /var/db/zoneinfo -a \
 	     -G /var/db/zoneinfo -a \
 	     -f /usr/share/zoneinfo/$$(cat /var/db/zoneinfo) ]; then \
diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile
index 71c1f96326dd..ad30497eb921 100644
--- a/multimedia/mencoder/Makefile
+++ b/multimedia/mencoder/Makefile
@@ -114,8 +114,6 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mencoder ${STAGEDIR}${PREFIX}/bin
-
-post-install:
 	${INSTALL_MAN} ${WRKSRC}/DOCS/man/en/mplayer.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/mencoder.1
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	@${CHMOD} 755 ${STAGEDIR}${DATADIR}
diff --git a/net-mgmt/devmon/Makefile b/net-mgmt/devmon/Makefile
index 7826a8b5cc61..62c269e7d3e7 100644
--- a/net-mgmt/devmon/Makefile
+++ b/net-mgmt/devmon/Makefile
@@ -48,8 +48,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/devmon.cfg.dist ${STAGEDIR}/${PREFIX}/devmon/
 	(cd ${WRKSRC}/modules && ${COPYTREE_SHARE} \* ${STAGEDIR}/${PREFIX}/devmon/modules/)
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}/${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${STAGEDIR}/${DOCSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/COPYING ${STAGEDIR}/${DOCSDIR}/
@@ -58,6 +57,5 @@ post-install:
 	${INSTALL} -d ${STAGEDIR}/${DOCSDIR}/extras
 	(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} \* ${STAGEDIR}/${DOCSDIR}/docs/)
 	(cd ${WRKSRC}/extras && ${COPYTREE_SHARE} \* ${STAGEDIR}/${DOCSDIR}/extras/)
-.endif
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/hastmon/Makefile b/net-mgmt/hastmon/Makefile
index 8924caf1da0a..2f72abecb630 100644
--- a/net-mgmt/hastmon/Makefile
+++ b/net-mgmt/hastmon/Makefile
@@ -25,7 +25,6 @@ do-install:
 	${SETENV} ${MKCMAKE_ENV} DESTDIR=${STAGEDIR} \
 		${MKCMAKE} -C ${WRKSRC} ${INSTALL_TARGET}
 
-post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/${doc} ${STAGEDIR}${DOCSDIR}
diff --git a/net-mgmt/ipplan/Makefile b/net-mgmt/ipplan/Makefile
index 68b3459830a3..2a7fd547d829 100644
--- a/net-mgmt/ipplan/Makefile
+++ b/net-mgmt/ipplan/Makefile
@@ -57,7 +57,6 @@ do-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR}
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
 
-post-install:
 	# make /var dirs
 	${MKDIR} ${STAGEDIR}/var/spool/ipplan/dhcpexport
 	${MKDIR} ${STAGEDIR}/var/spool/ipplan/exportdns
diff --git a/net-mgmt/nefu/Makefile b/net-mgmt/nefu/Makefile
index b2ac5bf00006..441607e4ee9a 100644
--- a/net-mgmt/nefu/Makefile
+++ b/net-mgmt/nefu/Makefile
@@ -55,8 +55,6 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/nefu.1 ${STAGEDIR}${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/nefu.conf.4 ${STAGEDIR}${PREFIX}/man/man4
-
-post-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR} ${STAGEDIR}${DBDIR}
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/nfdump/Makefile b/net-mgmt/nfdump/Makefile
index 34cf3c3247ec..3f7b4d716175 100644
--- a/net-mgmt/nfdump/Makefile
+++ b/net-mgmt/nfdump/Makefile
@@ -143,10 +143,8 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/man/${filename}.1 ${STAGEDIR}${PREFIX}/man/man1
 .endfor
 
-post-install:
-.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-mgmt/nsca/Makefile b/net-mgmt/nsca/Makefile
index ef0dfc3334c1..4997088abc1f 100644
--- a/net-mgmt/nsca/Makefile
+++ b/net-mgmt/nsca/Makefile
@@ -62,7 +62,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/sample-config/nsca.cfg ${STAGEDIR}${PREFIX}/etc/nagios/nsca.cfg-sample
 .endif
 
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
 
diff --git a/net-mgmt/nsca27/Makefile b/net-mgmt/nsca27/Makefile
index 6c01a620396e..7e90da096f74 100644
--- a/net-mgmt/nsca27/Makefile
+++ b/net-mgmt/nsca27/Makefile
@@ -63,7 +63,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/sample-config/nsca.cfg ${STAGEDIR}${PREFIX}/etc/nagios/nsca.cfg-sample
 .endif
 
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
 
diff --git a/net-mgmt/remarp/Makefile b/net-mgmt/remarp/Makefile
index a8d8522ea9eb..0d6c8f87c87d 100644
--- a/net-mgmt/remarp/Makefile
+++ b/net-mgmt/remarp/Makefile
@@ -34,7 +34,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/lib/remarp/*.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/remarp
 	${INSTALL_SCRIPT} ${WRKSRC}/sbin/remarp.pl ${STAGEDIR}${PREFIX}/sbin/remarp
 
-post-install:
 .if !defined(BATCH)
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "###############################################################################"
diff --git a/net-mgmt/statsd/Makefile b/net-mgmt/statsd/Makefile
index e5b4db031646..6c3211682bb1 100644
--- a/net-mgmt/statsd/Makefile
+++ b/net-mgmt/statsd/Makefile
@@ -37,8 +37,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/exampleConfig.js ${STAGEDIR}${DATADIR}/
 	${INSTALL_DATA} ${WRKSRC}/exampleProxyConfig.js ${STAGEDIR}${DATADIR}/
 	${INSTALL_DATA} ${WRKSRC}/stats.js ${STAGEDIR}${DATADIR}/
-
-post-install:
 	${INSTALL_DATA} ${WRKSRC}/exampleConfig.js \
 		${STAGEDIR}${PREFIX}/etc/statsd.js.sample
 
diff --git a/net-p2p/libbt/Makefile b/net-p2p/libbt/Makefile
index d77aac001359..c20088c3956a 100644
--- a/net-p2p/libbt/Makefile
+++ b/net-p2p/libbt/Makefile
@@ -35,8 +35,6 @@ do-install:
 .for i in benc.h bitset.h bterror.h btmessage.h bts.h context.h peer.h random.h segmenter.h strbuf.h stream.h types.h util.h
 	${INSTALL_DATA} ${WRKSRC}/include/${i} ${STAGEDIR}${PREFIX}/include/libbt
 .endfor
-
-post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOCS}
 	${INSTALL_MAN} ${WRKSRC}/docs/${i} ${STAGEDIR}${DOCSDIR}
diff --git a/net/delegate/Makefile b/net/delegate/Makefile
index 05136147a688..64404be9ee68 100644
--- a/net/delegate/Makefile
+++ b/net/delegate/Makefile
@@ -37,8 +37,6 @@ do-install:
 		${STAGEDIR}${PREFIX}/etc/rc.d/delegated.sh-dist
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/doc/,} ${STAGEDIR}${DOCSDIR}
-
-post-install:
 # Re-sign the executable
 	@${MKDIR} ${WRKDIR}/tmp
 	@${CP} ${STAGEDIR}${PREFIX}/sbin/delegated ${WRKDIR}/tmp/dg
diff --git a/net/dgd-kernel/Makefile b/net/dgd-kernel/Makefile
index c9fb593baefc..0c45a24611e3 100644
--- a/net/dgd-kernel/Makefile
+++ b/net/dgd-kernel/Makefile
@@ -43,8 +43,6 @@ do-install:
 	@${CHMOD} a+x ${STAGEDIR}${PREFIX}/etc/rc.d/dgd-kernel.sh.sample
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@cd ${WRKSRC}/kernellib && ${COPYTREE_SHARE} doc ${STAGEDIR}${DOCSDIR}
-
-post-install:
 	@# Need a temporary directory for certain files
 	@${MKDIR} ${STAGEDIR}${DATADIR}/tmp
 
diff --git a/net/dgd-lpmud/Makefile b/net/dgd-lpmud/Makefile
index 6e9b34b425dc..3b98d5533598 100644
--- a/net/dgd-lpmud/Makefile
+++ b/net/dgd-lpmud/Makefile
@@ -50,15 +50,13 @@ do-install:
 		${STAGEDIR}${DATADIR}/lpmud/ACCESS.ALLOW.example
 	${MV} ${STAGEDIR}${DATADIR}/lpmud/ACCESS.DENY \
 		${STAGEDIR}${DATADIR}/lpmud/ACCESS.DENY.example
-
-do-install-DOCS-on:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
-
-post-install:
 	# Need a temporary directory for certain files
 	${MKDIR} ${STAGEDIR}${DATADIR}/tmp
 	# Link in the dgd docs
 	${LN} -sf ${PREFIX}/share/doc/dgd/kfun ${STAGEDIR}${DATADIR}/lpmud/doc
 
+do-install-DOCS-on:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+
 .include <bsd.port.mk>
diff --git a/net/drawterm/Makefile b/net/drawterm/Makefile
index 94d057e901aa..44fbdd86130c 100644
--- a/net/drawterm/Makefile
+++ b/net/drawterm/Makefile
@@ -27,7 +27,7 @@ OPTIONS_DEFINE=	DOCS
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/drawterm ${STAGEDIR}${PREFIX}/bin
 
-post-install:
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/README ${WRKSRC}/LICENSE ${STAGEDIR}${DOCSDIR}
 
diff --git a/net/gogoc/Makefile b/net/gogoc/Makefile
index 032e6f12fc28..66b94799efbf 100644
--- a/net/gogoc/Makefile
+++ b/net/gogoc/Makefile
@@ -30,8 +30,6 @@ do-install:
 	cd ${WRKSRC}/gogoc-tsp/ && ${SETENV} ${MAKE_ENV} DESTDIR=${STAGEDIR} \
 	    ${MAKE_CMD} platform=freebsd installdir=${STAGEDIR}${PREFIX} install
 	${RM} ${STAGEDIR}${PREFIX}/bin/gogoc.conf*
-
-post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/gogoc
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/gogoc-tsp/bin/gogoc.conf.sample ${STAGEDIR}${EXAMPLESDIR}
diff --git a/net/isc-dhcp43-server/Makefile b/net/isc-dhcp43-server/Makefile
index 07fa00e63b5c..02b4e833db82 100644
--- a/net/isc-dhcp43-server/Makefile
+++ b/net/isc-dhcp43-server/Makefile
@@ -167,8 +167,6 @@ do-install:
 	${INSTALL_MAN} ${LDAP_README} ${STAGEDIR}${DOCSDIR}
 .endif
 .endif
-
-post-install:
 .if ${SUBSYS} == client
 	${INSTALL_SCRIPT} ${WRKSRC}/client/scripts/freebsd ${STAGEDIR}${PREFIX}/sbin/dhclient-script
 .elif ${SUBSYS} == server
diff --git a/net/java-beepcore/Makefile b/net/java-beepcore/Makefile
index 5ecfc758f01c..7659760caadf 100644
--- a/net/java-beepcore/Makefile
+++ b/net/java-beepcore/Makefile
@@ -27,7 +27,7 @@ do-install:
 	  && ${FIND} -s . -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${EXAMPLESDIR}/{} \;)
 	${INSTALL_DATA} ${WRKSRC}/lib/example.jar ${STAGEDIR}${EXAMPLESDIR}
 
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.txt ${WRKSRC}/*.htm ${STAGEDIR}${DOCSDIR}
 
diff --git a/net/pipsecd/Makefile b/net/pipsecd/Makefile
index 53123435c2a0..d77ccbd4a645 100644
--- a/net/pipsecd/Makefile
+++ b/net/pipsecd/Makefile
@@ -29,7 +29,4 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/COPYRIGHT ${STAGEDIR}${PREFIX}/share/doc/pipsecd
 	${INSTALL_MAN} ${WRKSRC}/README.port ${STAGEDIR}${PREFIX}/share/doc/pipsecd
 
-post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/pipsecd
-
 .include <bsd.port.mk>
diff --git a/net/pwhois/Makefile b/net/pwhois/Makefile
index c4daf669bbb7..289a44e289d9 100644
--- a/net/pwhois/Makefile
+++ b/net/pwhois/Makefile
@@ -56,9 +56,7 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/pwhoisd.conf \
 		${STAGEDIR}${ETCDIR}/pwhoisd.conf.sample
 	@${INSTALL_DATA} ${WRKSRC}/mysql/createdb.sql ${STAGEDIR}${DATADIR}/
-
-post-install:
-	@${INSTALL} -d -o 512 -g 512 ${STAGEDIR}/var/db/pwhois
-	@${INSTALL} -d -o 512 -g 512 ${STAGEDIR}/var/log/pwhois
+	@${INSTALL} -d ${STAGEDIR}/var/db/pwhois
+	@${INSTALL} -d ${STAGEDIR}/var/log/pwhois
 
 .include <bsd.port.mk>
diff --git a/net/remotebox/Makefile b/net/remotebox/Makefile
index 67ac06c5ae47..92b9082216db 100644
--- a/net/remotebox/Makefile
+++ b/net/remotebox/Makefile
@@ -47,7 +47,7 @@ do-install:
 	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.desktop \
 		${STAGEDIR}${PREFIX}/share/applications
 
-post-install:
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/docs/remotebox.pdf ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/docs/changelog.txt ${STAGEDIR}${DOCSDIR}
diff --git a/net/tn5250j/Makefile b/net/tn5250j/Makefile
index f824aad81bbc..225c4d521701 100644
--- a/net/tn5250j/Makefile
+++ b/net/tn5250j/Makefile
@@ -53,7 +53,7 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/tn5250j ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/build/tn5250j.jar ${STAGEDIR}${JAVAJARDIR}
 
-post-install:
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for d in ${DOC_FILES}
 	${INSTALL_MAN} ${WRKSRC}/src/${d} ${STAGEDIR}${DOCSDIR}
diff --git a/net/unison-devel/Makefile b/net/unison-devel/Makefile
index 22bc5b2ab504..66d2e71c7182 100644
--- a/net/unison-devel/Makefile
+++ b/net/unison-devel/Makefile
@@ -66,7 +66,6 @@ post-build:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/unison ${STAGEDIR}${PREFIX}/bin
 
-post-install:
 .if ${PORT_OPTIONS:MX11}
 	${INSTALL_PROGRAM} ${WRKSRC}/unison-text ${STAGEDIR}${PREFIX}/bin
 .endif
diff --git a/net/unison/Makefile b/net/unison/Makefile
index a6ba7ddce419..475024717373 100644
--- a/net/unison/Makefile
+++ b/net/unison/Makefile
@@ -64,7 +64,6 @@ post-build:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
-post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
 	cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${EXTRA_DOCS} ${STAGEDIR}${DOCSDIR}
diff --git a/net/unison232/Makefile b/net/unison232/Makefile
index a0df64ea14ce..f12b5207a49c 100644
--- a/net/unison232/Makefile
+++ b/net/unison232/Makefile
@@ -63,7 +63,6 @@ post-build:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}
 
-post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
 	cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${EXTRA_DOCS} ${STAGEDIR}${DOCSDIR}
diff --git a/net/unison240/Makefile b/net/unison240/Makefile
index 96f41a6dcb9a..3769e71186f0 100644
--- a/net/unison240/Makefile
+++ b/net/unison240/Makefile
@@ -64,7 +64,6 @@ post-build:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}
 
-post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
 	cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${EXTRA_DOCS} ${STAGEDIR}${DOCSDIR}
diff --git a/net/vnstat/Makefile b/net/vnstat/Makefile
index c68b4d401d92..95e37f2a0c70 100644
--- a/net/vnstat/Makefile
+++ b/net/vnstat/Makefile
@@ -64,11 +64,9 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/man/vnstati.1 ${STAGEDIR}/${MANPREFIX}/man/man1/vnstati.1
 .endif
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@${ECHO_MSG} "installing additional documentation to ${DOCSDIR}"
 	@${MKDIR} ${STAGEDIR}/${DOCSDIR}
 	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}/${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/ports-mgmt/jailaudit/Makefile b/ports-mgmt/jailaudit/Makefile
index 425f2f3a9181..ba430c85a44f 100644
--- a/ports-mgmt/jailaudit/Makefile
+++ b/ports-mgmt/jailaudit/Makefile
@@ -37,8 +37,6 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/jailaudit ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/jailaudit.conf.sample ${STAGEDIR}${PREFIX}/etc
 	${INSTALL_SCRIPT} ${WRKSRC}/410.jailaudit ${STAGEDIR}${PERIODICDIR}/security
-
-post-install:
 	${MKDIR} ${STAGEDIR}${REPORTDIR}
 	${MKDIR} ${STAGEDIR}${XTMPDIR}
 
diff --git a/ports-mgmt/pkgcompare/Makefile b/ports-mgmt/pkgcompare/Makefile
index a64140a34403..92f7bcc39d37 100644
--- a/ports-mgmt/pkgcompare/Makefile
+++ b/ports-mgmt/pkgcompare/Makefile
@@ -32,8 +32,6 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${BINARY} ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_MAN} ${WRKSRC}/pkg-compare.8 \
 		${STAGEDIR}${MAN8PREFIX}/man/man8
-
-post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${LICENSE_FILE} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
diff --git a/ports-mgmt/portell/Makefile b/ports-mgmt/portell/Makefile
index 44dd756ffbc2..5c6e3fc12192 100644
--- a/ports-mgmt/portell/Makefile
+++ b/ports-mgmt/portell/Makefile
@@ -28,7 +28,6 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.txt ${STAGEDIR}${DOCSDIR}
 
-post-install:
 .if !defined(BATCH)
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "###############################################################################"
diff --git a/print/cups-pdf/Makefile b/print/cups-pdf/Makefile
index 71b00f586af6..ce5105486eb9 100644
--- a/print/cups-pdf/Makefile
+++ b/print/cups-pdf/Makefile
@@ -94,8 +94,6 @@ do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/cups
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/
-
-post-install:
 	${INSTALL_DATA} ${WRKSRC}/extra/cups-pdf.conf \
 		${STAGEDIR}${PREFIX}/etc/cups/cups-pdf.conf.sample
 
diff --git a/print/gsfonts/Makefile b/print/gsfonts/Makefile
index 3c15a283e8fd..ecd2ce8febcc 100644
--- a/print/gsfonts/Makefile
+++ b/print/gsfonts/Makefile
@@ -40,11 +40,9 @@ do-install:
 		${LN} -s -f ${PREFIX}/share/fonts/$${F} ${FONTSDIR}/; \
 	done
 
-.include <bsd.port.options.mk>
-
 PORTDOCS=	ChangeLog README README.tweaks TODO
 
-post-install:
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/fonts && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
diff --git a/print/ps2eps/Makefile b/print/ps2eps/Makefile
index 0651c2829934..907ccab287c1 100644
--- a/print/ps2eps/Makefile
+++ b/print/ps2eps/Makefile
@@ -26,7 +26,7 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/man/man1/bbox.1 ${STAGEDIR}${PREFIX}/man/man1/
 	${INSTALL_MAN} ${WRKSRC}/doc/man/man1/ps2eps.1 ${STAGEDIR}${PREFIX}/man/man1/
 
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/pdf
diff --git a/print/py-trml2pdf/Makefile b/print/py-trml2pdf/Makefile
index c088af5ff3f7..81c0cf88cba9 100644
--- a/print/py-trml2pdf/Makefile
+++ b/print/py-trml2pdf/Makefile
@@ -29,10 +29,11 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/trml2pdf
 	@${INSTALL_SCRIPT} ${WRKSRC}/trml2pdf/* ${STAGEDIR}${PYTHON_SITELIBDIR}/trml2pdf
 
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.txt ${STAGEDIR}${DOCSDIR}
 
+post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${CP} -R ${WRKSRC}/rmls/ ${STAGEDIR}${EXAMPLESDIR}/rmls
 
diff --git a/science/libsvm/Makefile b/science/libsvm/Makefile
index da0ee9c64cab..4843ee50a47e 100644
--- a/science/libsvm/Makefile
+++ b/science/libsvm/Makefile
@@ -81,12 +81,10 @@ do-install:
 
 .endif
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	for f in ${TXT_DOCS}; do \
 	  ${INSTALL_DATA} ${WRKSRC}/$$f ${STAGEDIR}${DOCSDIR}; \
 	done
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/security/aimsniff/Makefile b/security/aimsniff/Makefile
index 5bebf3ff0421..a9722eb2b569 100644
--- a/security/aimsniff/Makefile
+++ b/security/aimsniff/Makefile
@@ -37,7 +37,7 @@ do-install:
 	${CHMOD} u+s ${STAGEDIR}${PREFIX}/bin/aimsniff
 .endif
 
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/$i ${STAGEDIR}${DOCSDIR}
diff --git a/security/ca_root_nss/Makefile b/security/ca_root_nss/Makefile
index 783c770a6c30..8614b756ae90 100644
--- a/security/ca_root_nss/Makefile
+++ b/security/ca_root_nss/Makefile
@@ -57,8 +57,6 @@ do-build:	apply-slist
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${CERTDIR}
 	${INSTALL_DATA} ${WRKDIR}/ca-root-nss.crt ${STAGEDIR}${PREFIX}/${CERTDIR}
-
-post-install:
 .if ${PORT_OPTIONS:METCSYMLINK}
 	${MKDIR} ${STAGEDIR}/etc/ssl
 	${LN} -sf ${PREFIX}/${CERTDIR}/ca-root-nss.crt ${STAGEDIR}/etc/ssl/cert.pem
diff --git a/security/cryptlib/Makefile b/security/cryptlib/Makefile
index da02c6340c8e..14ca85711ab6 100644
--- a/security/cryptlib/Makefile
+++ b/security/cryptlib/Makefile
@@ -38,7 +38,7 @@ do-install:
 	${LN} -sf libcl.so.3 ${STAGEDIR}${PREFIX}/lib/libcl.so
 	${INSTALL_DATA} ${WRKSRC}/cryptlib.h ${STAGEDIR}${PREFIX}/include
 
-post-install:
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
diff --git a/security/f-prot/Makefile b/security/f-prot/Makefile
index a7dbfb447296..ad2edb193008 100644
--- a/security/f-prot/Makefile
+++ b/security/f-prot/Makefile
@@ -42,7 +42,7 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/man/f-prot.conf.5 ${STAGEDIR}${MANPREFIX}/man/man5
 	${INSTALL_MAN} ${WRKSRC}/doc/man/fpupdate.8 ${STAGEDIR}${MANPREFIX}/man/man8
 
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR})
 	${CP} ${WRKSRC}/doc/CHANGES ${STAGEDIR}${DOCSDIR}
diff --git a/security/fakeident/Makefile b/security/fakeident/Makefile
index e30281fe8e0a..6b45c658507c 100644
--- a/security/fakeident/Makefile
+++ b/security/fakeident/Makefile
@@ -24,7 +24,4 @@ do-build:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/identd ${STAGEDIR}${PREFIX}/sbin
 
-post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/identd
-
 .include <bsd.port.mk>
diff --git a/security/fwanalog/Makefile b/security/fwanalog/Makefile
index e1a53a8b98fb..2a4e03e3e9c3 100644
--- a/security/fwanalog/Makefile
+++ b/security/fwanalog/Makefile
@@ -39,7 +39,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${ETCDIR}/${i}.sample
 .endfor
 
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
diff --git a/security/gorilla/Makefile b/security/gorilla/Makefile
index 0517154e91e4..15d22c41c5c9 100644
--- a/security/gorilla/Makefile
+++ b/security/gorilla/Makefile
@@ -69,8 +69,6 @@ do-install:
 		${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${dir}
 .endfor
 	@${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-
-post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README			\
 		${WRKSRC}/sources/README.install-from-source	\
diff --git a/security/keybase/Makefile b/security/keybase/Makefile
index 04f7745a5c86..52cad575cd3b 100644
--- a/security/keybase/Makefile
+++ b/security/keybase/Makefile
@@ -37,9 +37,7 @@ do-install:
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${KEYBASE_PREFIX}/lib/node_modules/${PORTNAME})
 	${CHMOD} +x ${STAGEDIR}${KEYBASE_PREFIX}/lib/node_modules/${PORTNAME}/bin/main.js
 	${LN} -s ${KEYBASE_PREFIX}/lib/node_modules/${PORTNAME}/bin/main.js ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-
-# Quiet stage-qa
-post-install:
+	# Quiet stage-qa
 	@${RM} ${STAGEDIR}${KEYBASE_PREFIX}/lib/node_modules/keybase/node_modules/request/node_modules/node-uuid/benchmark/bench.sh
 
 .include <bsd.port.mk>
diff --git a/security/letsencrypt.sh/Makefile b/security/letsencrypt.sh/Makefile
index e372b6c71a7b..7513f37a9f1d 100644
--- a/security/letsencrypt.sh/Makefile
+++ b/security/letsencrypt.sh/Makefile
@@ -61,7 +61,6 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_SCRIPT} ${WRKDIR}/${PERIODIC_FILES} ${STAGEDIR}${PREFIX}/${PERIODIC_DIRS}/${PERIODIC_FILES}
 
-post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 .	for d in dns-verification domains_txt ecc hook_chain import-from-official-client \
diff --git a/security/libbf/Makefile b/security/libbf/Makefile
index 2a1a95914e7a..7b011dd09476 100644
--- a/security/libbf/Makefile
+++ b/security/libbf/Makefile
@@ -30,7 +30,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/libblowfish.a ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}/blowfish.h ${STAGEDIR}${PREFIX}/include
 
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
diff --git a/security/openvpn-auth-radius/Makefile b/security/openvpn-auth-radius/Makefile
index 0dc3700d335e..81200a77027d 100644
--- a/security/openvpn-auth-radius/Makefile
+++ b/security/openvpn-auth-radius/Makefile
@@ -32,14 +32,11 @@ OPTIONS_DEFINE=	DOCS EXAMPLES
 do-install:
 	${INSTALL_LIB} ${WRKSRC}/radiusplugin.so ${STAGEDIR}${LOCALBASE}/lib
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
+post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/radiusplugin.cnf ${STAGEDIR}${EXAMPLESDIR}
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/security/retranslator/Makefile b/security/retranslator/Makefile
index 0b50c588f2e3..e0b2f7a6bef5 100644
--- a/security/retranslator/Makefile
+++ b/security/retranslator/Makefile
@@ -30,8 +30,6 @@ do-configure:
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}.bin \
 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-
-post-install:
 	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf \
 		${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
 
diff --git a/security/rkhunter/Makefile b/security/rkhunter/Makefile
index fae6d5578468..ff9b1a6f6f97 100644
--- a/security/rkhunter/Makefile
+++ b/security/rkhunter/Makefile
@@ -43,8 +43,6 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/415.${PORTNAME} ${STAGEDIR}${PREFIX}/etc/periodic/security
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/files/|} ${STAGEDIR}${DOCSDIR}
-
-post-install:
 	@${REINPLACE_CMD} -i '' -e 's|${STAGEDIR}||g' \
 		${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf
 	${INSTALL_DATA} ${WRKSRC}/files/${PORTNAME}.conf ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
diff --git a/security/softether/Makefile b/security/softether/Makefile
index 598c07fd08dc..97be83a81ea6 100644
--- a/security/softether/Makefile
+++ b/security/softether/Makefile
@@ -68,17 +68,14 @@ post-extract:
 # into ${PREFIX}/sbin
 do-install:
 	${MKDIR} ${STAGEDIR}/${PREFIX}/libexec/softether
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/vpnbridge/vpnbridge ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpnbridge
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/vpnclient/vpnclient ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpnclient
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/vpncmd/vpncmd ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpncmd
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/vpnserver/vpnserver ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpnserver
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/vpnbridge/vpnbridge ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpnbridge
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/vpnclient/vpnclient ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpnclient
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/vpncmd/vpncmd ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpncmd
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/vpnserver/vpnserver ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpnserver
 	${INSTALL_DATA} ${WRKSRC}/bin/vpnserver/hamcore.se2 ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/hamcore.se2
 	${INSTALL_SCRIPT} ${WRKDIR}/vpncmd ${STAGEDIR}/${PREFIX}/sbin/vpncmd
 
-post-install:
-.for i in vpnbridge vpnclient vpncmd vpnserver
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/${i}
-.endfor
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
diff --git a/security/vnccrack/Makefile b/security/vnccrack/Makefile
index 5daa25c1e64e..61f8b29c7e5f 100644
--- a/security/vnccrack/Makefile
+++ b/security/vnccrack/Makefile
@@ -21,7 +21,7 @@ OPTIONS_DEFINE=	DOCS
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/vnccrack ${STAGEDIR}${PREFIX}/bin
 
-post-install:
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/readme.txt ${STAGEDIR}${DOCSDIR}
 
diff --git a/security/webfwlog/Makefile b/security/webfwlog/Makefile
index cdd98c6d2bcd..29c88b3e9b2a 100644
--- a/security/webfwlog/Makefile
+++ b/security/webfwlog/Makefile
@@ -79,7 +79,7 @@ do-install:
 	@${ECHO} "Installed mysql shared library in ${MYSQL_PLUGIN_DIR}"
 .endif
 
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/mysql
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/pgsql
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/examples
diff --git a/security/yafic/Makefile b/security/yafic/Makefile
index 1e2d41709285..5961b8434d71 100644
--- a/security/yafic/Makefile
+++ b/security/yafic/Makefile
@@ -39,8 +39,6 @@ do-install:
 	${LN} -sf yafic-sign.1 ${STAGEDIR}${PREFIX}/man/man1/yafic-check.1
 .endif
 	${INSTALL_MAN} ${WRKSRC}/yafic.conf.5 ${STAGEDIR}${PREFIX}/man/man5
-
-post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/examples/yafic
 	@${CP} ${FILESDIR}/yafic.conf.sample ${STAGEDIR}${EXAMPLESDIR}
 
diff --git a/sysutils/anacron/Makefile b/sysutils/anacron/Makefile
index fc70ea45508a..921ed7062d44 100644
--- a/sysutils/anacron/Makefile
+++ b/sysutils/anacron/Makefile
@@ -25,8 +25,6 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/anacron.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
 	${INSTALL_MAN} ${WRKSRC}/anacrontab.5 ${STAGEDIR}${MAN5PREFIX}/man/man5
 	${INSTALL_DATA} ${FILESDIR}/anacrontab.sample ${STAGEDIR}${PREFIX}/etc
-
-post-install:
 	[ -d ${STAGEDIR}/var/spool/anacron ] || ${MKDIR} ${STAGEDIR}/var/spool/anacron
 
 .include <bsd.port.mk>
diff --git a/sysutils/boxbackup-devel/Makefile b/sysutils/boxbackup-devel/Makefile
index e8075463e9af..1d150b2e1725 100644
--- a/sysutils/boxbackup-devel/Makefile
+++ b/sysutils/boxbackup-devel/Makefile
@@ -130,7 +130,6 @@ do-install:
 	${WRKSRC}/${SERVERDIR}/raidfile-config.8.gz \
 	${STAGEDIR}${PREFIX}/man/man8/
 .endif
-post-install:
 .if ${PORT_OPTIONS:MCLIENT}
 	@${MKDIR} -m 0700 ${STAGEDIR}${PREFIX}/etc/box/bbackupd
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/monthly
diff --git a/sysutils/bsdadminscripts/Makefile b/sysutils/bsdadminscripts/Makefile
index e645158a34aa..8a382398f1a7 100644
--- a/sysutils/bsdadminscripts/Makefile
+++ b/sysutils/bsdadminscripts/Makefile
@@ -47,8 +47,6 @@ do-install:
 	distviper pkg_libchk pkg_upgrade pkg_validate portconfig rcstart uma
 	${INSTALL_MAN} ${WRKSRC}/src/${f}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 .endfor
-
-post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${MV} ${STAGEDIR}${PREFIX}/etc/*.sample ${STAGEDIR}${ETCDIR}
 	${RM} -rf ${STAGEDIR}${PREFIX}/etc/*.sample
diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile
index ff4537b4f755..c7698b04b476 100644
--- a/sysutils/conky/Makefile
+++ b/sysutils/conky/Makefile
@@ -128,8 +128,6 @@ post-patch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/conky ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/doc/conky.1 ${STAGEDIR}${MANPREFIX}/man/man1
-
-post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${EXAMPLE_CONF_FILE} ${STAGEDIR}${EXAMPLESDIR}/conkyrc.sample
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/sysutils/deltup/Makefile b/sysutils/deltup/Makefile
index 6c64fcc2526f..7a568bc3c1bf 100644
--- a/sysutils/deltup/Makefile
+++ b/sysutils/deltup/Makefile
@@ -55,8 +55,6 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC_BZIP2_102}/bzip2 ${STAGEDIR}${PREFIX}/bin/bzip2_1.0.2
 	${INSTALL_PROGRAM} ${WRKSRC_BZIP2_103}/bzip2 ${STAGEDIR}${PREFIX}/bin/bzip2_1.0.3
 	${INSTALL_MAN} ${WRKSRC}/deltup.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
-
-post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/${i}
diff --git a/sysutils/fcron/Makefile b/sysutils/fcron/Makefile
index 960ade965248..6eba88dd1caa 100644
--- a/sysutils/fcron/Makefile
+++ b/sysutils/fcron/Makefile
@@ -52,6 +52,7 @@ do-install:
 .for n in 1 5 8
 	${INSTALL_MAN} ${DOCSRC}/man/*.${n} ${STAGEDIR}${PREFIX}/man/man${n}
 .endfor
+	${MKDIR} -m 770 ${STAGEDIR}/var/spool/fcron
 
 do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
@@ -63,7 +64,4 @@ do-install-DOCS-on:
 	${INSTALL_DATA} ${DOCSRC}/${d}/* ${STAGEDIR}${DOCSDIR}/${d}
 .endfor
 
-post-install:
-	${MKDIR} -m 770 ${STAGEDIR}/var/spool/fcron
-
 .include <bsd.port.mk>
diff --git a/sysutils/flexbackup/Makefile b/sysutils/flexbackup/Makefile
index f8adbfe8aa89..d37fdd29eeb5 100644
--- a/sysutils/flexbackup/Makefile
+++ b/sysutils/flexbackup/Makefile
@@ -48,7 +48,7 @@ do-install:
 	@${INSTALL_MAN} ${WRKSRC}/flexbackup.conf.5 \
 		${STAGEDIR}${MAN5PREFIX}/man/man5
 
-post-install:
+post-install-DOCS-on:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} "${DOCLIST}" ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/sysutils/mnrpes/Makefile b/sysutils/mnrpes/Makefile
index 978da1586f82..53208d975910 100644
--- a/sysutils/mnrpes/Makefile
+++ b/sysutils/mnrpes/Makefile
@@ -40,8 +40,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/etc/checks.txt.dist ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/etc/mnrpes-receiver.cfg.dist ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/etc/mnrpes-scheduler.cfg.dist ${STAGEDIR}${ETCDIR}
-
-post-install:
 	${MKDIR} ${STAGEDIR}/var/run/${PORTNAME}
 	${MKDIR} ${STAGEDIR}/var/log/${PORTNAME}
 
diff --git a/sysutils/plconfig/Makefile b/sysutils/plconfig/Makefile
index 98d645851d2c..084f580b9168 100644
--- a/sysutils/plconfig/Makefile
+++ b/sysutils/plconfig/Makefile
@@ -17,7 +17,7 @@ OPTIONS_DEFINE=	DOCS
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/plconfig ${STAGEDIR}${PREFIX}/bin
 
-post-install:
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
diff --git a/textproc/saxon-devel/Makefile b/textproc/saxon-devel/Makefile
index be6d60254a28..4d4efb3b5fdb 100644
--- a/textproc/saxon-devel/Makefile
+++ b/textproc/saxon-devel/Makefile
@@ -79,10 +79,8 @@ do-install:
 .endfor
 	@${ECHO_MSG} " [ DONE ]"
 
-.if ${PORT_OPTIONS:MDOCS}
-post-install:
+post-install-DOCS-on:
 	${FIND} -s ${WRKSRC}/samples -not -type d | \
 		${SED} -ne 's|^${WRKSRC}/samples|${EXAMPLESDIR:S,${PREFIX}/,,}|p' >> ${TMPPLIST}
-.endif
 
 .include <bsd.port.mk>
diff --git a/www/apache-forrest/Makefile b/www/apache-forrest/Makefile
index 06c1c2042acb..6859df346e0b 100644
--- a/www/apache-forrest/Makefile
+++ b/www/apache-forrest/Makefile
@@ -48,11 +48,7 @@ do-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/bin/forrest ${STAGEDIR}${DATADIR}/bin/forrest
 	@${INSTALL_SCRIPT} ${WRKSRC}/tools/ant/bin/ant ${STAGEDIR}${DATADIR}/tools/ant/bin/ant
 	@${LN} -sf ../${DATADIR_REL}/bin/forrest ${STAGEDIR}${PREFIX}/bin/forrest
-
-post-install:
 	@cd ${STAGEDIR}${PLUGINSDIR}; \
-	${SETENV} FORREST_HOME=${STAGEDIR}${DATADIR} ${ANT} ${ANT_TARGET}; \
-	${SED} -e "/%%DATADIR%%/s//${DATADIR:S/\//\\\//g}/g" \
-		-e "/%%PORTVERSION%%/s//${PORTVERSION}/g" ${PKGMESSAGE};
+	${SETENV} FORREST_HOME=${STAGEDIR}${DATADIR} ${ANT} ${ANT_TARGET}
 
 .include <bsd.port.mk>
diff --git a/www/bins/Makefile b/www/bins/Makefile
index 548df991a0fb..365de223fc30 100644
--- a/www/bins/Makefile
+++ b/www/bins/Makefile
@@ -53,7 +53,6 @@ post-patch::
 do-install:
 	@${SETENV} LOCALE=${PREFIX}/share/locale DESTDIR=${STAGEDIR} PREFIX=${PREFIX} RC=${PREFIX}/share/bins ${WRKSRC}/install.sh
 
-post-install:
 .for file in ${BINS_SCRIPTS}
 	${INSTALL_SCRIPT} ${WRKSRC}/${file} ${STAGEDIR}${PREFIX}/bin
 .endfor
diff --git a/www/cplanet/Makefile b/www/cplanet/Makefile
index 1e48d853dacd..a9c164b6c538 100644
--- a/www/cplanet/Makefile
+++ b/www/cplanet/Makefile
@@ -21,7 +21,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}/${MANPREFIX}/man/man1
 
-post-install:
+post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/samples/cplanet-atom.cs \
 		${WRKSRC}/samples/cplanet-opml.cs \
diff --git a/www/css-mode.el/Makefile b/www/css-mode.el/Makefile
index 97336c3bf3dd..89c529f2001a 100644
--- a/www/css-mode.el/Makefile
+++ b/www/css-mode.el/Makefile
@@ -37,7 +37,7 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${XELISP_SUBDIR}
 	${INSTALL_DATA} ${_DISTDIR}/${DISTNAME} ${STAGEDIR}${PREFIX}/${XELISP_SUBDIR}
 
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${_DISTDIR}/doco.html ${STAGEDIR}${DOCSDIR}/css-mode-doc.html
 
diff --git a/www/edbrowse/Makefile b/www/edbrowse/Makefile
index 38c2b405ba7e..a904581c8290 100644
--- a/www/edbrowse/Makefile
+++ b/www/edbrowse/Makefile
@@ -30,7 +30,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/edbrowse ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKBASE}/doc/man-edbrowse-debian.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/edbrowse.1
 
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKBASE}/CHANGES ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKBASE}/COPYING ${STAGEDIR}${DOCSDIR}
diff --git a/www/flood/Makefile b/www/flood/Makefile
index 3bf9ab90cd17..380cfece95f8 100644
--- a/www/flood/Makefile
+++ b/www/flood/Makefile
@@ -30,7 +30,6 @@ OPTIONS_DEFINE=	DOCS
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/flood ${STAGEDIR}${PREFIX}/bin/flood
 
-post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for f in ${EX_SCRIPTS}
 	@${INSTALL_SCRIPT} ${WRKSRC}/examples/$f ${STAGEDIR}${EXAMPLESDIR}
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index 540d0262a42d..6f0806951dcd 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -176,7 +176,6 @@ do-install:
 	${MV} ${WRKSRC}/config/initializers/rack_attack.rb.example ${WRKSRC}/config/initializers/rack_attack.rb.sample
 	${CP} ${WRKSRC}/config/database.yml.postgresql ${WRKSRC}/config/database.yml.sample
 
-post-install:
 	${MKDIR} ${STAGEDIR}/home/git/repositories
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/public/assets
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/tmp/cache
diff --git a/www/google-appengine/Makefile b/www/google-appengine/Makefile
index 29ef37f76190..c3996cdcbe6f 100644
--- a/www/google-appengine/Makefile
+++ b/www/google-appengine/Makefile
@@ -63,7 +63,6 @@ do-install:
 	done)
 	${INSTALL_DATA} ${WRKSRC}/VERSION ${STAGEDIR}${DATADIR}
 
-post-install:
 	(cd ${STAGEDIR}${DATADIR} && \
 	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -d ${DATADIR} -f ${GAEDATADIR:Nphp} -q)
 
diff --git a/www/jdresolve/Makefile b/www/jdresolve/Makefile
index 9b861d701c7e..7c52bd94a9f2 100644
--- a/www/jdresolve/Makefile
+++ b/www/jdresolve/Makefile
@@ -29,7 +29,7 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/${file}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 .endfor
 
-post-install:
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/jdresolve
 .for i in ${DOC1}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/share/doc/jdresolve
diff --git a/www/jetty9/Makefile b/www/jetty9/Makefile
index 0d0ba31e45f3..389651067fa0 100644
--- a/www/jetty9/Makefile
+++ b/www/jetty9/Makefile
@@ -64,7 +64,6 @@ do-install:
 		${MKDIR} ${STAGEDIR}${WWWDIR}/demo-base/logs
 		${INSTALL_SCRIPT} ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/sbin
 
-post-install:
 		${MKDIR} ${STAGEDIR}${ETCDIR}
 		${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.sample ${STAGEDIR}${ETCDIR}/
 
diff --git a/www/jmeter/Makefile b/www/jmeter/Makefile
index 45554cf1dfb7..6349f88f3703 100644
--- a/www/jmeter/Makefile
+++ b/www/jmeter/Makefile
@@ -66,6 +66,9 @@ do-configure:
 .endfor
 	${PRINTF} '\n' >> ${WRKSRC}/bin/system.properties
 
+# For some reason, it is not enough for these three to simply be listed in
+# jmeter.properties file. JMeter refuses to start, unless they are found in lib/
+BOOTSTRAP_JARS=	avalon-framework xstream commons-io
 do-install:
 	cd ${WRKSRC} \
 	  && ${FIND} ${DATAFILES} -type d -exec ${MKDIR} ${STAGEDIR}/${DATADIR}/{} \;
@@ -77,10 +80,6 @@ do-install:
 	  && ${FIND} ${PORTDOCS} -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/{} \;
 	${INSTALL_SCRIPT} ${WRKDIR}/jmeter.sh ${STAGEDIR}${PREFIX}/bin/jmeter
 
-# For some reason, it is not enough for these three to simply be listed in
-# jmeter.properties file. JMeter refuses to start, unless they are found in lib/
-BOOTSTRAP_JARS=	avalon-framework xstream commons-io
-post-install:
 	@${LN} -s ${BOOTSTRAP_JARS:C|.*|${JAVAJARDIR}/&.jar|} ${STAGEDIR}${DATADIR}/lib/
 
 .include <bsd.port.post.mk>
diff --git a/www/mhonarc/Makefile b/www/mhonarc/Makefile
index a36d7ddf291b..bc57ef95bfbc 100644
--- a/www/mhonarc/Makefile
+++ b/www/mhonarc/Makefile
@@ -36,7 +36,6 @@ INSTALL_ARGS+=	-nodoc
 do-install:
 	cd ${WRKSRC} && ${PERL5} install.me ${INSTALL_ARGS}
 
-post-install:
 .for file in mha-dbedit mha-dbrecover mha-decode mhonarc
 	${REINPLACE_CMD} -E -e 's,${STAGEDIR},,g' ${STAGEDIR}/${PREFIX}/bin/${file}
 	${RM} ${STAGEDIR}/${PREFIX}/bin/${file}.bak
diff --git a/www/monast/Makefile b/www/monast/Makefile
index 58bd1a105b30..c73364c8e5c1 100644
--- a/www/monast/Makefile
+++ b/www/monast/Makefile
@@ -34,7 +34,6 @@ do-install:
 .endfor
 	(cd ${WRKSRC}/lib/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${WWWDIR}/lib)
 
-post-install:
 	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -d ${PYTHONPREFIX_SITELIBDIR} -f ${STAGEDIR}${PREFIX}/monast
 	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py -d ${PYTHONPREFIX_SITELIBDIR} -f ${STAGEDIR}${PREFIX}/monast
 
diff --git a/www/nanoblogger-extra/Makefile b/www/nanoblogger-extra/Makefile
index eb42d47256a9..f3cae13dcc50 100644
--- a/www/nanoblogger-extra/Makefile
+++ b/www/nanoblogger-extra/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	nanoblogger-extra
 PORTVERSION=	3.4.2
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://nanoblogger.sourceforge.net/downloads/
 
@@ -18,7 +19,7 @@ DATADIR=	${PREFIX}/share/nanoblogger
 
 NO_BUILD=	yes
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 do-install:
 .for data in default lang plugins
@@ -26,7 +27,7 @@ do-install:
 		${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}/${data} "! -empty" )
 .endfor
 
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in COPYING ChangeLog README
 	@${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
@@ -34,6 +35,7 @@ post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
 	@${INSTALL_DATA} ${WRKSRC}/docs/*.html ${STAGEDIR}${DOCSDIR}/html
 
+post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/docs/examples/nanoblogger.bash_completion ${STAGEDIR}${EXAMPLESDIR}
 
diff --git a/www/nanoblogger/Makefile b/www/nanoblogger/Makefile
index 16e1a60a4931..63f6bec59e04 100644
--- a/www/nanoblogger/Makefile
+++ b/www/nanoblogger/Makefile
@@ -39,7 +39,7 @@ do-install:
 .endfor
 	@${CP} ${WRKSRC}/welcome-to-nb.txt ${STAGEDIR}${DATADIR}
 
-post-install:
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in COPYING ChangeLog README TODO copyright
 	@${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
diff --git a/www/nextcloud/Makefile b/www/nextcloud/Makefile
index ebe87352ca59..e437cc769c8e 100644
--- a/www/nextcloud/Makefile
+++ b/www/nextcloud/Makefile
@@ -55,8 +55,6 @@ WITH_OPENSSL_PORT=	yes
 do-install:
 	@${MKDIR} -m 0755 ${STAGEDIR}${WWWDIR}
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
-
-post-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}/data
 
 .include <bsd.port.mk>
diff --git a/www/owncloud/Makefile b/www/owncloud/Makefile
index aa58160a8831..091ea94fa2bc 100644
--- a/www/owncloud/Makefile
+++ b/www/owncloud/Makefile
@@ -56,8 +56,6 @@ WITH_OPENSSL_PORT=	yes
 do-install:
 	@${MKDIR} -m 0755 ${STAGEDIR}${WWWDIR}
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
-
-post-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}/data
 
 .include <bsd.port.mk>
diff --git a/www/redmine/Makefile b/www/redmine/Makefile
index 181e9f0e0c35..1ab454b0d79c 100644
--- a/www/redmine/Makefile
+++ b/www/redmine/Makefile
@@ -80,6 +80,7 @@ do-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR}/tmp/pids
 	${MKDIR} ${STAGEDIR}${WWWDIR}/bundler.d
 	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
+	${TOUCH} ${STAGEDIR}${WWWDIR}/Gemfile.lock
 
 do-install-MYSQL-on:
 	${CP} ${FILESDIR}/mysql.rb ${STAGEDIR}${WWWDIR}/bundler.d
@@ -102,7 +103,4 @@ do-install-RMAGIC-on:
 do-install-THIN-on:
 	${CP} ${FILESDIR}/thin.rb ${STAGEDIR}${WWWDIR}/bundler.d
 
-post-install:
-	${TOUCH} ${STAGEDIR}${WWWDIR}/Gemfile.lock
-
 .include <bsd.port.mk>
diff --git a/www/sahi/Makefile b/www/sahi/Makefile
index 7d45117fd870..d478f6236b4e 100644
--- a/www/sahi/Makefile
+++ b/www/sahi/Makefile
@@ -69,7 +69,6 @@ do-install:
 	@${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
 
-post-install:
 	@${CP} ${STAGEDIR}${DATADIR}/config/browser_types/linux.xml ${STAGEDIR}${DATADIR}/userdata/config/browser_types.xml
 .for	d in bin userdata/bin
 	@${CHMOD} ${BINMODE} ${STAGEDIR}${DATADIR}/${d}/*
diff --git a/www/serf/Makefile b/www/serf/Makefile
index cdada4419e56..398d3c866cbe 100644
--- a/www/serf/Makefile
+++ b/www/serf/Makefile
@@ -58,7 +58,7 @@ post-patch:
 		-e '/^Libs.private/s|$$| -L${OPENSSLLIB} -lssl -lcrypto|' \
 		${WRKSRC}/build/serf.pc.in
 
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/design-guide.txt ${STAGEDIR}${DOCSDIR}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libserf-1.so
diff --git a/www/shellinabox/Makefile b/www/shellinabox/Makefile
index 14e861d8b30d..cb7a82377b8d 100644
--- a/www/shellinabox/Makefile
+++ b/www/shellinabox/Makefile
@@ -45,8 +45,6 @@ post-patch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/shellinaboxd ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/shellinaboxd.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
-
-post-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 
 .include <bsd.port.mk>
diff --git a/www/tclwebtest/Makefile b/www/tclwebtest/Makefile
index 57fbb79f38ae..7694605f36dc 100644
--- a/www/tclwebtest/Makefile
+++ b/www/tclwebtest/Makefile
@@ -35,7 +35,7 @@ do-install:
 	${CP} -R ${WRKSRC}/openacs4tests ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/tclwebtest ${STAGEDIR}${PREFIX}/bin/tclwebtest
 
-post-install:
+post-install-DOCS-on:
 	@${ECHO} "Installing docs"
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/doc
 	${TAR} -C ${WRKSRC} -c -f - ChangeLog README TODO index.html generate_docs.test | ${TAR} -C ${STAGEDIR}${DOCSDIR} -x -f -
diff --git a/www/thundercache/Makefile b/www/thundercache/Makefile
index d946319d6c02..b400cc19ca9d 100644
--- a/www/thundercache/Makefile
+++ b/www/thundercache/Makefile
@@ -93,7 +93,6 @@ do-install:
 	@${INSTALL_SCRIPT} ${WRKDIR}/log.sh ${STAGEDIR}${PREFIX}/thunder/sbin/
 	@${MKDIR} -m 755 ${STAGEDIR}/var/run/thunder
 
-post-install:
 	@(${CHMOD} +x ${WRKDIR}/test-deps.sh ; \
 	if ! ${WRKDIR}/test-deps.sh > /dev/null 2>&1 ; then \
 		${ECHO_MSG} "**** FATAL **** " ; \
diff --git a/www/tt-rss/Makefile b/www/tt-rss/Makefile
index f8681922b02a..4961d22297d7 100644
--- a/www/tt-rss/Makefile
+++ b/www/tt-rss/Makefile
@@ -88,7 +88,6 @@ do-install:
 	${TOUCH} ${STAGEDIR}${WWWDIR}/icons/.empty
 	${INSTALL_DATA} ${WRKDIR}/httpd-tt-rss.conf ${STAGEDIR}${DATADIR}
 
-post-install:
 	${MV} ${STAGEDIR}${WWWDIR}/config.php-dist ${STAGEDIR}${WWWDIR}/config.php.sample
 
 .include <bsd.port.mk>
diff --git a/www/uchiwa/Makefile b/www/uchiwa/Makefile
index 0c7f8352209f..1acac669ac76 100644
--- a/www/uchiwa/Makefile
+++ b/www/uchiwa/Makefile
@@ -97,7 +97,6 @@ do-install:
 	${STAGEDIR}${UCHIWA_SHAREDIR} \
 	${STAGEDIR}${UCHIWA_RCDIR}
 
-post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/uchiwa ${STAGEDIR}${PREFIX}/bin/uchiwa
 	${INSTALL_DATA} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}/config.json.example ${STAGEDIR}${PREFIX}/etc/uchiwa/config.json.sample
 	(cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}/public && ${COPYTREE_SHARE} . ${STAGEDIR}${UCHIWA_SHAREDIR})
diff --git a/www/web2ldap/Makefile b/www/web2ldap/Makefile
index 40a316803a7e..057072c6aceb 100644
--- a/www/web2ldap/Makefile
+++ b/www/web2ldap/Makefile
@@ -48,7 +48,7 @@ do-install:
 		${FIND} * -type d | ${GREP} -vE "^htdocs" | ${CPIO} -p ${STAGEDIR}${DATADIR}; \
 		${FIND} * -type f | ${GREP} -vE "^htdocs" | ${CPIO} -pd ${STAGEDIR}${DATADIR})
 
-post-install:
+post-install-DOCS-on:
 	@${ECHO_MSG} "==> Installing document files..."
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@(cd ${WRKSRC}; \
diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile
index 509bf3dd6f06..1116df81389f 100644
--- a/www/webalizer/Makefile
+++ b/www/webalizer/Makefile
@@ -176,8 +176,6 @@ do-install:
 		${STAGEDIR}${PREFIX}/bin/${PKGNAMEPREFIX}webazolver
 	${INSTALL_DATA} ${WRKSRC}/sample.conf \
 		${STAGEDIR}${PREFIX}/etc/${PKGNAMEPREFIX}webalizer.conf-dist ;
-
-post-install:
 .for i in ${LMAN1}
 	${INSTALL_MAN} ${WRKSRC}/${i:S/^${PKGNAMEPREFIX}//} ${STAGEDIR}${PREFIX}/man/man1/${i}
 .endfor
diff --git a/www/webinject/Makefile b/www/webinject/Makefile
index defe671c9abc..56bc38f4c46e 100644
--- a/www/webinject/Makefile
+++ b/www/webinject/Makefile
@@ -30,14 +30,12 @@ PLIST_FILES=	bin/webinject.pl \
 		${DATADIR:S,^${PREFIX}/,,}/config.xml \
 		${DATADIR:S,^${PREFIX}/,,}/testcases.xml
 
+PORTDOCS=	LICENSE README
+
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	@cd ${WRKSRC} && ${INSTALL_DATA} *.xml ${STAGEDIR}${DATADIR}
 	@cd ${WRKSRC} && ${INSTALL_SCRIPT} webinject.pl ${STAGEDIR}${PREFIX}/bin
-
-PORTDOCS=	LICENSE README
-
-post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
diff --git a/x11-fm/emelfm2/Makefile b/x11-fm/emelfm2/Makefile
index 51d6783fd2ff..a55af16cf11d 100644
--- a/x11-fm/emelfm2/Makefile
+++ b/x11-fm/emelfm2/Makefile
@@ -62,7 +62,7 @@ do-install:
 		MAN_DIR="${STAGEDIR}${MAN1PREFIX}/man/man1" \
 		${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
 
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in ${DOCFILES}
 	${INSTALL_DATA} ${WRKSRC}/docs/${file} ${STAGEDIR}${DOCSDIR}
author	Mathieu Arnold <mat@FreeBSD.org>	2016-07-19 11:04:13 +0000
committer	Mathieu Arnold <mat@FreeBSD.org>	2016-07-19 11:04:13 +0000
commit	f899c758a653ca8ff2f8a63aafcb2519a0b524ed (patch)
tree	be6eebf3e77ddf9fcf383081091d8b8b336dd71c
parent	Update devel/erlang-gpb to version 3.23.1. (diff)