svn commit: r418767 - in head: archivers/lbzip2 archivers/rar archivers/star audio/baresip audio/id3ren audio/mma audio/teamspeak3-server biology/biojava biology/recombine biology/seqan1 chinese/ph...

Tue Jul 19 11:04:23 UTC 2016

Author: mat
Date: Tue Jul 19 11:04:13 2016
New Revision: 418767
URL: https://svnweb.freebsd.org/changeset/ports/418767

Log:
  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

Modified:
  head/archivers/lbzip2/Makefile   (contents, props changed)
  head/archivers/rar/Makefile   (contents, props changed)
  head/archivers/star/Makefile   (contents, props changed)
  head/audio/baresip/Makefile   (contents, props changed)
  head/audio/id3ren/Makefile   (contents, props changed)
  head/audio/mma/Makefile   (contents, props changed)
  head/audio/teamspeak3-server/Makefile   (contents, props changed)
  head/biology/biojava/Makefile   (contents, props changed)
  head/biology/recombine/Makefile   (contents, props changed)
  head/biology/seqan1/Makefile   (contents, props changed)
  head/chinese/phpbb-tw/Makefile   (contents, props changed)
  head/chinese/phpbb3-tw/Makefile   (contents, props changed)
  head/comms/wsjt/Makefile   (contents, props changed)
  head/databases/galera/Makefile   (contents, props changed)
  head/databases/hbase/Makefile   (contents, props changed)
  head/databases/hsqldb/Makefile   (contents, props changed)
  head/databases/influxdb/Makefile   (contents, props changed)
  head/databases/mongodb32-tools/Makefile   (contents, props changed)
  head/databases/sqlite-ext-miscfuncs/Makefile   (contents, props changed)
  head/deskutils/myitcrm/Makefile   (contents, props changed)
  head/deskutils/plan/Makefile   (contents, props changed)
  head/devel/api-sanity-autotest/Makefile   (contents, props changed)
  head/devel/apr1/Makefile   (contents, props changed)
  head/devel/lockfree-malloc/Makefile   (contents, props changed)
  head/devel/ruby-gems/Makefile   (contents, props changed)
  head/devel/ruby-wirble/Makefile   (contents, props changed)
  head/devel/staf/Makefile   (contents, props changed)
  head/dns/dnsflood/Makefile   (contents, props changed)
  head/dns/mDNSResponder_nss/Makefile   (contents, props changed)
  head/dns/udns/Makefile   (contents, props changed)
  head/emulators/dynamips-community/Makefile   (contents, props changed)
  head/emulators/o2em/Makefile   (contents, props changed)
  head/emulators/yape/Makefile   (contents, props changed)
  head/games/jfsw/Makefile   (contents, props changed)
  head/games/linux-darwinia-demo/Makefile   (contents, props changed)
  head/games/linux-defcon/Makefile   (contents, props changed)
  head/games/sokoban/Makefile   (contents, props changed)
  head/games/tuxfighter/Makefile   (contents, props changed)
  head/games/uqm/Makefile   (contents, props changed)
  head/graphics/SciPlot/Makefile   (contents, props changed)
  head/graphics/argyllcms/Makefile   (contents, props changed)
  head/graphics/gimpfx-foundry/Makefile   (contents, props changed)
  head/graphics/libgltext/Makefile   (contents, props changed)
  head/graphics/mapserver/Makefile   (contents, props changed)
  head/graphics/openjump/Makefile   (contents, props changed)
  head/graphics/optipng/Makefile   (contents, props changed)
  head/graphics/ruby-image_size/Makefile   (contents, props changed)
  head/irc/libircclient/Makefile   (contents, props changed)
  head/irc/psybnc/Makefile   (contents, props changed)
  head/irc/unreal/Makefile   (contents, props changed)
  head/japanese/font-mikachan/Makefile   (contents, props changed)
  head/japanese/font-mona-ttf/Makefile   (contents, props changed)
  head/japanese/ruby-romkan/Makefile   (contents, props changed)
  head/java/java3d/Makefile   (contents, props changed)
  head/java/netbeans/Makefile   (contents, props changed)
  head/java/netrexx/Makefile   (contents, props changed)
  head/java/openjfx8-devel/Makefile   (contents, props changed)
  head/lang/f2c/Makefile   (contents, props changed)
  head/lang/linux-j/Makefile   (contents, props changed)
  head/lang/nim/Makefile   (contents, props changed)
  head/lang/nml/Makefile   (contents, props changed)
  head/lang/pike78/Makefile   (contents, props changed)
  head/mail/amavis-logwatch/Makefile   (contents, props changed)
  head/mail/archivesmtp/Makefile   (contents, props changed)
  head/mail/ez-pine-gpg/Makefile   (contents, props changed)
  head/mail/gubby/Makefile   (contents, props changed)
  head/mail/james/Makefile   (contents, props changed)
  head/mail/openemm2013/Makefile   (contents, props changed)
  head/mail/openemm2015/Makefile   (contents, props changed)
  head/mail/postfix-logwatch/Makefile   (contents, props changed)
  head/mail/postfix-postfwd/Makefile   (contents, props changed)
  head/mail/qpopper/Makefile   (contents, props changed)
  head/math/bargraph/Makefile   (contents, props changed)
  head/math/convertall/Makefile   (contents, props changed)
  head/math/ntl/Makefile   (contents, props changed)
  head/misc/digitemp/Makefile   (contents, props changed)
  head/misc/estic/Makefile   (contents, props changed)
  head/misc/gnustep-examples/Makefile   (contents, props changed)
  head/misc/libeatmydata/Makefile   (contents, props changed)
  head/misc/py-qt4-demo/Makefile   (contents, props changed)
  head/misc/py-qt5-demo/Makefile   (contents, props changed)
  head/misc/sent/Makefile   (contents, props changed)
  head/misc/zoneinfo/Makefile   (contents, props changed)
  head/multimedia/mencoder/Makefile   (contents, props changed)
  head/net-mgmt/devmon/Makefile   (contents, props changed)
  head/net-mgmt/hastmon/Makefile   (contents, props changed)
  head/net-mgmt/ipplan/Makefile   (contents, props changed)
  head/net-mgmt/nefu/Makefile   (contents, props changed)
  head/net-mgmt/nfdump/Makefile   (contents, props changed)
  head/net-mgmt/nsca/Makefile   (contents, props changed)
  head/net-mgmt/nsca27/Makefile   (contents, props changed)
  head/net-mgmt/remarp/Makefile   (contents, props changed)
  head/net-mgmt/statsd/Makefile   (contents, props changed)
  head/net-p2p/libbt/Makefile   (contents, props changed)
  head/net/delegate/Makefile   (contents, props changed)
  head/net/dgd-kernel/Makefile   (contents, props changed)
  head/net/dgd-lpmud/Makefile   (contents, props changed)
  head/net/drawterm/Makefile   (contents, props changed)
  head/net/gogoc/Makefile   (contents, props changed)
  head/net/isc-dhcp43-server/Makefile   (contents, props changed)
  head/net/java-beepcore/Makefile   (contents, props changed)
  head/net/pipsecd/Makefile   (contents, props changed)
  head/net/pwhois/Makefile   (contents, props changed)
  head/net/remotebox/Makefile   (contents, props changed)
  head/net/tn5250j/Makefile   (contents, props changed)
  head/net/unison-devel/Makefile   (contents, props changed)
  head/net/unison/Makefile   (contents, props changed)
  head/net/unison232/Makefile   (contents, props changed)
  head/net/unison240/Makefile   (contents, props changed)
  head/net/vnstat/Makefile   (contents, props changed)
  head/ports-mgmt/jailaudit/Makefile   (contents, props changed)
  head/ports-mgmt/pkgcompare/Makefile   (contents, props changed)
  head/ports-mgmt/portell/Makefile   (contents, props changed)
  head/print/cups-pdf/Makefile   (contents, props changed)
  head/print/gsfonts/Makefile   (contents, props changed)
  head/print/ps2eps/Makefile   (contents, props changed)
  head/print/py-trml2pdf/Makefile   (contents, props changed)
  head/science/libsvm/Makefile   (contents, props changed)
  head/security/aimsniff/Makefile   (contents, props changed)
  head/security/ca_root_nss/Makefile   (contents, props changed)
  head/security/cryptlib/Makefile   (contents, props changed)
  head/security/f-prot/Makefile   (contents, props changed)
  head/security/fakeident/Makefile   (contents, props changed)
  head/security/fwanalog/Makefile   (contents, props changed)
  head/security/gorilla/Makefile   (contents, props changed)
  head/security/keybase/Makefile   (contents, props changed)
  head/security/letsencrypt.sh/Makefile   (contents, props changed)
  head/security/libbf/Makefile   (contents, props changed)
  head/security/openvpn-auth-radius/Makefile   (contents, props changed)
  head/security/retranslator/Makefile   (contents, props changed)
  head/security/rkhunter/Makefile   (contents, props changed)
  head/security/softether/Makefile   (contents, props changed)
  head/security/vnccrack/Makefile   (contents, props changed)
  head/security/webfwlog/Makefile   (contents, props changed)
  head/security/yafic/Makefile   (contents, props changed)
  head/sysutils/anacron/Makefile   (contents, props changed)
  head/sysutils/boxbackup-devel/Makefile   (contents, props changed)
  head/sysutils/bsdadminscripts/Makefile   (contents, props changed)
  head/sysutils/conky/Makefile   (contents, props changed)
  head/sysutils/deltup/Makefile   (contents, props changed)
  head/sysutils/fcron/Makefile   (contents, props changed)
  head/sysutils/flexbackup/Makefile   (contents, props changed)
  head/sysutils/mnrpes/Makefile   (contents, props changed)
  head/sysutils/plconfig/Makefile   (contents, props changed)
  head/textproc/saxon-devel/Makefile   (contents, props changed)
  head/www/apache-forrest/Makefile   (contents, props changed)
  head/www/bins/Makefile   (contents, props changed)
  head/www/cplanet/Makefile   (contents, props changed)
  head/www/css-mode.el/Makefile   (contents, props changed)
  head/www/edbrowse/Makefile   (contents, props changed)
  head/www/flood/Makefile   (contents, props changed)
  head/www/gitlab/Makefile   (contents, props changed)
  head/www/google-appengine/Makefile   (contents, props changed)
  head/www/jdresolve/Makefile   (contents, props changed)
  head/www/jetty9/Makefile   (contents, props changed)
  head/www/jmeter/Makefile   (contents, props changed)
  head/www/mhonarc/Makefile   (contents, props changed)
  head/www/monast/Makefile   (contents, props changed)
  head/www/nanoblogger-extra/Makefile   (contents, props changed)
  head/www/nanoblogger/Makefile   (contents, props changed)
  head/www/nextcloud/Makefile   (contents, props changed)
  head/www/owncloud/Makefile   (contents, props changed)
  head/www/redmine/Makefile   (contents, props changed)
  head/www/sahi/Makefile   (contents, props changed)
  head/www/serf/Makefile   (contents, props changed)
  head/www/shellinabox/Makefile   (contents, props changed)
  head/www/tclwebtest/Makefile   (contents, props changed)
  head/www/thundercache/Makefile   (contents, props changed)
  head/www/tt-rss/Makefile   (contents, props changed)
  head/www/uchiwa/Makefile   (contents, props changed)
  head/www/web2ldap/Makefile   (contents, props changed)
  head/www/webalizer/Makefile   (contents, props changed)
  head/www/webinject/Makefile   (contents, props changed)
  head/x11-fm/emelfm2/Makefile   (contents, props changed)

Modified: head/archivers/lbzip2/Makefile
==============================================================================

--- head/archivers/lbzip2/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/archivers/lbzip2/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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}

Modified: head/archivers/rar/Makefile
==============================================================================
--- head/archivers/rar/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/archivers/rar/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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}

Modified: head/archivers/star/Makefile
==============================================================================
--- head/archivers/star/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/archivers/star/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -31,8 +31,6 @@ PORTDOCS=	README README.crash README.mti
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${FIND} ${WRKSRC} -type f -print \
 		| ${XARGS} ${REINPLACE_CMD} -e "s@/etc/default@${PREFIX}/etc at 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>

Modified: head/audio/baresip/Makefile
==============================================================================
--- head/audio/baresip/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/audio/baresip/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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 \

Modified: head/audio/id3ren/Makefile
==============================================================================
--- head/audio/id3ren/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/audio/id3ren/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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}
 

Modified: head/audio/mma/Makefile
==============================================================================
--- head/audio/mma/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/audio/mma/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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)

Modified: head/audio/teamspeak3-server/Makefile
==============================================================================
--- head/audio/teamspeak3-server/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/audio/teamspeak3-server/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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>

Modified: head/biology/biojava/Makefile
==============================================================================
--- head/biology/biojava/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/biology/biojava/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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}"

Modified: head/biology/recombine/Makefile
==============================================================================
--- head/biology/recombine/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/biology/recombine/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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}
 

Modified: head/biology/seqan1/Makefile
==============================================================================
--- head/biology/seqan1/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/biology/seqan1/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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}
 

Modified: head/chinese/phpbb-tw/Makefile
==============================================================================
--- head/chinese/phpbb-tw/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/chinese/phpbb-tw/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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}

Modified: head/chinese/phpbb3-tw/Makefile
==============================================================================
--- head/chinese/phpbb3-tw/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/chinese/phpbb3-tw/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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}
 

Modified: head/comms/wsjt/Makefile
==============================================================================
--- head/comms/wsjt/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/comms/wsjt/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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}

Modified: head/databases/galera/Makefile
==============================================================================
--- head/databases/galera/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/databases/galera/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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>

Modified: head/databases/hbase/Makefile
==============================================================================
--- head/databases/hbase/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/databases/hbase/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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>

Modified: head/databases/hsqldb/Makefile
==============================================================================
--- head/databases/hsqldb/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/databases/hsqldb/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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})

Modified: head/databases/influxdb/Makefile
==============================================================================
--- head/databases/influxdb/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/databases/influxdb/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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

Modified: head/databases/mongodb32-tools/Makefile
==============================================================================
--- head/databases/mongodb32-tools/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/databases/mongodb32-tools/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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}

Modified: head/databases/sqlite-ext-miscfuncs/Makefile
==============================================================================
--- head/databases/sqlite-ext-miscfuncs/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/databases/sqlite-ext-miscfuncs/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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}
 

Modified: head/deskutils/myitcrm/Makefile
==============================================================================
--- head/deskutils/myitcrm/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/deskutils/myitcrm/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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

Modified: head/deskutils/plan/Makefile
==============================================================================
--- head/deskutils/plan/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/deskutils/plan/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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>

Modified: head/devel/api-sanity-autotest/Makefile
==============================================================================
--- head/devel/api-sanity-autotest/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/devel/api-sanity-autotest/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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})
 

Modified: head/devel/apr1/Makefile
==============================================================================
--- head/devel/apr1/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/devel/apr1/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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

Modified: head/devel/lockfree-malloc/Makefile
==============================================================================
--- head/devel/lockfree-malloc/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/devel/lockfree-malloc/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -26,21 +26,15 @@ PLIST_FILES=	lib/liblite-malloc-shared.s
 
 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>

Modified: head/devel/ruby-gems/Makefile
==============================================================================
--- head/devel/ruby-gems/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/devel/ruby-gems/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -57,7 +57,6 @@ DOCS_VARS=		RUBY_SETUP_OPTIONS="--destdi
 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
 
 #

Modified: head/devel/ruby-wirble/Makefile
==============================================================================
--- head/devel/ruby-wirble/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/devel/ruby-wirble/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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}/

Modified: head/devel/staf/Makefile
==============================================================================
--- head/devel/staf/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/devel/staf/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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>

Modified: head/dns/dnsflood/Makefile
==============================================================================
--- head/dns/dnsflood/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/dns/dnsflood/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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}

Modified: head/dns/mDNSResponder_nss/Makefile
==============================================================================
--- head/dns/mDNSResponder_nss/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/dns/mDNSResponder_nss/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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
 

Modified: head/dns/udns/Makefile
==============================================================================
--- head/dns/udns/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/dns/udns/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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>

Modified: head/emulators/dynamips-community/Makefile
==============================================================================
--- head/emulators/dynamips-community/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/emulators/dynamips-community/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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}

Modified: head/emulators/o2em/Makefile
==============================================================================
--- head/emulators/o2em/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/emulators/o2em/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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>

Modified: head/emulators/yape/Makefile
==============================================================================
--- head/emulators/yape/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/emulators/yape/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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}
 

Modified: head/games/jfsw/Makefile
==============================================================================
--- head/games/jfsw/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/games/jfsw/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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>

Modified: head/games/linux-darwinia-demo/Makefile
==============================================================================
--- head/games/linux-darwinia-demo/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/games/linux-darwinia-demo/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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>

Modified: head/games/linux-defcon/Makefile
==============================================================================
--- head/games/linux-defcon/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/games/linux-defcon/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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>

Modified: head/games/sokoban/Makefile
==============================================================================
--- head/games/sokoban/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/games/sokoban/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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
 

Modified: head/games/tuxfighter/Makefile
==============================================================================
--- head/games/tuxfighter/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/games/tuxfighter/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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 \

Modified: head/games/uqm/Makefile
==============================================================================
--- head/games/uqm/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/games/uqm/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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}

Modified: head/graphics/SciPlot/Makefile
==============================================================================
--- head/graphics/SciPlot/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/graphics/SciPlot/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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}

Modified: head/graphics/argyllcms/Makefile
==============================================================================
--- head/graphics/argyllcms/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/graphics/argyllcms/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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>

Modified: head/graphics/gimpfx-foundry/Makefile
==============================================================================
--- head/graphics/gimpfx-foundry/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/graphics/gimpfx-foundry/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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}
 

Modified: head/graphics/libgltext/Makefile
==============================================================================
--- head/graphics/libgltext/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/graphics/libgltext/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -27,7 +27,6 @@ EXAMPLES_DESC=	Compile examples, need li
 .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>

Modified: head/graphics/mapserver/Makefile
==============================================================================
--- head/graphics/mapserver/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/graphics/mapserver/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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
 

Modified: head/graphics/openjump/Makefile
==============================================================================
--- head/graphics/openjump/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/graphics/openjump/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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}

Modified: head/graphics/optipng/Makefile
==============================================================================
--- head/graphics/optipng/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/graphics/optipng/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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}/
 

Modified: head/graphics/ruby-image_size/Makefile
==============================================================================
--- head/graphics/ruby-image_size/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/graphics/ruby-image_size/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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}/

Modified: head/irc/libircclient/Makefile
==============================================================================
--- head/irc/libircclient/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/irc/libircclient/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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>

Modified: head/irc/psybnc/Makefile
==============================================================================
--- head/irc/psybnc/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/irc/psybnc/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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/; \

Modified: head/irc/unreal/Makefile
==============================================================================
--- head/irc/unreal/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/irc/unreal/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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

Modified: head/japanese/font-mikachan/Makefile
==============================================================================
--- head/japanese/font-mikachan/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/japanese/font-mikachan/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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 .

Modified: head/japanese/font-mona-ttf/Makefile
==============================================================================
--- head/japanese/font-mona-ttf/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/japanese/font-mona-ttf/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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 .

Modified: head/japanese/ruby-romkan/Makefile
==============================================================================
--- head/japanese/ruby-romkan/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/japanese/ruby-romkan/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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/

Modified: head/java/java3d/Makefile
==============================================================================
--- head/java/java3d/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/java/java3d/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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>

Modified: head/java/netbeans/Makefile
==============================================================================
--- head/java/netbeans/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/java/netbeans/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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>

Modified: head/java/netrexx/Makefile
==============================================================================
--- head/java/netrexx/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/java/netrexx/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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} "-------------------------------------------------------"

Modified: head/java/openjfx8-devel/Makefile
==============================================================================
--- head/java/openjfx8-devel/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/java/openjfx8-devel/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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>

Modified: head/lang/f2c/Makefile
==============================================================================
--- head/lang/f2c/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/lang/f2c/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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}
 

Modified: head/lang/linux-j/Makefile
==============================================================================
--- head/lang/linux-j/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/lang/linux-j/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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>

Modified: head/lang/nim/Makefile
==============================================================================
--- head/lang/nim/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/lang/nim/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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>

Modified: head/lang/nml/Makefile
==============================================================================
--- head/lang/nml/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/lang/nml/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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>

Modified: head/lang/pike78/Makefile
==============================================================================
--- head/lang/pike78/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/lang/pike78/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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

Modified: head/mail/amavis-logwatch/Makefile
==============================================================================
--- head/mail/amavis-logwatch/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/mail/amavis-logwatch/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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}
 

Modified: head/mail/archivesmtp/Makefile
==============================================================================
--- head/mail/archivesmtp/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/mail/archivesmtp/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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

Modified: head/mail/ez-pine-gpg/Makefile
==============================================================================
--- head/mail/ez-pine-gpg/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/mail/ez-pine-gpg/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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}
 

Modified: head/mail/gubby/Makefile
==============================================================================
--- head/mail/gubby/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/mail/gubby/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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
 

Modified: head/mail/james/Makefile
==============================================================================
--- head/mail/james/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/mail/james/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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>

Modified: head/mail/openemm2013/Makefile
==============================================================================
--- head/mail/openemm2013/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/mail/openemm2013/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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

Modified: head/mail/openemm2015/Makefile
==============================================================================
--- head/mail/openemm2015/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/mail/openemm2015/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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

Modified: head/mail/postfix-logwatch/Makefile
==============================================================================
--- head/mail/postfix-logwatch/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/mail/postfix-logwatch/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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})
 

Modified: head/mail/postfix-postfwd/Makefile
==============================================================================
--- head/mail/postfix-postfwd/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/mail/postfix-postfwd/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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}

Modified: head/mail/qpopper/Makefile
==============================================================================
--- head/mail/qpopper/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/mail/qpopper/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -167,7 +167,6 @@ do-install:
 
 # based on original from op port, written by Cyrille Lefevre
 # <clefevre at 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 \

Modified: head/math/bargraph/Makefile
==============================================================================
--- head/math/bargraph/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/math/bargraph/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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}
 

Modified: head/math/convertall/Makefile
==============================================================================
--- head/math/convertall/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/math/convertall/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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>

Modified: head/math/ntl/Makefile
==============================================================================
--- head/math/ntl/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/math/ntl/Makefile	Tue Jul 19 11:04:13 2016	(r418767)
@@ -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}
 

Modified: head/misc/digitemp/Makefile
==============================================================================
--- head/misc/digitemp/Makefile	Tue Jul 19 09:40:53 2016	(r418766)
+++ head/misc/digitemp/Makefile	Tue Jul 19 11:04:13 2016	(r418767)

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
