diff --git a/archivers/lbzip2/Makefile b/archivers/lbzip2/Makefile
index c3afd33c438..46d5675893f 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 0371a024317..9b47a542e15 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 5046b4f5f86..2a1909ec654 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 b2e5bdeb7b4..6c12eb6c4fd 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 60759de5382..65bbd4a96e0 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 37a3b0c712e..3ffa32731fb 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/soundkonverter/Makefile b/audio/soundkonverter/Makefile
index 3a6135c23f7..17f88af8b11 100644
--- a/audio/soundkonverter/Makefile
+++ b/audio/soundkonverter/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	soundkonverter
 PORTVERSION=	2.2.2
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	audio kde
 
@@ -20,7 +21,6 @@ USES=		cmake compiler:c++11-lang
 USE_GITHUB=	yes
 USE_QT4=	corelib dbus gui network moc_build qmake_build rcc_build svg uic_build xml
 USE_KDE4=	automoc4 kdelibs libkcddb
-INSTALLS_ICONS=	yes
 WRKSRC_SUBDIR=	src
 
 OPTIONS_DEFAULT=	VORBIS FLAC NORMALIZE VORBISGAIN CDPARANOIA
diff --git a/audio/soundkonverter/pkg-plist b/audio/soundkonverter/pkg-plist
index 602b56b33d8..9d6142a198b 100644
--- a/audio/soundkonverter/pkg-plist
+++ b/audio/soundkonverter/pkg-plist
@@ -1,4 +1,4 @@
-%%QT_BINDIR%%/soundkonverter
+bin/soundkonverter
 lib/kde4/soundkonverter_codec_aften.so
 lib/kde4/soundkonverter_codec_faac.so
 lib/kde4/soundkonverter_codec_ffmpeg.so
diff --git a/audio/teamspeak3-server/Makefile b/audio/teamspeak3-server/Makefile
index ee84420c07d..845ebc5502d 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 45d22d8cb54..de1403f37d3 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 7889cad023b..0cb9d919acf 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 d5222cac07b..a256864ec0d 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 efa85c1dad4..ad1bf6c8b1d 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 ea22a32f7ea..43f15f7ca96 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 441b4054a4b..ba6366b8d7f 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/couchdb/Makefile b/databases/couchdb/Makefile
index 3afbd193c2a..2c0725b69c9 100644
--- a/databases/couchdb/Makefile
+++ b/databases/couchdb/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	couchdb
 PORTVERSION=	1.6.1
-PORTREVISION=	6
+PORTREVISION=	7
 PORTEPOCH=	2
 CATEGORIES=	databases
 MASTER_SITES=	APACHE/couchdb/source/${PORTVERSION}
diff --git a/databases/couchdb/files/patch-configure b/databases/couchdb/files/patch-configure
index c994b52f09c..399a9d7c6cf 100644
--- a/databases/couchdb/files/patch-configure
+++ b/databases/couchdb/files/patch-configure
@@ -5,7 +5,7 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking Erlang version compatibility" >&5
  $as_echo_n "checking Erlang version compatibility... " >&6; }
 -erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and =< 17 (erts-6.0)"
-+erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and =< 18 (erts-7.0)"
++erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and =< 18 (erts-8.0)"
  
  version="`${ERL} -version 2>&1 | ${SED} 's/[^0-9]/ /g'` 0 0 0"
  major_version=`echo $version | ${AWK} "{print \\$1}"`
@@ -14,7 +14,7 @@
  echo -n "detected Erlang version: $major_version.$minor_version.$patch_version..."
  
 -if test $major_version -lt 5 -o $major_version -gt 6; then
-+if test $major_version -lt 5 -o $major_version -gt 7; then
++if test $major_version -lt 5 -o $major_version -gt 8; then
      as_fn_error $? "$erlang_version_error major_version does not match" "$LINENO" 5
  fi
  
@@ -23,7 +23,7 @@
  
  
 - if can_use_nifs=$(echo $otp_release | grep -E "^(R14B|R15|R16|17)"); then
-+ if can_use_nifs=$(echo $otp_release | grep -E "^(R14B|R15|R16|17|18)"); then
++ if can_use_nifs=$(echo $otp_release | grep -E "^(R14B|R15|R16|17|18|19)"); then
    USE_OTP_NIFS_TRUE=
    USE_OTP_NIFS_FALSE='#'
  else
@@ -32,7 +32,7 @@
  fi
  
 - if can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17)"); then
-+ if can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17|18)"); then
++ if can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17|18|19)"); then
    USE_EJSON_COMPARE_NIF_TRUE=
    USE_EJSON_COMPARE_NIF_FALSE='#'
  else
diff --git a/databases/elixir-geo/Makefile b/databases/elixir-geo/Makefile
index 2862e87726e..ba46385a0e4 100644
--- a/databases/elixir-geo/Makefile
+++ b/databases/elixir-geo/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	geo
-PORTVERSION=	1.1.0
+PORTVERSION=	1.1.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 PKGNAMEPREFIX=	elixir-
diff --git a/databases/elixir-geo/distinfo b/databases/elixir-geo/distinfo
index f0cbec5f8c5..7a6b8407178 100644
--- a/databases/elixir-geo/distinfo
+++ b/databases/elixir-geo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1468225085
-SHA256 (bryanjos-geo-v1.1.0_GH0.tar.gz) = cbf690f71a6ba445fb033b6d5b3b73513420c955f42d5b298f0909c26a872b66
-SIZE (bryanjos-geo-v1.1.0_GH0.tar.gz) = 17878
+TIMESTAMP = 1468941922
+SHA256 (bryanjos-geo-v1.1.1_GH0.tar.gz) = 44d37f605b5f565cca3ca23efb798cf5f3197036ddc19f19f8cf391b5d594524
+SIZE (bryanjos-geo-v1.1.1_GH0.tar.gz) = 18281
diff --git a/databases/elixir-geo/pkg-plist b/databases/elixir-geo/pkg-plist
index be500105e38..f17945afa17 100644
--- a/databases/elixir-geo/pkg-plist
+++ b/databases/elixir-geo/pkg-plist
@@ -1,5 +1,7 @@
 lib/elixir/lib/geo/ebin/Elixir.Geo.Geometry.beam
 lib/elixir/lib/geo/ebin/Elixir.Geo.GeometryCollection.beam
+lib/elixir/lib/geo/ebin/Elixir.Geo.JSON.DecodeError.beam
+lib/elixir/lib/geo/ebin/Elixir.Geo.JSON.EncodeError.beam
 lib/elixir/lib/geo/ebin/Elixir.Geo.JSON.beam
 lib/elixir/lib/geo/ebin/Elixir.Geo.LineString.beam
 lib/elixir/lib/geo/ebin/Elixir.Geo.MultiLineString.beam
diff --git a/databases/galera/Makefile b/databases/galera/Makefile
index 0dc08544480..49810e57157 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 6eba978555b..d32ecff5872 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 e9f995e4b77..9ba9cbf04c9 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 7597864b8a5..7f49adaff8c 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 557290369af..4bb45eb5a40 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 08fcb2dc318..2c6d3526848 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/fet/Makefile b/deskutils/fet/Makefile
index 18917c6a899..4cc9abb4a7d 100644
--- a/deskutils/fet/Makefile
+++ b/deskutils/fet/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	fet
-PORTVERSION=	5.29.4
+PORTVERSION=	5.30.1
 CATEGORIES=	deskutils kde
 MASTER_SITES=	http://lalescu.ro/liviu/fet/download/ \
 		http://lalescu.ro/liviu/fet/download/old/ \
@@ -39,7 +39,7 @@ ONLYCL_USE_OFF=	qt4=gui,network
 ONLYCL_INSTALL_TARGET_OFF=	${WRKSRC}/fet
 
 post-patch:
-	${REINPLACE_CMD} -e 's|/usr/share/fet|${DATADIR}|g' \
+	@${REINPLACE_CMD} -e 's|/usr/share/fet|${DATADIR}|g' \
 		${WRKSRC}/src/interface/fet.cpp
 
 do-install:
@@ -51,6 +51,6 @@ do-install:
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \. ${STAGEDIR}${EXAMPLESDIR}
+	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/deskutils/fet/distinfo b/deskutils/fet/distinfo
index f103449d5a2..58a03f4371b 100644
--- a/deskutils/fet/distinfo
+++ b/deskutils/fet/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1465379253
-SHA256 (fet-5.29.4.tar.bz2) = 36eab10da61ade59826f274f35f57daff81c60cdc24d4d1ec25b20a7ed59af2f
-SIZE (fet-5.29.4.tar.bz2) = 10073514
+TIMESTAMP = 1468911589
+SHA256 (fet-5.30.1.tar.bz2) = c9ee88081ba08a4832509f5898d17da599608fbabc57ecec4cb6a0a2a2647404
+SIZE (fet-5.30.1.tar.bz2) = 10183864
diff --git a/deskutils/fet/files/patch-src__engine__timeconstraint.cpp b/deskutils/fet/files/patch-src__engine__timeconstraint.cpp
index 0488c80d9e6..1dd226eee3a 100644
--- a/deskutils/fet/files/patch-src__engine__timeconstraint.cpp
+++ b/deskutils/fet/files/patch-src__engine__timeconstraint.cpp
@@ -1,6 +1,6 @@
---- ./src/engine/timeconstraint.cpp.orig	2014-02-01 14:51:03.804739136 +0100
-+++ ./src/engine/timeconstraint.cpp	2014-02-01 14:51:46.994628354 +0100
-@@ -42,6 +42,7 @@
+--- src/engine/timeconstraint.cpp.orig	2016-04-09 13:57:44 UTC
++++ src/engine/timeconstraint.cpp
+@@ -39,6 +39,7 @@ File timeconstraint.cpp
  
  //for min max functions
  #include <algorithm>
diff --git a/deskutils/myitcrm/Makefile b/deskutils/myitcrm/Makefile
index 2ffd827ae0b..c815f2c7204 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 9bb5fc2b1d8..8fd067c9b9e 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 7576f7ae47f..f5edefa653f 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 613dc97ef96..529f47e0973 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/elfutils/Makefile b/devel/elfutils/Makefile
index 751bf445ba1..9cc691c0796 100644
--- a/devel/elfutils/Makefile
+++ b/devel/elfutils/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	elfutils
 PORTVERSION=	0.163
 PORTREVISION=	6
 CATEGORIES=	devel
-MASTER_SITES=	https://fedorahosted.org/releases/e/l/elfutils/$(PORTVERSION)/
+MASTER_SITES=	https://fedorahosted.org/releases/e/l/elfutils/${PORTVERSION}/
 
 MAINTAINER=	cem@FreeBSD.org
 COMMENT=	Library for manipulating ELF files and partial implementation of binutils
@@ -29,6 +29,7 @@ USES=		gmake libtool tar:bzip2
 USE_AUTOTOOLS=	automake:env
 USE_GCC=	4.8+
 GNU_CONFIGURE=	yes
+USE_LDCONFIG=	yes
 
 CFLAGS+=	-Wno-unused-parameter
 # Give i386 a prayer of building, and we can fix the warnings later:
@@ -39,13 +40,13 @@ CONFIGURE_ARGS+=	--program-prefix=eu-
 
 post-patch:
 	@${CP} -a \
-	    $(LOCALBASE)/share/gnulib/lib/obstack.c \
-	    $(LOCALBASE)/share/gnulib/lib/obstack.h \
-	    $(LOCALBASE)/share/gnulib/lib/obstack_printf.c \
-	    $(WRKSRC)/lib
+	    ${LOCALBASE}/share/gnulib/lib/obstack.c \
+	    ${LOCALBASE}/share/gnulib/lib/obstack.h \
+	    ${LOCALBASE}/share/gnulib/lib/obstack_printf.c \
+	    ${WRKSRC}/lib
 
 pre-configure:
-	@cd $(WRKSRC) && ${AUTOMAKE}
+	@cd ${WRKSRC} && ${AUTOMAKE}
 
 .include <bsd.port.pre.mk>
 
diff --git a/devel/erlang-gpb/Makefile b/devel/erlang-gpb/Makefile
index 54d009157f9..1d724c350c0 100644
--- a/devel/erlang-gpb/Makefile
+++ b/devel/erlang-gpb/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gpb
-PORTVERSION=	3.23.0
+PORTVERSION=	3.23.2
 CATEGORIES=	devel
 PKGNAMEPREFIX=	erlang-
 
diff --git a/devel/erlang-gpb/distinfo b/devel/erlang-gpb/distinfo
index bf76ecb5977..d1c4c5a94fb 100644
--- a/devel/erlang-gpb/distinfo
+++ b/devel/erlang-gpb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1468334592
-SHA256 (tomas-abrahamsson-gpb-3.23.0_GH0.tar.gz) = eefbfc36629c9a6ce5e15329127fde34ba60285da82980ab818edf2c28e88c90
-SIZE (tomas-abrahamsson-gpb-3.23.0_GH0.tar.gz) = 324605
+TIMESTAMP = 1468939023
+SHA256 (tomas-abrahamsson-gpb-3.23.2_GH0.tar.gz) = ac174051fe1a4f0e1a0df53b015cd3c13ccdcf9f13cba7b65fdea4796a35cc73
+SIZE (tomas-abrahamsson-gpb-3.23.2_GH0.tar.gz) = 330173
diff --git a/devel/llvm38/Makefile b/devel/llvm38/Makefile
index 5844c5a05ba..c0ff3bac73f 100644
--- a/devel/llvm38/Makefile
+++ b/devel/llvm38/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	llvm
-DISTVERSION=	3.8.0
-PORTREVISION=	3
+DISTVERSION=	3.8.1
 CATEGORIES=	devel lang
 MASTER_SITES=	http://llvm.org/${PRE_}releases/${LLVM_RELEASE}/${RCDIR}
 DISTNAME=	${PORTNAME}-${DISTVERSION}.src
diff --git a/devel/llvm38/distinfo b/devel/llvm38/distinfo
index 7cb466c06c7..4def87d7fa9 100644
--- a/devel/llvm38/distinfo
+++ b/devel/llvm38/distinfo
@@ -1,14 +1,15 @@
-SHA256 (llvm-3.8.0.src.tar.xz) = 555b028e9ee0f6445ff8f949ea10e9cd8be0d084840e21fbbe1d31d51fc06e46
-SIZE (llvm-3.8.0.src.tar.xz) = 16580932
-SHA256 (cfe-3.8.0.src.tar.xz) = 04149236de03cf05232d68eb7cb9c50f03062e339b68f4f8a03b650a11536cf9
-SIZE (cfe-3.8.0.src.tar.xz) = 9627228
-SHA256 (compiler-rt-3.8.0.src.tar.xz) = c8d3387e55f229543dac1941769120f24dc50183150bf19d1b070d53d29d56b0
-SIZE (compiler-rt-3.8.0.src.tar.xz) = 1270128
-SHA256 (clang-tools-extra-3.8.0.src.tar.xz) = afbda810106a6e64444bc164b921be928af46829117c95b996f2678ce4cb1ec4
-SIZE (clang-tools-extra-3.8.0.src.tar.xz) = 334072
-SHA256 (lld-3.8.0.src.tar.xz) = 94704dda228c9f75f4403051085001440b458501ec97192eee06e8e67f7f9f0c
-SIZE (lld-3.8.0.src.tar.xz) = 631596
-SHA256 (lldb-3.8.0.src.tar.xz) = e3f68f44147df0433e7989bf6ed1c58ff28d7c68b9c47553cb9915f744785a35
-SIZE (lldb-3.8.0.src.tar.xz) = 10929768
-SHA256 (openmp-3.8.0.src.tar.xz) = 92510e3f62e3de955e3a0b6708cebee1ca344d92fb02369cba5fdd5c68f773a0
-SIZE (openmp-3.8.0.src.tar.xz) = 2233144
+TIMESTAMP = 1468531320
+SHA256 (llvm-3.8.1.src.tar.xz) = 6e82ce4adb54ff3afc18053d6981b6aed1406751b8742582ed50f04b5ab475f9
+SIZE (llvm-3.8.1.src.tar.xz) = 16551472
+SHA256 (cfe-3.8.1.src.tar.xz) = 4cd3836dfb4b88b597e075341cae86d61c63ce3963e45c7fe6a8bf59bb382cdf
+SIZE (cfe-3.8.1.src.tar.xz) = 9605548
+SHA256 (compiler-rt-3.8.1.src.tar.xz) = 0df011dae14d8700499dfc961602ee0a9572fef926202ade5dcdfe7858411e5c
+SIZE (compiler-rt-3.8.1.src.tar.xz) = 1263312
+SHA256 (clang-tools-extra-3.8.1.src.tar.xz) = 664a5c60220de9c290bf2a5b03d902ab731a4f95fe73a00856175ead494ec396
+SIZE (clang-tools-extra-3.8.1.src.tar.xz) = 334768
+SHA256 (lld-3.8.1.src.tar.xz) = 2bd9be8bb18d82f7f59e31ea33b4e58387dbdef0bc11d5c9fcd5ce9a4b16dc00
+SIZE (lld-3.8.1.src.tar.xz) = 632288
+SHA256 (lldb-3.8.1.src.tar.xz) = 349148116a47e39dcb5d5042f10d8a6357d2c865034563283ca512f81cdce8a3
+SIZE (lldb-3.8.1.src.tar.xz) = 10928220
+SHA256 (openmp-3.8.1.src.tar.xz) = 68fcde6ef34e0275884a2de3450a31e931caf1d6fda8606ef14f89c4123617dc
+SIZE (openmp-3.8.1.src.tar.xz) = 2009572
diff --git a/devel/lockfree-malloc/Makefile b/devel/lockfree-malloc/Makefile
index cad2777c321..04705ffd638 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/py-billiard/Makefile b/devel/py-billiard/Makefile
index 5af6b7857d4..19b04737a7a 100644
--- a/devel/py-billiard/Makefile
+++ b/devel/py-billiard/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	billiard
-PORTVERSION=	3.3.0.21
+PORTVERSION=	3.3.0.23
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-billiard/distinfo b/devel/py-billiard/distinfo
index f62edcf4a52..08034a8fdcb 100644
--- a/devel/py-billiard/distinfo
+++ b/devel/py-billiard/distinfo
@@ -1,2 +1,2 @@
-SHA256 (billiard-3.3.0.21.tar.gz) = 9705f78f0a971b91a70b3b19aa7862401b6eb3b0bffc2a2e0702ed5eeaccdae9
-SIZE (billiard-3.3.0.21.tar.gz) = 151141
+SHA256 (billiard-3.3.0.23.tar.gz) = 692a2a5a55ee39a42bcb7557930e2541da85df9ea81c6e24827f63b80cd39d0b
+SIZE (billiard-3.3.0.23.tar.gz) = 151675
diff --git a/devel/py-celery/Makefile b/devel/py-celery/Makefile
index 82c50e1e247..e13f2738e3f 100644
--- a/devel/py-celery/Makefile
+++ b/devel/py-celery/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	celery
-PORTVERSION=	3.1.19
-PORTREVISION=	1
+PORTVERSION=	3.1.23
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-celery/distinfo b/devel/py-celery/distinfo
index 0ce1838c886..cabdd7db727 100644
--- a/devel/py-celery/distinfo
+++ b/devel/py-celery/distinfo
@@ -1,2 +1,2 @@
-SHA256 (celery-3.1.19.tar.gz) = bd6a21290c822ecf78947a7dbc8b2270d88a5fa08a7a2bfcd908bb3d5ed66b71
-SIZE (celery-3.1.19.tar.gz) = 1302241
+SHA256 (celery-3.1.23.tar.gz) = 1a359c815837f9dbf193a7dbc6addafa34612c077ff70c66e3b16e14eebd2418
+SIZE (celery-3.1.23.tar.gz) = 1310624
diff --git a/devel/py-cluster/Makefile b/devel/py-cluster/Makefile
index a3b275fe28e..fc4098cd00b 100644
--- a/devel/py-cluster/Makefile
+++ b/devel/py-cluster/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cluster
-PORTVERSION=	1.3.1
+PORTVERSION=	1.3.3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -9,7 +9,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	dbaio@bsd.com.br
 COMMENT=	Create several groups (clusters) of objects from a list in Python
 
-LICENSE=	LGPL21
+LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_GITHUB=	yes
diff --git a/devel/py-cluster/distinfo b/devel/py-cluster/distinfo
index bab7aedd884..9d5767a8b73 100644
--- a/devel/py-cluster/distinfo
+++ b/devel/py-cluster/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1468020597
-SHA256 (exhuma-python-cluster-v1.3.1_GH0.tar.gz) = f53411f76d96a98a90dff7ad0032cb828b96dc8866eeb69465f52f7e3aaaa794
-SIZE (exhuma-python-cluster-v1.3.1_GH0.tar.gz) = 49328
+TIMESTAMP = 1468887909
+SHA256 (exhuma-python-cluster-v1.3.3_GH0.tar.gz) = 4de2600408b77749abf6186df8571c3193ae7b729ec256fd8d0c25152c57ddf4
+SIZE (exhuma-python-cluster-v1.3.3_GH0.tar.gz) = 49352
diff --git a/devel/py-http-prompt/Makefile b/devel/py-http-prompt/Makefile
index 0670f3cd5fc..1e24a99f278 100644
--- a/devel/py-http-prompt/Makefile
+++ b/devel/py-http-prompt/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	http-prompt
-PORTVERSION=	0.4.1
+PORTVERSION=	0.4.2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-http-prompt/distinfo b/devel/py-http-prompt/distinfo
index 4d37874486e..d6a0a83b51c 100644
--- a/devel/py-http-prompt/distinfo
+++ b/devel/py-http-prompt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1467157659
-SHA256 (http-prompt-0.4.1.tar.gz) = a808009fa61e03cdb91a93a88035dfb82e6a502e01830af5a821781e9b13ffd7
-SIZE (http-prompt-0.4.1.tar.gz) = 19363
+TIMESTAMP = 1468888916
+SHA256 (http-prompt-0.4.2.tar.gz) = 01547af93e7631747bf9f77b82601ab077627d8b30fc47ae9dbc7638fb7a3a3c
+SIZE (http-prompt-0.4.2.tar.gz) = 19703
diff --git a/devel/ruby-gems/Makefile b/devel/ruby-gems/Makefile
index cb0cd58724b..144aee48446 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 60fa6eba011..e46d557bf74 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/sope2/Makefile b/devel/sope2/Makefile
index 6788b6240fc..00a5f4553d7 100644
--- a/devel/sope2/Makefile
+++ b/devel/sope2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=		sope2
 PORTVERSION=		2.3.13
+PORTREVISION=		1
 CATEGORIES=		devel gnustep
 MASTER_SITES=		http://www.sogo.nu/files/downloads/SOGo/Sources/
 DISTNAME=		SOPE-${PORTVERSION}
@@ -26,7 +27,7 @@ MYSQL_DESC=		Build with MySQL support
 PGSQL_DESC=		Build with PostgreSQL support
 MEMCACHED_DESC=		Install memcached
 
-USES=			gmake gnustep
+USES=			gmake iconv gnustep
 USE_GNUSTEP=		base build
 USE_LDCONFIG=		${GNUSTEP_LOCAL_LIBRARIES}
 
@@ -35,9 +36,9 @@ SUB_LIST+=		GNUSTEP_LOCAL_TOOLS=${GNUSTEP_LOCAL_TOOLS} \
 
 CONFIGURE_ARGS=		--with-gnustep --disable-debug --enable-strip
 
-LDAP_USE=	OPENLDAP=client
-PGSQL_USES=	pgsql
-MYSQL_USE=	MYSQL=client
+LDAP_USE=		OPENLDAP=client
+PGSQL_USES=		pgsql
+MYSQL_USE=		MYSQL=client
 MEMCACHED_RUN_DEPENDS=	${LOCALBASE}/bin/memcached:databases/memcached
 
 post-patch-LDAP-off:
diff --git a/devel/sope3/Makefile b/devel/sope3/Makefile
index cb939a6173e..4ccb45de5e8 100644
--- a/devel/sope3/Makefile
+++ b/devel/sope3/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=		sope3
-PORTVERSION=		3.1.3
+PORTVERSION=		3.1.4
 CATEGORIES=		devel gnustep
 MASTER_SITES=		http://www.sogo.nu/files/downloads/SOGo/Sources/
 DISTNAME=		SOPE-${PORTVERSION}
@@ -26,7 +26,7 @@ MYSQL_DESC=		Build with MySQL support
 PGSQL_DESC=		Build with PostgreSQL support
 MEMCACHED_DESC=		Install memcached
 
-USES=			gmake gnustep
+USES=			gmake iconv gnustep
 USE_GNUSTEP=		base build
 USE_LDCONFIG=		${GNUSTEP_LOCAL_LIBRARIES}
 
@@ -38,9 +38,9 @@ SUB_LIST+=		GNUSTEP_LOCAL_TOOLS=${GNUSTEP_LOCAL_TOOLS} \
 CONFIGURE_ARGS=		--with-gnustep --disable-debug --enable-strip
 CONFIGURE_ENV+=		CC="${CC}"
 
-LDAP_USE=	OPENLDAP=client
-PGSQL_USES=	pgsql
-MYSQL_USE=	MYSQL=client
+LDAP_USE=		OPENLDAP=client
+PGSQL_USES=		pgsql
+MYSQL_USE=		MYSQL=client
 MEMCACHED_RUN_DEPENDS=	${LOCALBASE}/bin/memcached:databases/memcached
 
 post-patch:
diff --git a/devel/sope3/distinfo b/devel/sope3/distinfo
index 16bb0e4e018..2ebeacadb4f 100644
--- a/devel/sope3/distinfo
+++ b/devel/sope3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1468361969
-SHA256 (SOPE-3.1.3.tar.gz) = 320c1fcc8e6489b46c31af7ae662c7dc920b2259edc1adeba2715d4b5a7dc6b0
-SIZE (SOPE-3.1.3.tar.gz) = 2278904
+TIMESTAMP = 1468935066
+SHA256 (SOPE-3.1.4.tar.gz) = a582855941d61b64c1ad988e3c797bd330647a381c0ea91f1b3dd740eea5b22c
+SIZE (SOPE-3.1.4.tar.gz) = 2279147
diff --git a/devel/staf/Makefile b/devel/staf/Makefile
index 39b4114f6ff..ac349f54d09 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/bind9-devel/Makefile b/dns/bind9-devel/Makefile
index 48528fff91e..55408d3a863 100644
--- a/dns/bind9-devel/Makefile
+++ b/dns/bind9-devel/Makefile
@@ -16,8 +16,8 @@ COMMENT=	BIND DNS suite with updated DNSSEC and DNS64
 LICENSE=	MPL
 
 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION=	9.12.0a.2016.07.04
-HASH=		c8fb7e4
+ISCVERSION=	9.12.0a.2016.07.14
+HASH=		203b693
 
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo
index 66a41bc0fc1..fbebb2054ea 100644
--- a/dns/bind9-devel/distinfo
+++ b/dns/bind9-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1467626025
-SHA256 (bind9-c8fb7e4.tar.gz) = 273b40b1ec4ec850007c5c4af0afdabd7b917232a4e889831ef3968a2dc8591a
-SIZE (bind9-c8fb7e4.tar.gz) = 11761224
+TIMESTAMP = 1468926927
+SHA256 (bind9-203b693.tar.gz) = 1702e2e597c88234c319b2ab83a286e28e6e58e23790858d0165dee6de1f5957
+SIZE (bind9-203b693.tar.gz) = 11763050
diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
index 95193c98488..7639b30ad45 100644
--- a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
+++ b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
@@ -1,4 +1,4 @@
---- bin/named/config.c.orig	2016-06-27 05:29:38 UTC
+--- bin/named/config.c.orig	2016-07-14 05:13:57 UTC
 +++ bin/named/config.c
 @@ -151,6 +151,8 @@ options {\n\
  	lame-ttl 600;\n\
@@ -9,9 +9,9 @@
  	max-cache-ttl 604800; /* 1 week */\n\
  	transfer-format many-answers;\n\
  	max-cache-size 90%;\n\
---- bin/named/server.c.orig	2016-06-27 05:29:38 UTC
+--- bin/named/server.c.orig	2016-07-14 05:13:57 UTC
 +++ bin/named/server.c
-@@ -3521,6 +3521,16 @@ configure_view(dns_view_t *view, dns_vie
+@@ -3549,6 +3549,16 @@ configure_view(dns_view_t *view, dns_vie
  	}
  
  	obj = NULL;
@@ -28,7 +28,7 @@
  	result = ns_config_get(maps, "max-cache-ttl", &obj);
  	INSIST(result == ISC_R_SUCCESS);
  	view->maxcachettl = cfg_obj_asuint32(obj);
---- lib/dns/include/dns/view.h.orig	2016-06-27 05:29:38 UTC
+--- lib/dns/include/dns/view.h.orig	2016-07-14 05:13:57 UTC
 +++ lib/dns/include/dns/view.h
 @@ -145,6 +145,8 @@ struct dns_view {
  	isc_boolean_t			requestnsid;
@@ -39,7 +39,7 @@
  	dns_ttl_t			maxncachettl;
  	isc_uint32_t			nta_lifetime;
  	isc_uint32_t			nta_recheck;
---- lib/dns/resolver.c.orig	2016-06-27 05:29:38 UTC
+--- lib/dns/resolver.c.orig	2016-07-14 05:13:57 UTC
 +++ lib/dns/resolver.c
 @@ -5431,6 +5431,18 @@ cache_name(fetchctx_t *fctx, dns_name_t 
  		}
@@ -60,7 +60,7 @@
  		 * Enforce the configure maximum cache TTL.
  		 */
  		if (rdataset->ttl > res->view->maxcachettl)
---- lib/isccfg/namedconf.c.orig	2016-06-27 05:29:38 UTC
+--- lib/isccfg/namedconf.c.orig	2016-07-14 05:13:57 UTC
 +++ lib/isccfg/namedconf.c
 @@ -1707,6 +1707,8 @@ view_clauses[] = {
  	{ "nosit-udp-size", &cfg_type_uint32, CFG_CLAUSEFLAG_OBSOLETE },
diff --git a/dns/bind9-devel/files/patch-configure b/dns/bind9-devel/files/patch-configure
index 61e41fe6761..da037e5615c 100644
--- a/dns/bind9-devel/files/patch-configure
+++ b/dns/bind9-devel/files/patch-configure
@@ -1,4 +1,4 @@
---- configure.orig	2016-07-04 05:46:50 UTC
+--- configure.orig	2016-07-14 05:13:57 UTC
 +++ configure
 @@ -14338,27 +14338,9 @@ done
  		# problems start to show up.
@@ -79,7 +79,7 @@
  		DNS_GSSAPI_LIBS="$LIBS"
  
  		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5
-@@ -22279,7 +22221,7 @@ $as_echo "" >&6; }
+@@ -22318,7 +22260,7 @@ $as_echo "" >&6; }
  			# Check other locations for includes.
  			# Order is important (sigh).
  
diff --git a/dns/bind911/Makefile b/dns/bind911/Makefile
index ab43db04c8a..82d801f4010 100644
--- a/dns/bind911/Makefile
+++ b/dns/bind911/Makefile
@@ -29,7 +29,7 @@ COMMENT=	BIND DNS suite with updated DNSSEC and DNS64
 LICENSE=	MPL
 
 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION=	9.11.0b1
+ISCVERSION=	9.11.0b2
 
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/dns/bind911/distinfo b/dns/bind911/distinfo
index 426daf5ab60..49b5975336d 100644
--- a/dns/bind911/distinfo
+++ b/dns/bind911/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1467624274
-SHA256 (bind-9.11.0b1.tar.gz) = de0f974225dfa8261ab624034cbeef715fe3f767aa3742cd7a2279002399f5d6
-SIZE (bind-9.11.0b1.tar.gz) = 9707184
+TIMESTAMP = 1468926742
+SHA256 (bind-9.11.0b2.tar.gz) = 440e7fa7c4e241c13028699ab107fc4c3efd1719012b1af356d39db5ab49109d
+SIZE (bind-9.11.0b2.tar.gz) = 9714852
diff --git a/dns/bind911/files/extrapatch-bind-min-override-ttl b/dns/bind911/files/extrapatch-bind-min-override-ttl
index b522fea8033..d0009bb61f4 100644
--- a/dns/bind911/files/extrapatch-bind-min-override-ttl
+++ b/dns/bind911/files/extrapatch-bind-min-override-ttl
@@ -1,4 +1,4 @@
---- bin/named/config.c.orig	2016-06-27 17:38:13 UTC
+--- bin/named/config.c.orig	2016-07-14 01:31:01 UTC
 +++ bin/named/config.c
 @@ -151,6 +151,8 @@ options {\n\
  	lame-ttl 600;\n\
@@ -9,9 +9,9 @@
  	max-cache-ttl 604800; /* 1 week */\n\
  	transfer-format many-answers;\n\
  	max-cache-size 90%;\n\
---- bin/named/server.c.orig	2016-06-27 17:38:13 UTC
+--- bin/named/server.c.orig	2016-07-14 01:31:01 UTC
 +++ bin/named/server.c
-@@ -3521,6 +3521,16 @@ configure_view(dns_view_t *view, dns_vie
+@@ -3549,6 +3549,16 @@ configure_view(dns_view_t *view, dns_vie
  	}
  
  	obj = NULL;
@@ -28,7 +28,7 @@
  	result = ns_config_get(maps, "max-cache-ttl", &obj);
  	INSIST(result == ISC_R_SUCCESS);
  	view->maxcachettl = cfg_obj_asuint32(obj);
---- lib/dns/include/dns/view.h.orig	2016-06-27 17:38:13 UTC
+--- lib/dns/include/dns/view.h.orig	2016-07-14 01:31:01 UTC
 +++ lib/dns/include/dns/view.h
 @@ -145,6 +145,8 @@ struct dns_view {
  	isc_boolean_t			requestnsid;
@@ -39,7 +39,7 @@
  	dns_ttl_t			maxncachettl;
  	isc_uint32_t			nta_lifetime;
  	isc_uint32_t			nta_recheck;
---- lib/dns/resolver.c.orig	2016-06-27 17:38:13 UTC
+--- lib/dns/resolver.c.orig	2016-07-14 01:31:01 UTC
 +++ lib/dns/resolver.c
 @@ -5431,6 +5431,18 @@ cache_name(fetchctx_t *fctx, dns_name_t 
  		}
@@ -60,7 +60,7 @@
  		 * Enforce the configure maximum cache TTL.
  		 */
  		if (rdataset->ttl > res->view->maxcachettl)
---- lib/isccfg/namedconf.c.orig	2016-06-27 17:38:13 UTC
+--- lib/isccfg/namedconf.c.orig	2016-07-14 01:31:01 UTC
 +++ lib/isccfg/namedconf.c
 @@ -1707,6 +1707,8 @@ view_clauses[] = {
  	{ "nosit-udp-size", &cfg_type_uint32, CFG_CLAUSEFLAG_OBSOLETE },
diff --git a/dns/bind911/files/patch-configure b/dns/bind911/files/patch-configure
index a501f24472c..2a3cfe4da1e 100644
--- a/dns/bind911/files/patch-configure
+++ b/dns/bind911/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2016-06-27 17:38:13 UTC
+--- configure.orig	2016-07-14 01:31:01 UTC
 +++ configure
-@@ -14205,27 +14205,9 @@ done
+@@ -14338,27 +14338,9 @@ done
  		# problems start to show up.
  		saved_libs="$LIBS"
  		for TRY_LIBS in \
@@ -30,7 +30,7 @@
  		    { $as_echo "$as_me:${as_lineno-$LINENO}: checking linking as $TRY_LIBS" >&5
  $as_echo_n "checking linking as $TRY_LIBS... " >&6; }
  		    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -14268,47 +14250,7 @@ $as_echo "no" >&6; } ;;
+@@ -14401,47 +14383,7 @@ $as_echo "no" >&6; } ;;
  		no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;;
  		esac
  
@@ -79,7 +79,7 @@
  		DNS_GSSAPI_LIBS="$LIBS"
  
  		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5
-@@ -22147,7 +22089,7 @@ $as_echo "" >&6; }
+@@ -22318,7 +22260,7 @@ $as_echo "" >&6; }
  			# Check other locations for includes.
  			# Order is important (sigh).
  
diff --git a/dns/bind99/Makefile b/dns/bind99/Makefile
index 055f5956e8a..8832db3906c 100644
--- a/dns/bind99/Makefile
+++ b/dns/bind99/Makefile
@@ -15,7 +15,7 @@ COMMENT=	BIND DNS suite with updated DNSSEC and DNS64
 LICENSE=	ISCL
 
 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION=	9.9.9-P1
+ISCVERSION=	9.9.9-P2
 
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/dns/bind99/distinfo b/dns/bind99/distinfo
index b2874b3e251..c5d0ef7b1f8 100644
--- a/dns/bind99/distinfo
+++ b/dns/bind99/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1464252734
-SHA256 (bind-9.9.9-P1.tar.gz) = 9bcc76b8cbee2e64210e80fc6b57a8e8ff07780f994f87d5a2aa312cdfa24aa4
-SIZE (bind-9.9.9-P1.tar.gz) = 8758793
-SHA256 (9.9.9-P1-rpz2+rl.14038.05.patch.xz) = 230ab0dbf30e8cf956ea6557d00046618abe158cb2fc3c2204c021ace58e5588
-SIZE (9.9.9-P1-rpz2+rl.14038.05.patch.xz) = 39284
+TIMESTAMP = 1468930264
+SHA256 (bind-9.9.9-P2.tar.gz) = 7746cc29071cb7e10f10be013cea836a3027b820a367ce3986cd366c01863bf2
+SIZE (bind-9.9.9-P2.tar.gz) = 8762371
+SHA256 (9.9.9-P2-rpz2+rl.14038.05.patch.xz) = d7ddc47641b95f4135baf6c7fd1e39ce06a599e1a97ba589e11c02d3be28ceed
+SIZE (9.9.9-P2-rpz2+rl.14038.05.patch.xz) = 39288
diff --git a/dns/dnsflood/Makefile b/dns/dnsflood/Makefile
index e527cbb99d9..eb17c0bcd1a 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 cf9c4c04f68..69e17ccd8bf 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 b824341501c..9eb40a2b53c 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 d2d8d4e8ed8..8721be0cbfd 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/i386-wine-devel/Makefile.inc b/emulators/i386-wine-devel/Makefile.inc
index a1acfe1888c..b488bcfefad 100644
--- a/emulators/i386-wine-devel/Makefile.inc
+++ b/emulators/i386-wine-devel/Makefile.inc
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	wine
-PORTVERSION=	1.9.13
+PORTVERSION=	1.9.14
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	LOCAL/dbn/repos/wine/${DIST_SUBDIR}/
diff --git a/emulators/i386-wine-devel/distinfo b/emulators/i386-wine-devel/distinfo
index 8d48a90daf0..741e6fcb739 100644
--- a/emulators/i386-wine-devel/distinfo
+++ b/emulators/i386-wine-devel/distinfo
@@ -1,13 +1,13 @@
-TIMESTAMP = 1467103889
-SHA256 (freebsd:9:x86:64/i386-wine-devel-1.9.13,1.txz) = b937c0379b35276308d8690b2a44b99f65e985ba2d60ca7ac8d2e99894ee6b79
-SIZE (freebsd:9:x86:64/i386-wine-devel-1.9.13,1.txz) = 40624824
-SHA256 (freebsd:9:x86:64/i386-wine-staging-1.9.13,1.txz) = f7a9e52f3fdf3d56a9723ded06bc93e7c04d4ec531ad24ba23cb915114ede548
-SIZE (freebsd:9:x86:64/i386-wine-staging-1.9.13,1.txz) = 43420524
-SHA256 (freebsd:10:x86:64/i386-wine-devel-1.9.13,1.txz) = 87dedabe5e48974798f516771c349216e7e16c037e5fd79a691367fe1685ee0b
-SIZE (freebsd:10:x86:64/i386-wine-devel-1.9.13,1.txz) = 40603808
-SHA256 (freebsd:10:x86:64/i386-wine-staging-1.9.13,1.txz) = 745c7d5dd274315ff94e2e95afb7f465893ec347db5ea0cba427d5d72a3ca72a
-SIZE (freebsd:10:x86:64/i386-wine-staging-1.9.13,1.txz) = 43383824
-SHA256 (freebsd:11:x86:64/i386-wine-devel-1.9.13,1.txz) = 6350f973c94a4d6a6d8c69062dbae4a47005be4150c1f46cd23993f1717a5a80
-SIZE (freebsd:11:x86:64/i386-wine-devel-1.9.13,1.txz) = 40129056
-SHA256 (freebsd:11:x86:64/i386-wine-staging-1.9.13,1.txz) = 183b9fab41e650758b5ed91ae2ee2c6592f40c6fd340416a63e5c2229bc92dc3
-SIZE (freebsd:11:x86:64/i386-wine-staging-1.9.13,1.txz) = 42901276
+TIMESTAMP = 1468908201
+SHA256 (freebsd:9:x86:64/i386-wine-devel-1.9.14,1.txz) = 2f8a824ef1ea8a20f3f4816ff13f8b96b8817de49a5b8b7d9f52d495d3388f3f
+SIZE (freebsd:9:x86:64/i386-wine-devel-1.9.14,1.txz) = 40700428
+SHA256 (freebsd:9:x86:64/i386-wine-staging-1.9.14,1.txz) = 50a131568672b37bd91092da8f21075e9b689302c10bbc079addb4c1180fef12
+SIZE (freebsd:9:x86:64/i386-wine-staging-1.9.14,1.txz) = 43495940
+SHA256 (freebsd:10:x86:64/i386-wine-devel-1.9.14,1.txz) = 0d8c4c7844bc523110c88e0cf59cb56620e912352d7c978a68755d8a1b10b290
+SIZE (freebsd:10:x86:64/i386-wine-devel-1.9.14,1.txz) = 40669660
+SHA256 (freebsd:10:x86:64/i386-wine-staging-1.9.14,1.txz) = 83bf109cdd0107ac9478aac6b074063c4e2e6e2cb2651c3c035c7af132f9c5b0
+SIZE (freebsd:10:x86:64/i386-wine-staging-1.9.14,1.txz) = 43470780
+SHA256 (freebsd:11:x86:64/i386-wine-devel-1.9.14,1.txz) = 0937f4ca4b2625bd7aa78c984cc5c9f22d8ecd52e6c317253f01510b5aad0304
+SIZE (freebsd:11:x86:64/i386-wine-devel-1.9.14,1.txz) = 40187560
+SHA256 (freebsd:11:x86:64/i386-wine-staging-1.9.14,1.txz) = f8765b1060037ddbb01d22ddaba1ea649f6f22f33075bba3c0f868db7ce1e51d
+SIZE (freebsd:11:x86:64/i386-wine-staging-1.9.14,1.txz) = 42962428
diff --git a/emulators/i386-wine-devel/pkg-plist b/emulators/i386-wine-devel/pkg-plist
index 86bca615287..1a728988516 100644
--- a/emulators/i386-wine-devel/pkg-plist
+++ b/emulators/i386-wine-devel/pkg-plist
@@ -858,6 +858,7 @@ include/wine/windows/winuser.rh
 include/wine/windows/winver.h
 include/wine/windows/wlanapi.h
 include/wine/windows/wmistr.h
+include/wine/windows/wmium.h
 include/wine/windows/wmiutils.h
 include/wine/windows/wmiutils.idl
 include/wine/windows/wmp.h
diff --git a/emulators/o2em/Makefile b/emulators/o2em/Makefile
index a4bb1c18202..9e34f53c328 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 2be966b0466..5a8b283ccec 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 ea3075c958e..3b47fbfc10f 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 64a2e450139..425f4e9292d 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 6acf72dc16e..c7ae7d9f945 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 1148435a96c..52e24cf3dad 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 042920ff954..52ee375c15f 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 b2da80ea88e..bf1299a3f2a 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/games/vegastrike/Makefile b/games/vegastrike/Makefile
index 6346e4ca94d..9e0efa29931 100644
--- a/games/vegastrike/Makefile
+++ b/games/vegastrike/Makefile
@@ -13,7 +13,9 @@ COMMENT=	Open source 3D space simulator
 
 LICENSE=	GPLv2
 
-BROKEN=		does not build (numerous C++ errors)
+BROKEN_FreeBSD_10=	does not build (numerous C++ errors)
+BROKEN_FreeBSD_11=	does not build (numerous C++ errors)
+BROKEN_FreeBSD_12=	does not build (numerous C++ errors)
 
 RUN_DEPENDS=	${DATADIR}/vegastrike.ico:games/vegastrike-data
 LIB_DEPENDS=	libboost_python.so:devel/boost-python-libs \
diff --git a/games/wtf/Makefile b/games/wtf/Makefile
index d89a13a7c74..7d913dc7d19 100644
--- a/games/wtf/Makefile
+++ b/games/wtf/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	wtf
-PORTVERSION=	20160531
+PORTVERSION=	20160719
 CATEGORIES=	games
 MASTER_SITES=	SF/bsdwtf
 
diff --git a/games/wtf/distinfo b/games/wtf/distinfo
index e378056b312..d9235bc014a 100644
--- a/games/wtf/distinfo
+++ b/games/wtf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1464781750
-SHA256 (wtf-20160531.tar.gz) = 9c038d2dfeccca95fcd51834c260d3bf652d16eddd6dfa9a61f9548f7a92ff74
-SIZE (wtf-20160531.tar.gz) = 24557
+TIMESTAMP = 1468938650
+SHA256 (wtf-20160719.tar.gz) = 2f0c568ed3b0f1435850ca1eb5de95ef7c7cb223e64ae9c0525ed03118b8dd68
+SIZE (wtf-20160719.tar.gz) = 24611
diff --git a/graphics/SciPlot/Makefile b/graphics/SciPlot/Makefile
index 4c1f6fd49b5..d8f1be45e45 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 c2fe55c7013..65d1394d113 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/bmeps/Makefile b/graphics/bmeps/Makefile
index d8f7dac365a..467e7bc5dea 100644
--- a/graphics/bmeps/Makefile
+++ b/graphics/bmeps/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bmpp
-PORTVERSION=	4.3.1
+PORTVERSION=	4.3.6
 CATEGORIES=	graphics perl5
 MASTER_SITES=	SF/dktools/dktools/dktools-${PORTVERSION}
 DISTNAME=	dktools-${PORTVERSION}
@@ -24,15 +24,12 @@ CONFIGURE_ENV=	ac_cv_header_sys_termios_h=no \
 		ac_cv_header_db_h=no
 
 ALL_TARGET=	bmpp
-USES=		gmake jpeg
-
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+USES=		gmake jpeg localbase
 
 PLIST_FILES=	bin/bmpp
 
 post-patch:
-	${REINPLACE_CMD} 's@sz->lsz =@st->lsz =@' ${WRKSRC}/dk3sf.c
+	@${REINPLACE_CMD} 's@sz->lsz =@st->lsz =@' ${WRKSRC}/dk3sf.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bmpp ${STAGEDIR}${PREFIX}/bin
diff --git a/graphics/bmeps/distinfo b/graphics/bmeps/distinfo
index ab3d03235b0..072c573b930 100644
--- a/graphics/bmeps/distinfo
+++ b/graphics/bmeps/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1464338602
-SHA256 (dktools-4.3.1.tar.gz) = 65ca2e70a998c15da776716c67a58b0108afd8ea6e41ea49c29475ad040b4364
-SIZE (dktools-4.3.1.tar.gz) = 9608175
+TIMESTAMP = 1468801664
+SHA256 (dktools-4.3.6.tar.gz) = 8e9f47d6f2bee32f30aca134396720057d530ad01b2a29b01b4dd5437fc169c6
+SIZE (dktools-4.3.6.tar.gz) = 8891499
diff --git a/graphics/deegree-igeoportal/Makefile b/graphics/deegree-igeoportal/Makefile
index a1563fbe0c0..db06bd23b28 100644
--- a/graphics/deegree-igeoportal/Makefile
+++ b/graphics/deegree-igeoportal/Makefile
@@ -12,6 +12,8 @@ DISTNAME=	${PORTNAME}-std_${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Browser based client handling WMS, WFS, and proxy service
 
+LICENSE=	LGPL21+
+
 USES=		zip
 USE_JAVA=	1.6+
 
@@ -34,14 +36,14 @@ OPTIONS_DEFINE=	DOCS
 
 .if ${PORT_OPTIONS:MTOMCAT6}
 TOMCATVER=	apache-tomcat-6.0
-TCPORT=	8180
+TCPORT=		8180
 BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat6
 RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat6
 .endif
 
 .if ${PORT_OPTIONS:MTOMCAT7}
 TOMCATVER=	apache-tomcat-7.0
-TCPORT=	8080
+TCPORT=		8080
 BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat7
 RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat7
 .endif
@@ -51,10 +53,11 @@ post-extract:
 	@${TAR} xf ${WRKDIR}/igeoportal-std.war -C ${WRKDIR}/${PORTDIRNAME}
 
 do-install:
-	${INSTALL} -d ${STAGEDIR}${WEBAPPDIR}/${PORTDIRNAME}
+	@${MKDIR} ${STAGEDIR}${WEBAPPDIR}/${PORTDIRNAME}
 	@cd ${WRKDIR}/${PORTDIRNAME} && ${COPYTREE_SHARE} \* ${STAGEDIR}${WEBAPPDIR}/${PORTDIRNAME}
 
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKDIR}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/graphics/gimpfx-foundry/Makefile b/graphics/gimpfx-foundry/Makefile
index fbac1559503..39d9fe95808 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 73856300d05..08fb5bb5154 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 02cbe9d0de3..ed167da594e 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 0bb5a630801..7beb9e55ad7 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 736fb4667fa..a896e7829d8 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 52a60c5a281..bba09d88941 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 a73efaa324f..30c6aedb4f7 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 f58d571a6fe..1145b286c3f 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 abafc5f1fda..6a8f7a3d397 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 20a78ea372f..7f18874bdc9 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 782b9124ff0..d7ab0d1f58a 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/p5-Number-Phone-JP/Makefile b/japanese/p5-Number-Phone-JP/Makefile
index dc1f26f4fae..5952077346e 100644
--- a/japanese/p5-Number-Phone-JP/Makefile
+++ b/japanese/p5-Number-Phone-JP/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Number-Phone-JP
-PORTVERSION=	0.20160601
+PORTVERSION=	0.20160705
 CATEGORIES=	japanese perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TANIGUCHI
diff --git a/japanese/p5-Number-Phone-JP/distinfo b/japanese/p5-Number-Phone-JP/distinfo
index 61db258fcd5..fc8701acc6c 100644
--- a/japanese/p5-Number-Phone-JP/distinfo
+++ b/japanese/p5-Number-Phone-JP/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1465069640
-SHA256 (Number-Phone-JP-0.20160601.tar.gz) = 0cbc50db54b7d6891dc4c51f2cca25557ecb34b4c9cba18beea50007bddb47ec
-SIZE (Number-Phone-JP-0.20160601.tar.gz) = 409567
+TIMESTAMP = 1468977970
+SHA256 (Number-Phone-JP-0.20160705.tar.gz) = 4068bdb4747ba1176c119aff71bd462a63adbb06e22ba959b3a041db3ee0d076
+SIZE (Number-Phone-JP-0.20160705.tar.gz) = 409560
diff --git a/japanese/ruby-romkan/Makefile b/japanese/ruby-romkan/Makefile
index cb56e464198..abc760bcd08 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 4546dbe7e21..5b1eab76b51 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 c179362ba72..c5634e42cc3 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 2aa42e13c23..98b48a7f6bd 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 a642f76aa9d..553f128438a 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 3b103a39a99..328356a3618 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 9c7e233f988..e1b623395c3 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 2cd852a3a35..1399279aaa5 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 dabac5cf9e2..2eac2069544 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 a08f729b814..45103fe9448 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/lang/rubinius/Makefile b/lang/rubinius/Makefile
index a59fd6c9036..683d3fe73bf 100644
--- a/lang/rubinius/Makefile
+++ b/lang/rubinius/Makefile
@@ -20,6 +20,7 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/bundle:sysutils/rubygem-bundler \
 
 BROKEN_FreeBSD_9=	does not build
 BROKEN_FreeBSD_11=	does not build
+BROKEN_FreeBSD_12=	does not build
 
 BROKEN_RUBY22=	yes
 BROKEN_RUBY23=	yes
diff --git a/mail/amavis-logwatch/Makefile b/mail/amavis-logwatch/Makefile
index ccb0d2bf798..daa487ab2d3 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 b5597450d55..540ea73968a 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 8155a800a84..4992e2baad2 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 eec918fd9ec..16869fefd01 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 df06279c224..90e9024b69b 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 df15543eb65..eb9f061eeff 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 81a8a2675cd..d70b53775b6 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 d58060cc135..2d61b3f2f2c 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 3a4d045348f..06df96251f1 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 9b1d2d9dad0..a465db8a723 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 1988dc2f8c5..b31584c7dec 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 8b9e46a393a..4bb6d5964f7 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/gambit/Makefile b/math/gambit/Makefile
index d093bfca403..9263d4aa544 100644
--- a/math/gambit/Makefile
+++ b/math/gambit/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gambit
-PORTVERSION=	14.1.0
+PORTVERSION=	15.1.0
 CATEGORIES=	math
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}${PORTVERSION:R:R}/${PORTVERSION}
 
@@ -17,7 +17,6 @@ USE_GNOME=	gtk20
 USE_WX=		3.0
 USE_CXXSTD=	c++11
 WX_CONF_ARGS=	absolute
-WX_UNICODE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/math/gambit/distinfo b/math/gambit/distinfo
index cb1bd8dee0c..47e390002cd 100644
--- a/math/gambit/distinfo
+++ b/math/gambit/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gambit-14.1.0.tar.gz) = 128d570fc20f3e78739408c0c0485e37df2f3e9485e81acfc0970b49d5b6d327
-SIZE (gambit-14.1.0.tar.gz) = 1702475
+TIMESTAMP = 1468957674
+SHA256 (gambit-15.1.0.tar.gz) = 5f71279666c0a6c3ee2196189ea95c0307e32c834d940ca633abd3a1ca757311
+SIZE (gambit-15.1.0.tar.gz) = 1773167
diff --git a/math/gambit/pkg-plist b/math/gambit/pkg-plist
index 2437cc7c3bc..ed36c77d018 100644
--- a/math/gambit/pkg-plist
+++ b/math/gambit/pkg-plist
@@ -28,6 +28,7 @@ include/libgambit/behavitr.h
 include/libgambit/behavspt.h
 include/libgambit/dvector.h
 include/libgambit/dvector.imp
+include/libgambit/function.h
 include/libgambit/game.h
 include/libgambit/gameagg.h
 include/libgambit/gamebagg.h
@@ -44,10 +45,12 @@ include/libgambit/pvector.h
 include/libgambit/pvector.imp
 include/libgambit/rational.h
 include/libgambit/recarray.h
+include/libgambit/shared_ptr.h
 include/libgambit/sqmatrix.h
 include/libgambit/sqmatrix.imp
 include/libgambit/stratitr.h
 include/libgambit/stratspt.h
+include/libgambit/tinyxml.h
 include/libgambit/trie_map.h
 include/libgambit/trie_map.imp
 include/libgambit/vector.h
diff --git a/math/ised/Makefile b/math/ised/Makefile
index 1180e72cf56..2b523de45eb 100644
--- a/math/ised/Makefile
+++ b/math/ised/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ised
-PORTVERSION=	2.7.0
+PORTVERSION=	2.7.1
 CATEGORIES=	math
 MASTER_SITES=	SF/${PORTNAME}
 
diff --git a/math/ised/distinfo b/math/ised/distinfo
index 3c5be5b892a..fc703bbd4fb 100644
--- a/math/ised/distinfo
+++ b/math/ised/distinfo
@@ -1,2 +1,3 @@
-SHA256 (ised-2.7.0.tar.bz2) = 903cc153648fa09f3aa8fdaf7f0f52610e60abe0d72c5181eaca41ba7d7d9f23
-SIZE (ised-2.7.0.tar.bz2) = 140641
+TIMESTAMP = 1468977878
+SHA256 (ised-2.7.1.tar.bz2) = abaecf32194c40b9198ee19b3a6ab96f16079e48e7f586adca784ec88351103a
+SIZE (ised-2.7.1.tar.bz2) = 140737
diff --git a/math/ntl/Makefile b/math/ntl/Makefile
index 3c848e1e312..68662e9d48f 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 ad851714da0..634d355e704 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 dec038b0202..75a40fd6f6d 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 1797f15f7df..9faaa4408d7 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 542d65547bb..54d840eec36 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 6bf583f6ce3..637a0500c10 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 c1ea452317d..c2eecad2ea8 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 a1ae11c2a55..764a0eda7c9 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/vifm/Makefile b/misc/vifm/Makefile
index 31c199a937c..9e41fa01721 100644
--- a/misc/vifm/Makefile
+++ b/misc/vifm/Makefile
@@ -2,16 +2,17 @@
 # $FreeBSD$
 
 PORTNAME=	vifm
-PORTVERSION=	0.8.1
+PORTVERSION=	0.8.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	misc
 
 MAINTAINER=	mp39590@gmail.com
 COMMENT=	Ncurses based file manager with vi like keybindings
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		desktop-file-utils gmake ncurses tar:bzip2
+USES=		desktop-file-utils gmake ncurses
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-gtk
 
diff --git a/misc/vifm/distinfo b/misc/vifm/distinfo
index 711e2bab4d4..e95c1e54d40 100644
--- a/misc/vifm/distinfo
+++ b/misc/vifm/distinfo
@@ -1,2 +1,3 @@
-SHA256 (vifm-vifm-v0.8.1_GH0.tar.gz) = 7f318b1770207344cddd1aea9da5c4c48cec2484c9efe4b49ea7b9d65066f3f7
-SIZE (vifm-vifm-v0.8.1_GH0.tar.gz) = 1011331
+TIMESTAMP = 1468759471
+SHA256 (vifm-vifm-v0.8.2_GH0.tar.gz) = 075ae740b1da2857ced40f85c7b81989b1fb8d055ca852dfd32b3aaab0fb742d
+SIZE (vifm-vifm-v0.8.2_GH0.tar.gz) = 1097953
diff --git a/misc/zoneinfo/Makefile b/misc/zoneinfo/Makefile
index 715553398cb..daf17603ccb 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/emby-server/Makefile b/multimedia/emby-server/Makefile
index f2741fbf1fb..751ac4a7f46 100644
--- a/multimedia/emby-server/Makefile
+++ b/multimedia/emby-server/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	emby-server
-PORTVERSION=	3.0.5985
+PORTVERSION=	3.0.5986
 CATEGORIES=	multimedia
 
 MAINTAINER=	woodsb02@FreeBSD.org
diff --git a/multimedia/emby-server/distinfo b/multimedia/emby-server/distinfo
index c60927a1315..d7c0fa4676e 100644
--- a/multimedia/emby-server/distinfo
+++ b/multimedia/emby-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1468021864
-SHA256 (MediaBrowser-Emby-3.0.5985_GH0.tar.gz) = 8bc025dfa35aa9ee23dd9682f19b6a248233afad0aebe55a379c1b7753c6e89a
-SIZE (MediaBrowser-Emby-3.0.5985_GH0.tar.gz) = 56062245
+TIMESTAMP = 1468931118
+SHA256 (MediaBrowser-Emby-3.0.5986_GH0.tar.gz) = 3df615ff56c7f1d76746d2d38f9933b613674a4aea92e786dda9de34f9f68c51
+SIZE (MediaBrowser-Emby-3.0.5986_GH0.tar.gz) = 56064667
diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile
index 71c1f96326d..ad30497eb92 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-im/uTox/Makefile b/net-im/uTox/Makefile
index 18ad148e60e..5b85f2aa046 100644
--- a/net-im/uTox/Makefile
+++ b/net-im/uTox/Makefile
@@ -5,7 +5,7 @@ PORTVERSION=	0.9.5.20160530
 PORTREVISION=	1
 CATEGORIES=	net-im net-p2p
 
-MAINTAINER=	fidaj@ukr.net
+MAINTAINER=	portmaster@BSDforge.com
 COMMENT=	Lightweight Tox client
 
 LICENSE=	GPLv3
diff --git a/net-mgmt/devmon/Makefile b/net-mgmt/devmon/Makefile
index 7826a8b5cc6..62c269e7d3e 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 8924caf1da0..2f72abecb63 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 68b3459830a..2a7fd547d82 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 b2ac5bf0000..441607e4ee9 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 34cf3c3247e..3f7b4d71617 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 ef0dfc3334c..4997088abc1 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 6c01a620396..7e90da096f7 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 a8d8522ea9e..0d6c8f87c87 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 e5b4db03164..6c3211682bb 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 d77aac00135..c20088c3956 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 05136147a68..64404be9ee6 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 c9fb593baef..0c45a24611e 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 6e9b34b425d..3b98d553359 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 94d057e901a..44fbdd86130 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 032e6f12fc2..66b94799efb 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/java-beepcore/Makefile b/net/java-beepcore/Makefile
index 5ecfc758f01..7659760caad 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 53123435c2a..d77ccbd4a64 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 c4daf669bbb..289a44e289d 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/py-amqp/Makefile b/net/py-amqp/Makefile
index 16dea56dbba..8623d2647d9 100644
--- a/net/py-amqp/Makefile
+++ b/net/py-amqp/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	amqp
-PORTVERSION=	1.4.7
+PORTVERSION=	1.4.9
 CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -10,13 +10,13 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	wg@FreeBSD.org
 COMMENT=	Low-level AMQP client for Python (fork of amqplib)
 
+LICENSE=	LGPL21
+
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}unittest2>=0.4.0:devel/py-unittest2 \
 		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \
 		${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage \
 		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
 
-LICENSE=	LGPL21
-
 USES=		python
 USE_PYTHON=	autoplist distutils
 
diff --git a/net/py-amqp/distinfo b/net/py-amqp/distinfo
index 8f0b1a0056d..178d76c479f 100644
--- a/net/py-amqp/distinfo
+++ b/net/py-amqp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (amqp-1.4.7.tar.gz) = 1781884b53e01209eeced13ca1d941f1a7026088974edb6fb62728638bd02dda
-SIZE (amqp-1.4.7.tar.gz) = 79189
+SHA256 (amqp-1.4.9.tar.gz) = 2dea4d16d073c902c3b89d9b96620fb6729ac0f7a923bbc777cb4ad827c0c61a
+SIZE (amqp-1.4.9.tar.gz) = 79392
diff --git a/net/py-kombu/Makefile b/net/py-kombu/Makefile
index 9ed90f29de5..37372f8d0c1 100644
--- a/net/py-kombu/Makefile
+++ b/net/py-kombu/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	kombu
-PORTVERSION=	3.0.32
+PORTVERSION=	3.0.35
 CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -31,7 +31,6 @@ REDIS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}redis>0:databases/py-redis
 SQLALCHEMY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy07>0:databases/py-sqlalchemy07
 ZMQ_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyzmq>=13.1.0:net/py-pyzmq
 
-
 USES=		python
 USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
diff --git a/net/py-kombu/distinfo b/net/py-kombu/distinfo
index bcf9b6b3468..e1d721c42d0 100644
--- a/net/py-kombu/distinfo
+++ b/net/py-kombu/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kombu-3.0.32.tar.gz) = d3edda02076ae04fa62d128007756f4c4298fe479119ca070a47a22afe867660
-SIZE (kombu-3.0.32.tar.gz) = 380958
+SHA256 (kombu-3.0.35.tar.gz) = 22ab336a17962717a5d9470547e5508d4bcf1b6ec10cd9486868daf4e5edb727
+SIZE (kombu-3.0.35.tar.gz) = 381135
diff --git a/net/remotebox/Makefile b/net/remotebox/Makefile
index 67ac06c5ae4..92b9082216d 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 f824aad81bb..225c4d52170 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 22bc5b2ab50..66d2e71c718 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 a6ba7ddce41..47502471737 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 a0df64ea14c..f12b5207a49 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 96f41a6dcb9..3769e71186f 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/ports-mgmt/jailaudit/Makefile b/ports-mgmt/jailaudit/Makefile
index 425f2f3a918..ba430c85a44 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 a64140a3440..92f7bcc39d3 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 44dd756ffbc..5c6e3fc1219 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 71b00f586af..ce5105486eb 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 3c15a283e8f..ecd2ce8febc 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 0651c282993..907ccab287c 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 c088af5ff3f..81c0cf88cba 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 da0ee9c64ca..4843ee50a47 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 5bebf3ff042..a9722eb2b56 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/cryptlib/Makefile b/security/cryptlib/Makefile
index da02c6340c8..14ca85711ab 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 a7dbfb44729..ad2edb19300 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 e30281fe8e0..6b45c658507 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 e1a53a8b98f..2a4e03e3e9c 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 0517154e91e..15d22c41c5c 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 04f7745a5c8..52cad575cd3 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 e372b6c71a7..7513f37a9f1 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 2a1a95914e7..7b011dd0947 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 0dc3700d335..81200a77027 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/py-pyscard/Makefile b/security/py-pyscard/Makefile
index 3901e3edaa6..fe0b69c350d 100644
--- a/security/py-pyscard/Makefile
+++ b/security/py-pyscard/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pyscard
-PORTVERSION=	1.9.3
+PORTVERSION=	1.9.4
 CATEGORIES=	security python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/security/py-pyscard/distinfo b/security/py-pyscard/distinfo
index 58c0497f0b1..5fa40d1f0ab 100644
--- a/security/py-pyscard/distinfo
+++ b/security/py-pyscard/distinfo
@@ -1,2 +1,3 @@
-SHA256 (pyscard-1.9.3.tar.gz) = cb8a18fc1342099ecb38e93d50d42c5ab56792e5be5fb243d6af3afaa48a2cec
-SIZE (pyscard-1.9.3.tar.gz) = 145926
+TIMESTAMP = 1468924890
+SHA256 (pyscard-1.9.4.tar.gz) = 9b4c36b98264a1ec6523561cb904724b16022d6ba051b5d14b69c2862eb9c03e
+SIZE (pyscard-1.9.4.tar.gz) = 147034
diff --git a/security/retranslator/Makefile b/security/retranslator/Makefile
index 0b50c588f2e..e0b2f7a6bef 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 fae6d557846..ff9b1a6f6f9 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/vnccrack/Makefile b/security/vnccrack/Makefile
index 5daa25c1e64..61f8b29c7e5 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 cdd98c6d2bc..29c88b3e9b2 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 1e2d4170928..5961b8434d7 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 fc70ea45508..921ed7062d4 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 e8075463e9a..1d150b2e172 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 e645158a34a..8a382398f1a 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 ff4537b4f75..c7698b04b47 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 6c64fcc2526..7a568bc3c1b 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 960ade96524..6eba88dd1ca 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 f8adbfe8aa8..d37fdd29eeb 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 978da1586f8..53208d97591 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/munin-common/files/patch-Makefile b/sysutils/munin-common/files/patch-Makefile
index 12af94e59f0..7a9536c8c7a 100644
--- a/sysutils/munin-common/files/patch-Makefile
+++ b/sysutils/munin-common/files/patch-Makefile
@@ -134,7 +134,17 @@
  	    fi                                                 \
  	done
  
-@@ -183,7 +166,7 @@ install-async:
+@@ -176,14 +159,14 @@ install-plugins-java: build-plugins-java
+ install-async-prime: install-async
+ 
+ install-async:
+-	mkdir -p $(LIBDIR)
+-	$(INSTALL) -m 0755 build/node/_bin/munin-async $(LIBDIR)/
+-	$(INSTALL) -m 0755 build/node/_bin/munin-asyncd $(LIBDIR)/
++	mkdir -p $(DESTDIR)$(LIBDIR)
++	$(INSTALL) -m 0755 build/node/_bin/munin-async $(DESTDIR)$(LIBDIR)/
++	$(INSTALL) -m 0755 build/node/_bin/munin-asyncd $(DESTDIR)$(LIBDIR)/
+ 
  install-node-prime: install-node-pre install-node
  
  install-node-pre: build/node/munin-node.conf install-pre
diff --git a/sysutils/munin-common/files/patch-plugins_node.d_ntp__states.in b/sysutils/munin-common/files/patch-plugins_node.d_ntp__states.in
new file mode 100644
index 00000000000..732d58a22e3
--- /dev/null
+++ b/sysutils/munin-common/files/patch-plugins_node.d_ntp__states.in
@@ -0,0 +1,10 @@
+--- plugins/node.d/ntp_states.in.orig	2014-11-24 21:46:24 UTC
++++ plugins/node.d/ntp_states.in
+@@ -53,6 +53,7 @@ my %stateval = (
+                  "excess"    => 2,
+                  "backup"    => 3,
+                  "outlyer"   => 4,
++                 "outlier"   => 4,
+                  "candidate" => 5,
+                  "sys.peer"  => 6,
+                  "pps.peer"  => 7
diff --git a/sysutils/munin-common/munin.mk b/sysutils/munin-common/munin.mk
index dc1dc1ea178..91eb1da6563 100644
--- a/sysutils/munin-common/munin.mk
+++ b/sysutils/munin-common/munin.mk
@@ -29,6 +29,7 @@ MAKE_ARGS=	${MUNIN_DIRS} \
 USERS=		munin
 GROUPS=		munin
 PLIST_SUB=	${MUNIN_DIRS} USER=${USERS} GROUP=${GROUPS}
+SUB_LIST=	${MUNIN_DIRS} USER=${USERS} GROUP=${GROUPS}
 
 CPE_VENDOR=	munin-monitoring
 
diff --git a/sysutils/munin-node/Makefile b/sysutils/munin-node/Makefile
index 38cc4594f16..4c2200eb542 100644
--- a/sysutils/munin-node/Makefile
+++ b/sysutils/munin-node/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	munin
 PORTVERSION=	${MUNIN_VERSION}
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	${MUNIN_SITES}
 PKGNAMESUFFIX=	-node
@@ -32,8 +32,8 @@ SHEBANG_FILES=	node/sbin/munin-node node/sbin/munin-sched \
 
 .include "${.CURDIR}/../munin-common/munin.mk"
 
-ALL_TARGET=	build-node build-plugins
-INSTALL_TARGET=	install-node-prime install-plugins-prime
+ALL_TARGET=	build-node build-plugins build/node/_bin/munin-async build/node/_bin/munin-asyncd
+INSTALL_TARGET=	install-node-prime install-async-prime install-plugins-prime
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	SNMP PERL JAVA
@@ -55,7 +55,7 @@ JAVA_BUILD=	yes
 JAVA_RUN=	yes
 
 SUB_FILES=	pkg-message plugins.conf
-USE_RC_SUBR=	munin-node munin-sched
+USE_RC_SUBR=	munin-asyncd munin-node munin-sched
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
@@ -72,9 +72,7 @@ post-patch:
 	@${FIND} ${WRKSRC}/node/sbin -type f -name "*.orig" -delete
 
 post-install:
-	${MKDIR} ${STAGEDIR}${DBDIR}/plugin-state
-	${INSTALL_SCRIPT} ${WRKDIR}/munin-node \
-		${STAGEDIR}${PREFIX}/etc/rc.d/munin-node
+	${MKDIR} ${STAGEDIR}${DBDIR}/plugin-state ${STAGEDIR}${SPOOLDIR}/async
 	${INSTALL_DATA} ${WRKSRC}/build/node/munin-node.conf \
 		${STAGEDIR}${ETCDIR}/munin-node.conf.sample
 	${INSTALL_DATA} ${WRKDIR}/plugins.conf \
diff --git a/sysutils/munin-node/files/munin-asyncd.in b/sysutils/munin-node/files/munin-asyncd.in
new file mode 100644
index 00000000000..f21878cee67
--- /dev/null
+++ b/sysutils/munin-node/files/munin-asyncd.in
@@ -0,0 +1,40 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: munin-asyncd
+# REQUIRE: DAEMON munin-node
+# BEFORE:  cron
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf to enable munin-asyncd:
+# munin_asyncd_enable (bool):   Set to "NO" by default.
+#                               Set it to "YES" to enable munin-asyncd
+# munin_asyncd_spool:           The spool directory, default:
+#                               %%DBDIR%%/async
+# munin_asyncd_host:            Host to connect to, default: localhost:4949
+# munin_asyncd_args:            Extra args to pass to munin-asyncd
+#
+
+. /etc/rc.subr
+
+name=munin_asyncd
+rcvar=munin_asyncd_enable
+
+load_rc_config $name
+
+: ${munin_asyncd_enable:=NO}
+: ${munin_asyncd_spool:=%%SPOOLDIR%%/async}
+: ${munin_asyncd_host:=localhost:4949}
+
+command="%%DATADIR%%/munin-asyncd"
+command_interpreter="%%PREFIX%%/bin/perl"
+pidfile="/var/run/${name}.pid"
+
+start_cmd()
+{
+        check_startmsgs && echo "Starting ${name}."
+        daemon -u %%USER%% -f -p ${pidfile} ${command_interpreter} ${command} --spool ${munin_asyncd_spool} --host ${munin_asyncd_host} ${munin_asyncd_args}
+}
+
+run_rc_command $1
diff --git a/sysutils/munin-node/pkg-plist b/sysutils/munin-node/pkg-plist
index 838f50c2b0a..6f755c8ce0c 100644
--- a/sysutils/munin-node/pkg-plist
+++ b/sysutils/munin-node/pkg-plist
@@ -50,6 +50,8 @@ sbin/munin-node
 sbin/munin-node-configure
 sbin/munin-run
 sbin/munin-sched
+%%DATADIR%%/munin-async
+%%DATADIR%%/munin-asyncd
 %%JAVA%%%%DATADIR%%/munin-jmx-plugins.jar
 %%DATADIR%%/plugins/amavis
 %%DATADIR%%/plugins/apache_accesses
@@ -251,4 +253,6 @@ sbin/munin-sched
 %%DATADIR%%/plugins/zimbra_
 @dir(%%USER%%,%%GROUP%%,) %%DBDIRNODE%%/plugin-state
 @dir %%ETCDIR%%/plugins
+@dir(%%USER%%,%%GROUP%%,) %%SPOOLDIR%%/async
+@comment @dir %%SPOOLDIR%%
 @comment @dir %%DBDIRNODE%%
diff --git a/sysutils/plconfig/Makefile b/sysutils/plconfig/Makefile
index 98d645851d2..084f580b916 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/sysutils/qjail/Makefile b/sysutils/qjail/Makefile
index 9e1c2b8eae3..16cecb2cfd4 100644
--- a/sysutils/qjail/Makefile
+++ b/sysutils/qjail/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	qjail
-PORTVERSION=	4.8
+PORTVERSION=	4.9
 CATEGORIES=	sysutils
 MASTER_SITES=	SF/${PORTNAME}
 
@@ -22,6 +22,7 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 USES=		tar:bzip2
 NO_BUILD=	yes
+NO_ARCH=	yes
 
 CONFLICTS_INSTALL=	qjail-2.* qjail-3.*
 
diff --git a/sysutils/qjail/distinfo b/sysutils/qjail/distinfo
index 6b39f10641e..e48262345ae 100644
--- a/sysutils/qjail/distinfo
+++ b/sysutils/qjail/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qjail-4.8.tar.bz2) = dc41c6a7c498129202d3973db11a6a6600ec598a9ac8aeaa8d0baeeba1553224
-SIZE (qjail-4.8.tar.bz2) = 64593
+SHA256 (qjail-4.9.tar.bz2) = 163d8893d431ab0699156db4a15c1c8927a71c4918014adb6006a8b6657cb49b
+SIZE (qjail-4.9.tar.bz2) = 66048
diff --git a/sysutils/zrep/Makefile b/sysutils/zrep/Makefile
index 3199ef9836a..6b7da1782ee 100644
--- a/sysutils/zrep/Makefile
+++ b/sysutils/zrep/Makefile
@@ -1,30 +1,30 @@
 # $FreeBSD$
 
 PORTNAME=	zrep
-PORTVERSION=	1.0.1
+PORTVERSION=	1.6.1
+PORTREVISION=	1
+DISTVERSIONPREFIX= v
 CATEGORIES=	sysutils
-MASTER_SITES=	http://www.bolthole.com/solaris/zrep/ \
-		http://www.bsdstore.ru/downloads/
-DISTNAME=	${PORTNAME}
-EXTRACT_SUFX=
 
 MAINTAINER=	olevole@olevole.ru
 COMMENT=	ZFS based replication and failover solution
 
+LICENSE=	bolthole
+LICENSE_NAME=	bolthole
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+LICENSE_PERMS=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell
+
 RUN_DEPENDS=	ksh93:shells/ksh93
 
+USE_GITHUB=     yes
+GH_ACCOUNT=     bolthole
+
 PLIST_FILES=	bin/zrep
 
 NO_BUILD=	yes
 
-.include <bsd.port.options.mk>
-
 post-patch:
-	@${REINPLACE_CMD} -e 's|#!/bin/ksh -p|#!${PREFIX}/bin/ksh93 -p|' ${WRKSRC}/zrep
-
-do-extract:
-	@${MKDIR} ${WRKSRC}
-	@${CP} -p ${DISTDIR}/${PORTNAME} ${WRKSRC}
+	@${REINPLACE_CMD} -e 's|#!/bin/ksh -p|#!${LOCALBASE}/bin/ksh93 -p|' ${WRKSRC}/zrep
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}/${PREFIX}/bin
diff --git a/sysutils/zrep/distinfo b/sysutils/zrep/distinfo
index 883f316d43f..2f4a8d01230 100644
--- a/sysutils/zrep/distinfo
+++ b/sysutils/zrep/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zrep) = 2156852bfe0e9ed3a220cbb459ffb2b423488de023b03f8f9c8e1af876a44b75
-SIZE (zrep) = 45158
+SHA256 (bolthole-zrep-v1.6.1_GH0.tar.gz) = d40cbb2a04a88673d3d82ce4ae98ef9b17f5c80ac14ef7f552eea6f473381cb4
+SIZE (bolthole-zrep-v1.6.1_GH0.tar.gz) = 44599
diff --git a/sysutils/zrep/files/patch-zrep b/sysutils/zrep/files/patch-zrep
deleted file mode 100644
index 608be8ba7d3..00000000000
--- a/sysutils/zrep/files/patch-zrep
+++ /dev/null
@@ -1,94 +0,0 @@
---- zrep.orig	2013-05-13 22:01:15.000000000 +0400
-+++ zrep	2013-11-19 18:37:52.921978370 +0400
-@@ -15,7 +15,6 @@
- ZREP_PATH=${ZREP_PATH:-zrep}  #Set to /path/to/zrep, if needed, for remote
- #ZREP_CREATE_FLAGS="-o whatever"   #Set for extra options on remote zfs create
- 
--
- #########################################################################
- # Everyting else below here, should not be touched. First we have autodetect
- # routines, and then internal utilities such as locking functions.
-@@ -35,8 +34,8 @@
- 
- # dump the usage message, and check for capabilities
- # make sure we dont spew for non-root, so that "zrep status" works
--case `id` in
--	*\(root\))
-+case `whoami` in
-+	root)
- 	zrep_checkfile=/var/run/zrep.check.$$
- 	;;
- 	*)
-@@ -109,7 +108,8 @@
- # Note that we check for "us, OR our global parent", if different
- #
- zrep_has_global_lock(){
--	lockpid=`ls -l $Z_GLOBAL_LOCKFILE 2>/dev/null |awk -F/ '{print $NF}'`
-+	[ ! -f "${Z_GLOBAL_LOCKFILE}" ] && return 1
-+	lockpid=`cat ${Z_GLOBAL_LOCKFILE}`
- 	if [[ "$lockpid" == "" ]] ; then return 1 ; fi
- 	if [[ "$lockpid" != "$Z_GLOBAL_PID" ]] ; then
- 		if [[ "$lockpid" != "$$" ]] ; then
-@@ -127,7 +127,10 @@
- zrep_get_global_lock(){
- 	typeset retry_count=$Z_LOCK_RETRY
- 
--	ln -s /proc/$Z_GLOBAL_PID $Z_GLOBAL_LOCKFILE && return 0
-+	if  [ ! -f "${Z_GLOBAL_LOCKFILE}" ] ; then
-+            echo $Z_GLOBAL_PID > $Z_GLOBAL_LOCKFILE
-+            return 0
-+        fi
- 
- 	# otherwise, deal with fail
- 	# Check for dead old holder first.
-@@ -135,7 +138,10 @@
- 	
- 	while (( retry_count > 0 )); do
- 		sleep 1
--		ln -s /proc/$Z_GLOBAL_PID $Z_GLOBAL_LOCKFILE && return 0
-+		if  [ ! -f "${Z_GLOBAL_LOCKFILE}" ] ; then
-+		    echo $Z_GLOBAL_PID > $Z_GLOBAL_LOCKFILE
-+		    return 0
-+		fi
- 		retry_count=$((retry_count-1))
- 	done
- 
-@@ -178,7 +184,9 @@
- 	typeset check=`zrep_fs_lock_pid $1` newcheck
- 	if [[ "$check" != "-" ]] ; then
- 		# validate fs lock before giving up
--		ls -d /proc/$check >/dev/null 2>&1 && return 1
-+	    if [ "${check}" != "-" ] ; then
-+                [ -f "${Z_GLOBAL_LOCKFILE}" ] && return 1
-+            fi
- 	fi
- 
- 	zrep_get_global_lock  || return 1
-@@ -257,8 +265,7 @@
- 
- zrep_gettimeinseconds(){
- 	# unfortunately, solaris date doesnt do '%s', so need to use perl
--	typeset PATH=$PERL_BIN:$PATH
--	perl -e 'print int(time);'
-+	    date +%s
- }
- ###### zrep_status
- 
-@@ -713,7 +720,7 @@
- 		READONLYPROP="-o readonly=on"
- 	else
- 		READONLYPROP=""
--		print Ancient local version of ZFS detected.
-+#		print Ancient local version of ZFS detected.
- 		print Creating destination filesystem as separate step
- 		zrep_ssh $desthost zfs create $ZREP_CREATE_FLAGS -o readonly=on $destfs || zrep_errquit "Cannot create $desthost:$destfs"
- 	fi
-@@ -757,7 +764,7 @@
- 	# Successful initial sync! Woo! okay record that, etc.
- 	# ... after stupid old-zfs-compat junk, that is
- 	if (( ! Z_HAS_X )) ; then
--		print Debug: Because you have old zfs support, setting remote properties by hand
-+#		print Debug: Because you have old zfs support, setting remote properties by hand
- 		zrep_ssh $desthost zfs set readonly=on $destfs	||
- 			clearquit Could not set readonly for $desthost:$destfs
- 
diff --git a/textproc/kibana41/Makefile b/textproc/kibana41/Makefile
index 7be75bcf14b..14481ca022c 100644
--- a/textproc/kibana41/Makefile
+++ b/textproc/kibana41/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	kibana
-PORTVERSION=	4.1.6
+PORTVERSION=	4.1.10
 DISTVERSIONSUFFIX=	-linux-x86
 CATEGORIES=	textproc www
 MASTER_SITES=	http://download.elastic.co/kibana/kibana/
diff --git a/textproc/kibana41/distinfo b/textproc/kibana41/distinfo
index 1b9c245effd..5ea4dbf36b9 100644
--- a/textproc/kibana41/distinfo
+++ b/textproc/kibana41/distinfo
@@ -1,2 +1,3 @@
-SHA256 (kibana-4.1.6-linux-x86.tar.gz) = 8b812eef1053eb654918009f7caab8035fcb1f61bdacbeaf232aca58022596eb
-SIZE (kibana-4.1.6-linux-x86.tar.gz) = 18096111
+TIMESTAMP = 1468835340
+SHA256 (kibana-4.1.10-linux-x86.tar.gz) = 0c87db8dde429bb3ca696d3c30163117299cc9de56923aeb6d86a6edd8afda51
+SIZE (kibana-4.1.10-linux-x86.tar.gz) = 18397470
diff --git a/textproc/kibana45/Makefile b/textproc/kibana45/Makefile
index f8e0dfeaf55..4ede30b749a 100644
--- a/textproc/kibana45/Makefile
+++ b/textproc/kibana45/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	kibana
-PORTVERSION?=	4.5.0
+PORTVERSION?=	4.5.3
 DISTVERSIONSUFFIX=	-linux-x86
 CATEGORIES=	textproc www
 MASTER_SITES=	https://download.elastic.co/kibana/kibana/ \
diff --git a/textproc/kibana45/distinfo b/textproc/kibana45/distinfo
index 8e5207ee3f0..6f0479c548c 100644
--- a/textproc/kibana45/distinfo
+++ b/textproc/kibana45/distinfo
@@ -1,2 +1,3 @@
-SHA256 (kibana-4.5.0-linux-x86.tar.gz) = d0cfdde3f19d30c2d9e8d3e289cb2b0624a99d93b9adccdfa5884a98c908b62d
-SIZE (kibana-4.5.0-linux-x86.tar.gz) = 32154895
+TIMESTAMP = 1468835382
+SHA256 (kibana-4.5.3-linux-x86.tar.gz) = 5472909617f80a05caa8f4923ea6ca6f93ddcb590b9d2585787d2db4360c9d93
+SIZE (kibana-4.5.3-linux-x86.tar.gz) = 32916554
diff --git a/textproc/kibana45/pkg-plist b/textproc/kibana45/pkg-plist
index 29f1ae64b53..139cd5f4e45 100644
--- a/textproc/kibana45/pkg-plist
+++ b/textproc/kibana45/pkg-plist
@@ -78,14 +78,10 @@
 %%WWWDIR%%/node_modules/@bigfunger/decompress-zip/node_modules/nopt/bin/nopt.js
 %%WWWDIR%%/node_modules/@bigfunger/decompress-zip/node_modules/nopt/examples/my-program.js
 %%WWWDIR%%/node_modules/@bigfunger/decompress-zip/node_modules/nopt/lib/nopt.js
-%%WWWDIR%%/node_modules/@bigfunger/decompress-zip/node_modules/nopt/node_modules/abbrev/.npmignore
-%%WWWDIR%%/node_modules/@bigfunger/decompress-zip/node_modules/nopt/node_modules/abbrev/.travis.yml
-%%WWWDIR%%/node_modules/@bigfunger/decompress-zip/node_modules/nopt/node_modules/abbrev/CONTRIBUTING.md
 %%WWWDIR%%/node_modules/@bigfunger/decompress-zip/node_modules/nopt/node_modules/abbrev/LICENSE
 %%WWWDIR%%/node_modules/@bigfunger/decompress-zip/node_modules/nopt/node_modules/abbrev/README.md
 %%WWWDIR%%/node_modules/@bigfunger/decompress-zip/node_modules/nopt/node_modules/abbrev/abbrev.js
 %%WWWDIR%%/node_modules/@bigfunger/decompress-zip/node_modules/nopt/node_modules/abbrev/package.json
-%%WWWDIR%%/node_modules/@bigfunger/decompress-zip/node_modules/nopt/node_modules/abbrev/test.js
 %%WWWDIR%%/node_modules/@bigfunger/decompress-zip/node_modules/nopt/package.json
 %%WWWDIR%%/node_modules/@bigfunger/decompress-zip/node_modules/q/CHANGES.md
 %%WWWDIR%%/node_modules/@bigfunger/decompress-zip/node_modules/q/LICENSE
@@ -140,14 +136,10 @@
 %%WWWDIR%%/node_modules/@bigfunger/decompress-zip/node_modules/touch/node_modules/nopt/bin/nopt.js
 %%WWWDIR%%/node_modules/@bigfunger/decompress-zip/node_modules/touch/node_modules/nopt/examples/my-program.js
 %%WWWDIR%%/node_modules/@bigfunger/decompress-zip/node_modules/touch/node_modules/nopt/lib/nopt.js
-%%WWWDIR%%/node_modules/@bigfunger/decompress-zip/node_modules/touch/node_modules/nopt/node_modules/abbrev/.npmignore
-%%WWWDIR%%/node_modules/@bigfunger/decompress-zip/node_modules/touch/node_modules/nopt/node_modules/abbrev/.travis.yml
-%%WWWDIR%%/node_modules/@bigfunger/decompress-zip/node_modules/touch/node_modules/nopt/node_modules/abbrev/CONTRIBUTING.md
 %%WWWDIR%%/node_modules/@bigfunger/decompress-zip/node_modules/touch/node_modules/nopt/node_modules/abbrev/LICENSE
 %%WWWDIR%%/node_modules/@bigfunger/decompress-zip/node_modules/touch/node_modules/nopt/node_modules/abbrev/README.md
 %%WWWDIR%%/node_modules/@bigfunger/decompress-zip/node_modules/touch/node_modules/nopt/node_modules/abbrev/abbrev.js
 %%WWWDIR%%/node_modules/@bigfunger/decompress-zip/node_modules/touch/node_modules/nopt/node_modules/abbrev/package.json
-%%WWWDIR%%/node_modules/@bigfunger/decompress-zip/node_modules/touch/node_modules/nopt/node_modules/abbrev/test.js
 %%WWWDIR%%/node_modules/@bigfunger/decompress-zip/node_modules/touch/node_modules/nopt/package.json
 %%WWWDIR%%/node_modules/@bigfunger/decompress-zip/node_modules/touch/package.json
 %%WWWDIR%%/node_modules/@bigfunger/decompress-zip/node_modules/touch/touch.js
@@ -161,7 +153,6 @@
 %%WWWDIR%%/node_modules/@spalger/filesaver/README.md
 %%WWWDIR%%/node_modules/@spalger/filesaver/file-saver.js
 %%WWWDIR%%/node_modules/@spalger/filesaver/package.json
-%%WWWDIR%%/node_modules/@spalger/leaflet-draw/.gitattributes
 %%WWWDIR%%/node_modules/@spalger/leaflet-draw/.npmignore
 %%WWWDIR%%/node_modules/@spalger/leaflet-draw/CHANGELOG.md
 %%WWWDIR%%/node_modules/@spalger/leaflet-draw/MIT-LICENCE.txt
@@ -182,8 +173,6 @@
 %%WWWDIR%%/node_modules/@spalger/numeral/Gruntfile.js
 %%WWWDIR%%/node_modules/@spalger/numeral/LICENSE
 %%WWWDIR%%/node_modules/@spalger/numeral/README.md
-%%WWWDIR%%/node_modules/@spalger/numeral/bower.json
-%%WWWDIR%%/node_modules/@spalger/numeral/component.json
 %%WWWDIR%%/node_modules/@spalger/numeral/languages.js
 %%WWWDIR%%/node_modules/@spalger/numeral/languages/be-nl.js
 %%WWWDIR%%/node_modules/@spalger/numeral/languages/chs.js
@@ -212,35 +201,6 @@
 %%WWWDIR%%/node_modules/@spalger/numeral/languages/th.js
 %%WWWDIR%%/node_modules/@spalger/numeral/languages/tr.js
 %%WWWDIR%%/node_modules/@spalger/numeral/languages/uk-UA.js
-%%WWWDIR%%/node_modules/@spalger/numeral/min/languages.min.js
-%%WWWDIR%%/node_modules/@spalger/numeral/min/languages/be-nl.min.js
-%%WWWDIR%%/node_modules/@spalger/numeral/min/languages/chs.min.js
-%%WWWDIR%%/node_modules/@spalger/numeral/min/languages/cs.min.js
-%%WWWDIR%%/node_modules/@spalger/numeral/min/languages/da-dk.min.js
-%%WWWDIR%%/node_modules/@spalger/numeral/min/languages/de-ch.min.js
-%%WWWDIR%%/node_modules/@spalger/numeral/min/languages/de.min.js
-%%WWWDIR%%/node_modules/@spalger/numeral/min/languages/en-gb.min.js
-%%WWWDIR%%/node_modules/@spalger/numeral/min/languages/es-ES.min.js
-%%WWWDIR%%/node_modules/@spalger/numeral/min/languages/es.min.js
-%%WWWDIR%%/node_modules/@spalger/numeral/min/languages/et.min.js
-%%WWWDIR%%/node_modules/@spalger/numeral/min/languages/fi.min.js
-%%WWWDIR%%/node_modules/@spalger/numeral/min/languages/fr-CA.min.js
-%%WWWDIR%%/node_modules/@spalger/numeral/min/languages/fr-ch.min.js
-%%WWWDIR%%/node_modules/@spalger/numeral/min/languages/fr.min.js
-%%WWWDIR%%/node_modules/@spalger/numeral/min/languages/hu.min.js
-%%WWWDIR%%/node_modules/@spalger/numeral/min/languages/it.min.js
-%%WWWDIR%%/node_modules/@spalger/numeral/min/languages/ja.min.js
-%%WWWDIR%%/node_modules/@spalger/numeral/min/languages/nl-nl.min.js
-%%WWWDIR%%/node_modules/@spalger/numeral/min/languages/pl.min.js
-%%WWWDIR%%/node_modules/@spalger/numeral/min/languages/pt-br.min.js
-%%WWWDIR%%/node_modules/@spalger/numeral/min/languages/pt-pt.min.js
-%%WWWDIR%%/node_modules/@spalger/numeral/min/languages/ru-UA.min.js
-%%WWWDIR%%/node_modules/@spalger/numeral/min/languages/ru.min.js
-%%WWWDIR%%/node_modules/@spalger/numeral/min/languages/sk.min.js
-%%WWWDIR%%/node_modules/@spalger/numeral/min/languages/th.min.js
-%%WWWDIR%%/node_modules/@spalger/numeral/min/languages/tr.min.js
-%%WWWDIR%%/node_modules/@spalger/numeral/min/languages/uk-UA.min.js
-%%WWWDIR%%/node_modules/@spalger/numeral/min/numeral.min.js
 %%WWWDIR%%/node_modules/@spalger/numeral/numeral.js
 %%WWWDIR%%/node_modules/@spalger/numeral/package.json
 %%WWWDIR%%/node_modules/@spalger/test-subj-selector/.npmignore
@@ -539,6 +499,7 @@
 %%WWWDIR%%/node_modules/autoprefixer/node_modules/fs-extra/node_modules/jsonfile/CHANGELOG.md
 %%WWWDIR%%/node_modules/autoprefixer/node_modules/fs-extra/node_modules/jsonfile/LICENSE
 %%WWWDIR%%/node_modules/autoprefixer/node_modules/fs-extra/node_modules/jsonfile/README.md
+%%WWWDIR%%/node_modules/autoprefixer/node_modules/fs-extra/node_modules/jsonfile/appveyor.yml
 %%WWWDIR%%/node_modules/autoprefixer/node_modules/fs-extra/node_modules/jsonfile/index.js
 %%WWWDIR%%/node_modules/autoprefixer/node_modules/fs-extra/node_modules/jsonfile/package.json
 %%WWWDIR%%/node_modules/autoprefixer/node_modules/fs-extra/package.json
@@ -1871,17 +1832,18 @@
 %%WWWDIR%%/node_modules/babel-core/node_modules/line-numbers/package.json
 %%WWWDIR%%/node_modules/babel-core/node_modules/line-numbers/readme.md
 %%WWWDIR%%/node_modules/babel-core/node_modules/output-file-sync/LICENSE
-%%WWWDIR%%/node_modules/babel-core/node_modules/output-file-sync/README.md
 %%WWWDIR%%/node_modules/babel-core/node_modules/output-file-sync/index.js
-%%WWWDIR%%/node_modules/babel-core/node_modules/output-file-sync/node_modules/xtend/.jshintrc
-%%WWWDIR%%/node_modules/babel-core/node_modules/output-file-sync/node_modules/xtend/.npmignore
-%%WWWDIR%%/node_modules/babel-core/node_modules/output-file-sync/node_modules/xtend/LICENCE
-%%WWWDIR%%/node_modules/babel-core/node_modules/output-file-sync/node_modules/xtend/Makefile
-%%WWWDIR%%/node_modules/babel-core/node_modules/output-file-sync/node_modules/xtend/README.md
-%%WWWDIR%%/node_modules/babel-core/node_modules/output-file-sync/node_modules/xtend/immutable.js
-%%WWWDIR%%/node_modules/babel-core/node_modules/output-file-sync/node_modules/xtend/mutable.js
-%%WWWDIR%%/node_modules/babel-core/node_modules/output-file-sync/node_modules/xtend/package.json
-%%WWWDIR%%/node_modules/babel-core/node_modules/output-file-sync/node_modules/xtend/test.js
+%%WWWDIR%%/node_modules/babel-core/node_modules/output-file-sync/node_modules/graceful-fs/LICENSE
+%%WWWDIR%%/node_modules/babel-core/node_modules/output-file-sync/node_modules/graceful-fs/README.md
+%%WWWDIR%%/node_modules/babel-core/node_modules/output-file-sync/node_modules/graceful-fs/fs.js
+%%WWWDIR%%/node_modules/babel-core/node_modules/output-file-sync/node_modules/graceful-fs/graceful-fs.js
+%%WWWDIR%%/node_modules/babel-core/node_modules/output-file-sync/node_modules/graceful-fs/legacy-streams.js
+%%WWWDIR%%/node_modules/babel-core/node_modules/output-file-sync/node_modules/graceful-fs/package.json
+%%WWWDIR%%/node_modules/babel-core/node_modules/output-file-sync/node_modules/graceful-fs/polyfills.js
+%%WWWDIR%%/node_modules/babel-core/node_modules/output-file-sync/node_modules/object-assign/index.js
+%%WWWDIR%%/node_modules/babel-core/node_modules/output-file-sync/node_modules/object-assign/license
+%%WWWDIR%%/node_modules/babel-core/node_modules/output-file-sync/node_modules/object-assign/package.json
+%%WWWDIR%%/node_modules/babel-core/node_modules/output-file-sync/node_modules/object-assign/readme.md
 %%WWWDIR%%/node_modules/babel-core/node_modules/output-file-sync/package.json
 %%WWWDIR%%/node_modules/babel-core/node_modules/path-exists/index.js
 %%WWWDIR%%/node_modules/babel-core/node_modules/path-exists/license
@@ -1960,6 +1922,8 @@
 %%WWWDIR%%/node_modules/babel-core/node_modules/regexpu/node_modules/recast/node_modules/esprima-fb/bin/esvalidate.js
 %%WWWDIR%%/node_modules/babel-core/node_modules/regexpu/node_modules/recast/node_modules/esprima-fb/esprima.js
 %%WWWDIR%%/node_modules/babel-core/node_modules/regexpu/node_modules/recast/node_modules/esprima-fb/package.json
+%%WWWDIR%%/node_modules/babel-core/node_modules/regexpu/node_modules/recast/node_modules/source-map/CHANGELOG.md
+%%WWWDIR%%/node_modules/babel-core/node_modules/regexpu/node_modules/recast/node_modules/source-map/LICENSE
 %%WWWDIR%%/node_modules/babel-core/node_modules/regexpu/node_modules/recast/node_modules/source-map/README.md
 %%WWWDIR%%/node_modules/babel-core/node_modules/regexpu/node_modules/recast/node_modules/source-map/dist/source-map.debug.js
 %%WWWDIR%%/node_modules/babel-core/node_modules/regexpu/node_modules/recast/node_modules/source-map/dist/source-map.js
@@ -1979,10 +1943,8 @@
 %%WWWDIR%%/node_modules/babel-core/node_modules/regexpu/node_modules/recast/node_modules/source-map/source-map.js
 %%WWWDIR%%/node_modules/babel-core/node_modules/regexpu/node_modules/recast/package.json
 %%WWWDIR%%/node_modules/babel-core/node_modules/regexpu/node_modules/regenerate/LICENSE-MIT.txt
-%%WWWDIR%%/node_modules/babel-core/node_modules/regexpu/node_modules/regenerate/README.md
 %%WWWDIR%%/node_modules/babel-core/node_modules/regexpu/node_modules/regenerate/package.json
 %%WWWDIR%%/node_modules/babel-core/node_modules/regexpu/node_modules/regenerate/regenerate.js
-%%WWWDIR%%/node_modules/babel-core/node_modules/regexpu/node_modules/regenerate/x.js
 %%WWWDIR%%/node_modules/babel-core/node_modules/regexpu/node_modules/regjsgen/LICENSE.txt
 %%WWWDIR%%/node_modules/babel-core/node_modules/regexpu/node_modules/regjsgen/README.md
 %%WWWDIR%%/node_modules/babel-core/node_modules/regexpu/node_modules/regjsgen/package.json
@@ -3273,12 +3235,29 @@
 %%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/node_modules/graceful-fs/legacy-streams.js
 %%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/node_modules/graceful-fs/package.json
 %%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/node_modules/graceful-fs/polyfills.js
+%%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/node_modules/minimatch/LICENSE
+%%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/node_modules/minimatch/README.md
+%%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/node_modules/minimatch/minimatch.js
+%%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/node_modules/minimatch/node_modules/brace-expansion/README.md
+%%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/node_modules/minimatch/node_modules/brace-expansion/index.js
+%%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/.npmignore
+%%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/LICENSE.md
+%%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/README.md
+%%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/index.js
+%%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json
+%%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/.travis.yml
+%%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/LICENSE
+%%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/README.markdown
+%%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/example/map.js
+%%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/index.js
+%%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/package.json
+%%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/node_modules/minimatch/node_modules/brace-expansion/package.json
+%%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/node_modules/minimatch/package.json
 %%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/node_modules/readable-stream/.npmignore
 %%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/node_modules/readable-stream/.travis.yml
-%%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/node_modules/readable-stream/.zuul.yml
 %%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/node_modules/readable-stream/LICENSE
 %%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/node_modules/readable-stream/README.md
-%%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/node_modules/readable-stream/doc/stream.markdown
+%%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/node_modules/readable-stream/doc/stream.md
 %%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/node_modules/readable-stream/doc/wg-meetings/2015-01-30.md
 %%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/node_modules/readable-stream/duplex.js
 %%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/node_modules/readable-stream/lib/_stream_duplex.js
@@ -3286,6 +3265,10 @@
 %%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/node_modules/readable-stream/lib/_stream_readable.js
 %%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/node_modules/readable-stream/lib/_stream_transform.js
 %%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/node_modules/readable-stream/lib/_stream_writable.js
+%%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/node_modules/readable-stream/node_modules/buffer-shims/index.js
+%%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/node_modules/readable-stream/node_modules/buffer-shims/license.md
+%%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/node_modules/readable-stream/node_modules/buffer-shims/package.json
+%%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/node_modules/readable-stream/node_modules/buffer-shims/readme.md
 %%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/node_modules/readable-stream/node_modules/core-util-is/LICENSE
 %%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/node_modules/readable-stream/node_modules/core-util-is/README.md
 %%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/node_modules/readable-stream/node_modules/core-util-is/float.patch
@@ -3322,6 +3305,9 @@
 %%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/node_modules/readable-stream/readable.js
 %%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/node_modules/readable-stream/transform.js
 %%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/node_modules/readable-stream/writable.js
+%%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/node_modules/set-immediate-shim/index.js
+%%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/node_modules/set-immediate-shim/package.json
+%%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/node_modules/set-immediate-shim/readme.md
 %%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/package.json
 %%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/readdirp.js
 %%WWWDIR%%/node_modules/babel/node_modules/chokidar/node_modules/readdirp/stream-api.js
@@ -3338,17 +3324,18 @@
 %%WWWDIR%%/node_modules/babel/node_modules/fs-readdir-recursive/index.js
 %%WWWDIR%%/node_modules/babel/node_modules/fs-readdir-recursive/package.json
 %%WWWDIR%%/node_modules/babel/node_modules/output-file-sync/LICENSE
-%%WWWDIR%%/node_modules/babel/node_modules/output-file-sync/README.md
 %%WWWDIR%%/node_modules/babel/node_modules/output-file-sync/index.js
-%%WWWDIR%%/node_modules/babel/node_modules/output-file-sync/node_modules/xtend/.jshintrc
-%%WWWDIR%%/node_modules/babel/node_modules/output-file-sync/node_modules/xtend/.npmignore
-%%WWWDIR%%/node_modules/babel/node_modules/output-file-sync/node_modules/xtend/LICENCE
-%%WWWDIR%%/node_modules/babel/node_modules/output-file-sync/node_modules/xtend/Makefile
-%%WWWDIR%%/node_modules/babel/node_modules/output-file-sync/node_modules/xtend/README.md
-%%WWWDIR%%/node_modules/babel/node_modules/output-file-sync/node_modules/xtend/immutable.js
-%%WWWDIR%%/node_modules/babel/node_modules/output-file-sync/node_modules/xtend/mutable.js
-%%WWWDIR%%/node_modules/babel/node_modules/output-file-sync/node_modules/xtend/package.json
-%%WWWDIR%%/node_modules/babel/node_modules/output-file-sync/node_modules/xtend/test.js
+%%WWWDIR%%/node_modules/babel/node_modules/output-file-sync/node_modules/graceful-fs/LICENSE
+%%WWWDIR%%/node_modules/babel/node_modules/output-file-sync/node_modules/graceful-fs/README.md
+%%WWWDIR%%/node_modules/babel/node_modules/output-file-sync/node_modules/graceful-fs/fs.js
+%%WWWDIR%%/node_modules/babel/node_modules/output-file-sync/node_modules/graceful-fs/graceful-fs.js
+%%WWWDIR%%/node_modules/babel/node_modules/output-file-sync/node_modules/graceful-fs/legacy-streams.js
+%%WWWDIR%%/node_modules/babel/node_modules/output-file-sync/node_modules/graceful-fs/package.json
+%%WWWDIR%%/node_modules/babel/node_modules/output-file-sync/node_modules/graceful-fs/polyfills.js
+%%WWWDIR%%/node_modules/babel/node_modules/output-file-sync/node_modules/object-assign/index.js
+%%WWWDIR%%/node_modules/babel/node_modules/output-file-sync/node_modules/object-assign/license
+%%WWWDIR%%/node_modules/babel/node_modules/output-file-sync/node_modules/object-assign/package.json
+%%WWWDIR%%/node_modules/babel/node_modules/output-file-sync/node_modules/object-assign/readme.md
 %%WWWDIR%%/node_modules/babel/node_modules/output-file-sync/package.json
 %%WWWDIR%%/node_modules/babel/node_modules/path-exists/index.js
 %%WWWDIR%%/node_modules/babel/node_modules/path-exists/license
@@ -4417,6 +4404,7 @@
 %%WWWDIR%%/node_modules/clipboard/node_modules/tiny-emitter/bower.json
 %%WWWDIR%%/node_modules/clipboard/node_modules/tiny-emitter/dist/tinyemitter.js
 %%WWWDIR%%/node_modules/clipboard/node_modules/tiny-emitter/dist/tinyemitter.min.js
+%%WWWDIR%%/node_modules/clipboard/node_modules/tiny-emitter/index.d.ts
 %%WWWDIR%%/node_modules/clipboard/node_modules/tiny-emitter/index.js
 %%WWWDIR%%/node_modules/clipboard/node_modules/tiny-emitter/package.json
 %%WWWDIR%%/node_modules/clipboard/package.js
@@ -4638,6 +4626,7 @@
 %%WWWDIR%%/node_modules/css-loader/node_modules/cssnano/node_modules/postcss-colormin/node_modules/color/node_modules/color-string/node_modules/color-name/package.json
 %%WWWDIR%%/node_modules/css-loader/node_modules/cssnano/node_modules/postcss-colormin/node_modules/color/node_modules/color-string/package.json
 %%WWWDIR%%/node_modules/css-loader/node_modules/cssnano/node_modules/postcss-colormin/node_modules/color/package.json
+%%WWWDIR%%/node_modules/css-loader/node_modules/cssnano/node_modules/postcss-colormin/node_modules/colormin/CHANGELOG.md
 %%WWWDIR%%/node_modules/css-loader/node_modules/cssnano/node_modules/postcss-colormin/node_modules/colormin/LICENSE-MIT
 %%WWWDIR%%/node_modules/css-loader/node_modules/cssnano/node_modules/postcss-colormin/node_modules/colormin/README.md
 %%WWWDIR%%/node_modules/css-loader/node_modules/cssnano/node_modules/postcss-colormin/node_modules/colormin/dist/index.js
@@ -4647,18 +4636,26 @@
 %%WWWDIR%%/node_modules/css-loader/node_modules/cssnano/node_modules/postcss-colormin/node_modules/colormin/dist/lib/toLonghand.js
 %%WWWDIR%%/node_modules/css-loader/node_modules/cssnano/node_modules/postcss-colormin/node_modules/colormin/dist/lib/toShorthand.js
 %%WWWDIR%%/node_modules/css-loader/node_modules/cssnano/node_modules/postcss-colormin/node_modules/colormin/dist/lib/trimLeadingZero.js
-%%WWWDIR%%/node_modules/css-loader/node_modules/cssnano/node_modules/postcss-colormin/node_modules/colormin/node_modules/color/CHANGELOG.md
 %%WWWDIR%%/node_modules/css-loader/node_modules/cssnano/node_modules/postcss-colormin/node_modules/colormin/node_modules/color/LICENSE
 %%WWWDIR%%/node_modules/css-loader/node_modules/cssnano/node_modules/postcss-colormin/node_modules/colormin/node_modules/color/README.md
 %%WWWDIR%%/node_modules/css-loader/node_modules/cssnano/node_modules/postcss-colormin/node_modules/colormin/node_modules/color/index.js
-%%WWWDIR%%/node_modules/css-loader/node_modules/cssnano/node_modules/postcss-colormin/node_modules/colormin/node_modules/color/node_modules/color-convert/.travis.yml
+%%WWWDIR%%/node_modules/css-loader/node_modules/cssnano/node_modules/postcss-colormin/node_modules/colormin/node_modules/color/node_modules/clone/.npmignore
+%%WWWDIR%%/node_modules/css-loader/node_modules/cssnano/node_modules/postcss-colormin/node_modules/colormin/node_modules/color/node_modules/clone/.travis.yml
+%%WWWDIR%%/node_modules/css-loader/node_modules/cssnano/node_modules/postcss-colormin/node_modules/colormin/node_modules/color/node_modules/clone/LICENSE
+%%WWWDIR%%/node_modules/css-loader/node_modules/cssnano/node_modules/postcss-colormin/node_modules/colormin/node_modules/color/node_modules/clone/README.md
+%%WWWDIR%%/node_modules/css-loader/node_modules/cssnano/node_modules/postcss-colormin/node_modules/colormin/node_modules/color/node_modules/clone/clone.js
+%%WWWDIR%%/node_modules/css-loader/node_modules/cssnano/node_modules/postcss-colormin/node_modules/colormin/node_modules/color/node_modules/clone/package.json
+%%WWWDIR%%/node_modules/css-loader/node_modules/cssnano/node_modules/postcss-colormin/node_modules/colormin/node_modules/color/node_modules/clone/test-apart-ctx.html
+%%WWWDIR%%/node_modules/css-loader/node_modules/cssnano/node_modules/postcss-colormin/node_modules/colormin/node_modules/color/node_modules/clone/test.html
+%%WWWDIR%%/node_modules/css-loader/node_modules/cssnano/node_modules/postcss-colormin/node_modules/colormin/node_modules/color/node_modules/clone/test.js
 %%WWWDIR%%/node_modules/css-loader/node_modules/cssnano/node_modules/postcss-colormin/node_modules/colormin/node_modules/color/node_modules/color-convert/CHANGELOG.md
 %%WWWDIR%%/node_modules/css-loader/node_modules/cssnano/node_modules/postcss-colormin/node_modules/colormin/node_modules/color/node_modules/color-convert/LICENSE
 %%WWWDIR%%/node_modules/css-loader/node_modules/cssnano/node_modules/postcss-colormin/node_modules/colormin/node_modules/color/node_modules/color-convert/README.md
-%%WWWDIR%%/node_modules/css-loader/node_modules/cssnano/node_modules/postcss-colormin/node_modules/colormin/node_modules/color/node_modules/color-convert/component.json
 %%WWWDIR%%/node_modules/css-loader/node_modules/cssnano/node_modules/postcss-colormin/node_modules/colormin/node_modules/color/node_modules/color-convert/conversions.js
+%%WWWDIR%%/node_modules/css-loader/node_modules/cssnano/node_modules/postcss-colormin/node_modules/colormin/node_modules/color/node_modules/color-convert/css-keywords.js
 %%WWWDIR%%/node_modules/css-loader/node_modules/cssnano/node_modules/postcss-colormin/node_modules/colormin/node_modules/color/node_modules/color-convert/index.js
 %%WWWDIR%%/node_modules/css-loader/node_modules/cssnano/node_modules/postcss-colormin/node_modules/colormin/node_modules/color/node_modules/color-convert/package.json
+%%WWWDIR%%/node_modules/css-loader/node_modules/cssnano/node_modules/postcss-colormin/node_modules/colormin/node_modules/color/node_modules/color-convert/route.js
 %%WWWDIR%%/node_modules/css-loader/node_modules/cssnano/node_modules/postcss-colormin/node_modules/colormin/node_modules/color/node_modules/color-string/CHANGELOG.md
 %%WWWDIR%%/node_modules/css-loader/node_modules/cssnano/node_modules/postcss-colormin/node_modules/colormin/node_modules/color/node_modules/color-string/LICENSE
 %%WWWDIR%%/node_modules/css-loader/node_modules/cssnano/node_modules/postcss-colormin/node_modules/colormin/node_modules/color/node_modules/color-string/README.md
@@ -4669,12 +4666,9 @@
 %%WWWDIR%%/node_modules/css-loader/node_modules/cssnano/node_modules/postcss-colormin/node_modules/colormin/node_modules/color/node_modules/color-string/node_modules/color-name/package.json
 %%WWWDIR%%/node_modules/css-loader/node_modules/cssnano/node_modules/postcss-colormin/node_modules/colormin/node_modules/color/node_modules/color-string/package.json
 %%WWWDIR%%/node_modules/css-loader/node_modules/cssnano/node_modules/postcss-colormin/node_modules/colormin/node_modules/color/package.json
-%%WWWDIR%%/node_modules/css-loader/node_modules/cssnano/node_modules/postcss-colormin/node_modules/colormin/node_modules/css-color-names/Makefile
 %%WWWDIR%%/node_modules/css-loader/node_modules/cssnano/node_modules/postcss-colormin/node_modules/colormin/node_modules/css-color-names/README.md
 %%WWWDIR%%/node_modules/css-loader/node_modules/cssnano/node_modules/postcss-colormin/node_modules/colormin/node_modules/css-color-names/css-color-names.json
-%%WWWDIR%%/node_modules/css-loader/node_modules/cssnano/node_modules/postcss-colormin/node_modules/colormin/node_modules/css-color-names/getcolors.sh
 %%WWWDIR%%/node_modules/css-loader/node_modules/cssnano/node_modules/postcss-colormin/node_modules/colormin/node_modules/css-color-names/package.json
-%%WWWDIR%%/node_modules/css-loader/node_modules/cssnano/node_modules/postcss-colormin/node_modules/colormin/node_modules/css-color-names/stringify.js
 %%WWWDIR%%/node_modules/css-loader/node_modules/cssnano/node_modules/postcss-colormin/node_modules/colormin/package.json
 %%WWWDIR%%/node_modules/css-loader/node_modules/cssnano/node_modules/postcss-colormin/node_modules/reduce-function-call/CHANGELOG.md
 %%WWWDIR%%/node_modules/css-loader/node_modules/cssnano/node_modules/postcss-colormin/node_modules/reduce-function-call/LICENSE
@@ -4949,7 +4943,6 @@
 %%WWWDIR%%/node_modules/css-loader/node_modules/source-list-map/lib/index.js
 %%WWWDIR%%/node_modules/css-loader/node_modules/source-list-map/package.json
 %%WWWDIR%%/node_modules/css-loader/package.json
-%%WWWDIR%%/node_modules/d3/.gitattributes
 %%WWWDIR%%/node_modules/d3/.npmignore
 %%WWWDIR%%/node_modules/d3/.spmignore
 %%WWWDIR%%/node_modules/d3/CONTRIBUTING.md
@@ -5862,7 +5855,6 @@
 %%WWWDIR%%/node_modules/glob/README.md
 %%WWWDIR%%/node_modules/glob/common.js
 %%WWWDIR%%/node_modules/glob/glob.js
-%%WWWDIR%%/node_modules/glob/node_modules/inflight/.eslintrc
 %%WWWDIR%%/node_modules/glob/node_modules/inflight/LICENSE
 %%WWWDIR%%/node_modules/glob/node_modules/inflight/README.md
 %%WWWDIR%%/node_modules/glob/node_modules/inflight/inflight.js
@@ -5871,7 +5863,6 @@
 %%WWWDIR%%/node_modules/glob/node_modules/inflight/node_modules/wrappy/package.json
 %%WWWDIR%%/node_modules/glob/node_modules/inflight/node_modules/wrappy/wrappy.js
 %%WWWDIR%%/node_modules/glob/node_modules/inflight/package.json
-%%WWWDIR%%/node_modules/glob/node_modules/inflight/test.js
 %%WWWDIR%%/node_modules/glob/node_modules/inherits/LICENSE
 %%WWWDIR%%/node_modules/glob/node_modules/inherits/README.md
 %%WWWDIR%%/node_modules/glob/node_modules/inherits/inherits.js
@@ -5961,8 +5952,6 @@
 %%WWWDIR%%/node_modules/gridster/dist/jquery.gridster.with-extras.js
 %%WWWDIR%%/node_modules/gridster/dist/jquery.gridster.with-extras.min.js
 %%WWWDIR%%/node_modules/gridster/node_modules/jquery/.editorconfig
-%%WWWDIR%%/node_modules/gridster/node_modules/jquery/.gitattributes
-%%WWWDIR%%/node_modules/gridster/node_modules/jquery/.gitmodules
 %%WWWDIR%%/node_modules/gridster/node_modules/jquery/.jshintrc
 %%WWWDIR%%/node_modules/gridster/node_modules/jquery/.mailmap
 %%WWWDIR%%/node_modules/gridster/node_modules/jquery/.npmignore
@@ -6701,6 +6690,7 @@
 %%WWWDIR%%/node_modules/jade/node_modules/clean-css/lib/properties/compactable.js
 %%WWWDIR%%/node_modules/jade/node_modules/clean-css/lib/properties/every-combination.js
 %%WWWDIR%%/node_modules/jade/node_modules/clean-css/lib/properties/has-inherit.js
+%%WWWDIR%%/node_modules/jade/node_modules/clean-css/lib/properties/invalid-property-error.js
 %%WWWDIR%%/node_modules/jade/node_modules/clean-css/lib/properties/optimizer.js
 %%WWWDIR%%/node_modules/jade/node_modules/clean-css/lib/properties/override-compactor.js
 %%WWWDIR%%/node_modules/jade/node_modules/clean-css/lib/properties/populate-components.js
@@ -6792,7 +6782,6 @@
 %%WWWDIR%%/node_modules/jade/node_modules/commander/Readme.md
 %%WWWDIR%%/node_modules/jade/node_modules/commander/index.js
 %%WWWDIR%%/node_modules/jade/node_modules/commander/package.json
-%%WWWDIR%%/node_modules/jade/node_modules/constantinople/.gitattributes
 %%WWWDIR%%/node_modules/jade/node_modules/constantinople/.npmignore
 %%WWWDIR%%/node_modules/jade/node_modules/constantinople/.travis.yml
 %%WWWDIR%%/node_modules/jade/node_modules/constantinople/LICENSE
@@ -6800,7 +6789,6 @@
 %%WWWDIR%%/node_modules/jade/node_modules/constantinople/index.js
 %%WWWDIR%%/node_modules/jade/node_modules/constantinople/node_modules/.bin/acorn
 %%WWWDIR%%/node_modules/jade/node_modules/constantinople/node_modules/acorn/.editorconfig
-%%WWWDIR%%/node_modules/jade/node_modules/constantinople/node_modules/acorn/.gitattributes
 %%WWWDIR%%/node_modules/jade/node_modules/constantinople/node_modules/acorn/.npmignore
 %%WWWDIR%%/node_modules/jade/node_modules/constantinople/node_modules/acorn/.tern-project
 %%WWWDIR%%/node_modules/jade/node_modules/constantinople/node_modules/acorn/.travis.yml
@@ -6999,6 +6987,8 @@
 %%WWWDIR%%/node_modules/jade/node_modules/uglify-js/node_modules/async/component.json
 %%WWWDIR%%/node_modules/jade/node_modules/uglify-js/node_modules/async/lib/async.js
 %%WWWDIR%%/node_modules/jade/node_modules/uglify-js/node_modules/async/package.json
+%%WWWDIR%%/node_modules/jade/node_modules/uglify-js/node_modules/source-map/CHANGELOG.md
+%%WWWDIR%%/node_modules/jade/node_modules/uglify-js/node_modules/source-map/LICENSE
 %%WWWDIR%%/node_modules/jade/node_modules/uglify-js/node_modules/source-map/README.md
 %%WWWDIR%%/node_modules/jade/node_modules/uglify-js/node_modules/source-map/dist/source-map.debug.js
 %%WWWDIR%%/node_modules/jade/node_modules/uglify-js/node_modules/source-map/dist/source-map.js
@@ -7119,7 +7109,6 @@
 %%WWWDIR%%/node_modules/jade/node_modules/uglify-js/tools/exports.js
 %%WWWDIR%%/node_modules/jade/node_modules/uglify-js/tools/node.js
 %%WWWDIR%%/node_modules/jade/node_modules/uglify-js/tools/props.html
-%%WWWDIR%%/node_modules/jade/node_modules/void-elements/.gitattributes
 %%WWWDIR%%/node_modules/jade/node_modules/void-elements/.npmignore
 %%WWWDIR%%/node_modules/jade/node_modules/void-elements/.travis.yml
 %%WWWDIR%%/node_modules/jade/node_modules/void-elements/LICENSE
@@ -7137,7 +7126,6 @@
 %%WWWDIR%%/node_modules/jade/node_modules/with/node_modules/acorn-globals/index.js
 %%WWWDIR%%/node_modules/jade/node_modules/with/node_modules/acorn-globals/node_modules/.bin/acorn
 %%WWWDIR%%/node_modules/jade/node_modules/with/node_modules/acorn-globals/node_modules/acorn/.editorconfig
-%%WWWDIR%%/node_modules/jade/node_modules/with/node_modules/acorn-globals/node_modules/acorn/.gitattributes
 %%WWWDIR%%/node_modules/jade/node_modules/with/node_modules/acorn-globals/node_modules/acorn/.npmignore
 %%WWWDIR%%/node_modules/jade/node_modules/with/node_modules/acorn-globals/node_modules/acorn/.tern-project
 %%WWWDIR%%/node_modules/jade/node_modules/with/node_modules/acorn-globals/node_modules/acorn/.travis.yml
@@ -7180,7 +7168,6 @@
 %%WWWDIR%%/node_modules/jade/node_modules/with/node_modules/acorn-globals/node_modules/acorn/src/whitespace.js
 %%WWWDIR%%/node_modules/jade/node_modules/with/node_modules/acorn-globals/package.json
 %%WWWDIR%%/node_modules/jade/node_modules/with/node_modules/acorn/.editorconfig
-%%WWWDIR%%/node_modules/jade/node_modules/with/node_modules/acorn/.gitattributes
 %%WWWDIR%%/node_modules/jade/node_modules/with/node_modules/acorn/.npmignore
 %%WWWDIR%%/node_modules/jade/node_modules/with/node_modules/acorn/.tern-project
 %%WWWDIR%%/node_modules/jade/node_modules/with/node_modules/acorn/.travis.yml
@@ -8317,11 +8304,14 @@
 %%WWWDIR%%/node_modules/micromatch/node_modules/braces/node_modules/expand-range/node_modules/fill-range/node_modules/isobject/LICENSE
 %%WWWDIR%%/node_modules/micromatch/node_modules/braces/node_modules/expand-range/node_modules/fill-range/node_modules/isobject/README.md
 %%WWWDIR%%/node_modules/micromatch/node_modules/braces/node_modules/expand-range/node_modules/fill-range/node_modules/isobject/index.js
+%%WWWDIR%%/node_modules/micromatch/node_modules/braces/node_modules/expand-range/node_modules/fill-range/node_modules/isobject/node_modules/isarray/.npmignore
+%%WWWDIR%%/node_modules/micromatch/node_modules/braces/node_modules/expand-range/node_modules/fill-range/node_modules/isobject/node_modules/isarray/.travis.yml
+%%WWWDIR%%/node_modules/micromatch/node_modules/braces/node_modules/expand-range/node_modules/fill-range/node_modules/isobject/node_modules/isarray/Makefile
 %%WWWDIR%%/node_modules/micromatch/node_modules/braces/node_modules/expand-range/node_modules/fill-range/node_modules/isobject/node_modules/isarray/README.md
-%%WWWDIR%%/node_modules/micromatch/node_modules/braces/node_modules/expand-range/node_modules/fill-range/node_modules/isobject/node_modules/isarray/build/build.js
 %%WWWDIR%%/node_modules/micromatch/node_modules/braces/node_modules/expand-range/node_modules/fill-range/node_modules/isobject/node_modules/isarray/component.json
 %%WWWDIR%%/node_modules/micromatch/node_modules/braces/node_modules/expand-range/node_modules/fill-range/node_modules/isobject/node_modules/isarray/index.js
 %%WWWDIR%%/node_modules/micromatch/node_modules/braces/node_modules/expand-range/node_modules/fill-range/node_modules/isobject/node_modules/isarray/package.json
+%%WWWDIR%%/node_modules/micromatch/node_modules/braces/node_modules/expand-range/node_modules/fill-range/node_modules/isobject/node_modules/isarray/test.js
 %%WWWDIR%%/node_modules/micromatch/node_modules/braces/node_modules/expand-range/node_modules/fill-range/node_modules/isobject/package.json
 %%WWWDIR%%/node_modules/micromatch/node_modules/braces/node_modules/expand-range/node_modules/fill-range/node_modules/randomatic/LICENSE
 %%WWWDIR%%/node_modules/micromatch/node_modules/braces/node_modules/expand-range/node_modules/fill-range/node_modules/randomatic/README.md
@@ -8343,7 +8333,6 @@
 %%WWWDIR%%/node_modules/micromatch/node_modules/braces/node_modules/expand-range/node_modules/fill-range/node_modules/repeat-string/package.json
 %%WWWDIR%%/node_modules/micromatch/node_modules/braces/node_modules/expand-range/node_modules/fill-range/package.json
 %%WWWDIR%%/node_modules/micromatch/node_modules/braces/node_modules/expand-range/package.json
-%%WWWDIR%%/node_modules/micromatch/node_modules/braces/node_modules/preserve/.gitattributes
 %%WWWDIR%%/node_modules/micromatch/node_modules/braces/node_modules/preserve/.jshintrc
 %%WWWDIR%%/node_modules/micromatch/node_modules/braces/node_modules/preserve/.npmignore
 %%WWWDIR%%/node_modules/micromatch/node_modules/braces/node_modules/preserve/.travis.yml
@@ -8361,6 +8350,10 @@
 %%WWWDIR%%/node_modules/micromatch/node_modules/expand-brackets/LICENSE
 %%WWWDIR%%/node_modules/micromatch/node_modules/expand-brackets/README.md
 %%WWWDIR%%/node_modules/micromatch/node_modules/expand-brackets/index.js
+%%WWWDIR%%/node_modules/micromatch/node_modules/expand-brackets/node_modules/is-posix-bracket/LICENSE
+%%WWWDIR%%/node_modules/micromatch/node_modules/expand-brackets/node_modules/is-posix-bracket/README.md
+%%WWWDIR%%/node_modules/micromatch/node_modules/expand-brackets/node_modules/is-posix-bracket/index.js
+%%WWWDIR%%/node_modules/micromatch/node_modules/expand-brackets/node_modules/is-posix-bracket/package.json
 %%WWWDIR%%/node_modules/micromatch/node_modules/expand-brackets/package.json
 %%WWWDIR%%/node_modules/micromatch/node_modules/extglob/LICENSE
 %%WWWDIR%%/node_modules/micromatch/node_modules/extglob/README.md
@@ -8440,16 +8433,11 @@
 %%WWWDIR%%/node_modules/minimatch/README.md
 %%WWWDIR%%/node_modules/minimatch/browser.js
 %%WWWDIR%%/node_modules/minimatch/minimatch.js
-%%WWWDIR%%/node_modules/minimatch/node_modules/brace-expansion/.npmignore
 %%WWWDIR%%/node_modules/minimatch/node_modules/brace-expansion/README.md
-%%WWWDIR%%/node_modules/minimatch/node_modules/brace-expansion/example.js
 %%WWWDIR%%/node_modules/minimatch/node_modules/brace-expansion/index.js
 %%WWWDIR%%/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/.npmignore
-%%WWWDIR%%/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/.travis.yml
 %%WWWDIR%%/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/LICENSE.md
-%%WWWDIR%%/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/Makefile
 %%WWWDIR%%/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/README.md
-%%WWWDIR%%/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/example.js
 %%WWWDIR%%/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/index.js
 %%WWWDIR%%/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json
 %%WWWDIR%%/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/.travis.yml
@@ -8594,7 +8582,6 @@
 %%WWWDIR%%/node_modules/postcss-minify-selectors/README.md
 %%WWWDIR%%/node_modules/postcss-minify-selectors/index.js
 %%WWWDIR%%/node_modules/postcss-minify-selectors/lib/unquote.js
-%%WWWDIR%%/node_modules/postcss-minify-selectors/node_modules/javascript-natural-sort/.gitattributes
 %%WWWDIR%%/node_modules/postcss-minify-selectors/node_modules/javascript-natural-sort/.idea/.name
 %%WWWDIR%%/node_modules/postcss-minify-selectors/node_modules/javascript-natural-sort/.idea/encodings.xml
 %%WWWDIR%%/node_modules/postcss-minify-selectors/node_modules/javascript-natural-sort/.idea/javascript-natural-sort.iml
@@ -9000,6 +8987,7 @@
 %%WWWDIR%%/node_modules/postcss-single-charset/node_modules/fs-extra/node_modules/jsonfile/CHANGELOG.md
 %%WWWDIR%%/node_modules/postcss-single-charset/node_modules/fs-extra/node_modules/jsonfile/LICENSE
 %%WWWDIR%%/node_modules/postcss-single-charset/node_modules/fs-extra/node_modules/jsonfile/README.md
+%%WWWDIR%%/node_modules/postcss-single-charset/node_modules/fs-extra/node_modules/jsonfile/appveyor.yml
 %%WWWDIR%%/node_modules/postcss-single-charset/node_modules/fs-extra/node_modules/jsonfile/index.js
 %%WWWDIR%%/node_modules/postcss-single-charset/node_modules/fs-extra/node_modules/jsonfile/package.json
 %%WWWDIR%%/node_modules/postcss-single-charset/node_modules/fs-extra/node_modules/ncp/.npmignore
@@ -9109,7 +9097,6 @@
 %%WWWDIR%%/node_modules/postcss-unique-selectors/node_modules/css-list/lib/map.js
 %%WWWDIR%%/node_modules/postcss-unique-selectors/node_modules/css-list/lib/split.js
 %%WWWDIR%%/node_modules/postcss-unique-selectors/node_modules/css-list/package.json
-%%WWWDIR%%/node_modules/postcss-unique-selectors/node_modules/javascript-natural-sort/.gitattributes
 %%WWWDIR%%/node_modules/postcss-unique-selectors/node_modules/javascript-natural-sort/.idea/.name
 %%WWWDIR%%/node_modules/postcss-unique-selectors/node_modules/javascript-natural-sort/.idea/encodings.xml
 %%WWWDIR%%/node_modules/postcss-unique-selectors/node_modules/javascript-natural-sort/.idea/javascript-natural-sort.iml
@@ -9257,7 +9244,6 @@
 %%WWWDIR%%/node_modules/regenerator/node_modules/commoner/node_modules/detective/index.js
 %%WWWDIR%%/node_modules/regenerator/node_modules/commoner/node_modules/detective/node_modules/.bin/acorn
 %%WWWDIR%%/node_modules/regenerator/node_modules/commoner/node_modules/detective/node_modules/acorn/.editorconfig
-%%WWWDIR%%/node_modules/regenerator/node_modules/commoner/node_modules/detective/node_modules/acorn/.gitattributes
 %%WWWDIR%%/node_modules/regenerator/node_modules/commoner/node_modules/detective/node_modules/acorn/.npmignore
 %%WWWDIR%%/node_modules/regenerator/node_modules/commoner/node_modules/detective/node_modules/acorn/.tern-project
 %%WWWDIR%%/node_modules/regenerator/node_modules/commoner/node_modules/detective/node_modules/acorn/.travis.yml
@@ -9897,7 +9883,6 @@
 %%WWWDIR%%/node_modules/request/node_modules/oauth-sign/README.md
 %%WWWDIR%%/node_modules/request/node_modules/oauth-sign/index.js
 %%WWWDIR%%/node_modules/request/node_modules/oauth-sign/package.json
-%%WWWDIR%%/node_modules/request/node_modules/oauth-sign/test.js
 %%WWWDIR%%/node_modules/request/node_modules/qs/.eslintignore
 %%WWWDIR%%/node_modules/request/node_modules/qs/.npmignore
 %%WWWDIR%%/node_modules/request/node_modules/qs/.travis.yml
@@ -9927,7 +9912,6 @@
 %%WWWDIR%%/node_modules/request/node_modules/tough-cookie/lib/pubsuffix.js
 %%WWWDIR%%/node_modules/request/node_modules/tough-cookie/lib/store.js
 %%WWWDIR%%/node_modules/request/node_modules/tough-cookie/package.json
-%%WWWDIR%%/node_modules/request/node_modules/tunnel-agent/.jshintrc
 %%WWWDIR%%/node_modules/request/node_modules/tunnel-agent/LICENSE
 %%WWWDIR%%/node_modules/request/node_modules/tunnel-agent/README.md
 %%WWWDIR%%/node_modules/request/node_modules/tunnel-agent/index.js
@@ -10021,10 +10005,6 @@
 %%WWWDIR%%/node_modules/tar/node_modules/block-stream/LICENCE
 %%WWWDIR%%/node_modules/tar/node_modules/block-stream/LICENSE
 %%WWWDIR%%/node_modules/tar/node_modules/block-stream/README.md
-%%WWWDIR%%/node_modules/tar/node_modules/block-stream/bench/block-stream-pause.js
-%%WWWDIR%%/node_modules/tar/node_modules/block-stream/bench/block-stream.js
-%%WWWDIR%%/node_modules/tar/node_modules/block-stream/bench/dropper-pause.js
-%%WWWDIR%%/node_modules/tar/node_modules/block-stream/bench/dropper.js
 %%WWWDIR%%/node_modules/tar/node_modules/block-stream/block-stream.js
 %%WWWDIR%%/node_modules/tar/node_modules/block-stream/package.json
 %%WWWDIR%%/node_modules/tar/node_modules/fstream/.npmignore
@@ -10355,7 +10335,6 @@
 %%WWWDIR%%/node_modules/webpack/node_modules/interpret/README.md
 %%WWWDIR%%/node_modules/webpack/node_modules/interpret/index.js
 %%WWWDIR%%/node_modules/webpack/node_modules/interpret/package.json
-%%WWWDIR%%/node_modules/webpack/node_modules/memory-fs/.gitattributes
 %%WWWDIR%%/node_modules/webpack/node_modules/memory-fs/.npmignore
 %%WWWDIR%%/node_modules/webpack/node_modules/memory-fs/.travis.yml
 %%WWWDIR%%/node_modules/webpack/node_modules/memory-fs/README.md
@@ -10745,7 +10724,6 @@
 %%WWWDIR%%/node_modules/webpack/node_modules/supports-color/node_modules/has-flag/readme.md
 %%WWWDIR%%/node_modules/webpack/node_modules/supports-color/package.json
 %%WWWDIR%%/node_modules/webpack/node_modules/supports-color/readme.md
-%%WWWDIR%%/node_modules/webpack/node_modules/tapable/.gitattributes
 %%WWWDIR%%/node_modules/webpack/node_modules/tapable/.npmignore
 %%WWWDIR%%/node_modules/webpack/node_modules/tapable/.travis.yml
 %%WWWDIR%%/node_modules/webpack/node_modules/tapable/README.md
@@ -10839,7 +10817,6 @@
 %%WWWDIR%%/node_modules/webpack/node_modules/uglify-js/tools/node.js
 %%WWWDIR%%/node_modules/webpack/node_modules/uglify-js/tools/props.html
 %%WWWDIR%%/node_modules/webpack/node_modules/watchpack/.eslintrc
-%%WWWDIR%%/node_modules/webpack/node_modules/watchpack/.gitattributes
 %%WWWDIR%%/node_modules/webpack/node_modules/watchpack/.npmignore
 %%WWWDIR%%/node_modules/webpack/node_modules/watchpack/.travis.yml
 %%WWWDIR%%/node_modules/webpack/node_modules/watchpack/README.md
@@ -10919,12 +10896,29 @@
 %%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/examples/package.json
 %%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/examples/stream-api-pipe.js
 %%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/examples/stream-api.js
+%%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/node_modules/minimatch/LICENSE
+%%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/node_modules/minimatch/README.md
+%%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/node_modules/minimatch/minimatch.js
+%%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/node_modules/minimatch/node_modules/brace-expansion/README.md
+%%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/node_modules/minimatch/node_modules/brace-expansion/index.js
+%%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/.npmignore
+%%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/LICENSE.md
+%%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/README.md
+%%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/index.js
+%%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json
+%%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/.travis.yml
+%%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/LICENSE
+%%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/README.markdown
+%%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/example/map.js
+%%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/index.js
+%%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/package.json
+%%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/node_modules/minimatch/node_modules/brace-expansion/package.json
+%%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/node_modules/minimatch/package.json
 %%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/node_modules/readable-stream/.npmignore
 %%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/node_modules/readable-stream/.travis.yml
-%%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/node_modules/readable-stream/.zuul.yml
 %%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/node_modules/readable-stream/LICENSE
 %%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/node_modules/readable-stream/README.md
-%%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/node_modules/readable-stream/doc/stream.markdown
+%%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/node_modules/readable-stream/doc/stream.md
 %%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/node_modules/readable-stream/doc/wg-meetings/2015-01-30.md
 %%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/node_modules/readable-stream/duplex.js
 %%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/node_modules/readable-stream/lib/_stream_duplex.js
@@ -10932,6 +10926,10 @@
 %%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/node_modules/readable-stream/lib/_stream_readable.js
 %%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/node_modules/readable-stream/lib/_stream_transform.js
 %%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/node_modules/readable-stream/lib/_stream_writable.js
+%%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/node_modules/readable-stream/node_modules/buffer-shims/index.js
+%%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/node_modules/readable-stream/node_modules/buffer-shims/license.md
+%%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/node_modules/readable-stream/node_modules/buffer-shims/package.json
+%%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/node_modules/readable-stream/node_modules/buffer-shims/readme.md
 %%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/node_modules/readable-stream/node_modules/core-util-is/LICENSE
 %%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/node_modules/readable-stream/node_modules/core-util-is/README.md
 %%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/node_modules/readable-stream/node_modules/core-util-is/float.patch
@@ -10968,6 +10966,9 @@
 %%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/node_modules/readable-stream/readable.js
 %%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/node_modules/readable-stream/transform.js
 %%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/node_modules/readable-stream/writable.js
+%%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/node_modules/set-immediate-shim/index.js
+%%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/node_modules/set-immediate-shim/package.json
+%%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/node_modules/set-immediate-shim/readme.md
 %%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/package.json
 %%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/readdirp.js
 %%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/chokidar/node_modules/readdirp/stream-api.js
@@ -10981,7 +10982,6 @@
 %%WWWDIR%%/node_modules/webpack/node_modules/watchpack/node_modules/graceful-fs/polyfills.js
 %%WWWDIR%%/node_modules/webpack/node_modules/watchpack/package.json
 %%WWWDIR%%/node_modules/webpack/node_modules/watchpack/playground/watch-folder.js
-%%WWWDIR%%/node_modules/webpack/node_modules/webpack-core/.gitattributes
 %%WWWDIR%%/node_modules/webpack/node_modules/webpack-core/.npmignore
 %%WWWDIR%%/node_modules/webpack/node_modules/webpack-core/README.md
 %%WWWDIR%%/node_modules/webpack/node_modules/webpack-core/lib/CachedSource.js
diff --git a/textproc/mdocml/Makefile b/textproc/mdocml/Makefile
index d5b8cb6bff4..6838203b1f5 100644
--- a/textproc/mdocml/Makefile
+++ b/textproc/mdocml/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mdocml
-PORTVERSION=	1.13.3
+PORTVERSION=	1.13.4
 CATEGORIES=	textproc
 MASTER_SITES=	http://mdocml.bsd.lv/snapshots/ \
 		LOCAL/uqs
@@ -18,8 +18,9 @@ HAS_CONFIGURE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-post-patch:
+post-configure:
 	@${REINPLACE_CMD} -e '/^CFLAGS/s/-g//' -e '/^PREFIX/s/=/?=/' \
-		${WRKSRC}/Makefile
+		-e 's/^INSTALL_PROGRAM.*/INSTALL_PROGRAM=${INSTALL_PROGRAM}/' \
+		${WRKSRC}/Makefile.local
 
 .include <bsd.port.mk>
diff --git a/textproc/mdocml/distinfo b/textproc/mdocml/distinfo
index ee4a41eab5f..68e79242a4a 100644
--- a/textproc/mdocml/distinfo
+++ b/textproc/mdocml/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mdocml-1.13.3.tar.gz) = 23ccab4800d50bf4c327979af5d4aa1a6a2dc490789cb67c4c3ac1bd40b8cad8
-SIZE (mdocml-1.13.3.tar.gz) = 358971
+TIMESTAMP = 1468937374
+SHA256 (mdocml-1.13.4.tar.gz) = 0a55c1addb188071d6f784599303656b8465e98ec6b2f4f264e12fb96d79e0ef
+SIZE (mdocml-1.13.4.tar.gz) = 370428
diff --git a/textproc/mdocml/pkg-plist b/textproc/mdocml/pkg-plist
index 65fceac9bbd..2196c5e5840 100644
--- a/textproc/mdocml/pkg-plist
+++ b/textproc/mdocml/pkg-plist
@@ -2,16 +2,19 @@ bin/apropos
 bin/demandoc
 @comment bin/man
 bin/mandoc
+bin/soelim
 bin/whatis
 @comment include/mandoc/man.h
 @comment include/mandoc/mandoc.h
 @comment include/mandoc/mandoc_aux.h
 @comment include/mandoc/mdoc.h
+@comment include/mandoc/roff.h
 lib/mandoc/libmandoc.a
 man/man1/apropos.1.gz
 man/man1/demandoc.1.gz
 @comment man/man1/man.1.gz
 man/man1/mandoc.1.gz
+man/man1/soelim.1.gz
 man/man1/whatis.1.gz
 man/man3/mandoc.3.gz
 man/man3/mandoc_escape.3.gz
@@ -19,6 +22,7 @@ man/man3/mandoc_malloc.3.gz
 man/man3/mansearch.3.gz
 man/man3/mchars_alloc.3.gz
 man/man3/tbl.3.gz
+man/man5/man.conf.5.gz
 man/man5/mandoc.db.5.gz
 man/man7/eqn.7.gz
 man/man7/man.7.gz
@@ -28,4 +32,3 @@ man/man7/mdoc.7.gz
 man/man7/tbl.7.gz
 man/man8/makewhatis.8.gz
 sbin/makewhatis
-%%EXAMPLESDIR%%/example.style.css
diff --git a/textproc/saxon-devel/Makefile b/textproc/saxon-devel/Makefile
index be6d60254a2..4d4efb3b5fd 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 06c1c2042ac..6859df346e0 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 548df991a0f..365de223fc3 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 1e48d853dac..a9c164b6c53 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 97336c3bf3d..89c529f2001 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 38c2b405ba7..a904581c829 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/firefox/Makefile b/www/firefox/Makefile
index 00d9bf21a07..42c0372f8b3 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -57,6 +57,8 @@ OPTIONS_DEFAULT_FreeBSD_10_amd64=	RUST
 OPTIONS_DEFAULT_FreeBSD_10_i386=	RUST
 OPTIONS_DEFAULT_FreeBSD_11_amd64=	RUST
 OPTIONS_DEFAULT_FreeBSD_11_i386=	RUST
+OPTIONS_DEFAULT_FreeBSD_12_amd64=	RUST
+OPTIONS_DEFAULT_FreeBSD_12_i386=	RUST
 
 OPTIONS_SINGLE+=	TOOLKIT
 OPTIONS_SINGLE_TOOLKIT=	GTK2 GTK3
diff --git a/www/flood/Makefile b/www/flood/Makefile
index 3bf9ab90cd1..380cfece95f 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 540d0262a42..6f0806951dc 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 29ef37f7619..c3996cdcbe6 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 9b861d701c7..7c52bd94a9f 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 0d0ba31e45f..389651067fa 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 45554cf1dfb..6349f88f370 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 a36d7ddf291..bc57ef95bfb 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/mod_qos/Makefile b/www/mod_qos/Makefile
index 9dc82df9c42..fc8b45fb392 100644
--- a/www/mod_qos/Makefile
+++ b/www/mod_qos/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mod_qos
-PORTVERSION=	11.22
+PORTVERSION=	11.30
 CATEGORIES=	www
 MASTER_SITES=	SF/mod-qos
 DIST_SUBDIR=	apache2
@@ -10,7 +10,7 @@ DIST_SUBDIR=	apache2
 MAINTAINER=	fax@nohik.ee
 COMMENT=	QoS for Apache
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
 
 USE_APACHE=	22+
 AP_GENPLIST=	yes
diff --git a/www/mod_qos/distinfo b/www/mod_qos/distinfo
index f4278998180..0034e7f293b 100644
--- a/www/mod_qos/distinfo
+++ b/www/mod_qos/distinfo
@@ -1,2 +1,3 @@
-SHA256 (apache2/mod_qos-11.22.tar.gz) = 33dbd3a2609c93ff199eca0c91e1f0781a258c27305d0f9802a1b1f366a3700d
-SIZE (apache2/mod_qos-11.22.tar.gz) = 531599
+TIMESTAMP = 1468874742
+SHA256 (apache2/mod_qos-11.30.tar.gz) = 833deb1a8c29ebe73606719351bf5d0f327e65b8c6d217f439b05b05e6026c1f
+SIZE (apache2/mod_qos-11.30.tar.gz) = 535136
diff --git a/www/monast/Makefile b/www/monast/Makefile
index 58bd1a105b3..c73364c8e5c 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 eb42d47256a..f3cae13dcc5 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 16e1a60a493..63f6bec59e0 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 ebe87352ca5..e437cc769c8 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 aa58160a883..618a4ed57f1 100644
--- a/www/owncloud/Makefile
+++ b/www/owncloud/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	owncloud
-PORTVERSION=	9.0.3
+PORTVERSION=	9.0.4
 CATEGORIES=	www
 MASTER_SITES=	http://download.owncloud.org/community/
 
@@ -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/owncloud/distinfo b/www/owncloud/distinfo
index e03709474b7..b58cd1d1e31 100644
--- a/www/owncloud/distinfo
+++ b/www/owncloud/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1467350000
-SHA256 (owncloud-9.0.3.tar.bz2) = 5cf45c1b75434496635a58fcbece668bc0abb40f04d8304ce6d01e6b75887f60
-SIZE (owncloud-9.0.3.tar.bz2) = 28517856
+TIMESTAMP = 1468976370
+SHA256 (owncloud-9.0.4.tar.bz2) = ab71e8648c918629f6551333c45dd3b79d90f1dc0171d3def0a443bdc238a669
+SIZE (owncloud-9.0.4.tar.bz2) = 28521439
diff --git a/www/owncloud/pkg-plist b/www/owncloud/pkg-plist
index a7360b5287c..73a5e7f2100 100644
--- a/www/owncloud/pkg-plist
+++ b/www/owncloud/pkg-plist
@@ -1,5 +1,5 @@
-@(%%OWNCLOUD_USERNAME%%,%%OWNCLOUD_GROUPNAME%%,664) %%WWWDIR%%/.htaccess
-@(%%OWNCLOUD_USERNAME%%,%%OWNCLOUD_GROUPNAME%%,664) %%WWWDIR%%/.user.ini
+%%WWWDIR%%/.htaccess
+%%WWWDIR%%/.user.ini
 %%WWWDIR%%/3rdparty/.gitignore
 %%WWWDIR%%/3rdparty/LICENSE INFO
 %%WWWDIR%%/3rdparty/README.md
@@ -3265,6 +3265,7 @@
 %%WWWDIR%%/apps/dav/lib/carddav/carddavbackend.php
 %%WWWDIR%%/apps/dav/lib/carddav/contactsmanager.php
 %%WWWDIR%%/apps/dav/lib/carddav/converter.php
+%%WWWDIR%%/apps/dav/lib/carddav/imageexportplugin.php
 %%WWWDIR%%/apps/dav/lib/carddav/plugin.php
 %%WWWDIR%%/apps/dav/lib/carddav/syncjob.php
 %%WWWDIR%%/apps/dav/lib/carddav/syncservice.php
@@ -3326,6 +3327,7 @@
 %%WWWDIR%%/apps/dav/lib/migration/calendaradapter.php
 %%WWWDIR%%/apps/dav/lib/migration/migrateaddressbooks.php
 %%WWWDIR%%/apps/dav/lib/migration/migratecalendars.php
+%%WWWDIR%%/apps/dav/lib/migration/nothingtodoexception.php
 %%WWWDIR%%/apps/dav/lib/rootcollection.php
 %%WWWDIR%%/apps/dav/lib/server.php
 %%WWWDIR%%/apps/dav/lib/systemtag/systemtagmappingnode.php
@@ -8081,6 +8083,7 @@
 %%WWWDIR%%/core/command/user/resetpassword.php
 %%WWWDIR%%/core/controller/avatarcontroller.php
 %%WWWDIR%%/core/controller/lostcontroller.php
+%%WWWDIR%%/core/controller/occcontroller.php
 %%WWWDIR%%/core/controller/setupcontroller.php
 %%WWWDIR%%/core/controller/usercontroller.php
 %%WWWDIR%%/core/css/apps.css
@@ -8347,13 +8350,13 @@
 %%WWWDIR%%/core/doc/admin/_sources/installation/appliance_installation.txt
 %%WWWDIR%%/core/doc/admin/_sources/installation/apps_management_installation.txt
 %%WWWDIR%%/core/doc/admin/_sources/installation/apps_supported.txt
+%%WWWDIR%%/core/doc/admin/_sources/installation/changing_the_web_route.txt
 %%WWWDIR%%/core/doc/admin/_sources/installation/command_line_installation.txt
 %%WWWDIR%%/core/doc/admin/_sources/installation/deployment_recommendations.txt
 %%WWWDIR%%/core/doc/admin/_sources/installation/index.txt
 %%WWWDIR%%/core/doc/admin/_sources/installation/installation_wizard.txt
 %%WWWDIR%%/core/doc/admin/_sources/installation/linux_installation.txt
 %%WWWDIR%%/core/doc/admin/_sources/installation/nginx_examples.txt
-%%WWWDIR%%/core/doc/admin/_sources/installation/nginx_owncloud_8x.txt
 %%WWWDIR%%/core/doc/admin/_sources/installation/nginx_owncloud_9x.txt
 %%WWWDIR%%/core/doc/admin/_sources/installation/php_54_installation.txt
 %%WWWDIR%%/core/doc/admin/_sources/installation/php_55_installation.txt
@@ -8557,13 +8560,13 @@
 %%WWWDIR%%/core/doc/admin/installation/appliance_installation.html
 %%WWWDIR%%/core/doc/admin/installation/apps_management_installation.html
 %%WWWDIR%%/core/doc/admin/installation/apps_supported.html
+%%WWWDIR%%/core/doc/admin/installation/changing_the_web_route.html
 %%WWWDIR%%/core/doc/admin/installation/command_line_installation.html
 %%WWWDIR%%/core/doc/admin/installation/deployment_recommendations.html
 %%WWWDIR%%/core/doc/admin/installation/index.html
 %%WWWDIR%%/core/doc/admin/installation/installation_wizard.html
 %%WWWDIR%%/core/doc/admin/installation/linux_installation.html
 %%WWWDIR%%/core/doc/admin/installation/nginx_examples.html
-%%WWWDIR%%/core/doc/admin/installation/nginx_owncloud_8x.html
 %%WWWDIR%%/core/doc/admin/installation/nginx_owncloud_9x.html
 %%WWWDIR%%/core/doc/admin/installation/php_54_installation.html
 %%WWWDIR%%/core/doc/admin/installation/php_55_installation.html
@@ -9952,6 +9955,7 @@
 %%WWWDIR%%/lib/private/repair.php
 %%WWWDIR%%/lib/private/repair/assetcache.php
 %%WWWDIR%%/lib/private/repair/avatarpermissions.php
+%%WWWDIR%%/lib/private/repair/brokenupdaterrepair.php
 %%WWWDIR%%/lib/private/repair/cleantags.php
 %%WWWDIR%%/lib/private/repair/collation.php
 %%WWWDIR%%/lib/private/repair/copyrewritebasetoconfig.php
@@ -10275,6 +10279,7 @@
 %%WWWDIR%%/public.php
 %%WWWDIR%%/remote.php
 %%WWWDIR%%/resources/codesigning/core.crt
+%%WWWDIR%%/resources/codesigning/intermediate.crl.pem
 %%WWWDIR%%/resources/codesigning/root.crt
 %%WWWDIR%%/resources/config/ca-bundle.crt
 %%WWWDIR%%/resources/config/mimetypealiases.dist.json
@@ -10592,7 +10597,6 @@
 %%WWWDIR%%/updater/src/Command/RestartWebServerCommand.php
 %%WWWDIR%%/updater/src/Command/StartCommand.php
 %%WWWDIR%%/updater/src/Command/UpdateConfigCommand.php
-%%WWWDIR%%/updater/src/Command/UpgradeShippedAppsCommand.php
 %%WWWDIR%%/updater/src/Console/Application.php
 %%WWWDIR%%/updater/src/Controller/DownloadController.php
 %%WWWDIR%%/updater/src/Controller/IndexController.php
@@ -10609,6 +10613,7 @@
 %%WWWDIR%%/updater/src/Tests/Utils/ConfigReaderTest.php
 %%WWWDIR%%/updater/src/Tests/Utils/FeedTest.php
 %%WWWDIR%%/updater/src/Tests/Utils/FetcherTest.php
+%%WWWDIR%%/updater/src/Tests/Utils/OccRunnerTest.php
 %%WWWDIR%%/updater/src/Tests/Utils/RegistryTest.php
 %%WWWDIR%%/updater/src/Tests/bootstrap.php
 %%WWWDIR%%/updater/src/Tests/phpunit.xml
diff --git a/www/py-flask-restplus/Makefile b/www/py-flask-restplus/Makefile
index 9d9ec3d4398..c11bfeef9e1 100644
--- a/www/py-flask-restplus/Makefile
+++ b/www/py-flask-restplus/Makefile
@@ -3,7 +3,6 @@
 PORTNAME=	flask-restplus
 PORTVERSION=	0.9.2
 CATEGORIES=	www python
-MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	andrej@ebert.su
@@ -17,20 +16,27 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>=0.8:www/py-flask \
 		${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema \
 		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
 		${PYTHON_PKGNAMEPREFIX}aniso8601>=0.82:devel/py-aniso8601
-
-TEST_DEPENDS:=	${RUN_DEPENDS} \
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}blinker>0:devel/py-blinker \
 		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \
-		${PYTHON_PKGNAMEPREFIX}rednose>0:devel/py-rednose \
-		${PYTHON_PKGNAMEPREFIX}blinker>0:devel/py-blinker \
-		${PYTHON_PKGNAMEPREFIX}tzlocal>0:devel/py-tzlocal
+		${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
 
 CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}flask-restplus08
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	noirbizarre
+
 USES=		python
 USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 
-do-test:
-	@(cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test)
+.include <bsd.port.pre.mk>
 
-.include <bsd.port.mk>
+.if ${PYTHON_REL} < 3300
+TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
+.endif
+
+do-test:
+	@${RM} -fr ${TEST_WRKSRC}/build/lib/tests
+	@(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest)
+
+.include <bsd.port.post.mk>
diff --git a/www/py-flask-restplus/distinfo b/www/py-flask-restplus/distinfo
index a60bc2f2b2f..2b56aeb7c93 100644
--- a/www/py-flask-restplus/distinfo
+++ b/www/py-flask-restplus/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1468167697
-SHA256 (flask-restplus-0.9.2.tar.gz) = c4313097a673ef2cffabceb44b6fdd03132ee5e7ab34d0289c37af12a3d11186
-SIZE (flask-restplus-0.9.2.tar.gz) = 868988
+SHA256 (noirbizarre-flask-restplus-0.9.2_GH0.tar.gz) = df87a84ec65e0b35cc9e4f98f21358087468761f45a27f2ca74583439bbb3114
+SIZE (noirbizarre-flask-restplus-0.9.2_GH0.tar.gz) = 255824
diff --git a/www/py-flask-restplus08/Makefile b/www/py-flask-restplus08/Makefile
index 7bf3c2c3885..3eac90983f3 100644
--- a/www/py-flask-restplus08/Makefile
+++ b/www/py-flask-restplus08/Makefile
@@ -3,7 +3,6 @@
 PORTNAME=	flask-restplus
 PORTVERSION=	0.8.6
 CATEGORIES=	www python
-MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	08
 
@@ -18,21 +17,28 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask-RESTful>=0.3.2:www/py-flask-restful \
 		${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema \
 		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
 		${PYTHON_PKGNAMEPREFIX}aniso8601>=0.82:devel/py-aniso8601
-
-TEST_DEPENDS:=	${RUN_DEPENDS} \
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}blinker>0:devel/py-blinker \
 		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \
-		${PYTHON_PKGNAMEPREFIX}rednose>0:devel/py-rednose \
-		${PYTHON_PKGNAMEPREFIX}blinker>0:devel/py-blinker \
-		${PYTHON_PKGNAMEPREFIX}tzlocal>0:devel/py-tzlocal
+		${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
 
 CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}flask-restplus
 PORTSCOUT=	limit:^0\.8
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	noirbizarre
+
 USES=		python
 USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 
-do-test:
-	@(cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test)
+.include <bsd.port.pre.mk>
 
-.include <bsd.port.mk>
+.if ${PYTHON_REL} < 3300
+TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
+.endif
+
+do-test:
+	@${RM} -fr ${TEST_WRKSRC}/build/lib/tests
+	@(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest)
+
+.include <bsd.port.post.mk>
diff --git a/www/py-flask-restplus08/distinfo b/www/py-flask-restplus08/distinfo
index f308c7d387c..f7f0419599c 100644
--- a/www/py-flask-restplus08/distinfo
+++ b/www/py-flask-restplus08/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1468851260
-SHA256 (flask-restplus-0.8.6.tar.gz) = 3bb76cc156b9a09da62396d82b29fa31e4f27cccf79528538fe7155cf2785593
-SIZE (flask-restplus-0.8.6.tar.gz) = 1077073
+SHA256 (noirbizarre-flask-restplus-0.8.6_GH0.tar.gz) = 5f10e1391e99216f74cc5053c421bfed3ccdc2ef16569bf4a31c01bfebff74c6
+SIZE (noirbizarre-flask-restplus-0.8.6_GH0.tar.gz) = 100249
diff --git a/www/py-scrapy/Makefile b/www/py-scrapy/Makefile
index 5d6aec66670..1a51af99ff9 100644
--- a/www/py-scrapy/Makefile
+++ b/www/py-scrapy/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Scrapy
-PORTVERSION=	0.22.2
+PORTVERSION=	1.1.1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/www/py-scrapy/distinfo b/www/py-scrapy/distinfo
index 8562cd3ec07..c3c4725dff3 100644
--- a/www/py-scrapy/distinfo
+++ b/www/py-scrapy/distinfo
@@ -1,2 +1,3 @@
-SHA256 (Scrapy-0.22.2.tar.gz) = d373de91cdc7bb7b06a4a80c6676b7a72bd14a1350a8064bb64a1ced3504dd7e
-SIZE (Scrapy-0.22.2.tar.gz) = 757900
+TIMESTAMP = 1468879647
+SHA256 (Scrapy-1.1.1.tar.gz) = 697441b8ca18e55c75a8853ce2b0ab20447c0a720912c2da57b60e2a3b9b4d1f
+SIZE (Scrapy-1.1.1.tar.gz) = 1016330
diff --git a/www/redmine/Makefile b/www/redmine/Makefile
index 181e9f0e0c3..1ab454b0d79 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 7d45117fd87..d478f6236b4 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 cdada4419e5..398d3c866cb 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 14e861d8b30..cb7a82377b8 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/sogo2/Makefile b/www/sogo2/Makefile
index 3f7aff63d5e..d3242c2a067 100644
--- a/www/sogo2/Makefile
+++ b/www/sogo2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=		sogo2
 PORTVERSION=		2.3.13
+PORTREVISION=		1
 CATEGORIES=		www gnustep
 MASTER_SITES=		http://www.sogo.nu/files/downloads/SOGo/Sources/
 DISTNAME=		SOGo-${PORTVERSION}
diff --git a/www/sogo3/Makefile b/www/sogo3/Makefile
index 97146ebb75b..d971f4821f8 100644
--- a/www/sogo3/Makefile
+++ b/www/sogo3/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=		sogo3
-PORTVERSION=		3.1.3
+PORTVERSION=		3.1.4
 CATEGORIES=		www gnustep
 MASTER_SITES=		http://www.sogo.nu/files/downloads/SOGo/Sources/
 DISTNAME=		SOGo-${PORTVERSION}
diff --git a/www/sogo3/distinfo b/www/sogo3/distinfo
index 9ca81c350a9..a482110c487 100644
--- a/www/sogo3/distinfo
+++ b/www/sogo3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1468363545
-SHA256 (SOGo-3.1.3.tar.gz) = 57a3521238eca299b655fd2e02e8dae6e968e5dcc5e37461eac27ecc3fb5f624
-SIZE (SOGo-3.1.3.tar.gz) = 32034711
+TIMESTAMP = 1468935954
+SHA256 (SOGo-3.1.4.tar.gz) = 3fd4fa3b078886866c57df03c22558b0329adeac12aef3e93ff022b951f6089c
+SIZE (SOGo-3.1.4.tar.gz) = 32204142
diff --git a/www/sogo3/pkg-plist b/www/sogo3/pkg-plist
index 5ad81502e8b..a77ad52872d 100644
--- a/www/sogo3/pkg-plist
+++ b/www/sogo3/pkg-plist
@@ -1538,6 +1538,7 @@ GNUstep/Local/Library/SOGo/WebServerResources/js/Common/sgAvatarImage.directive.
 GNUstep/Local/Library/SOGo/WebServerResources/js/Common/sgCheckmark.directive.js
 GNUstep/Local/Library/SOGo/WebServerResources/js/Common/sgColorPicker.directive.js
 GNUstep/Local/Library/SOGo/WebServerResources/js/Common/sgCompile.directive.js
+GNUstep/Local/Library/SOGo/WebServerResources/js/Common/sgDatepickerReadonlyInput.directive.js
 GNUstep/Local/Library/SOGo/WebServerResources/js/Common/sgEnter.directive.js
 GNUstep/Local/Library/SOGo/WebServerResources/js/Common/sgEscape.directive.js
 GNUstep/Local/Library/SOGo/WebServerResources/js/Common/sgFocus.directive.js
diff --git a/www/tclwebtest/Makefile b/www/tclwebtest/Makefile
index 57fbb79f38a..7694605f36d 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 d946319d6c0..b400cc19ca9 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 f8681922b02..4961d22297d 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 0c7f8352209..1acac669ac7 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 40a316803a7..057072c6ace 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 509bf3dd6f0..1116df81389 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 defe671c9ab..56bc38f4c46 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 51d6783fd2f..a55af16cf11 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}