Update to 1.0.5

PR: 21944 Submitted by: Anders Nordby <anders@fix.no> MAINTAINER
author: jeh <jeh@FreeBSD.org> 2000-10-28 10:04:18 +0800
committer: jeh <jeh@FreeBSD.org> 2000-10-28 10:04:18 +0800
commit: ecf4e9909a1102d50d20c72635360392f7f9b4af (patch)
tree: 4c9aa60f2d06f4fb61abfc16c98c70f07a0ef4b3 /security/nessus-devel/distinfo
parent: a48a01b66b2bcaf5e1885839dc6ecabd71f097cc (diff)
download: freebsd-ports-graphics-ecf4e9909a1102d50d20c72635360392f7f9b4af.tar.gz
freebsd-ports-graphics-ecf4e9909a1102d50d20c72635360392f7f9b4af.tar.zst
freebsd-ports-graphics-ecf4e9909a1102d50d20c72635360392f7f9b4af.zip
1 files changed, 1 insertions, 1 deletions
diff --git a/security/nessus-devel/distinfo b/security/nessus-devel/distinfo
index 26db817bee2..fa9a5ed129c 100644
--- a/security/nessus-devel/distinfo
+++ b/security/nessus-devel/distinfo
@@ -1 +1 @@
-MD5 (nessus/nessus-core-1.0.4.tar.gz) = b6d66f613b3c45526195df9e0087dd63
+MD5 (nessus/nessus-core-1.0.5.tar.gz) = e5636b91642588c4bff8c69b582e3e01
diff --git a/GIDs b/GIDs
index eeb69ed48cce..0dc6fa722c36 100644
--- a/GIDs
+++ b/GIDs
@@ -160,7 +160,7 @@ opendnssec:*:215:
 nsd:*:216:
 anvil:*:217:
 zap:*:218:
-# free: 219
+sddm:*:219:
 bs:*:220:
 # free: 221
 rtpproxy:*:222:
@@ -175,7 +175,7 @@ kismet:*:229:
 # free: 231
 # free: 232
 # free: 233
-# free: 234
+kafka:*:234:
 # free: 235
 # free: 236
 # free: 237
diff --git a/MOVED b/MOVED
index 8b5a098d99f4..552eb84a46c9 100644
--- a/MOVED
+++ b/MOVED
@@ -9543,3 +9543,5 @@ databases/py33-sqlite3||2017-09-03|Removed, please update to Python 3.6
 devel/py33-setuptools||2017-09-03|Removed, please update to Python 3.6
 x11-toolkits/py33-tkinter||2017-09-03|Removed, please update to Python 3.6
 devel/py3-enum34||2017-09-03|Removed, Python 3.3 only
+security/clambc||2017-09-14|Has expired: Practically unmaintained, featuring issues elsewhere solved 6 years ago
+devel/cmake-modules||2017-09-14|Merged with devel/cmake
diff --git a/Mk/Uses/compiler.mk b/Mk/Uses/compiler.mk
index fa7b9b925b1d..b87668b9f3b1 100644
--- a/Mk/Uses/compiler.mk
+++ b/Mk/Uses/compiler.mk
@@ -144,7 +144,7 @@ CHOSEN_COMPILER_TYPE=	gcc
 .if ${_COMPILER_ARGS:Mc++14-lang}
 .if !${COMPILER_FEATURES:Mc++14}
 .if (defined(FAVORITE_COMPILER) && ${FAVORITE_COMPILER} == gcc) || (${ARCH} != amd64 && ${ARCH} != i386) # clang not always supported on Tier-2
-USE_GCC=	5+
+USE_GCC=	yes
 CHOSEN_COMPILER_TYPE=	gcc
 .elif (${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 35) || ${COMPILER_TYPE} == gcc
 .if ${ALT_COMPILER_TYPE} == clang && ${ALT_COMPILER_VERSION} >= 35
diff --git a/Mk/Uses/php.mk b/Mk/Uses/php.mk
index 3e0ac35bf4a0..e423bb77a2c5 100644
--- a/Mk/Uses/php.mk
+++ b/Mk/Uses/php.mk
@@ -275,13 +275,13 @@ add-plist-phpext:
 		>> ${TMPPLIST}
 	@${FIND} -P ${STAGEDIR}${PREFIX}/include/php/ext/${PHP_MODNAME} ! -type d 2>/dev/null | \
 		${SED} -ne 's,^${STAGEDIR}${PREFIX}/,,p' >> ${TMPPLIST}
-	@${ECHO_CMD} "@exec echo \#include \\\"ext/${PHP_MODNAME}/config.h\\\" >> %D/include/php/ext/php_config.h" \
+	@${ECHO_CMD} "@postexec echo \#include \\\"ext/${PHP_MODNAME}/config.h\\\" >> %D/include/php/ext/php_config.h" \
 		>> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec cp %D/include/php/ext/php_config.h %D/include/php/ext/php_config.h.orig" \
+	@${ECHO_CMD} "@preunexec cp %D/include/php/ext/php_config.h %D/include/php/ext/php_config.h.orig" \
 		>> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec grep -v ext/${PHP_MODNAME}/config.h %D/include/php/ext/php_config.h.orig > %D/include/php/ext/php_config.h || true" \
+	@${ECHO_CMD} "@preunexec grep -v ext/${PHP_MODNAME}/config.h %D/include/php/ext/php_config.h.orig > %D/include/php/ext/php_config.h || true" \
 		>> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec ${RM} %D/include/php/ext/php_config.h.orig" \
+	@${ECHO_CMD} "@preunexec ${RM} %D/include/php/ext/php_config.h.orig" \
 		>> ${TMPPLIST}
 	@${ECHO_CMD} "${PHP_EXT_INI_FILE}" \
 		>> ${TMPPLIST}
diff --git a/Mk/Uses/tcl.mk b/Mk/Uses/tcl.mk
index b4aad235af71..94250178c2fe 100644
--- a/Mk/Uses/tcl.mk
+++ b/Mk/Uses/tcl.mk
@@ -40,11 +40,11 @@
 #   			  is installed, bring in the default version. See
 #   			  ${_TCLTK_DEFAULT_VERSION} below.
 #
-# - 84, 85, 86		- Depend on a specific version series of PORT. Multiple
+# - 84, 85, 86, 87	- Depend on a specific version series of PORT. Multiple
 #   			  values are OK. The highest version available is
 #   			  picked.
 #
-# - 84+, 85+, 86+	- Depend on any installed version greater or equal to
+# - 84+, 85+, 86+, 87+	- Depend on any installed version greater or equal to
 #   			  the specified version.
 #
 # If wrapper is specified, an additional dependency on tcl-wrapper or
@@ -72,7 +72,7 @@ _INCLUDE_USES_TCL_MK=	yes
 #
 # When adding a version, please keep the comment in
 # Mk/bsd.default-versions.mk in sync.
-_TCLTK_VALID_VERSIONS=	84 85 86
+_TCLTK_VALID_VERSIONS=	84 85 86 87
 
 #
 # Bring in the default and check that the specified version is in the list of
@@ -100,8 +100,8 @@ _TCLTK_WANTED_VERSIONS:=${_TCLTK_DEFAULT_VERSION}
 #
 # Parse one or more ver arguments.
 #
-.if ${tcl_ARGS:M8[4-6]}
-_TCLTK_WANTED_VERSIONS:=${tcl_ARGS:M8[4-6]}
+.if ${tcl_ARGS:M8[4-7]}
+_TCLTK_WANTED_VERSIONS:=${tcl_ARGS:M8[4-7]}
 .endif
 
 #
@@ -144,9 +144,13 @@ _TCLTK_WANTED_VERSION:=	${_v}
 .endfor
 
 #
-# If we couldn't find any wanted version installed, depend on the highest one.
+# If we couldn't find any wanted version installed, depend on the default or the highest one.
 .if !defined(_TCLTK_WANTED_VERSION)
+.  if ${_TCLTK_WANTED_VERSIONS:M${_TCLTK_DEFAULT_VERSION}}
+_TCLTK_WANTED_VERSION:=	${_TCLTK_DEFAULT_VERSION}
+.  else
 _TCLTK_WANTED_VERSION:= ${_TCLTK_HIGHEST_VERSION}
+.  endif
 .endif
 
 #
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index 6af4d443b98d..e6c369403018 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -38,7 +38,7 @@ FIREBIRD_DEFAULT?=	2.5
 # Possible values: 3.0.0
 FPC_DEFAULT?=		3.0.2
 # Possible values: 4.8, 4.9, 5, 6, 7
-GCC_DEFAULT?=		5
+GCC_DEFAULT?=		6
 # Possible values: 7, 8, 9, agpl
 GHOSTSCRIPT_DEFAULT?=	agpl
 .if ${ARCH} == amd64
@@ -134,7 +134,7 @@ check-makevars::
 # Make sure we have a default in the end
 SSL_DEFAULT?=	base
 .endif
-# Possible values: 8.4, 8.5, 8.6
+# Possible values: 8.4, 8.5, 8.6, 8.7
 TCLTK_DEFAULT?=		8.6
 
 # Possible values: 4, 5
diff --git a/Mk/bsd.emacs.mk b/Mk/bsd.emacs.mk
index 65c179c5a0d6..1dd61d5059a8 100644
--- a/Mk/bsd.emacs.mk
+++ b/Mk/bsd.emacs.mk
@@ -66,7 +66,7 @@ EMACS_MASTERDIR_PKGFILES?=	NO
 # Emacs-25.x
 .if (${EMACS_PORT_NAME} == "emacs25")
 EMACS_NAME=		emacs
-EMACS_VER=		25.2
+EMACS_VER=		25.3
 EMACS_MAJOR_VER=	25
 EMACS_LIBDIR?=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER?=	share/${EMACS_NAME}/${EMACS_VER}
@@ -99,7 +99,7 @@ PLIST?=			${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
 
 .elif (${EMACS_PORT_NAME} == "emacs-nox11")
 EMACS_NAME=		emacs
-EMACS_VER=		25.2
+EMACS_VER=		25.3
 EMACS_MAJOR_VER=	25
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER?= share/${EMACS_NAME}/${EMACS_VER}
diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk
index 54c1b0f578d8..4eb4248eb0bf 100644
--- a/Mk/bsd.sites.mk
+++ b/Mk/bsd.sites.mk
@@ -44,8 +44,7 @@ MASTER_SITE_PORTS_JP+= \
 .if !defined(IGNORE_MASTER_SITE_AFTERSTEP)
 MASTER_SITE_AFTERSTEP+= \
 	ftp://ftp.afterstep.org/%SUBDIR%/ \
-	ftp://ftp.kddlabs.co.jp/X11/AfterStep/%SUBDIR%/ \
-	ftp://ftp.dti.ad.jp/pub/X/AfterStep/%SUBDIR%/
+	ftp://ftp.kddlabs.co.jp/X11/AfterStep/%SUBDIR%/
 .endif
 
 .if !defined(IGNORE_MASTER_SITE_APACHE)
@@ -287,8 +286,7 @@ MASTER_SITE_FREEBSD_ORG+= \
 	ftp://ftp.se.FreeBSD.org/pub/FreeBSD/%SUBDIR%/ \
 	ftp://ftp.jp.FreeBSD.org/pub/FreeBSD/%SUBDIR%/ \
 	ftp://ftp.uk.FreeBSD.org/pub/FreeBSD/%SUBDIR%/ \
-	ftp://ftp.ru.FreeBSD.org/pub/FreeBSD/%SUBDIR%/ \
-	ftp://ftp.dti.ad.jp/pub/FreeBSD/%SUBDIR%/
+	ftp://ftp.ru.FreeBSD.org/pub/FreeBSD/%SUBDIR%/
 .endif
 
 .if !defined(IGNORE_MASTER_SITE_FRUGALWARE)
@@ -533,7 +531,6 @@ MASTER_SITE_GNOME+= \
 	ftp://ftp.cse.buffalo.edu/pub/Gnome/%SUBDIR%/ \
 	http://fr2.rpmfind.net/linux/gnome.org/%SUBDIR%/ \
 	http://www.gtlib.gatech.edu/pub/gnome/%SUBDIR%/ \
-	ftp://ftp.dti.ad.jp/pub/X/gnome/%SUBDIR%/ \
 	http://linorg.usp.br/gnome/%SUBDIR%/ \
 	http://mirror.aarnet.edu.au/pub/gnome/%SUBDIR%/ \
 	ftp://ftp.kddlabs.co.jp/pub/GNOME/%SUBDIR%/ \
@@ -560,7 +557,6 @@ MASTER_SITE_GNU+= \
 	http://www.gtlib.gatech.edu/pub/gnu/gnu/%SUBDIR%/ \
 	http://mirrors.kernel.org/gnu/%SUBDIR%/ \
 	ftp://ftp.kddlabs.co.jp/GNU/gnu/%SUBDIR%/ \
-	ftp://ftp.dti.ad.jp/pub/GNU/%SUBDIR%/ \
 	ftp://ftp.mirrorservice.org/sites/ftp.gnu.org/gnu/%SUBDIR%/ \
 	ftp://ftp.informatik.hu-berlin.de/pub/gnu/gnu/%SUBDIR%/ \
 	ftp://ftp.informatik.rwth-aachen.de/pub/mirror/ftp.gnu.org/pub/gnu/%SUBDIR%/ \
@@ -643,7 +639,6 @@ MASTER_SITE_ISC+= \
 	ftp://ftp.ciril.fr/pub/isc/%SUBDIR%/ \
 	ftp://ftp.freenet.de/pub/ftp.isc.org/isc/%SUBDIR%/ \
 	ftp://ftp.iij.ad.jp/pub/network/isc/%SUBDIR%/ \
-	ftp://ftp.dti.ad.jp/pub/net/isc/%SUBDIR%/ \
 	ftp://ftp.u-aizu.ac.jp/pub/net/isc/%SUBDIR%/ \
 	ftp://ftp.task.gda.pl/mirror/ftp.isc.org/isc/%SUBDIR%/ \
 	ftp://ftp.sunet.se/pub/network/isc/%SUBDIR%/ \
@@ -795,7 +790,6 @@ MASTER_SITE_NETBSD+= \
 	ftp://sunsite.uio.no/bsd/unix/NetBSD/packages/distfiles/%SUBDIR%/ \
 	ftp://ftp.sunet.se/pub/NetBSD/packages/distfiles/%SUBDIR%/ \
 	ftp://ftp.demon.co.uk/pub/mirrors/NetBSD/packages/distfiles/%SUBDIR%/ \
-	ftp://ftp.dti.ad.jp/pub/NetBSD/packages/distfiles/%SUBDIR%/ \
 	ftp://ftp.funet.fi/pub/NetBSD/packages/distfiles/%SUBDIR%/
 .endif
 
@@ -1133,7 +1127,6 @@ MASTER_SITE_XCONTRIB+= \
 	ftp://ftp.gwdg.de/pub/x11/x.org/contrib/%SUBDIR%/ \
 	ftp://ftp.x.org/contrib/%SUBDIR%/ \
 	ftp://ftp.sunet.se/pub/X11/ftp.x.org/contrib/%SUBDIR%/ \
-	ftp://ftp.dti.ad.jp/pub/X/XFree86/mirror/X.Org/contrib/%SUBDIR%/ \
 	ftp://ftp.kddlabs.co.jp/X11/ftp.x.org/contrib/%SUBDIR%/ \
 	ftp://ftp2.x.org/contrib/%SUBDIR%/
 .endif
diff --git a/UIDs b/UIDs
index 6ab45edaca0e..47619756bc22 100644
--- a/UIDs
+++ b/UIDs
@@ -165,7 +165,7 @@ opendnssec:*:215:215::0:0:Opendnssec Pseudo User:/nonexistent:/usr/sbin/nologin
 nsd:*:216:216::0:0:NSD DNS Server:/nonexistent:/usr/sbin/nologin
 anvil:*:217:217::0:0:anvil certificate dropper:/var/db/anvil:/bin/sh
 zap:*:218:218::0:0:zap user:/usr/local/zap:/bin/sh
-# free: 219
+sddm:*:219:219::0:0:SDDM Display Manager user:/usr/local/etc/sddm/home:/usr/sbin/nologin
 bs:*:220:220::0:0:Big Sister:/usr/local/bigsister:/bin/sh
 # free: 221
 rtpproxy:*:222:222::0:0:& user:/nonexistent:/sbin/nologin
@@ -180,7 +180,7 @@ _hfm:*:227:227::0:0:hfm daemon:/nonexistent:/usr/sbin/nologin
 # free: 231
 # free: 232
 # free: 233
-# free: 234
+kafka:*:234:234::0:0:Apache Kafka user:/nonexistent:/usr/sbin/nologin
 # free: 235
 # free: 236
 # free: 237
@@ -818,7 +818,7 @@ chronyd:*:849:849::0:0:chronyd user:/nonexistent:/usr/sbin/nologin
 # free: 868
 # free: 869
 # free: 870
-# free: 871
+archiva:*:871:871::0:0:Apache Archiva Daemon:/nonexistent:/usr/sbin/nologin
 # free: 872
 # free: 873
 # free: 874
diff --git a/UPDATING b/UPDATING
index 2ec2d38cb815..4a1426384d1b 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,17 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20170914:
+  AFFECTS: users of CMake
+  AUTHOR: adridg@freebsd.org
+
+  The ports devel/cmake and devel/cmake-modules have been merged into
+  devel/cmake. The benefit of being able to update the modules without
+  the binary is outweighed by the issues caused by having the binary
+  out-of-sync with the modules.
+
+  All ports have been updated to depend only on CMake.
+
 20170904
   AFFECTS: users of net-mgmt/seafile-server
   AUTHOR: ultima@FreeBSD.org
diff --git a/accessibility/atkmm/Makefile b/accessibility/atkmm/Makefile
index c8a18831aa69..2fbc8e3d8dbd 100644
--- a/accessibility/atkmm/Makefile
+++ b/accessibility/atkmm/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	atkmm
 PORTVERSION=	2.24.2
+PORTREVISION=	1
 CATEGORIES=	accessibility gnome
 MASTER_SITES=	GNOME
 
diff --git a/archivers/brotli/Makefile b/archivers/brotli/Makefile
index 404f2f3837b8..f5ebdbf5162b 100644
--- a/archivers/brotli/Makefile
+++ b/archivers/brotli/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	brotli
 PORTVERSION=	0.6.0
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 PORTEPOCH=	1
 CATEGORIES=	archivers devel
diff --git a/archivers/c-blosc/Makefile b/archivers/c-blosc/Makefile
index 69a277f56693..1343bb45d0c6 100644
--- a/archivers/c-blosc/Makefile
+++ b/archivers/c-blosc/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	c-blosc
 PORTVERSION=	1.12.1
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	archivers devel
 
diff --git a/archivers/kf5-karchive/Makefile b/archivers/kf5-karchive/Makefile
index 2c91a7210219..3eb99edd3bb6 100644
--- a/archivers/kf5-karchive/Makefile
+++ b/archivers/kf5-karchive/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	karchive
 PORTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	archivers kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/archivers/libpar2/Makefile b/archivers/libpar2/Makefile
index 96c4a66bcb20..67d32310d26f 100644
--- a/archivers/libpar2/Makefile
+++ b/archivers/libpar2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libpar2
 PORTVERSION=	0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	archivers
 MASTER_SITES=	http://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/
 
diff --git a/archivers/paq/Makefile b/archivers/paq/Makefile
index bbf24f903878..ba49589add30 100644
--- a/archivers/paq/Makefile
+++ b/archivers/paq/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	paq
 PORTVERSION=	20140131
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	archivers
 MASTER_SITES=	http://mattmahoney.net/dc/ LOCAL/bf/paq/
 DISTFILES=	wbpe110.zip zpaqd633.zip zpaq657.zip zpipe.201.zip
diff --git a/archivers/pxz/Makefile b/archivers/pxz/Makefile
index 5385f41bfea3..d9b312c96eec 100644
--- a/archivers/pxz/Makefile
+++ b/archivers/pxz/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pxz
 PORTVERSION=	0.20141018
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	archivers
 MASTER_SITES=	LOCAL/delphij
 DISTNAME=	pxz-git-${PORTVERSION:S/0.//}
diff --git a/archivers/py-brotli/Makefile b/archivers/py-brotli/Makefile
index 82f90364d4c7..93bcd074f55c 100644
--- a/archivers/py-brotli/Makefile
+++ b/archivers/py-brotli/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	brotli
 PORTVERSION=	0.6.0
+PORTREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/archivers/rubygem-fpm/Makefile b/archivers/rubygem-fpm/Makefile
index 070c4a7ef6a1..a35be7781947 100644
--- a/archivers/rubygem-fpm/Makefile
+++ b/archivers/rubygem-fpm/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	fpm
-PORTVERSION=	1.9.2
+PORTVERSION=	1.9.3
 CATEGORIES=	archivers rubygems
 MASTER_SITES=	RG
 
diff --git a/archivers/rubygem-fpm/distinfo b/archivers/rubygem-fpm/distinfo
index c7ca401f76db..b76a67694871 100644
--- a/archivers/rubygem-fpm/distinfo
+++ b/archivers/rubygem-fpm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501776352
-SHA256 (rubygem/fpm-1.9.2.gem) = cb1d567a3045d0c61069d479051d16d62d404b4fa13067e085b409c5a3967f27
-SIZE (rubygem/fpm-1.9.2.gem) = 141312
+TIMESTAMP = 1505229651
+SHA256 (rubygem/fpm-1.9.3.gem) = 43d4a541992c2abaca8383346f5cdfe8b3ecedde6ccf90efd83dbbef224b777b
+SIZE (rubygem/fpm-1.9.3.gem) = 141312
diff --git a/archivers/rvm/Makefile b/archivers/rvm/Makefile
index 0bedff642dc1..ff1290aed287 100644
--- a/archivers/rvm/Makefile
+++ b/archivers/rvm/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	rvm
 PORTVERSION=	1.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	archivers
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	an
diff --git a/astro/foxtrotgps/Makefile b/astro/foxtrotgps/Makefile
index aec177c38628..ed23b2daf84d 100644
--- a/astro/foxtrotgps/Makefile
+++ b/astro/foxtrotgps/Makefile
@@ -11,6 +11,7 @@ MAINTAINER=	crwhipp@gmail.com
 COMMENT=	Lightweight opensource gps moving map application
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libexif.so:graphics/libexif \
diff --git a/astro/foxtrotgps/pkg-descr b/astro/foxtrotgps/pkg-descr
index 294715cc3187..e93a31d9a096 100644
--- a/astro/foxtrotgps/pkg-descr
+++ b/astro/foxtrotgps/pkg-descr
@@ -6,4 +6,4 @@ are available, and new ones may be added.
 
 Map areas may be downloaded and cached for use while offline.
 
-WWW: http://www.foxtrotgps.org
+WWW: https://www.foxtrotgps.org/
diff --git a/astro/geographiclib/Makefile b/astro/geographiclib/Makefile
index 5527b7fe2a40..9714bb1abcd7 100644
--- a/astro/geographiclib/Makefile
+++ b/astro/geographiclib/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	geographiclib
 PORTVERSION=	1.46
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	astro
 MASTER_SITES=	SF/geographiclib/distrib\
 		SF/geographiclib:geoids,gravity,magnetic
diff --git a/astro/gpstk/Makefile b/astro/gpstk/Makefile
index 142ca9a44b02..fdc482b54a60 100644
--- a/astro/gpstk/Makefile
+++ b/astro/gpstk/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gpstk
 PORTVERSION=	2.9
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	astro devel
 
diff --git a/astro/kstars/Makefile b/astro/kstars/Makefile
index 4f8eac4f1724..171aaa110333 100644
--- a/astro/kstars/Makefile
+++ b/astro/kstars/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kstars
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	astro kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/astro/libosmium/Makefile b/astro/libosmium/Makefile
index ef834c74d385..553c76980771 100644
--- a/astro/libosmium/Makefile
+++ b/astro/libosmium/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libosmium
 PORTVERSION=	2.13.1
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	astro geography devel
 
diff --git a/astro/libosmpbf/files/patch-src_CMakeLists.txt b/astro/libosmpbf/files/patch-src_CMakeLists.txt
index 46550ae61fdd..61b06b58446d 100644
--- a/astro/libosmpbf/files/patch-src_CMakeLists.txt
+++ b/astro/libosmpbf/files/patch-src_CMakeLists.txt
@@ -1,3 +1,5 @@
+Don't use special compiler flags.
+Add upstream patch to make dependencies explicit; needed for ninja builds.
 --- src/CMakeLists.txt.orig	2014-03-15 15:11:32 UTC
 +++ src/CMakeLists.txt
 @@ -3,7 +3,6 @@ PROTOBUF_GENERATE_CPP(CPPS HS fileformat
@@ -8,3 +10,19 @@
  endif()
  
  add_library(osmpbf STATIC ${CPPS})
+@@ -10,8 +10,13 @@ add_library(osmpbf STATIC ${CPPS})
+ 
+ set_target_properties(osmpbf PROPERTIES LINKER_LANGUAGE CXX LANGUAGE CXX)
+ 
+-ADD_CUSTOM_COMMAND(TARGET osmpbf POST_BUILD  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/src/fileformat.pb.h ${CMAKE_SOURCE_DIR}/include/osmpbf)
+-ADD_CUSTOM_COMMAND(TARGET osmpbf POST_BUILD  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/src/osmformat.pb.h ${CMAKE_SOURCE_DIR}/include/osmpbf)
++ADD_CUSTOM_COMMAND(TARGET osmpbf POST_BUILD
++    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/src/fileformat.pb.h ${CMAKE_SOURCE_DIR}/include/osmpbf
++    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/src/osmformat.pb.h ${CMAKE_SOURCE_DIR}/include/osmpbf
++    BYPRODUCTS
++        ${CMAKE_SOURCE_DIR}/include/osmpbf/fileformat.pb.h
++        ${CMAKE_SOURCE_DIR}/include/osmpbf/osmformat.pb.h
++)
+ 
+ SET(INCLUDE_INSTALL "include/osmpbf")
+ SET(files ${CMAKE_SOURCE_DIR}/include/osmpbf/osmpbf.h ${CMAKE_BINARY_DIR}/src/osmformat.pb.h ${CMAKE_BINARY_DIR}/src/fileformat.pb.h)
diff --git a/astro/libosmpbf/files/patch-tools_CMakeLists.txt b/astro/libosmpbf/files/patch-tools_CMakeLists.txt
index c2b2d1c4f374..f2f4789b6197 100644
--- a/astro/libosmpbf/files/patch-tools_CMakeLists.txt
+++ b/astro/libosmpbf/files/patch-tools_CMakeLists.txt
@@ -1,3 +1,5 @@
+Don't use special compiler flags.
+Add upstream patch to make dependencies explicit; needed for ninja builds.
 --- tools/CMakeLists.txt.orig	2014-03-15 15:11:32 UTC
 +++ tools/CMakeLists.txt
 @@ -4,7 +4,6 @@ PROJECT(${PROJECT})
@@ -8,3 +10,12 @@
  endif()
  
  SET(CPP_SRC osmpbf-outline.cpp)
+@@ -10,6 +10,8 @@ endif()
+ SET(CPP_SRC osmpbf-outline.cpp)
+ SET(HPP_SRC "")
+ SET(C_SRC "")
++set_source_files_properties(${CPP_SRC}
++    OBJECT_DEPENDS "${CMAKE_SOURCE_DIR}/include/osmpbf/fileformat.pb.h;${CMAKE_SOURCE_DIR}/include/osmpbf/osmformat.pb.h")
+ include_directories("${CMAKE_SOURCE_DIR}/include")
+ 
+ add_executable(${PROJECT} ${HPP_SRC} ${CPP_SRC} ${C_SRC})
diff --git a/astro/nightfall/Makefile b/astro/nightfall/Makefile
index f397823b159e..f36304edd689 100644
--- a/astro/nightfall/Makefile
+++ b/astro/nightfall/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	nightfall
 PORTVERSION=	1.86
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	astro
 MASTER_SITES=	http://www.la-samhna.de/nightfall/
 
diff --git a/astro/opencpn/Makefile b/astro/opencpn/Makefile
index f0cb63955483..868adda64847 100644
--- a/astro/opencpn/Makefile
+++ b/astro/opencpn/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	opencpn
 PORTVERSION=	4.4.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	astro geography
 
 MAINTAINER=	ml@netfence.it
diff --git a/astro/p5-Astro-satpass/Makefile b/astro/p5-Astro-satpass/Makefile
index eda9f95d8744..a6125a161774 100644
--- a/astro/p5-Astro-satpass/Makefile
+++ b/astro/p5-Astro-satpass/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Astro-satpass
-PORTVERSION=	0.082
+PORTVERSION=	0.083
 CATEGORIES=	astro perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/astro/p5-Astro-satpass/distinfo b/astro/p5-Astro-satpass/distinfo
index e06f6bf96586..bed61c13a3bb 100644
--- a/astro/p5-Astro-satpass/distinfo
+++ b/astro/p5-Astro-satpass/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1497486082
-SHA256 (Astro-satpass-0.082.tar.gz) = 34c498bd21514629c1027c7a16be393955f02dad22a24f7e2499f1f27042a829
-SIZE (Astro-satpass-0.082.tar.gz) = 539258
+TIMESTAMP = 1505424268
+SHA256 (Astro-satpass-0.083.tar.gz) = ca28a8c303e7b22df3c09b5b4b6ce4ca64d76ce40a42cca121a6913d1ea40120
+SIZE (Astro-satpass-0.083.tar.gz) = 541954
diff --git a/astro/qmapshack/Makefile b/astro/qmapshack/Makefile
index 58205362533a..57a730852d90 100644
--- a/astro/qmapshack/Makefile
+++ b/astro/qmapshack/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	qmapshack
 PORTVERSION=	1.8.1
+PORTREVISION=	1
 CATEGORIES=	astro
 MASTER_SITES=	https://bitbucket.org/maproom/qmapshack/downloads/
 
diff --git a/astro/viking/Makefile b/astro/viking/Makefile
index 3cdf265abaf1..0fbbf23f7fee 100644
--- a/astro/viking/Makefile
+++ b/astro/viking/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	viking
 PORTVERSION=	1.6.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	astro
 MASTER_SITES=	SF/${PORTNAME}/
 
diff --git a/astro/wcslib/Makefile b/astro/wcslib/Makefile
index d6e8c0db1a31..2725bb1b05d4 100644
--- a/astro/wcslib/Makefile
+++ b/astro/wcslib/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	wcslib
 PORTVERSION=	5.16
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	astro
 MASTER_SITES=	ftp://ftp.atnf.csiro.au/pub/software/wcslib/
 
diff --git a/astro/xearth/files/freebsd.committers.markers b/astro/xearth/files/freebsd.committers.markers
index 9d3ce151d43b..ed31bae17281 100644
--- a/astro/xearth/files/freebsd.committers.markers
+++ b/astro/xearth/files/freebsd.committers.markers
@@ -168,6 +168,7 @@
  49.612,        6.130,          "culot"                         # Luxembourg, Luxembourg
  50.76107,	6.09304,	"tg"				# Aachen, Germany
  51.98,		5.96,		"wilko"				# Arnhem, The Netherlands
+ 51.86,		5.85,		"adridg"			# Lent, The Netherlands
  53.20460,	5.80429,	"kwm"				# Leeuwarden, The Netherlands
  51.758894,	5.739367,	"ed"				# Grave, the Netherlands
  51.86,		5.54,		"asmodai"			# Barendrecht, The Netherlands
diff --git a/astro/xtide/Makefile b/astro/xtide/Makefile
index d2222be1163a..e11b08462945 100644
--- a/astro/xtide/Makefile
+++ b/astro/xtide/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xtide
 PORTVERSION=	2.15.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	astro geography
 MASTER_SITES=	ftp://ftp.flaterco.com/xtide/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
diff --git a/audio/Makefile b/audio/Makefile
index 438baa854d1e..837f775f0066 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -657,6 +657,7 @@
     SUBDIR += py-mutagen
     SUBDIR += py-ogg
     SUBDIR += py-openal
+    SUBDIR += py-opuslib
     SUBDIR += py-py-jack
     SUBDIR += py-pyacoustid
     SUBDIR += py-pyaudio
diff --git a/audio/abraca/Makefile b/audio/abraca/Makefile
index 209e546ef2dd..a81fa1f757bd 100644
--- a/audio/abraca/Makefile
+++ b/audio/abraca/Makefile
@@ -3,13 +3,16 @@
 
 PORTNAME=	abraca
 PORTVERSION=	0.8.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	GTK2 client for the XMMS2 music player
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING.GPL
+
 BUILD_DEPENDS=	${LOCALBASE}/bin/valac:lang/vala
 LIB_DEPENDS=	libxmmsclient.so:audio/xmms2 \
 		libgee-0.8.so:devel/libgee
diff --git a/audio/abraca/files/patch-src_abraca-filter-searchbox.vala b/audio/abraca/files/patch-src_abraca-filter-searchbox.vala
new file mode 100644
index 000000000000..e7f249cb0359
--- /dev/null
+++ b/audio/abraca/files/patch-src_abraca-filter-searchbox.vala
@@ -0,0 +1,14 @@
+--- src/abraca-filter-searchbox.vala.orig	2014-10-26 18:55:55 UTC
++++ src/abraca-filter-searchbox.vala
+@@ -78,7 +78,11 @@ public class Abraca.FilterSearchBox : Gtk.ComboBox, Se
+ 			do {
+ 				store.get(iter, 0, out current);
+ 				if (current == pattern) {
++#if VALA_0_36
++					store.remove(ref iter);
++#else
+ 					store.remove(iter);
++#endif
+ 					break;
+ 				}
+ 			} while (store.iter_next(ref iter));
diff --git a/audio/abraca/files/patch-src_abraca-medialib.vala b/audio/abraca/files/patch-src_abraca-medialib.vala
new file mode 100644
index 000000000000..eb72aa720c21
--- /dev/null
+++ b/audio/abraca/files/patch-src_abraca-medialib.vala
@@ -0,0 +1,14 @@
+--- src/abraca-medialib.vala.orig	2014-10-26 18:55:55 UTC
++++ src/abraca-medialib.vala
+@@ -505,7 +505,11 @@ namespace Abraca {
+ 				do {
+ 					urls.get(iter, 0, out current);
+ 					if (current == url) {
++#if VALA_0_36
++						urls.remove(ref iter);
++#else
+ 						urls.remove(iter);
++#endif
+ 						break;
+ 					}
+ 				} while (urls.iter_next(ref iter));
diff --git a/audio/abraca/files/patch-src_abraca-playlist-model.vala b/audio/abraca/files/patch-src_abraca-playlist-model.vala
new file mode 100644
index 000000000000..e573bb784adb
--- /dev/null
+++ b/audio/abraca/files/patch-src_abraca-playlist-model.vala
@@ -0,0 +1,14 @@
+--- src/abraca-playlist-model.vala.orig	2014-10-26 18:55:55 UTC
++++ src/abraca-playlist-model.vala
+@@ -136,7 +136,11 @@ namespace Abraca {
+ 				get(iter, Column.ID, out mid);
+ 
+ 				playlist_map.remove_path((int) mid, path);
++#if VALA_0_36
++				remove(ref iter);
++#else
+ 				remove(iter);
++#endif
+ 			}
+ 		}
+ 
diff --git a/audio/abraca/files/patch-src_abraca-resolver.vala b/audio/abraca/files/patch-src_abraca-resolver.vala
new file mode 100644
index 000000000000..96abbeaa9b62
--- /dev/null
+++ b/audio/abraca/files/patch-src_abraca-resolver.vala
@@ -0,0 +1,13 @@
+--- src/abraca-resolver.vala.orig	2014-10-26 18:55:55 UTC
++++ src/abraca-resolver.vala
+@@ -63,8 +63,8 @@ public class Abraca.MetadataResolver : GLib.Object {
+ 
+ 	private Gee.List<MetadataRequestorImpl> listeners = new Gee.ArrayList<MetadataRequestorImpl>();
+ 
+-	private Gee.List<int> pending = new Gee.ArrayList<uint>();
+-	private Gee.Map<int,Xmms.Collection> pending_mids = new Gee.HashMap<uint,Xmms.Collection>();
++	private Gee.List<int> pending = new Gee.ArrayList<int>();
++	private Gee.Map<int,Xmms.Collection> pending_mids = new Gee.HashMap<int,Xmms.Collection>();
+ 
+ 	private uint timeout_handle = 0;
+ 	private bool in_flight = false;
diff --git a/audio/abraca/files/patch-src_abraca-server-browser-dialog.vala b/audio/abraca/files/patch-src_abraca-server-browser-dialog.vala
new file mode 100644
index 000000000000..b835ca3c300f
--- /dev/null
+++ b/audio/abraca/files/patch-src_abraca-server-browser-dialog.vala
@@ -0,0 +1,14 @@
+--- src/abraca-server-browser-dialog.vala.orig	2014-10-26 18:55:55 UTC
++++ src/abraca-server-browser-dialog.vala
+@@ -145,7 +145,11 @@ public class Abraca.ServerBrowserDialog : Gtk.Dialog
+ 			unowned string entry_name, entry_path;
+ 			location_store.get(iter, Column.NAME, out entry_name, Column.PATH, out entry_path);
+ 			if (path == entry_path) {
++#if VALA_0_36
++				location_store.remove(ref iter);
++#else
+ 				location_store.remove(iter);
++#endif
+ 				break;
+ 			}
+ 		} while (location_store.iter_next(ref iter));
diff --git a/audio/abraca/pkg-descr b/audio/abraca/pkg-descr
index 8424f2c85576..0ee8e2a8d756 100644
--- a/audio/abraca/pkg-descr
+++ b/audio/abraca/pkg-descr
@@ -1,4 +1,4 @@
 Abraca is a GTK2 client for the XMMS2 music player. It is designed with
 collections in mind, which makes managing your music a breeze.
 
-WWW: http://abraca.github.com/Abraca
+WWW: http://abraca.github.io/Abraca/
diff --git a/audio/ardour5/Makefile b/audio/ardour5/Makefile
index 2465a1a5cc74..322f87192ea5 100644
--- a/audio/ardour5/Makefile
+++ b/audio/ardour5/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ardour5
 PORTVERSION=	5.11.0
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/beerml/ardour_releases/raw/master/
 # The original master side points to the latest release only:
diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index abc742f7ad00..84e5038425e8 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	audacity
 PORTVERSION=	2.1.3
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	Audacity-
 CATEGORIES=	audio
 
diff --git a/audio/beast/Makefile b/audio/beast/Makefile
index 75929083477b..ba6f86d22962 100644
--- a/audio/beast/Makefile
+++ b/audio/beast/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	beast
 PORTVERSION=	0.7.8
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	audio
 MASTER_SITES=	http://testbit.eu/pub/dists/beast/v${PORTVERSION:R}/
 
diff --git a/audio/calf/Makefile b/audio/calf/Makefile
index dd3c2215fa58..4a93843c5bff 100644
--- a/audio/calf/Makefile
+++ b/audio/calf/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	calf
 PORTVERSION=	0.0.60
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	audio
 MASTER_SITES=	http://calf-studio-gear.org/files/
 
diff --git a/audio/ccaudio2/Makefile b/audio/ccaudio2/Makefile
index 906df1468b4f..50e654db6a02 100644
--- a/audio/ccaudio2/Makefile
+++ b/audio/ccaudio2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ccaudio2
 PORTVERSION=	2.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	GNU/ccaudio
 
diff --git a/audio/chromaprint/Makefile b/audio/chromaprint/Makefile
index eb296d384f6b..a1ce8268d9d6 100644
--- a/audio/chromaprint/Makefile
+++ b/audio/chromaprint/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	chromaprint
 PORTVERSION=	1.4.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/acoustid/${PORTNAME}/releases/download/v${PORTVERSION}/ \
 		https://bitbucket.org/acoustid/${PORTNAME}/downloads/
diff --git a/audio/csound/Makefile b/audio/csound/Makefile
index c057f6048acf..b12ad0a5025c 100644
--- a/audio/csound/Makefile
+++ b/audio/csound/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	csound
 PORTVERSION=	5.19.01
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	audio lang
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}5/${PORTNAME}${PORTVERSION:R} \
 		SF/${PORTNAME}/${PORTNAME}5/${PORTNAME}${PORTVERSION:R}/manual:manual
diff --git a/audio/csound6/Makefile b/audio/csound6/Makefile
index 0aa21380ccf9..5d4e45d3726f 100644
--- a/audio/csound6/Makefile
+++ b/audio/csound6/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	csound
 PORTVERSION=	6.06
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	audio lang
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}6/${PORTNAME:S/c/C/}${PORTVERSION}
 PKGNAMESUFFIX=	6
diff --git a/audio/deadbeef/Makefile b/audio/deadbeef/Makefile
index a419e5e368c6..557e77c3f6d1 100644
--- a/audio/deadbeef/Makefile
+++ b/audio/deadbeef/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	deadbeef
 PORTVERSION=	0.7.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/
 
diff --git a/audio/dream/pkg-descr b/audio/dream/pkg-descr
index 38b49650ed8f..72ecc699230f 100644
--- a/audio/dream/pkg-descr
+++ b/audio/dream/pkg-descr
@@ -1,4 +1,4 @@
 Open-Source Software Implementation of a DRM (Digital Radio Mondiale) Receiver
 under the GNU General Public License (GPL)
 
-WWW: http://drm.sourceforge.net/wiki/index.php/Main_Page
+WWW: https://sourceforge.net/p/drm/wiki/Home/
diff --git a/audio/dsbmixer/Makefile b/audio/dsbmixer/Makefile
index ecfcbdca8280..01dea47777c4 100644
--- a/audio/dsbmixer/Makefile
+++ b/audio/dsbmixer/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	dsbmixer
-PORTVERSION=	1.1
+PORTVERSION=	1.2
 CATEGORIES=	audio
 MASTER_SITES=	http://freeshell.de/~mk/download/
 
@@ -16,7 +16,7 @@ RUN_DEPENDS=	dsbwrtsysctl:sysutils/dsbwrtsysctl
 USES=		tar:tgz qmake
 
 USE_GL=		gl
-USE_QT5=	buildtools core gui linguisttools widgets
+USE_QT5=	buildtools_build core gui linguisttools_build widgets
 
 QMAKE_ARGS=	PORTS=1
 
diff --git a/audio/dsbmixer/distinfo b/audio/dsbmixer/distinfo
index e5ab0b846547..cdcff523dfa9 100644
--- a/audio/dsbmixer/distinfo
+++ b/audio/dsbmixer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500951608
-SHA256 (dsbmixer-1.1.tgz) = 57fef13d72a542fea97a445d69560934a7e708e213b9f336f8fbb0b50374a6ec
-SIZE (dsbmixer-1.1.tgz) = 27446
+TIMESTAMP = 1504432939
+SHA256 (dsbmixer-1.2.tgz) = 111702caf84a7326e99078990cab92515b83dfb8e648be7c9f4c06401ba30721
+SIZE (dsbmixer-1.2.tgz) = 37334
diff --git a/audio/emms/Makefile b/audio/emms/Makefile
index 0d1008cfd5f9..1711cb408a26 100644
--- a/audio/emms/Makefile
+++ b/audio/emms/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	emms
 PORTVERSION=	4.3
+PORTREVISION=	1
 CATEGORIES=	audio elisp
 MASTER_SITES=	GNU
 
diff --git a/audio/espeak/Makefile b/audio/espeak/Makefile
index 81b66b4f4937..9e5b6f045916 100644
--- a/audio/espeak/Makefile
+++ b/audio/espeak/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	espeak
 PORTVERSION=	1.48.04
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
diff --git a/audio/exaile-devel/Makefile b/audio/exaile-devel/Makefile
index fbc436fa2a4d..965856e36917 100644
--- a/audio/exaile-devel/Makefile
+++ b/audio/exaile-devel/Makefile
@@ -17,12 +17,12 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen \
 		${PYTHON_PKGNAMEPREFIX}bsddb3>0:databases/py-bsddb3
 
 USE_GITHUB=	yes
-GH_TAGNAME=	cd1d092
-COMMITDATE=	20170629
+GH_TAGNAME=	11885d6
+COMMITDATE=	20170907
 
 NO_ARCH=	yes
 USES=		desktop-file-utils gmake gnome python:2.7
-USE_GNOME=	gtk30 librsvg2 pygobject3
+USE_GNOME=	gtk30 intltool librsvg2 pygobject3
 USE_GSTREAMER1=	good faad
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
diff --git a/audio/exaile-devel/distinfo b/audio/exaile-devel/distinfo
index 2cca7a5f39f9..e27f813d5732 100644
--- a/audio/exaile-devel/distinfo
+++ b/audio/exaile-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1498684912
-SHA256 (exaile-exaile-4.0.20170629-cd1d092_GH0.tar.gz) = 424464f99781782af372ab2003baf7c6a93afc386b51a81b8f118baf03feb4a7
-SIZE (exaile-exaile-4.0.20170629-cd1d092_GH0.tar.gz) = 3377522
+TIMESTAMP = 1504765304
+SHA256 (exaile-exaile-4.0.20170907-11885d6_GH0.tar.gz) = 7f7cc45c7aca08672b865b4b784ac2a16210c5411eeedd59cce1c5bc8797867a
+SIZE (exaile-exaile-4.0.20170907-11885d6_GH0.tar.gz) = 3365325
diff --git a/audio/exaile-devel/pkg-plist b/audio/exaile-devel/pkg-plist
index cb7645e31738..5658a8529775 100644
--- a/audio/exaile-devel/pkg-plist
+++ b/audio/exaile-devel/pkg-plist
@@ -263,6 +263,9 @@ lib/exaile/xlgui/panel/flatplaylist.pyo
 lib/exaile/xlgui/panel/menus.py
 lib/exaile/xlgui/panel/menus.pyc
 lib/exaile/xlgui/panel/menus.pyo
+lib/exaile/xlgui/panel/lyrics.py
+lib/exaile/xlgui/panel/lyrics.pyc
+lib/exaile/xlgui/panel/lyrics.pyo
 lib/exaile/xlgui/panel/playlists.py
 lib/exaile/xlgui/panel/playlists.pyc
 lib/exaile/xlgui/panel/playlists.pyo
@@ -287,6 +290,9 @@ lib/exaile/xlgui/preferences/collection.pyo
 lib/exaile/xlgui/preferences/cover.py
 lib/exaile/xlgui/preferences/cover.pyc
 lib/exaile/xlgui/preferences/cover.pyo
+lib/exaile/xlgui/preferences/lyrics.py
+lib/exaile/xlgui/preferences/lyrics.pyc
+lib/exaile/xlgui/preferences/lyrics.pyo
 lib/exaile/xlgui/preferences/playback.py
 lib/exaile/xlgui/preferences/playback.pyc
 lib/exaile/xlgui/preferences/playback.pyo
@@ -355,12 +361,10 @@ share/applications/exaile.desktop
 share/dbus-1/services/org.exaile.Exaile.service
 share/exaile/data/images/128x128
 share/exaile/data/images/16x16/artist.png
-share/exaile/data/images/16x16/audio-x-generic.png
 share/exaile/data/images/16x16/exaile-pause.png
 share/exaile/data/images/16x16/exaile-play.png
 share/exaile/data/images/16x16/exaile.png
 share/exaile/data/images/16x16/extension.png
-share/exaile/data/images/16x16/folder-music.png
 share/exaile/data/images/16x16/genre.png
 share/exaile/data/images/16x16/media-playlist-dynamic.png
 share/exaile/data/images/16x16/media-playlist-repeat.png
@@ -372,7 +376,6 @@ share/exaile/data/images/22x22/exaile-pause.png
 share/exaile/data/images/22x22/exaile-play.png
 share/exaile/data/images/22x22/exaile.png
 share/exaile/data/images/22x22/extension.png
-share/exaile/data/images/22x22/folder-music.png
 share/exaile/data/images/22x22/genre.png
 share/exaile/data/images/22x22/media-playlist-dynamic.png
 share/exaile/data/images/22x22/media-playlist-repeat.png
@@ -384,7 +387,6 @@ share/exaile/data/images/24x24/exaile-pause.png
 share/exaile/data/images/24x24/exaile-play.png
 share/exaile/data/images/24x24/exaile.png
 share/exaile/data/images/24x24/extension.png
-share/exaile/data/images/24x24/folder-music.png
 share/exaile/data/images/24x24/genre.png
 share/exaile/data/images/24x24/media-playlist-dynamic.png
 share/exaile/data/images/24x24/media-playlist-repeat.png
@@ -396,7 +398,6 @@ share/exaile/data/images/32x32/exaile-pause.png
 share/exaile/data/images/32x32/exaile-play.png
 share/exaile/data/images/32x32/exaile.png
 share/exaile/data/images/32x32/extension.png
-share/exaile/data/images/32x32/folder-music.png
 share/exaile/data/images/32x32/genre.png
 share/exaile/data/images/32x32/media-playlist-dynamic.png
 share/exaile/data/images/32x32/media-playlist-repeat.png
@@ -407,13 +408,12 @@ share/exaile/data/images/48x48/exaile-pause.png
 share/exaile/data/images/48x48/exaile-play.png
 share/exaile/data/images/48x48/exaile.png
 share/exaile/data/images/48x48/extension.png
-share/exaile/data/images/48x48/folder-music.png
 share/exaile/data/images/48x48/genre.png
 share/exaile/data/images/48x48/office-calendar.png
-share/exaile/data/images/emptystar.png
 share/exaile/data/images/exailelogo.png
 share/exaile/data/images/nocover.png
 share/exaile/data/images/scalable/artist.svg
+share/exaile/data/images/scalable/exaile-noshadow.svg
 share/exaile/data/images/scalable/exaile-pause.svg
 share/exaile/data/images/scalable/exaile-play.svg
 share/exaile/data/images/scalable/exaile.svg
@@ -421,7 +421,6 @@ share/exaile/data/images/scalable/extension.svg
 share/exaile/data/images/scalable/genre.svg
 share/exaile/data/images/scalable/office-calendar.svg
 share/exaile/data/images/splash.png
-share/exaile/data/images/star.png
 share/exaile/data/ui/about_dialog.ui
 share/exaile/data/ui/collection_manager.ui
 share/exaile/data/ui/coverchooser.ui
@@ -433,12 +432,14 @@ share/exaile/data/ui/panel/collection.ui
 share/exaile/data/ui/panel/device.ui
 share/exaile/data/ui/panel/files.ui
 share/exaile/data/ui/panel/flatplaylist.ui
+share/exaile/data/ui/panel/lyrics.ui
 share/exaile/data/ui/panel/playlists.ui
 share/exaile/data/ui/panel/radio.ui
 share/exaile/data/ui/playlist.ui
 share/exaile/data/ui/preferences/appearance.ui
 share/exaile/data/ui/preferences/collection.ui
 share/exaile/data/ui/preferences/cover.ui
+share/exaile/data/ui/preferences/lyrics.ui
 share/exaile/data/ui/preferences/playback.ui
 share/exaile/data/ui/preferences/playlists.ui
 share/exaile/data/ui/preferences/plugin.ui
@@ -500,10 +501,6 @@ share/exaile/plugins/bookmarks/PLUGININFO
 share/exaile/plugins/bookmarks/__init__.py
 share/exaile/plugins/bookmarks/__init__.pyc
 share/exaile/plugins/bookmarks/__init__.pyo
-share/exaile/plugins/bookmarks/bookmarks_pane.ui
-share/exaile/plugins/bookmarks/bookmarksprefs.py
-share/exaile/plugins/bookmarks/bookmarksprefs.pyc
-share/exaile/plugins/bookmarks/bookmarksprefs.pyo
 share/exaile/plugins/bpm/PLUGININFO
 share/exaile/plugins/bpm/__init__.py
 share/exaile/plugins/bpm/__init__.pyc
@@ -524,9 +521,6 @@ share/exaile/plugins/cd/cdprefs.py
 share/exaile/plugins/cd/cdprefs.pyc
 share/exaile/plugins/cd/cdprefs.pyo
 share/exaile/plugins/cd/cdprefs_pane.ui
-share/exaile/plugins/cd/importer.py
-share/exaile/plugins/cd/importer.pyc
-share/exaile/plugins/cd/importer.pyo
 share/exaile/plugins/currentsong/PLUGININFO
 share/exaile/plugins/currentsong/__init__.py
 share/exaile/plugins/currentsong/__init__.pyc
@@ -754,15 +748,6 @@ share/exaile/plugins/lyricsmania/PLUGININFO
 share/exaile/plugins/lyricsmania/__init__.py
 share/exaile/plugins/lyricsmania/__init__.pyc
 share/exaile/plugins/lyricsmania/__init__.pyo
-share/exaile/plugins/lyricsviewer/PLUGININFO
-share/exaile/plugins/lyricsviewer/__init__.py
-share/exaile/plugins/lyricsviewer/__init__.pyc
-share/exaile/plugins/lyricsviewer/__init__.pyo
-share/exaile/plugins/lyricsviewer/lyricsviewer.ui
-share/exaile/plugins/lyricsviewer/lyricsviewer_prefs.ui
-share/exaile/plugins/lyricsviewer/lyricsviewerprefs.py
-share/exaile/plugins/lyricsviewer/lyricsviewerprefs.pyc
-share/exaile/plugins/lyricsviewer/lyricsviewerprefs.pyo
 share/exaile/plugins/lyricwiki/PLUGININFO
 share/exaile/plugins/lyricwiki/__init__.py
 share/exaile/plugins/lyricwiki/__init__.pyc
diff --git a/audio/firefly/Makefile b/audio/firefly/Makefile
index d572ac7a1dec..50d4e7df2e6f 100644
--- a/audio/firefly/Makefile
+++ b/audio/firefly/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	firefly
 PORTVERSION=	1696
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	audio
 MASTER_SITES=	SF/fireflyserver-server/Sources/mt-daapd/svn-${PORTVERSION}
 DISTNAME=	mt-daapd-svn-${PORTVERSION}
diff --git a/audio/funktrackergold/Makefile b/audio/funktrackergold/Makefile
index 10349c2685cf..5ed472ccb36d 100644
--- a/audio/funktrackergold/Makefile
+++ b/audio/funktrackergold/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	funktrackergold
 DISTVERSION=	1.5-2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	SUNSITE/apps/sound/players
 
diff --git a/audio/gbsplay/Makefile b/audio/gbsplay/Makefile
index 638123620bf2..c4188f6a3361 100644
--- a/audio/gbsplay/Makefile
+++ b/audio/gbsplay/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gbsplay
 PORTVERSION=	0.0.93.20161217
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 
 MAINTAINER=	ehaupt@FreeBSD.org
diff --git a/audio/gnuspeechsa/Makefile b/audio/gnuspeechsa/Makefile
index 5cd160483793..89f5c2952c3f 100644
--- a/audio/gnuspeechsa/Makefile
+++ b/audio/gnuspeechsa/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gnuspeechsa
 PORTVERSION=	0.1.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	GNU/gnuspeech
 
diff --git a/audio/gogglesmm/Makefile b/audio/gogglesmm/Makefile
index 0022f732842c..e1eaaacf8dcd 100644
--- a/audio/gogglesmm/Makefile
+++ b/audio/gogglesmm/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gogglesmm
 PORTVERSION=	1.1.9
+PORTREVISION=	1
 CATEGORIES=	audio
 
 MAINTAINER=	jhale@FreeBSD.org
diff --git a/audio/gtkguitune/Makefile b/audio/gtkguitune/Makefile
index 19d9d38f3bff..cd10357b2622 100644
--- a/audio/gtkguitune/Makefile
+++ b/audio/gtkguitune/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	gtkguitune
 PORTVERSION=	0.8
 DISTVERSIONPREFIX=	gtk2-
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	audio
 MASTER_SITES=	GENTOO \
 		http://www.oocities.org/harpin_floh/mysoft/
diff --git a/audio/idjc/Makefile b/audio/idjc/Makefile
index 600f4151d45d..827b1996f41c 100644
--- a/audio/idjc/Makefile
+++ b/audio/idjc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	idjc
 PORTVERSION=	0.8.16
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	audio python
 MASTER_SITES=	SF/idjc/idjc/0.8
 
diff --git a/audio/jalv/Makefile b/audio/jalv/Makefile
index 2a77404306bc..b4f10f0565af 100644
--- a/audio/jalv/Makefile
+++ b/audio/jalv/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	jalv
 PORTVERSION=	1.6.0
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://download.drobilla.net/
 
diff --git a/audio/libsoxr/Makefile b/audio/libsoxr/Makefile
index 422e87f1ec43..ea3ee30571aa 100644
--- a/audio/libsoxr/Makefile
+++ b/audio/libsoxr/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	libsoxr
 PORTVERSION=	0.1.2.20160529
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	LOCAL/riggs/soxr/
 
diff --git a/audio/murmur/Makefile b/audio/murmur/Makefile
index 3602e2f6e651..ccdc1bfa06f2 100644
--- a/audio/murmur/Makefile
+++ b/audio/murmur/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	murmur
 PORTVERSION=	1.2.19
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio net
 
 MAINTAINER=	feld@FreeBSD.org
diff --git a/audio/musescore/Makefile b/audio/musescore/Makefile
index 0b19cc8ba376..7bd42cd819a1 100644
--- a/audio/musescore/Makefile
+++ b/audio/musescore/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	musescore
 PORTVERSION=	2.1
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://ftp.osuosl.org/pub/musescore/releases/MuseScore-${PORTVERSION}/
 DISTNAME=	MuseScore-${PORTVERSION}
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index dc687ed9d71c..d023a4e4ae86 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	musicpd
 PORTVERSION=	0.20.10
+PORTREVISION=	1
 CATEGORIES=	audio ipv6
 MASTER_SITES=	http://www.musicpd.org/download/mpd/${PORTVERSION:R}/
 DISTNAME=	mpd-${PORTVERSION}
diff --git a/audio/ncmpcpp/Makefile b/audio/ncmpcpp/Makefile
index 61aff1918ae5..c53e3caef217 100644
--- a/audio/ncmpcpp/Makefile
+++ b/audio/ncmpcpp/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	ncmpcpp
 PORTVERSION=	0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://ncmpcpp.rybczak.net/stable/
 
diff --git a/audio/openal-soft/Makefile b/audio/openal-soft/Makefile
index 997488400341..bb0c1466fc32 100644
--- a/audio/openal-soft/Makefile
+++ b/audio/openal-soft/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	openal-soft
 PORTVERSION=	1.18.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://kcat.strangesoft.net/openal-releases/
 
diff --git a/audio/openspc/Makefile b/audio/openspc/Makefile
index bba1c9bbb74d..3702c0243dfa 100644
--- a/audio/openspc/Makefile
+++ b/audio/openspc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	openspc
 PORTVERSION=	0.3.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	http://membres.lycos.fr/pixels/ \
 		LOCAL/ehaupt
diff --git a/audio/paman/Makefile b/audio/paman/Makefile
index dbe30a1a2e59..087eb760ecea 100644
--- a/audio/paman/Makefile
+++ b/audio/paman/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	paman
 PORTVERSION=	0.9.4
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	audio
 MASTER_SITES=	http://0pointer.de/lennart/projects/${PORTNAME}/
 
diff --git a/audio/paprefs/Makefile b/audio/paprefs/Makefile
index 33b184b1edda..fd73c0ea2d58 100644
--- a/audio/paprefs/Makefile
+++ b/audio/paprefs/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	paprefs
 PORTVERSION=	0.9.10
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://freedesktop.org/software/pulseaudio/${PORTNAME}/
 
diff --git a/audio/patchage/Makefile b/audio/patchage/Makefile
index 21dc3c5aeed0..b741b2649629 100644
--- a/audio/patchage/Makefile
+++ b/audio/patchage/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	patchage
 PORTVERSION=	0.5.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	audio
 MASTER_SITES=	http://download.drobilla.net/ \
 		http://frugalware.mirrors.tds.net/pub/linux/frugalware/frugalware-current/source/xmultimedia-extra/patchage/
diff --git a/audio/pavucontrol/Makefile b/audio/pavucontrol/Makefile
index a474a684b59f..f29c00c067ab 100644
--- a/audio/pavucontrol/Makefile
+++ b/audio/pavucontrol/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pavucontrol
 PORTVERSION=	3.0
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://freedesktop.org/software/pulseaudio/${PORTNAME}/
 
diff --git a/audio/pavumeter/Makefile b/audio/pavumeter/Makefile
index 0c030f30d932..660adc57822a 100644
--- a/audio/pavumeter/Makefile
+++ b/audio/pavumeter/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pavumeter
 PORTVERSION=	0.9.3
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	audio
 MASTER_SITES=	http://0pointer.de/lennart/projects/${PORTNAME}/
 
diff --git a/audio/pragha/Makefile b/audio/pragha/Makefile
index 03c3a716fb0a..be84de62627a 100644
--- a/audio/pragha/Makefile
+++ b/audio/pragha/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pragha
 PORTVERSION=	1.3.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/pragha-music-player/${PORTNAME}/releases/download/v${PORTVERSION}/
 
diff --git a/audio/pulseaudio-module-sndio/Makefile b/audio/pulseaudio-module-sndio/Makefile
index f603b2c9f254..9f1a67d4f67a 100644
--- a/audio/pulseaudio-module-sndio/Makefile
+++ b/audio/pulseaudio-module-sndio/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pulseaudio-module-sndio
-PORTVERSION=	9.0
-PORTREVISION=	1
+DISTVERSION=	10.99.1
 CATEGORIES=	audio
 
 MAINTAINER=	tobik@FreeBSD.org
@@ -19,9 +18,8 @@ USES=		pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	t6
 
-MAKE_ARGS=	STAGEDIR="${STAGEDIR}"
-
 PULSE_MODDIR=	`pkg-config --variable=modlibexecdir libpulse`
 PLIST_FILES=	${PULSE_MODDIR}/module-sndio.so
+SUB_FILES=	pkg-message
 
 .include <bsd.port.mk>
diff --git a/audio/pulseaudio-module-sndio/distinfo b/audio/pulseaudio-module-sndio/distinfo
index 57183bfd0dad..79c5d5314c34 100644
--- a/audio/pulseaudio-module-sndio/distinfo
+++ b/audio/pulseaudio-module-sndio/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1477495195
-SHA256 (t6-pulseaudio-module-sndio-9.0_GH0.tar.gz) = 39aad04590ea3f4e48239a5497b964491c2e96b6e2855f365e582ba3130875b0
-SIZE (t6-pulseaudio-module-sndio-9.0_GH0.tar.gz) = 90797
+TIMESTAMP = 1504721015
+SHA256 (t6-pulseaudio-module-sndio-10.99.1_GH0.tar.gz) = b4756d9ddc183fa785f9b96b77b20f076f466cbc9c8506c7af95621e755e52f4
+SIZE (t6-pulseaudio-module-sndio-10.99.1_GH0.tar.gz) = 93067
diff --git a/audio/pulseaudio-module-sndio/files/pkg-message.in b/audio/pulseaudio-module-sndio/files/pkg-message.in
new file mode 100644
index 000000000000..0cd169bbfdc1
--- /dev/null
+++ b/audio/pulseaudio-module-sndio/files/pkg-message.in
@@ -0,0 +1,3 @@
+The sndio module can be loaded via %%LOCALBASE%%/etc/pulse/default.pa:
+
+  load-module module-sndio device=snd/0
diff --git a/audio/pulseaudio-module-sndio/pkg-message b/audio/pulseaudio-module-sndio/pkg-message
deleted file mode 100644
index 5d08d096c4b8..000000000000
--- a/audio/pulseaudio-module-sndio/pkg-message
+++ /dev/null
@@ -1,9 +0,0 @@
-To use the sndio PulseAudio module load it with
-
-    pacmd load-module module-sndio
-
-You can use audio/pavucontrol or pacmd to switch a specific stream
-over to use it.  Unloading the OSS module will send all streams over
-sndio:
-
-    pacmd unload-module module-oss
diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index d27a8b83660c..314be95dc8eb 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -5,8 +5,8 @@
 # PORTREVISION bumps of depending ports.
 
 PORTNAME=	pulseaudio
-PORTVERSION=	10.0
-PORTREVISION=	4
+PORTVERSION=	11.0
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://freedesktop.org/software/pulseaudio/releases/
 
@@ -51,7 +51,6 @@ CONFIGURE_ARGS=	--localstatedir=/var \
 		--disable-systemd-journal \
 		--disable-systemd-login \
 		--disable-neon-opt \
-		--disable-xen \
 		--disable-lirc # untested
 
 USERS=		pulse
diff --git a/audio/pulseaudio/distinfo b/audio/pulseaudio/distinfo
index 0805e4704b50..8c73f4448a04 100644
--- a/audio/pulseaudio/distinfo
+++ b/audio/pulseaudio/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1484711815
-SHA256 (pulseaudio-10.0.tar.xz) = a3186824de9f0d2095ded5d0d0db0405dc73133983c2fbb37291547e37462f57
-SIZE (pulseaudio-10.0.tar.xz) = 1608040
+TIMESTAMP = 1504603004
+SHA256 (pulseaudio-11.0.tar.xz) = 072305d4018fc5e75bb1b45ee6b938fa52fc9fd27493bf327415ef89ed14c969
+SIZE (pulseaudio-11.0.tar.xz) = 1648128
diff --git a/audio/pulseaudio/files/patch-src_Makefile.in b/audio/pulseaudio/files/patch-src_Makefile.in
index 06bf44085945..de89e1046337 100644
--- a/audio/pulseaudio/files/patch-src_Makefile.in
+++ b/audio/pulseaudio/files/patch-src_Makefile.in
@@ -1,6 +1,6 @@
---- src/Makefile.in.orig	2016-06-24 23:00:54 UTC
+--- src/Makefile.in.orig	2017-09-05 09:14:12 UTC
 +++ src/Makefile.in
-@@ -11092,7 +11092,7 @@ info-am:
+@@ -11203,7 +11203,7 @@ info-am:
  
  install-data-am: install-commonlibLTLIBRARIES install-dbuspolicyDATA \
  	install-dist_alsapathsDATA install-dist_alsaprofilesetsDATA \
diff --git a/audio/pulseaudio/files/patch-src_modules_module-detect.c b/audio/pulseaudio/files/patch-src_modules_module-detect.c
index fbe74713c8e6..fb440f731c2f 100644
--- a/audio/pulseaudio/files/patch-src_modules_module-detect.c
+++ b/audio/pulseaudio/files/patch-src_modules_module-detect.c
@@ -1,6 +1,6 @@
---- src/modules/module-detect.c.orig	2016-05-10 12:28:04 UTC
+--- src/modules/module-detect.c.orig	2017-09-03 11:41:12 UTC
 +++ src/modules/module-detect.c
-@@ -160,11 +160,45 @@ static int detect_oss(pa_core *c, int ju
+@@ -160,11 +160,41 @@ static int detect_oss(pa_core *c, int ju
                  continue;
  
          } else if (sscanf(line, "pcm%u: ", &device) == 1) {
@@ -14,34 +14,30 @@
 +                continue;
 +
 +            if (!pa_endswith(line, "default"))
-+                continue;
+                 continue;
 +
 +            const char *p = strrchr(line, '(');
 +
 +            if (!p)
-                 continue;
++                continue;
 +
-+            if (!c->default_sink && (strstr(p, "play") || (strstr(p, "p:") && !strstr(p, "(0p:")))) {
++            if (!c->configured_default_sink && (strstr(p, "play") || (strstr(p, "p:") && !strstr(p, "(0p:")))) {
 +                uint32_t idx = PA_IDXSET_INVALID;
 +                pa_sink *s;
 +                PA_IDXSET_FOREACH(s, c->sinks, idx) {
 +                    if (s->module == m) {
-+                        if (!pa_namereg_set_default_sink(c, s))
-+                            pa_log_error("failed to set default sink for device: /dev/dsp%u", device);
-+
++                        pa_core_set_configured_default_sink(c, s->name);
 +                        break;
 +                    }
 +                }
 +            }
 +
-+            if (!c->default_source && (strstr(p, "rec") || (strstr(p, "r:") && !strstr(p, "/0r:")))) {
++            if (!c->configured_default_source && (strstr(p, "rec") || (strstr(p, "r:") && !strstr(p, "/0r:")))) {
 +                uint32_t idx = PA_IDXSET_INVALID;
 +                pa_source *s;
 +                PA_IDXSET_FOREACH(s, c->sources, idx) {
 +                    if (s->module == m) {
-+                        if (!pa_namereg_set_default_source(c, s))
-+                            pa_log_error("failed to set default source for device: /dev/dsp%u", device);
-+
++                        pa_core_set_configured_default_source(c, s->name);
 +                        break;
 +                    }
 +                }
diff --git a/audio/pulseaudio/files/patch-src_modules_raop_raop-client.c b/audio/pulseaudio/files/patch-src_modules_raop_raop-client.c
new file mode 100644
index 000000000000..8687cedc31ef
--- /dev/null
+++ b/audio/pulseaudio/files/patch-src_modules_raop_raop-client.c
@@ -0,0 +1,13 @@
+--- src/modules/raop/raop-client.c.orig	2017-07-24 23:14:10 UTC
++++ src/modules/raop/raop-client.c
+@@ -35,6 +35,10 @@
+ #include <sys/filio.h>
+ #endif
+ 
++#ifdef HAVE_NETINET_IN_H
++#include <netinet/in.h>
++#endif
++
+ #include <pulse/xmalloc.h>
+ #include <pulse/timeval.h>
+ #include <pulse/sample.h>
diff --git a/audio/pulseaudio/pkg-plist b/audio/pulseaudio/pkg-plist
index a45be76ff755..42d930243658 100644
--- a/audio/pulseaudio/pkg-plist
+++ b/audio/pulseaudio/pkg-plist
@@ -66,10 +66,10 @@ lib/libpulse-mainloop-glib.so.0
 lib/libpulse-mainloop-glib.so.0.0.5
 lib/libpulse-simple.so
 lib/libpulse-simple.so.0
-lib/libpulse-simple.so.0.1.0
+lib/libpulse-simple.so.0.1.1
 lib/libpulse.so
 lib/libpulse.so.0
-lib/libpulse.so.0.20.1
+lib/libpulse.so.0.20.2
 %%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/libavahi-wrap.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-allow-passthrough.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-device-manager.so
@@ -246,6 +246,7 @@ share/locale/gu/LC_MESSAGES/pulseaudio.mo
 share/locale/gl/LC_MESSAGES/pulseaudio.mo
 share/locale/he/LC_MESSAGES/pulseaudio.mo
 share/locale/hi/LC_MESSAGES/pulseaudio.mo
+share/locale/hr/LC_MESSAGES/pulseaudio.mo
 share/locale/hu/LC_MESSAGES/pulseaudio.mo
 share/locale/id/LC_MESSAGES/pulseaudio.mo
 share/locale/it/LC_MESSAGES/pulseaudio.mo
@@ -256,6 +257,7 @@ share/locale/lt/LC_MESSAGES/pulseaudio.mo
 share/locale/ml/LC_MESSAGES/pulseaudio.mo
 share/locale/mr/LC_MESSAGES/pulseaudio.mo
 share/locale/nl/LC_MESSAGES/pulseaudio.mo
+share/locale/nn/LC_MESSAGES/pulseaudio.mo
 share/locale/oc/LC_MESSAGES/pulseaudio.mo
 share/locale/or/LC_MESSAGES/pulseaudio.mo
 share/locale/pa/LC_MESSAGES/pulseaudio.mo
diff --git a/audio/py-karaoke/Makefile b/audio/py-karaoke/Makefile
index 523e9b4a222a..33de373f5f1e 100644
--- a/audio/py-karaoke/Makefile
+++ b/audio/py-karaoke/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	karaoke
 PORTVERSION=	0.7.5
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	audio python
 MASTER_SITES=	SF/py${PORTNAME}/py${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/audio/py-opuslib/Makefile b/audio/py-opuslib/Makefile
new file mode 100644
index 000000000000..85dd0628566f
--- /dev/null
+++ b/audio/py-opuslib/Makefile
@@ -0,0 +1,21 @@
+# Created by: Yuri Victorovich
+# $FreeBSD$
+
+PORTNAME=	opuslib
+PORTVERSION=	1.1.0
+CATEGORIES=	audio python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	yuri@rawbw.com
+COMMENT=	Python bindings to the libopus, IETF low-delay audio codec
+
+LICENSE=	BSD3CLAUSE
+
+RUN_DEPENDS=	${LOCALBASE}/lib/libopus.so:audio/opus
+
+USES=		python:2.7
+USE_PYTHON=	autoplist distutils
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/audio/py-opuslib/distinfo b/audio/py-opuslib/distinfo
new file mode 100644
index 000000000000..4a2f8f35f0b4
--- /dev/null
+++ b/audio/py-opuslib/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1504481859
+SHA256 (opuslib-1.1.0.tar.gz) = 342d9693f836cc42a44ae5f8bac51ae17d52e24e8daceb792cb610024f1e341b
+SIZE (opuslib-1.1.0.tar.gz) = 7009
diff --git a/audio/py-opuslib/pkg-descr b/audio/py-opuslib/pkg-descr
new file mode 100644
index 000000000000..b89dc36db8a5
--- /dev/null
+++ b/audio/py-opuslib/pkg-descr
@@ -0,0 +1,7 @@
+Python bindings to the libopus, IETF low-delay audio codec.
+
+It allows python applications to use the Opus audio codec to encode
+and decode audio, usually in order to reduce the network bandwidth
+that is used by the application.
+
+WWW: https://github.com/onbeep/opuslib
diff --git a/audio/py-tagpy/Makefile b/audio/py-tagpy/Makefile
index ff60861a5e4d..815a22eef373 100644
--- a/audio/py-tagpy/Makefile
+++ b/audio/py-tagpy/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	tagpy
 PORTVERSION=	2013.1
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	audio python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/audio/qjackctl/Makefile b/audio/qjackctl/Makefile
index 6e50f3d54392..1294fdd3b9dc 100644
--- a/audio/qjackctl/Makefile
+++ b/audio/qjackctl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	qjackctl
 PORTVERSION=	0.4.5
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	SF
 
diff --git a/audio/qmidiarp/Makefile b/audio/qmidiarp/Makefile
index c0f80cd4faef..d8968805587b 100644
--- a/audio/qmidiarp/Makefile
+++ b/audio/qmidiarp/Makefile
@@ -4,6 +4,7 @@
 PORTNAME=	qmidiarp
 DISTVERSIONPREFIX=	qmidiarp-
 DISTVERSION=	0.6.4-26
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-g1a15c13
 CATEGORIES=	audio
 
diff --git a/audio/rosegarden/Makefile b/audio/rosegarden/Makefile
index 913472ff5243..75b32f88ca94 100644
--- a/audio/rosegarden/Makefile
+++ b/audio/rosegarden/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	rosegarden
 PORTVERSION=	17.04
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	SF
 
diff --git a/audio/sayonara/Makefile b/audio/sayonara/Makefile
index f555d7a8a25e..c69b4605eda9 100644
--- a/audio/sayonara/Makefile
+++ b/audio/sayonara/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	sayonara
 PORTVERSION=	0.9.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://www.sayonara-player.com/sw/
 DISTNAME=	${PORTNAME}-player-${PORTVERSION}-git11-20161030
diff --git a/audio/sayonara/files/patch-CMakeLists.txt b/audio/sayonara/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..19201cb7227d
--- /dev/null
+++ b/audio/sayonara/files/patch-CMakeLists.txt
@@ -0,0 +1,28 @@
+CMake 3.9 compatibility. Upstreamed in a different form for
+sayonara 0.9.4, which is fully patched for CMake 3.9 and FreeBSD
+
+--- CMakeLists.txt.orig	2016-10-30 11:53:25 UTC
++++ CMakeLists.txt
+@@ -1,6 +1,11 @@
+ CMAKE_MINIMUM_REQUIRED(VERSION 2.7)
+ PROJECT("Sayonara Player")
+ 
++IF(POLICY CMP0071)
++    CMAKE_POLICY(SET CMP0071 OLD)
++    SET(CMAKE_POLICY_DEFAULT_CMP0071 OLD)  # Don't reset in subdirs
++ENDIF()
++
+ set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}")
+ INCLUDE(cotire)
+ SET(VAR_SAYONARA_VERSION "0.9.2")
+@@ -15,6 +20,10 @@ ADD_DEFINITIONS( -DSAYONARA_INSTALL_SHAR
+ MESSAGE("Build Sayonara ${VAR_SAYONARA_VERSION}")
+ MESSAGE("Will install to ${CMAKE_INSTALL_PREFIX}")
+ 
++# CMake 3.9 searches full UI-file paths
++SET(CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/GUI/Preferences/Fonts)
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src/GUI/Playlist/ ${CMAKE_BINARY_DIR}/src/GUI/Preferences .)
++
+ ADD_SUBDIRECTORY(src)
+ ADD_SUBDIRECTORY(resources)
+ 
diff --git a/audio/sayonara/files/patch-src_3rdParty_SomaFM_ui_GUI__SomaFM.h b/audio/sayonara/files/patch-src_3rdParty_SomaFM_ui_GUI__SomaFM.h
new file mode 100644
index 000000000000..c077b2e25a76
--- /dev/null
+++ b/audio/sayonara/files/patch-src_3rdParty_SomaFM_ui_GUI__SomaFM.h
@@ -0,0 +1,11 @@
+--- src/3rdParty/SomaFM/ui/GUI_SomaFM.h.orig	2017-09-01 21:11:21 UTC
++++ src/3rdParty/SomaFM/ui/GUI_SomaFM.h
+@@ -29,7 +29,7 @@
+ #include "SomaFMLibrary.h"
+ #include "SomaFMStation.h"
+ 
+-#include "3rdParty/SomaFM/ui_GUI_SomaFM.h"
++#include "3rdParty/SomaFM/ui/ui_GUI_SomaFM.h"
+ #include "Components/Covers/CoverLocation.h"
+ #include "GUI/Helper/SayonaraWidget/SayonaraWidget.h"
+ 
diff --git a/audio/sayonara/files/patch-src_3rdParty_Soundcloud_ui_GUI__SoundcloudArtistSearch.h b/audio/sayonara/files/patch-src_3rdParty_Soundcloud_ui_GUI__SoundcloudArtistSearch.h
new file mode 100644
index 000000000000..a7018ed137c5
--- /dev/null
+++ b/audio/sayonara/files/patch-src_3rdParty_Soundcloud_ui_GUI__SoundcloudArtistSearch.h
@@ -0,0 +1,11 @@
+--- src/3rdParty/Soundcloud/ui/GUI_SoundcloudArtistSearch.h.orig	2017-09-01 21:08:31 UTC
++++ src/3rdParty/Soundcloud/ui/GUI_SoundcloudArtistSearch.h
+@@ -25,7 +25,7 @@
+ 
+ #include <QDialog>
+ #include "GUI/Helper/SayonaraWidget/SayonaraDialog.h"
+-#include "3rdParty/Soundcloud/ui_GUI_SoundcloudArtistSearch.h"
++#include "3rdParty/Soundcloud/ui/ui_GUI_SoundcloudArtistSearch.h"
+ #include "3rdParty/Soundcloud/src/SoundcloudLibrary.h"
+ #include "3rdParty/Soundcloud/src/SoundcloudDataFetcher.h"
+ 
diff --git a/audio/sayonara/files/patch-src_3rdParty_Soundcloud_ui_GUI__SoundcloudLibrary.h b/audio/sayonara/files/patch-src_3rdParty_Soundcloud_ui_GUI__SoundcloudLibrary.h
new file mode 100644
index 000000000000..7ca8f81b1999
--- /dev/null
+++ b/audio/sayonara/files/patch-src_3rdParty_Soundcloud_ui_GUI__SoundcloudLibrary.h
@@ -0,0 +1,11 @@
+--- src/3rdParty/Soundcloud/ui/GUI_SoundcloudLibrary.h.orig	2017-09-01 21:10:28 UTC
++++ src/3rdParty/Soundcloud/ui/GUI_SoundcloudLibrary.h
+@@ -23,7 +23,7 @@
+ #ifndef GUI_SOUNDCLOUDLIBRARY_H
+ #define GUI_SOUNDCLOUDLIBRARY_H
+ 
+-#include "3rdParty/Soundcloud/ui_GUI_SoundcloudLibrary.h"
++#include "3rdParty/Soundcloud/ui/ui_GUI_SoundcloudLibrary.h"
+ 
+ #include "GUI/Library/GUI_AbstractLibrary.h"
+ 
diff --git a/audio/sayonara/files/patch-uifiles.patch b/audio/sayonara/files/patch-uifiles.patch
new file mode 100644
index 000000000000..bb0ff8786048
--- /dev/null
+++ b/audio/sayonara/files/patch-uifiles.patch
@@ -0,0 +1,181 @@
+Many files #include generated UI-files with the path where they are
+generated by CMake 3.8; this breaks autouic in CMake 3.9, which looks
+at the actual source path and generates the files in a different
+location. All upstreamed in different forms for the forthcoming 0.9.4.
+
+--- src/GUI/Library/ImportFolderDialog/GUI_ImportFolder.h.orig	2016-10-30 11:53:25 UTC
++++ src/GUI/Library/ImportFolderDialog/GUI_ImportFolder.h
+@@ -21,7 +21,7 @@
+ #ifndef GUIIMPORTFOLDER_H_
+ #define GUIIMPORTFOLDER_H_
+ 
+-#include "GUI/Library/ui_GUI_ImportFolder.h"
++#include "ui_GUI_ImportFolder.h"
+ #include "GUI/Helper/SayonaraWidget/SayonaraDialog.h"
+ #include "Components/Library/Importer/LibraryImporter.h"
+ 
+--- src/GUI/Library/InfoBox/GUI_LibraryInfoBox.h.orig	2016-10-30 11:53:25 UTC
++++ src/GUI/Library/InfoBox/GUI_LibraryInfoBox.h
+@@ -25,7 +25,7 @@
+ #ifndef GUILIBRARYINFOBOX_H_
+ #define GUILIBRARYINFOBOX_H_
+ 
+-#include "GUI/Library/ui_GUI_LibraryInfoBox.h"
++#include "ui_GUI_LibraryInfoBox.h"
+ #include "GUI/Helper/SayonaraWidget/SayonaraDialog.h"
+ 
+ 
+--- src/GUI/Playlist/BottomBar/GUI_PlaylistBottomBar.h.orig	2016-10-30 11:53:25 UTC
++++ src/GUI/Playlist/BottomBar/GUI_PlaylistBottomBar.h
+@@ -24,7 +24,7 @@
+ #define PLAYLISTBOTTOMBAR_H
+ 
+ #include "GUI/Helper/SayonaraWidget/SayonaraWidget.h"
+-#include "GUI/Playlist/ui_GUI_PlaylistBottomBar.h"
++#include "ui_GUI_PlaylistBottomBar.h"
+ 
+ #include "Helper/Shutdown/Shutdown.h"
+ #include "Helper/Playlist/PlaylistMode.h"
+--- src/GUI/Preferences/Broadcast/GUI_BroadcastSetup.h.orig	2016-10-30 11:53:25 UTC
++++ src/GUI/Preferences/Broadcast/GUI_BroadcastSetup.h
+@@ -23,7 +23,7 @@
+ #ifndef GUI_BROADCASTSETUP_H
+ #define GUI_BROADCASTSETUP_H
+ 
+-#include "GUI/Preferences/ui_GUI_BroadcastSetup.h"
++#include "ui_GUI_BroadcastSetup.h"
+ #include "Interfaces/PreferenceDialog/PreferenceWidgetInterface.h"
+ 
+ class GUI_BroadcastSetup :
+--- src/GUI/Preferences/Fonts/GUI_FontConfig.h.orig	2016-10-30 11:53:25 UTC
++++ src/GUI/Preferences/Fonts/GUI_FontConfig.h
+@@ -24,7 +24,7 @@
+ #define GUI_FONTCONFIG_H
+ 
+ #include "Interfaces/PreferenceDialog/PreferenceWidgetInterface.h"
+-#include "GUI/Preferences/ui_GUI_FontConfig.h"
++#include "ui_GUI_FontConfig.h"
+ 
+ #include <QFontDatabase>
+ #include <QFont>
+--- src/GUI/Preferences/Language/GUI_LanguageChooser.h.orig	2016-10-30 11:53:25 UTC
++++ src/GUI/Preferences/Language/GUI_LanguageChooser.h
+@@ -26,7 +26,7 @@
+ #include <QMap>
+ #include <QShowEvent>
+ 
+-#include "GUI/Preferences/ui_GUI_LanguageChooser.h"
++#include "ui_GUI_LanguageChooser.h"
+ #include "Interfaces/PreferenceDialog/PreferenceWidgetInterface.h"
+ 
+ 
+--- src/GUI/Preferences/LastFM/GUI_LastFM.h.orig	2016-10-30 11:53:25 UTC
++++ src/GUI/Preferences/LastFM/GUI_LastFM.h
+@@ -29,7 +29,7 @@
+ #ifndef GUI_LASTFM_H_
+ #define GUI_LASTFM_H_
+ 
+-#include "GUI/Preferences/ui_GUI_LastFM.h"
++#include "ui_GUI_LastFM.h"
+ 
+ #include "Components/StreamPlugins/LastFM/LastFM.h"
+ #include "Interfaces/PreferenceDialog/PreferenceWidgetInterface.h"
+--- src/GUI/Preferences/LibraryPreferences/GUI_LibraryPreferences.h.orig	2016-10-30 11:53:25 UTC
++++ src/GUI/Preferences/LibraryPreferences/GUI_LibraryPreferences.h
+@@ -22,7 +22,7 @@
+ #define GUI_LIBRARYPREFERENCES_H
+ 
+ #include "Interfaces/PreferenceDialog/PreferenceWidgetInterface.h"
+-#include "GUI/Preferences/ui_GUI_LibraryPreferences.h"
++#include "ui_GUI_LibraryPreferences.h"
+ 
+ 
+ class GUI_LibraryPreferences :
+--- src/GUI/Preferences/Notifications/GUI_Notifications.h.orig	2016-10-30 11:53:25 UTC
++++ src/GUI/Preferences/Notifications/GUI_Notifications.h
+@@ -25,7 +25,7 @@
+ 
+ #include "Interfaces/PreferenceDialog/PreferenceWidgetInterface.h"
+ #include "Interfaces/Notification/NotificationHandler.h"
+-#include "GUI/Preferences/ui_GUI_Notifications.h"
++#include "ui_GUI_Notifications.h"
+ 
+ 
+ class GUI_Notifications :
+--- src/GUI/Preferences/PlayerPreferences/GUI_PlayerPreferences.h.orig	2016-10-30 11:53:25 UTC
++++ src/GUI/Preferences/PlayerPreferences/GUI_PlayerPreferences.h
+@@ -24,7 +24,7 @@
+ #define GUI_PLAYERPREFERENCES_H
+ 
+ #include "Interfaces/PreferenceDialog/PreferenceWidgetInterface.h"
+-#include "GUI/Preferences/ui_GUI_PlayerPreferences.h"
++#include "ui_GUI_PlayerPreferences.h"
+ 
+ 
+ class GUI_PlayerPreferences :
+--- src/GUI/Preferences/PlaylistPreferences/GUI_PlaylistPreferences.h.orig	2016-10-30 11:53:25 UTC
++++ src/GUI/Preferences/PlaylistPreferences/GUI_PlaylistPreferences.h
+@@ -28,7 +28,7 @@
+ 
+ 
+ #include "Interfaces/PreferenceDialog/PreferenceWidgetInterface.h"
+-#include "GUI/Preferences/ui_GUI_PlaylistPreferences.h"
++#include "ui_GUI_PlaylistPreferences.h"
+ 
+ 
+ class GUI_PlaylistPreferences :
+--- src/GUI/Preferences/PreferenceDialog/GUI_PreferenceDialog.h.orig	2016-10-30 11:53:25 UTC
++++ src/GUI/Preferences/PreferenceDialog/GUI_PreferenceDialog.h
+@@ -25,7 +25,7 @@
+ 
+ #include <QDialog>
+ #include <QList>
+-#include "GUI/Preferences/ui_GUI_PreferenceDialog.h"
++#include "ui_GUI_PreferenceDialog.h"
+ #include "GUI/Helper/SayonaraWidget/SayonaraWidget.h"
+ #include "Interfaces/PreferenceDialog/PreferenceDialogInterface.h"
+ 
+--- src/GUI/Preferences/RemoteControl/GUI_RemoteControl.h.orig	2016-10-30 11:53:25 UTC
++++ src/GUI/Preferences/RemoteControl/GUI_RemoteControl.h
+@@ -25,7 +25,7 @@
+ #ifndef GUISOCKETSETUP_H_
+ #define GUISOCKETSETUP_H_
+ 
+-#include "GUI/Preferences/ui_GUI_RemoteControl.h"
++#include "ui_GUI_RemoteControl.h"
+ 
+ #include "Interfaces/PreferenceDialog/PreferenceWidgetInterface.h"
+ 
+--- src/GUI/Preferences/Shortcuts/GUI_ShortcutEntry.h.orig	2016-10-30 11:53:25 UTC
++++ src/GUI/Preferences/Shortcuts/GUI_ShortcutEntry.h
+@@ -24,7 +24,7 @@
+ 
+ #include "GUI/Helper/SayonaraWidget/SayonaraWidget.h"
+ #include "GUI/Helper/Shortcuts/ShortcutHandler.h"
+-#include "GUI/Preferences/ui_GUI_ShortcutEntry.h"
++#include "ui_GUI_ShortcutEntry.h"
+ 
+ 
+ /**
+--- src/GUI/Preferences/Shortcuts/GUI_Shortcuts.h.orig	2016-10-30 11:53:25 UTC
++++ src/GUI/Preferences/Shortcuts/GUI_Shortcuts.h
+@@ -24,7 +24,7 @@
+ #define GUI_SHORTCUTS_H
+ 
+ 
+-#include "GUI/Preferences/ui_GUI_Shortcuts.h"
++#include "ui_GUI_Shortcuts.h"
+ #include "GUI/Helper/Shortcuts/ShortcutHandler.h"
+ 
+ #include "Interfaces/PreferenceDialog/PreferenceWidgetInterface.h"
+--- src/GUI/Preferences/StreamRecorder/GUI_StreamRecorder.h.orig	2016-10-30 11:53:25 UTC
++++ src/GUI/Preferences/StreamRecorder/GUI_StreamRecorder.h
+@@ -25,7 +25,7 @@
+ #ifndef GUI_STREAMRECORDER_H_
+ #define GUI_STREAMRECORDER_H_
+ 
+-#include "GUI/Preferences/ui_GUI_StreamRecorder.h"
++#include "ui_GUI_StreamRecorder.h"
+ #include "Interfaces/PreferenceDialog/PreferenceWidgetInterface.h"
+ 
+ class GUI_StreamRecorder :
diff --git a/audio/schismtracker/Makefile b/audio/schismtracker/Makefile
index 748cff86805a..3b7be6e008b9 100644
--- a/audio/schismtracker/Makefile
+++ b/audio/schismtracker/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	schismtracker
 PORTVERSION=	20170420
+PORTREVISION=	1
 CATEGORIES=	audio
 
 MAINTAINER=	ehaupt@FreeBSD.org
diff --git a/audio/smasher/Makefile b/audio/smasher/Makefile
index d49bb1da082d..8ace65dc5869 100644
--- a/audio/smasher/Makefile
+++ b/audio/smasher/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	smasher
 PORTVERSION=	1.1.7
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	audio
 MASTER_SITES=	SF
 
diff --git a/audio/soundkonverter/Makefile b/audio/soundkonverter/Makefile
index d92a741221d0..de2053732ec3 100644
--- a/audio/soundkonverter/Makefile
+++ b/audio/soundkonverter/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	soundkonverter
 PORTVERSION=	2.2.2
 DISTVERSIONPREFIX=	v
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio kde
 
 MAINTAINER=	dbn@FreeBSD.org
diff --git a/audio/soundtouch/Makefile b/audio/soundtouch/Makefile
index ce7a65cc6656..4d044e250dfb 100644
--- a/audio/soundtouch/Makefile
+++ b/audio/soundtouch/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	soundtouch
 PORTVERSION=	1.9.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://www.surina.net/soundtouch/
 
diff --git a/audio/spek/Makefile b/audio/spek/Makefile
index 57b1ae27ebac..b1cd44c8ba16 100644
--- a/audio/spek/Makefile
+++ b/audio/spek/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	spek
 PORTVERSION=	0.8.2
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/alexkay/${PORTNAME}/releases/download/v${PORTVERSION}/
 
diff --git a/audio/stk/Makefile b/audio/stk/Makefile
index 795da754cadd..05fb3da1fd92 100644
--- a/audio/stk/Makefile
+++ b/audio/stk/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	stk
-PORTVERSION=	4.5.1
+PORTVERSION=	4.6.0
 CATEGORIES=	audio
 MASTER_SITES=	http://ccrma.stanford.edu/software/stk/release/
 
@@ -17,10 +17,13 @@ LIB_DEPENDS=	libjack.so:audio/jack
 USES=		autoreconf dos2unix gmake pkgconfig localbase
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-jack
-DOS2UNIX_GLOB=		*.cpp *.h
+CONFIGURE_ARGS=	--with-jack --with-oss
+DOS2UNIX_GLOB=	*.cpp *.h
+MAKE_ARGS=	RAWWAVES=${DATADIR}/rawwaves/
 
 post-install:
+	@cd ${WRKSRC} && ${COPYTREE_SHARE} rawwaves ${STAGEDIR}${DATADIR}
+	@${RM} ${STAGEDIR}${DATADIR}/rawwaves/._* ${STAGEDIR}${DATADIR}/rawwaves/*.c
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libstk-${PORTVERSION}.so
 
 .include <bsd.port.mk>
diff --git a/audio/stk/distinfo b/audio/stk/distinfo
index b72a8faebb46..e80f9d11e5b8 100644
--- a/audio/stk/distinfo
+++ b/audio/stk/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502358993
-SHA256 (stk-4.5.1.tar.gz) = 3466860901a181120d3bd0407e4aeb5ab24127a4350c314af106778c1db88594
-SIZE (stk-4.5.1.tar.gz) = 2413113
+TIMESTAMP = 1504376994
+SHA256 (stk-4.6.0.tar.gz) = 648fcb9a0a4243d2d93fc72b29955953f4e794edf04c31f2ed0ed720d05287d2
+SIZE (stk-4.6.0.tar.gz) = 2403223
diff --git a/audio/stk/files/patch-configure.ac b/audio/stk/files/patch-configure.ac
index 92b8f950ed66..92b5739b525f 100644
--- a/audio/stk/files/patch-configure.ac
+++ b/audio/stk/files/patch-configure.ac
@@ -1,4 +1,4 @@
---- configure.ac.orig	2016-02-23 01:51:06 UTC
+--- configure.ac.orig	2017-09-01 00:28:55 UTC
 +++ configure.ac
 @@ -85,7 +85,6 @@ if test "$debug" = "yes"; then
  else
@@ -17,50 +17,44 @@
  
  # Check compiler and use -Wall if gnu.
  if [test $GXX = "yes" ;] then
-@@ -127,31 +126,31 @@ if test $realtime = yes; then
-   # Checks for package options and external software
-   AC_MSG_CHECKING(for audio API)
+@@ -134,27 +133,27 @@ api="$api -D__UNIX_JACK__"
+   AC_CHECK_LIB(jack, jack_client_open, , AC_MSG_ERROR(JACK support requires the jack library!))])
+ 
    case $host in
 -    *-*-linux*)
-+    *-*-freebsd*)
-     AC_ARG_WITH(jack, [  --with-jack = choose JACK server support (mac and linux only)], [
-     api="$api -D__UNIX_JACK__"
-     AC_MSG_RESULT(using JACK)
-     AC_CHECK_LIB(jack, jack_client_open, , AC_MSG_ERROR(JACK support requires the jack library!))
--    AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(Jack support also requires the asound library!))], )
-+    #AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(Jack support also requires the asound library!))], )
- 
++    *-*-linux*|*-*-freebsd*)
      # Look for ALSA flag
--    AC_ARG_WITH(alsa, [  --with-alsa = choose native ALSA API support (linux only)], [
+-    AC_ARG_WITH(alsa, [  --with-alsa = choose native ALSA API support (linux only)])
+-    AS_IF([test "x$with_alsa" == "xyes"], [
 -    api="$api -D__LINUX_ALSA__"
 -    AC_MSG_RESULT(using ALSA)
--    AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(ALSA support requires the asound library!))], )
-+    #AC_ARG_WITH(alsa, [  --with-alsa = choose native ALSA API support (linux only)], [
+-    AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(ALSA support requires the asound library!))])
++    #AC_ARG_WITH(alsa, [  --with-alsa = choose native ALSA API support (linux only)])
++    #AS_IF([test "x$with_alsa" == "xyes"], [
 +    #api="$api -D__LINUX_ALSA__"
 +    #AC_MSG_RESULT(using ALSA)
-+    #AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(ALSA support requires the asound library!))], )
++    #AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(ALSA support requires the asound library!))])
  
      # Look for OSS flag
--    AC_ARG_WITH(oss, [  --with-oss = choose OSS API support (linux only)], [
+     AC_ARG_WITH(oss, [  --with-oss = choose OSS API support (unixes only)])
+     AS_IF([test "x$with_oss" == "xyes"], [
 -    api="$api -D__LINUX_OSS__ -D__LINUX_ALSA__"
--    AC_MSG_RESULT(using OSS)
--    AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(OSS support requires ALSA for RtMidi!))], )
-+    #AC_ARG_WITH(oss, [  --with-oss = choose OSS API support (linux only)], [
-+    #api="$api -D__LINUX_OSS__"
-+    #AC_MSG_RESULT(using OSS)
-+    #AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(OSS support requires ALSA for RtMidi!))], )
++    api="$api -D__LINUX_OSS__"
+     AC_MSG_RESULT(using OSS)
+-    AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(OSS support requires ALSA for RtMidi!))])
++    #AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(OSS support requires ALSA for RtMidi!))])
  
      # If no audio api flags specified, use ALSA
--    if [test "$api" == "";] then
+-    AS_IF([test "$api" == ""], [
 -      AC_MSG_RESULT(using ALSA)
 -      AC_SUBST( api, [-D__LINUX_ALSA__] )
 -      AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(ALSA support requires the asound library!))
--    fi
-+    #if [test "$api" == "";] then
+-    ])
++    #AS_IF([test "$api" == ""], [
 +    #  AC_MSG_RESULT(using ALSA)
 +    #  AC_SUBST( api, [-D__LINUX_ALSA__] )
 +    #  AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(ALSA support requires the asound library!))
-+    #fi
++    #])
  
      AC_CHECK_LIB(pthread, pthread_create, , AC_MSG_ERROR(RtAudio requires the pthread library!))
      ;;
diff --git a/audio/stk/files/patch-src_RtAudio.cpp b/audio/stk/files/patch-src_RtAudio.cpp
deleted file mode 100644
index 0cfd68e67346..000000000000
--- a/audio/stk/files/patch-src_RtAudio.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/RtAudio.cpp.orig	2016-02-23 01:51:06 UTC
-+++ src/RtAudio.cpp
-@@ -47,6 +47,11 @@
- #include <climits>
- #include <algorithm>
- 
-+#if defined(__FreeBSD__)
-+#include <sys/soundcard.h>
-+#define AFMT_FLOAT 0x00004000
-+#endif
-+
- // Static variable definitions.
- const unsigned int RtApi::MAX_SAMPLE_RATES = 14;
- const unsigned int RtApi::SAMPLE_RATES[] = {
-@@ -9023,7 +9028,7 @@ bool RtApiOss :: probeDeviceOpen( unsign
-   }
- 
-   // Verify the sample rate setup worked.
--  if ( abs( srate - sampleRate ) > 100 ) {
-+  if ( abs( (int)(srate - sampleRate) ) > 100 ) {
-     close( fd );
-     errorStream_ << "RtApiOss::probeDeviceOpen: device (" << ainfo.name << ") does not support sample rate (" << sampleRate << ").";
-     errorText_ = errorStream_.str();
diff --git a/audio/stk/pkg-plist b/audio/stk/pkg-plist
index 975074edde5b..c14af15516f6 100644
--- a/audio/stk/pkg-plist
+++ b/audio/stk/pkg-plist
@@ -101,5 +101,46 @@ include/stk/Whistle.h
 include/stk/Wurley.h
 include/stk/WvIn.h
 include/stk/WvOut.h
-lib/libstk-4.5.1.so
+lib/libstk-4.6.0.so
 lib/libstk.so
+%%DATADIR%%/rawwaves/ahh.raw
+%%DATADIR%%/rawwaves/bassdrum.raw
+%%DATADIR%%/rawwaves/britestk.raw
+%%DATADIR%%/rawwaves/cowbell1.raw
+%%DATADIR%%/rawwaves/crashcym.raw
+%%DATADIR%%/rawwaves/dope.raw
+%%DATADIR%%/rawwaves/eee.raw
+%%DATADIR%%/rawwaves/fwavblnk.raw
+%%DATADIR%%/rawwaves/halfwave.raw
+%%DATADIR%%/rawwaves/hihatcym.raw
+%%DATADIR%%/rawwaves/impuls10.raw
+%%DATADIR%%/rawwaves/impuls20.raw
+%%DATADIR%%/rawwaves/impuls40.raw
+%%DATADIR%%/rawwaves/mand1.raw
+%%DATADIR%%/rawwaves/mand10.raw
+%%DATADIR%%/rawwaves/mand11.raw
+%%DATADIR%%/rawwaves/mand12.raw
+%%DATADIR%%/rawwaves/mand2.raw
+%%DATADIR%%/rawwaves/mand3.raw
+%%DATADIR%%/rawwaves/mand4.raw
+%%DATADIR%%/rawwaves/mand5.raw
+%%DATADIR%%/rawwaves/mand6.raw
+%%DATADIR%%/rawwaves/mand7.raw
+%%DATADIR%%/rawwaves/mand8.raw
+%%DATADIR%%/rawwaves/mand9.raw
+%%DATADIR%%/rawwaves/mandpluk.raw
+%%DATADIR%%/rawwaves/marmstk1.raw
+%%DATADIR%%/rawwaves/ooo.raw
+%%DATADIR%%/rawwaves/peksblnk.raw
+%%DATADIR%%/rawwaves/ppksblnk.raw
+%%DATADIR%%/rawwaves/ridecymb.raw
+%%DATADIR%%/rawwaves/silence.raw
+%%DATADIR%%/rawwaves/sineblnk.raw
+%%DATADIR%%/rawwaves/sinewave.raw
+%%DATADIR%%/rawwaves/snardrum.raw
+%%DATADIR%%/rawwaves/snglpeak.raw
+%%DATADIR%%/rawwaves/tambourn.raw
+%%DATADIR%%/rawwaves/tomhidrm.raw
+%%DATADIR%%/rawwaves/tomlowdr.raw
+%%DATADIR%%/rawwaves/tommiddr.raw
+%%DATADIR%%/rawwaves/twopeaks.raw
diff --git a/audio/synthpod-lv2/Makefile b/audio/synthpod-lv2/Makefile
index 4d25533b5903..a23b008dab33 100644
--- a/audio/synthpod-lv2/Makefile
+++ b/audio/synthpod-lv2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	synthpod
 PORTVERSION=	g20170810
+PORTREVISION=	1
 CATEGORIES=	audio
 PKGNAMESUFFIX=	-lv2
 
diff --git a/audio/vm-lv2/Makefile b/audio/vm-lv2/Makefile
index c26c9d0d5418..32d4a1dff9c5 100644
--- a/audio/vm-lv2/Makefile
+++ b/audio/vm-lv2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	vm
 PORTVERSION=	0.4.0
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	https://gitlab.com/OpenMusicKontrollers/vm.lv2/repository/archive.tar.gz?ref=${PORTVERSION}&dummy=/
 PKGNAMESUFFIX=	-lv2
diff --git a/audio/wxguitar/Makefile b/audio/wxguitar/Makefile
index e73e995a6345..6f2cb5baa7b9 100644
--- a/audio/wxguitar/Makefile
+++ b/audio/wxguitar/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	wxguitar
 PORTVERSION=	1.01
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	audio
 MASTER_SITES=	http://mirror.amdmi3.ru/distfiles/
 
diff --git a/audio/xmms-gbsplay/Makefile b/audio/xmms-gbsplay/Makefile
index 79342faa27d5..2b5cfda9f2ea 100644
--- a/audio/xmms-gbsplay/Makefile
+++ b/audio/xmms-gbsplay/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gbsplay
 PORTVERSION=	0.0.8
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	audio
 MASTER_SITES=	LOCAL/ehaupt
 PKGNAMEPREFIX=	xmms-
diff --git a/audio/zita-convolver/Makefile b/audio/zita-convolver/Makefile
index 3c9214f17677..9c4d84de4523 100644
--- a/audio/zita-convolver/Makefile
+++ b/audio/zita-convolver/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	zita-convolver
 PORTVERSION=	3.1.0
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://kokkinizita.linuxaudio.org/linuxaudio/downloads/
 
diff --git a/benchmarks/himenobench/Makefile b/benchmarks/himenobench/Makefile
index 72cdfe67d694..2599d6c63d03 100644
--- a/benchmarks/himenobench/Makefile
+++ b/benchmarks/himenobench/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	himenobench
 PORTVERSION=	2015.07.09
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	benchmarks
 MASTER_SITES=	http://accc.riken.jp/wp-content/uploads/2015/07/
 DISTFILES=	himenobmtxp_xl.zip himenobmtxp_l.zip \
diff --git a/benchmarks/hpl/Makefile b/benchmarks/hpl/Makefile
index a4545338f7d4..eafdd2bb67db 100644
--- a/benchmarks/hpl/Makefile
+++ b/benchmarks/hpl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	hpl
 PORTVERSION=	2.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	benchmarks
 MASTER_SITES=	NETLIB/benchmark/hpl
 
diff --git a/benchmarks/octave-forge-benchmark/Makefile b/benchmarks/octave-forge-benchmark/Makefile
index 3d757a51824d..d2f0425fb1b0 100644
--- a/benchmarks/octave-forge-benchmark/Makefile
+++ b/benchmarks/octave-forge-benchmark/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-benchmark
 PORTVERSION=	1.1.1
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	benchmarks math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/benchmarks/phoronix-test-suite/Makefile b/benchmarks/phoronix-test-suite/Makefile
index e21d4f06c64b..3499bf9c9da1 100644
--- a/benchmarks/phoronix-test-suite/Makefile
+++ b/benchmarks/phoronix-test-suite/Makefile
@@ -2,7 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	phoronix-test-suite
-PORTVERSION=	7.0.1
+PORTVERSION=	7.2.1
+PORTREVISION=	1
 CATEGORIES=	benchmarks
 MASTER_SITES=	http://www.phoronix-test-suite.com/releases/
 
diff --git a/benchmarks/phoronix-test-suite/distinfo b/benchmarks/phoronix-test-suite/distinfo
index 0d5acb4accea..e1aa304eefb0 100644
--- a/benchmarks/phoronix-test-suite/distinfo
+++ b/benchmarks/phoronix-test-suite/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1493199092
-SHA256 (phoronix-test-suite-7.0.1.tar.gz) = 436d949af604248776d725afb0f4eba6b8f9b1bf134d1f97544baf00e67c9d78
-SIZE (phoronix-test-suite-7.0.1.tar.gz) = 777651
+TIMESTAMP = 1499509633
+SHA256 (phoronix-test-suite-7.2.1.tar.gz) = dceaccbfa0a614da4d7191dc07e07406b6498ebf136a9249701a3c86a8611cc6
+SIZE (phoronix-test-suite-7.2.1.tar.gz) = 782972
diff --git a/benchmarks/polygraph/Makefile b/benchmarks/polygraph/Makefile
index ae06d8de25ac..f37f8f0f0aeb 100644
--- a/benchmarks/polygraph/Makefile
+++ b/benchmarks/polygraph/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	polygraph
 PORTVERSION=	4.9.0
-PORTREVISION=	3
+PORTREVISION=	4
 DISTVERSIONSUFFIX=	-src
 CATEGORIES=	benchmarks www
 MASTER_SITES=	http://www.web-polygraph.org/downloads/srcs/
diff --git a/benchmarks/stress-ng/Makefile b/benchmarks/stress-ng/Makefile
index b0f85e787e5b..415368ab37bc 100644
--- a/benchmarks/stress-ng/Makefile
+++ b/benchmarks/stress-ng/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	stress-ng
-PORTVERSION=	0.08.13
+PORTVERSION=	0.08.14
 CATEGORIES=	benchmarks
 MASTER_SITES=	http://kernel.ubuntu.com/~cking/tarballs/stress-ng/
 
diff --git a/benchmarks/stress-ng/distinfo b/benchmarks/stress-ng/distinfo
index ecbb5a683a28..14844098df54 100644
--- a/benchmarks/stress-ng/distinfo
+++ b/benchmarks/stress-ng/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504261486
-SHA256 (stress-ng-0.08.13.tar.gz) = a1d072f9ec6cac353f94b636bcb1220a2d2e87b858a7310679d52ac067c97de8
-SIZE (stress-ng-0.08.13.tar.gz) = 440147
+TIMESTAMP = 1505207642
+SHA256 (stress-ng-0.08.14.tar.gz) = a7a8767ec92cffdd2c16145e7d1547cee87cb375fd56ce0bd6ecee8a397f0cd9
+SIZE (stress-ng-0.08.14.tar.gz) = 444376
diff --git a/benchmarks/sysbench/Makefile b/benchmarks/sysbench/Makefile
index 190a3a36c09f..3b9d039395d9 100644
--- a/benchmarks/sysbench/Makefile
+++ b/benchmarks/sysbench/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	sysbench
-PORTVERSION=	1.0.8
+PORTVERSION=	1.0.9
 CATEGORIES=	benchmarks databases
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/benchmarks/sysbench/distinfo b/benchmarks/sysbench/distinfo
index e5c32744c91a..c29fa8d77261 100644
--- a/benchmarks/sysbench/distinfo
+++ b/benchmarks/sysbench/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499297334
-SHA256 (akopytov-sysbench-1.0.8_GH0.tar.gz) = 2dad131a99578999c8159eccd2f7ec1b9da4eca9e646dfeb838cf72c00862d69
-SIZE (akopytov-sysbench-1.0.8_GH0.tar.gz) = 1494988
+TIMESTAMP = 1504718674
+SHA256 (akopytov-sysbench-1.0.9_GH0.tar.gz) = 3e472d5b175dcc5a8b0ebdf102dbe64bdcc712f6c41812849490e739bf8ce483
+SIZE (akopytov-sysbench-1.0.9_GH0.tar.gz) = 1495628
diff --git a/benchmarks/sysbench/pkg-plist b/benchmarks/sysbench/pkg-plist
index a2eb0ab76660..d6f3fd42d0c4 100644
--- a/benchmarks/sysbench/pkg-plist
+++ b/benchmarks/sysbench/pkg-plist
@@ -61,6 +61,8 @@ bin/sysbench
 %%DATADIR%%/tests/t/opt_version.t
 %%DATADIR%%/tests/t/script_bulk_insert_mysql.t
 %%DATADIR%%/tests/t/script_bulk_insert_pgsql.t
+%%DATADIR%%/tests/t/script_oltp_delete_mysql.t
+%%DATADIR%%/tests/t/script_oltp_delete_pgsql.t
 %%DATADIR%%/tests/t/script_oltp_help.t
 %%DATADIR%%/tests/t/script_oltp_insert_mysql.t
 %%DATADIR%%/tests/t/script_oltp_insert_pgsql.t
diff --git a/biology/bowtie/Makefile b/biology/bowtie/Makefile
index 8d419e80cf16..07561719db5e 100644
--- a/biology/bowtie/Makefile
+++ b/biology/bowtie/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=		bowtie
 PORTVERSION=		1.1.2
-PORTREVISION=	3
+PORTREVISION=	4
 DISTVERSIONPREFIX=	v
 CATEGORIES=		biology
 
diff --git a/biology/cd-hit/Makefile b/biology/cd-hit/Makefile
index 5c348f176127..f71685847cc8 100644
--- a/biology/cd-hit/Makefile
+++ b/biology/cd-hit/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cd-hit
 PORTVERSION=	4.6.6
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	V
 CATEGORIES=	biology
 
diff --git a/biology/crux/Makefile b/biology/crux/Makefile
index 86b1fb5860e8..75f95844dda6 100644
--- a/biology/crux/Makefile
+++ b/biology/crux/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	crux
 PORTVERSION=	1.2.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	biology python
 MASTER_SITES=	http://www.canonware.com/download/Crux/
 
diff --git a/biology/fasttree/Makefile b/biology/fasttree/Makefile
index 1dcc0db615ba..617ac37291d0 100644
--- a/biology/fasttree/Makefile
+++ b/biology/fasttree/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	FastTree
 PORTVERSION=	2.1.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	biology
 MASTER_SITES=	http://www.microbesonline.org/fasttree/
 EXTRACT_SUFX=	.c
diff --git a/biology/jellyfish/Makefile b/biology/jellyfish/Makefile
index 5225aae87fbd..22f1c3506485 100644
--- a/biology/jellyfish/Makefile
+++ b/biology/jellyfish/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	jellyfish
 PORTVERSION=	2.2.6
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	biology
 
diff --git a/biology/molden/Makefile b/biology/molden/Makefile
index f24a91257ab9..999d80767849 100644
--- a/biology/molden/Makefile
+++ b/biology/molden/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	molden
 PORTVERSION=	5.7
-PORTREVISION=	10
+PORTREVISION=	11
 PORTEPOCH=	1
 CATEGORIES=	biology
 MASTER_SITES=	ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/
diff --git a/biology/mopac/Makefile b/biology/mopac/Makefile
index a160df902f3c..65b3d4a60d5b 100644
--- a/biology/mopac/Makefile
+++ b/biology/mopac/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mopac
 PORTVERSION=	7.${MOPAC_SUBVERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	biology
 MASTER_SITES=	http://bioinformatics.org/ghemical/download/%SUBDIR%/
diff --git a/biology/ncbi-blast+/Makefile b/biology/ncbi-blast+/Makefile
index d12f3154dc45..fe2cb96360f3 100644
--- a/biology/ncbi-blast+/Makefile
+++ b/biology/ncbi-blast+/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	blast+
 PORTVERSION=	2.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	biology
 MASTER_SITES=	http://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${PORTVERSION}/ \
 		http://acadix.biz/Ports/distfiles/
diff --git a/biology/p5-BioPerl/Makefile b/biology/p5-BioPerl/Makefile
index 5ec3da283c7c..82fb358da082 100644
--- a/biology/p5-BioPerl/Makefile
+++ b/biology/p5-BioPerl/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	BioPerl
-PORTVERSION=	1.007001
-PORTREVISION=	2
+PORTVERSION=	1.007002
 CATEGORIES=	biology perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:CJFIELDS
diff --git a/biology/p5-BioPerl/distinfo b/biology/p5-BioPerl/distinfo
index de8de98486f3..28d3fb904493 100644
--- a/biology/p5-BioPerl/distinfo
+++ b/biology/p5-BioPerl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479828383
-SHA256 (BioPerl-1.007001.tar.gz) = 9da1dbcd10452f53194c98c6cc2f604a59124507dcc1e6a8440565f44dd07b40
-SIZE (BioPerl-1.007001.tar.gz) = 12486953
+TIMESTAMP = 1505232617
+SHA256 (BioPerl-1.007002.tar.gz) = 17aa3aaab2f381bbcaffdc370002eaf28f2c341b538068d6586b2276a76464a1
+SIZE (BioPerl-1.007002.tar.gz) = 12362741
diff --git a/biology/p5-BioPerl/pkg-plist b/biology/p5-BioPerl/pkg-plist
index f24234684afb..8027beef64d8 100644
--- a/biology/p5-BioPerl/pkg-plist
+++ b/biology/p5-BioPerl/pkg-plist
@@ -36,7 +36,6 @@ bin/bp_netinstall.pl
 bin/bp_nexus2nh.pl
 bin/bp_nrdb.pl
 bin/bp_oligo_count.pl
-bin/bp_pairwise_kaks.pl
 bin/bp_parse_hmmsearch.pl
 bin/bp_process_gadfly.pl
 bin/bp_process_sgd.pl
@@ -769,10 +768,6 @@ bin/bp_unflatten_seq.pl
 %%SITE_PERL%%/Bio/Tools/Phylo/Gumby.pm
 %%SITE_PERL%%/Bio/Tools/Phylo/Molphy.pm
 %%SITE_PERL%%/Bio/Tools/Phylo/Molphy/Result.pm
-%%SITE_PERL%%/Bio/Tools/Phylo/PAML.pm
-%%SITE_PERL%%/Bio/Tools/Phylo/PAML/Codeml.pm
-%%SITE_PERL%%/Bio/Tools/Phylo/PAML/ModelResult.pm
-%%SITE_PERL%%/Bio/Tools/Phylo/PAML/Result.pm
 %%SITE_PERL%%/Bio/Tools/Phylo/Phylip/ProtDist.pm
 %%SITE_PERL%%/Bio/Tools/Prediction/Exon.pm
 %%SITE_PERL%%/Bio/Tools/Prediction/Gene.pm
@@ -893,7 +888,6 @@ bin/bp_unflatten_seq.pl
 %%PERL5_MAN1%%/bp_nexus2nh.pl.1.gz
 %%PERL5_MAN1%%/bp_nrdb.pl.1.gz
 %%PERL5_MAN1%%/bp_oligo_count.pl.1.gz
-%%PERL5_MAN1%%/bp_pairwise_kaks.pl.1.gz
 %%PERL5_MAN1%%/bp_parse_hmmsearch.pl.1.gz
 %%PERL5_MAN1%%/bp_process_gadfly.pl.1.gz
 %%PERL5_MAN1%%/bp_process_sgd.pl.1.gz
@@ -1623,10 +1617,6 @@ bin/bp_unflatten_seq.pl
 %%PERL5_MAN3%%/Bio::Tools::Phylo::Gumby.3.gz
 %%PERL5_MAN3%%/Bio::Tools::Phylo::Molphy.3.gz
 %%PERL5_MAN3%%/Bio::Tools::Phylo::Molphy::Result.3.gz
-%%PERL5_MAN3%%/Bio::Tools::Phylo::PAML.3.gz
-%%PERL5_MAN3%%/Bio::Tools::Phylo::PAML::Codeml.3.gz
-%%PERL5_MAN3%%/Bio::Tools::Phylo::PAML::ModelResult.3.gz
-%%PERL5_MAN3%%/Bio::Tools::Phylo::PAML::Result.3.gz
 %%PERL5_MAN3%%/Bio::Tools::Phylo::Phylip::ProtDist.3.gz
 %%PERL5_MAN3%%/Bio::Tools::Prediction::Exon.3.gz
 %%PERL5_MAN3%%/Bio::Tools::Prediction::Gene.3.gz
diff --git a/biology/plink/Makefile b/biology/plink/Makefile
index 43c14f1ddf97..98c9dd3e1dd3 100644
--- a/biology/plink/Makefile
+++ b/biology/plink/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	plink
 PORTVERSION=	1.07
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	biology science
 MASTER_SITES=	http://pngu.mgh.harvard.edu/~purcell/plink/dist/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
diff --git a/biology/psi88/Makefile b/biology/psi88/Makefile
index 89cb93ec4c80..6ce0d9fe629d 100644
--- a/biology/psi88/Makefile
+++ b/biology/psi88/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	psi88
 PORTVERSION=	1.0
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	biology
 MASTER_SITES=	http://www.ccl.net/cca/software/SOURCES/FORTRAN/psi88/
 DISTNAME=	${PORTNAME}
diff --git a/biology/seqan-apps/Makefile b/biology/seqan-apps/Makefile
index e18467daa1c5..541910be643d 100644
--- a/biology/seqan-apps/Makefile
+++ b/biology/seqan-apps/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	seqan-apps
 PORTVERSION=	2.2.0
 DISTVERSIONPREFIX=	seqan-v
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	biology
 
 MAINTAINER=	h2+fbsdports@fsfe.org
diff --git a/biology/seqtools/Makefile b/biology/seqtools/Makefile
index a76ddf96aa65..20eb535a15a0 100644
--- a/biology/seqtools/Makefile
+++ b/biology/seqtools/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	seqtools
 PORTVERSION=	4.44.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	biology
 MASTER_SITES=	ftp://ftp.sanger.ac.uk/pub4/resources/software/seqtools/PRODUCTION/
 
diff --git a/biology/ssaha/Makefile b/biology/ssaha/Makefile
index c7f6966f8a47..024151cd6d03 100644
--- a/biology/ssaha/Makefile
+++ b/biology/ssaha/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ssaha
 PORTVERSION=	3.1c
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	biology
 MASTER_SITES=	ftp://ftp.sanger.ac.uk/pub4/resources/software/ssaha/
 DISTNAME=	${PORTNAME}_v${PORTVERSION:S/.//}
diff --git a/biology/t_coffee/Makefile b/biology/t_coffee/Makefile
index d7a37f4b9c6e..ad4b555386d6 100644
--- a/biology/t_coffee/Makefile
+++ b/biology/t_coffee/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	t_coffee
 PORTVERSION=	9.03
 DISTVERSIONSUFFIX=	.r1318
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	biology
 MASTER_SITES=	http://www.tcoffee.org/Packages/Stable/Version_${PORTVERSION}${DISTVERSIONSUFFIX}/
 DISTNAME=	T-COFFEE_distribution_Version_${PORTVERSION}${DISTVERSIONSUFFIX}
diff --git a/biology/tinker/Makefile b/biology/tinker/Makefile
index a9f98b84e13b..66c499bc4931 100644
--- a/biology/tinker/Makefile
+++ b/biology/tinker/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	tinker
 PORTVERSION=	7.1.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	biology
 MASTER_SITES=	http://dasher.wustl.edu/tinker/downloads/
 
diff --git a/cad/NASTRAN-95/Makefile b/cad/NASTRAN-95/Makefile
index 0b74a3fe3941..92d72fcb60ac 100644
--- a/cad/NASTRAN-95/Makefile
+++ b/cad/NASTRAN-95/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	NASTRAN-95
 PORTVERSION=	20160908
+PORTREVISION=	1
 CATEGORIES=	cad science
 
 MAINTAINER=	pfg@FreeBSD.org
diff --git a/cad/alliance/Makefile b/cad/alliance/Makefile
index bdfad7f5ea56..b1ee0d31b395 100644
--- a/cad/alliance/Makefile
+++ b/cad/alliance/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	alliance
 DISTVERSION=	5.0-20120515
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	cad
 MASTER_SITES=	http://ftp.lyx.org/lip6/softs/alliance/distribution/5.0/ \
 		http://ftp.jussieu.fr/lip6/softs/alliance/distribution/5.0/ \
diff --git a/cad/calculix-ccx/Makefile b/cad/calculix-ccx/Makefile
index 1619f5675442..104eab63345c 100644
--- a/cad/calculix-ccx/Makefile
+++ b/cad/calculix-ccx/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ccx
 PORTVERSION=	2.12
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	http://www.dhondt.de/
 PKGNAMEPREFIX=	CalculiX-
diff --git a/cad/cura-engine/Makefile b/cad/cura-engine/Makefile
index ecbd5e64c629..51d6ee4f4f91 100644
--- a/cad/cura-engine/Makefile
+++ b/cad/cura-engine/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	CuraEngine
 PORTVERSION=	15.04
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	cad
 
 MAINTAINER=	cederom@tlen.pl
diff --git a/cad/dinotrace/Makefile b/cad/dinotrace/Makefile
index 654d8c066212..95e1d3723a53 100644
--- a/cad/dinotrace/Makefile
+++ b/cad/dinotrace/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dinotrace
 PORTVERSION=	9.4c
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	cad
 MASTER_SITES=	http://www.veripool.org/ftp/
 
diff --git a/cad/elmerfem/Makefile b/cad/elmerfem/Makefile
index 2d29ba921a8b..84eb998b5186 100644
--- a/cad/elmerfem/Makefile
+++ b/cad/elmerfem/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	elmerfem
 PORTVERSION=	8.3.20170519
+PORTREVISION=	1
 CATEGORIES=	cad science
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/cad/feappv/Makefile b/cad/feappv/Makefile
index 23038a942557..93f451ad4a20 100644
--- a/cad/feappv/Makefile
+++ b/cad/feappv/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	feappv
 PORTVERSION=	3.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	cad science
 MASTER_SITES=	http://www.ce.berkeley.edu/projects/feap/feappv/
 DISTFILES=	${PORTNAME}${PORTVERSION:S/.//}${EXTRACT_SUFX} ${PORTDOCS}
diff --git a/cad/freecad/Makefile b/cad/freecad/Makefile
index bfc582edb368..7e1a729ed1e0 100644
--- a/cad/freecad/Makefile
+++ b/cad/freecad/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	FreeCAD
 DISTVERSION=	0.17.g20170616
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	cad
 
 MAINTAINER=	tj+freebsd_ports@a13.fr
diff --git a/cad/freehdl/Makefile b/cad/freehdl/Makefile
index 71acf082050c..a4be05643c9b 100644
--- a/cad/freehdl/Makefile
+++ b/cad/freehdl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	freehdl
 PORTVERSION=	0.0.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	cad
 MASTER_SITES=	http://freehdl.seul.org/~enaroska/
 
diff --git a/cad/gmsh/Makefile b/cad/gmsh/Makefile
index a2b3c735e3a1..ce7541f5af21 100644
--- a/cad/gmsh/Makefile
+++ b/cad/gmsh/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gmsh
 PORTVERSION=	3.0.4
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	http://gmsh.info/src/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
diff --git a/cad/gspiceui/Makefile b/cad/gspiceui/Makefile
index 468099b0d1f2..453353b4a666 100644
--- a/cad/gspiceui/Makefile
+++ b/cad/gspiceui/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gspiceui
 PORTVERSION=	1.1.00
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	cad
 MASTER_SITES=	SF/${PORTNAME}/gSpiceUI/${PORTNAME}-v${PORTVERSION}
 DISTNAME=	${PORTNAME}-v${PORTVERSION}
diff --git a/cad/kicad-devel/Makefile b/cad/kicad-devel/Makefile
index 5ffac72ff687..a91ac17bcd49 100644
--- a/cad/kicad-devel/Makefile
+++ b/cad/kicad-devel/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	kicad
 DISTVERSION=	r${GIT_SRC_DATE}
+PORTREVISION=	1
 #PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	LOCAL/mr
diff --git a/cad/kicad/Makefile b/cad/kicad/Makefile
index 417f2b019ce1..ba8dbec2cbf2 100644
--- a/cad/kicad/Makefile
+++ b/cad/kicad/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	kicad
 PORTVERSION=	4.0.7
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	cad
 
diff --git a/cad/klayout/Makefile b/cad/klayout/Makefile
index 78e25816239a..32a5f5c1fbc9 100644
--- a/cad/klayout/Makefile
+++ b/cad/klayout/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	klayout
 PORTVERSION=	0.24.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	cad
 MASTER_SITES=	http://www.klayout.org/downloads/source/
 
diff --git a/cad/libopencad/Makefile b/cad/libopencad/Makefile
index 438ac7621580..127f2c85164d 100644
--- a/cad/libopencad/Makefile
+++ b/cad/libopencad/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libopencad
 PORTVERSION=	0.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	cad graphics geography
 
 MAINTAINER=	lbartoletti@tuxfamily.org
diff --git a/cad/librecad/Makefile b/cad/librecad/Makefile
index 59973d933b07..ef3c82c0c5d1 100644
--- a/cad/librecad/Makefile
+++ b/cad/librecad/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	librecad
 PORTVERSION=	2.1.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	cad
 
 MAINTAINER=	jhale@FreeBSD.org
diff --git a/cad/meshlab/Makefile b/cad/meshlab/Makefile
index 28991b16b583..c6014af040a0 100644
--- a/cad/meshlab/Makefile
+++ b/cad/meshlab/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	meshlab
 PORTVERSION=	1.3.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	cad
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/MeshLab%20v${PORTVERSION}/
 DISTNAME=	MeshLabSrc_AllInc_v${PORTVERSION:C|\.||g}
diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile
index abdda704b04a..2720ffc3df2e 100644
--- a/cad/opencascade/Makefile
+++ b/cad/opencascade/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	opencascade
 PORTVERSION=	7.1.0
-PORTREVISION=   1
+PORTREVISION=	2
 CATEGORIES=	cad science
 MASTER_SITES=	LOCAL/thierry
 
diff --git a/cad/openscad/Makefile b/cad/openscad/Makefile
index c38620915587..dab0bbbd1d28 100644
--- a/cad/openscad/Makefile
+++ b/cad/openscad/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	openscad
 PORTVERSION=	2015.03
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	cad
 MASTER_SITES=	http://files.openscad.org/
 DISTNAME=	openscad-${PORTVERSION}.src
diff --git a/cad/openvsp/Makefile b/cad/openvsp/Makefile
index 0c9827725783..d6536b7d3799 100644
--- a/cad/openvsp/Makefile
+++ b/cad/openvsp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	openvsp
 PORTVERSION=	3.13.2
+PORTREVISION=	1
 DISTVERSIONPREFIX=	${GH_PROJECT}_
 CATEGORIES=	cad
 
diff --git a/cad/pdnmesh/Makefile b/cad/pdnmesh/Makefile
index 0164a564dab7..0685ce6a576b 100644
--- a/cad/pdnmesh/Makefile
+++ b/cad/pdnmesh/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pdnmesh
 PORTVERSION=	0.2.2
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	cad
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-source/${PORTVERSION}
 
diff --git a/cad/qelectrotech/Makefile b/cad/qelectrotech/Makefile
index f7b74fe6fa3b..95c885d63973 100644
--- a/cad/qelectrotech/Makefile
+++ b/cad/qelectrotech/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	qelectrotech
 PORTVERSION=	0.5
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	cad
 MASTER_SITES=	http://download.tuxfamily.org/qet/tags/20151127/
diff --git a/cad/qucs/Makefile b/cad/qucs/Makefile
index 9056d806cba9..3a248431b404 100644
--- a/cad/qucs/Makefile
+++ b/cad/qucs/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	qucs
 PORTVERSION=	0.0.19
+PORTREVISION=	1
 CATEGORIES=	cad science
 MASTER_SITES=	SF
 
diff --git a/cad/repsnapper/Makefile b/cad/repsnapper/Makefile
index e4ae2d839bca..2e2e540b80af 100644
--- a/cad/repsnapper/Makefile
+++ b/cad/repsnapper/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	repsnapper
 DISTVERSION=	2.5a4
+PORTREVISION=	1
 CATEGORIES=	cad
 
 MAINTAINER=	martin.dieringer@gmx.de
diff --git a/cad/sceptre/Makefile b/cad/sceptre/Makefile
index daf5e245f174..678ab3728ac1 100644
--- a/cad/sceptre/Makefile
+++ b/cad/sceptre/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	sceptre
 PORTVERSION=	2012.061
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	cad
 MASTER_SITES=	http://alpha.fh-friedberg.de/iem/fileadmin/user_upload/novender/sceptre/
 
diff --git a/cad/scotch/Makefile b/cad/scotch/Makefile
index e433d93f85ca..cb8a6e4cc0d9 100644
--- a/cad/scotch/Makefile
+++ b/cad/scotch/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	scotch
 DISTVERSION=	5.1.12b_esmumps
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	cad science
 MASTER_SITES=	https://gforge.inria.fr/frs/download.php/28978/
 DISTNAME=	${PORTNAME}_${DISTVERSION}
diff --git a/cad/stepcode/Makefile b/cad/stepcode/Makefile
index 5f3da757719b..8fa2465d022f 100644
--- a/cad/stepcode/Makefile
+++ b/cad/stepcode/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	stepcode
 PORTVERSION=	0.8
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	cad
 
 MAINTAINER=	fernando.apesteguia@gmail.com
diff --git a/cad/tochnog/Makefile b/cad/tochnog/Makefile
index d2567275455e..fe36324e9d42 100644
--- a/cad/tochnog/Makefile
+++ b/cad/tochnog/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	tochnog
 PORTVERSION=	20140100
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	cad
 MASTER_SITES=	SF/${PORTNAME}/Tochnog%20Latest%20January%202014
 DISTFILES=	Sources${EXTRACT_SUFX} gid${EXTRACT_SUFX} \
diff --git a/cad/verilog-mode.el/Makefile b/cad/verilog-mode.el/Makefile
index 541972beaf16..0d6e4fbbe12a 100644
--- a/cad/verilog-mode.el/Makefile
+++ b/cad/verilog-mode.el/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	verilog-mode.el
 PORTVERSION=	801
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	cad elisp
 MASTER_SITES=	http://www.veripool.org/ftp/
 DISTNAME=	${PORTNAME:R}-${PORTVERSION}.${PORTNAME:E}
diff --git a/chinese/ibus-libpinyin/Makefile b/chinese/ibus-libpinyin/Makefile
index 0ee87bd141da..d1bae508ca83 100644
--- a/chinese/ibus-libpinyin/Makefile
+++ b/chinese/ibus-libpinyin/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ibus-libpinyin
 PORTVERSION=	1.7.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	chinese
 MASTER_SITES=	SF/libpinyin/${PORTNAME}
 
diff --git a/chinese/ibus-pinyin/Makefile b/chinese/ibus-pinyin/Makefile
index 17cbdf31d61d..c43b2c7450ab 100644
--- a/chinese/ibus-pinyin/Makefile
+++ b/chinese/ibus-pinyin/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ibus-pinyin
 PORTVERSION=	1.5.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	chinese
 
 MAINTAINER=	henry.hu.sh@gmail.com
diff --git a/chinese/librime/Makefile b/chinese/librime/Makefile
index 9f82d27dc3cc..d3cd1dd88888 100644
--- a/chinese/librime/Makefile
+++ b/chinese/librime/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	librime
 PORTVERSION=	1.2.9
 DISTVERSIONPREFIX=	rime-
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	chinese textproc
 
 MAINTAINER=	lichray@gmail.com
diff --git a/chinese/opencc/Makefile b/chinese/opencc/Makefile
index facbfdf58eaf..e69ada8d46c6 100644
--- a/chinese/opencc/Makefile
+++ b/chinese/opencc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	opencc
 PORTVERSION=	1.0.4
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	ver.
 CATEGORIES=	chinese converters
 
diff --git a/chinese/pyzy/Makefile b/chinese/pyzy/Makefile
index 78b1e066ca6f..5cf42b8b0496 100644
--- a/chinese/pyzy/Makefile
+++ b/chinese/pyzy/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pyzy
 PORTVERSION=	0.1.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	chinese
 
 MAINTAINER=	henry.hu.sh@gmail.com
diff --git a/comms/aldo/Makefile b/comms/aldo/Makefile
index f930c0661234..94b5917f8553 100644
--- a/comms/aldo/Makefile
+++ b/comms/aldo/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	aldo
 PORTVERSION=	0.7.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SAVANNAH
 
diff --git a/comms/dabstick-radio/Makefile b/comms/dabstick-radio/Makefile
index 7cc86f609743..dc67dea31dd8 100644
--- a/comms/dabstick-radio/Makefile
+++ b/comms/dabstick-radio/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dabstick-radio
 PORTVERSION=	0.96
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	comms audio hamradio
 MASTER_SITES=	http://www.sdr-j.tk/ \
 		LOCAL/nox/
diff --git a/comms/efax-gtk/Makefile b/comms/efax-gtk/Makefile
index 1cd0f81bb41f..c90c05222cca 100644
--- a/comms/efax-gtk/Makefile
+++ b/comms/efax-gtk/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	efax-gtk
 PORTVERSION=	3.2.13
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	comms
 MASTER_SITES=	SF
 EXTRACT_SUFX=	.src.tgz
diff --git a/comms/ems-flasher/Makefile b/comms/ems-flasher/Makefile
index 61333c424453..42880105cbda 100644
--- a/comms/ems-flasher/Makefile
+++ b/comms/ems-flasher/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ems-flasher
 PORTVERSION=	0.03
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	comms
 MASTER_SITES=	http://lacklustre.net/projects/ems-flasher/ \
 		https://cooltrainer.org/freebsd-ports/ems-flasher/
diff --git a/comms/fldigi/Makefile b/comms/fldigi/Makefile
index 41817ddf29e4..9197466fbba1 100644
--- a/comms/fldigi/Makefile
+++ b/comms/fldigi/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	fldigi
 PORTVERSION=	4.0.9
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 
diff --git a/comms/flrig/Makefile b/comms/flrig/Makefile
index f11fb6bf1cb8..23e681e1d197 100644
--- a/comms/flrig/Makefile
+++ b/comms/flrig/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	flrig
-PORTVERSION=	1.3.31
+PORTVERSION=	1.3.34
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF/fldigi/${PORTNAME}
 
diff --git a/comms/flrig/distinfo b/comms/flrig/distinfo
index 69d4277ed6bf..82f559e55c7e 100644
--- a/comms/flrig/distinfo
+++ b/comms/flrig/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1494970784
-SHA256 (flrig-1.3.31.tar.gz) = b2df2baf21a2324c895b6f3909e605000fc5bb7efc0e59dd2520d9ac8f5c82bc
-SIZE (flrig-1.3.31.tar.gz) = 678850
+TIMESTAMP = 1505139120
+SHA256 (flrig-1.3.34.tar.gz) = 6a6311c2cf3d533f0ac10d7e6b8c6b9ef71c6ce98a7baa2e5c8aeb7e5f91f96f
+SIZE (flrig-1.3.34.tar.gz) = 691775
diff --git a/comms/freedv/Makefile b/comms/freedv/Makefile
index 1ce6a20b637e..7557bbfd59f8 100644
--- a/comms/freedv/Makefile
+++ b/comms/freedv/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	freedv
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://files.freedv.org/freedv/ \
 		LOCAL/db
diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile
index 026d789b06d0..29be0ff3846c 100644
--- a/comms/gnuradio/Makefile
+++ b/comms/gnuradio/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	gnuradio
 PORTVERSION=	3.7.10.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	comms astro hamradio
 MASTER_SITES=	http://gnuradio.org/releases/gnuradio/ \
 		LOCAL/db
@@ -58,7 +58,7 @@ DOCSDIR=	share/doc/${PORTNAME}-${PORTVERSION}
 USE_GNOME=	pygtk2
 USE_PYQT=	core gui opengl
 USE_WX=		3.0+
-USE_QT4=	corelib gui xml qmake moc rcc uic
+USE_QT4=	corelib gui xml qmake moc_build rcc_build uic_build
 WX_COMPS=	wx wx:build wx:run python:build python:run
 USE_LDCONFIG=	yes
 PLIST_SUB+=	MAJOR_VERSION="3"
diff --git a/comms/gr-osmosdr/Makefile b/comms/gr-osmosdr/Makefile
index 520230ff485c..d8a77b4cef76 100644
--- a/comms/gr-osmosdr/Makefile
+++ b/comms/gr-osmosdr/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	gr-osmosdr
 PORTVERSION=	20160622
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://contribs.martymac.org/FreeBSD-ports/distfiles/ \
 		LOCAL/martymac
diff --git a/comms/gtkmmorse/Makefile b/comms/gtkmmorse/Makefile
index b33c9a36a90e..cf59029c10c4 100644
--- a/comms/gtkmmorse/Makefile
+++ b/comms/gtkmmorse/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gtkmmorse
 PORTVERSION=	0.9.27
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SAVANNAH
 
diff --git a/comms/py-gammu/Makefile b/comms/py-gammu/Makefile
index 00f6683379b6..48a9ad752c03 100644
--- a/comms/py-gammu/Makefile
+++ b/comms/py-gammu/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gammu
-PORTVERSION=	2.7
+PORTVERSION=	2.9
 CATEGORIES=	comms python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libGammu.so:comms/gammu
 
-USES=		pkgconfig python:-2.7 tar:bz2
+USES=		pkgconfig python:-2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/comms/py-gammu/distinfo b/comms/py-gammu/distinfo
index d22ae532bfda..eceb157e8c01 100644
--- a/comms/py-gammu/distinfo
+++ b/comms/py-gammu/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1478876563
-SHA256 (python-gammu-2.7.tar.bz2) = 007db06a0c5c8d02498a7f9f43052c4a936adddd842640c96ad6f2d4f8cf2140
-SIZE (python-gammu-2.7.tar.bz2) = 118067
+TIMESTAMP = 1505141452
+SHA256 (python-gammu-2.9.tar.gz) = 15b9c10b39e3117f04e9ee5c6581d4669677b2fb96037694491f55989610c5bf
+SIZE (python-gammu-2.9.tar.gz) = 135322
diff --git a/comms/qt5-serialbus/Makefile b/comms/qt5-serialbus/Makefile
index 3c810c8be5c6..f4f6c0bd686a 100644
--- a/comms/qt5-serialbus/Makefile
+++ b/comms/qt5-serialbus/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	serialbus
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms
 PKGNAMEPREFIX=	qt5-
 
diff --git a/comms/sdr-wspr/Makefile b/comms/sdr-wspr/Makefile
index 662ce0e6ba54..f88e5418b3dd 100644
--- a/comms/sdr-wspr/Makefile
+++ b/comms/sdr-wspr/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	sdr-wspr
 PORTVERSION=	0.1.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	comms hamradio
 
 MAINTAINER=	jeff@baitis.net
diff --git a/comms/telldus-core/Makefile b/comms/telldus-core/Makefile
index 1984a6f9dfec..42c12ec20d52 100644
--- a/comms/telldus-core/Makefile
+++ b/comms/telldus-core/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	telldus-core
 PORTVERSION=	2.1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	comms
 MASTER_SITES=	http://download.telldus.se/TellStick/Software/telldus-core/
 
diff --git a/comms/trustedqsl/Makefile b/comms/trustedqsl/Makefile
index b249cd9551e7..65a85c26516f 100644
--- a/comms/trustedqsl/Makefile
+++ b/comms/trustedqsl/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	trustedqsl
 PORTVERSION=	2.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.arrl.org/files/file/LoTW%20Instructions/ \
 		LOCAL/shurd
diff --git a/comms/twpsk/Makefile b/comms/twpsk/Makefile
index fae2c7cfef75..52880d49dd62 100644
--- a/comms/twpsk/Makefile
+++ b/comms/twpsk/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	twpsk
-PORTVERSION=	4.2
+PORTVERSION=	4.3
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://wa0eir.bcts.info/src/
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
diff --git a/comms/twpsk/distinfo b/comms/twpsk/distinfo
index e3bcf56c2764..7403a290b3da 100644
--- a/comms/twpsk/distinfo
+++ b/comms/twpsk/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1486082057
-SHA256 (twpsk-4.2.src.tar.gz) = b6c255b3ce16e6e8c3220261d434a54e2852b625e4e0daa437a8edd9e63a8078
-SIZE (twpsk-4.2.src.tar.gz) = 245368
+TIMESTAMP = 1504228232
+SHA256 (twpsk-4.3.src.tar.gz) = 6877852b968e19d5a52063df208a091cfa3157ccd0470d18418a7986f666914a
+SIZE (twpsk-4.3.src.tar.gz) = 245520
diff --git a/comms/uhd/Makefile b/comms/uhd/Makefile
index b4e79a405f08..866c3324faf5 100644
--- a/comms/uhd/Makefile
+++ b/comms/uhd/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	uhd
 PORTVERSION=	3.10.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://files.ettus.com/binaries/images/
 DISTFILES=	${IMAGE_FILE}
diff --git a/comms/usrp/Makefile b/comms/usrp/Makefile
index e1f0b3311872..de39a82f4686 100644
--- a/comms/usrp/Makefile
+++ b/comms/usrp/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	usrp
 PORTVERSION=	3.4.3
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	comms hamradio
 MASTER_SITES=	LOCAL/adrian
 DISTNAME=	Ettus-USRP-3.4.3
diff --git a/comms/wsjt/Makefile b/comms/wsjt/Makefile
index f20e3d8d7e44..26cd3a204f23 100644
--- a/comms/wsjt/Makefile
+++ b/comms/wsjt/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	wsjt
 DISTVERSION=	${VERSION}.r${SVN_REV}
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	comms hamradio
 MASTER_SITES=	LOCAL/db
 DISTNAME=	wsjt-r${SVN_REV}
diff --git a/comms/wsjtx/Makefile b/comms/wsjtx/Makefile
index 0f32cd5375e0..582b14d26584 100644
--- a/comms/wsjtx/Makefile
+++ b/comms/wsjtx/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	wsjtx
 PORTVERSION=	1.7.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF/wsjt/${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
diff --git a/comms/wspr/Makefile b/comms/wspr/Makefile
index ba67d41f78c0..64903a4539e3 100644
--- a/comms/wspr/Makefile
+++ b/comms/wspr/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	wspr
 DISTVERSION=	${VERSION}.r${SVN_REV}
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	comms hamradio
 MASTER_SITES=	LOCAL/db
 DISTNAME=	wspr-r${SVN_REV}
diff --git a/converters/cl-babel-sbcl/Makefile b/converters/cl-babel-sbcl/Makefile
index 299de737076e..f6b6fc06fbd6 100644
--- a/converters/cl-babel-sbcl/Makefile
+++ b/converters/cl-babel-sbcl/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	babel
 PORTVERSION=	2010.01.16
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	converters lisp
 PKGNAMEPREFIX=	cl-
 DISTFILES=	# none
diff --git a/converters/pdf2djvu/Makefile b/converters/pdf2djvu/Makefile
index 8cc493f71433..450139a89a15 100644
--- a/converters/pdf2djvu/Makefile
+++ b/converters/pdf2djvu/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pdf2djvu
 PORTVERSION=	0.7.21
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	converters
 MASTER_SITES=	https://bitbucket.org/jwilk/pdf2djvu/downloads/
 
diff --git a/databases/Makefile b/databases/Makefile
index 0262587405e5..d892ea0cfeaf 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -556,6 +556,7 @@
     SUBDIR += pecl-pdo_user
     SUBDIR += pecl-redis
     SUBDIR += pecl-rrd
+    SUBDIR += pecl-rrd1
     SUBDIR += pecl-tokyo_tyrant
     SUBDIR += percona-pam-for-mysql
     SUBDIR += percona-toolkit
@@ -566,6 +567,7 @@
     SUBDIR += percona57-client
     SUBDIR += percona57-pam-for-mysql
     SUBDIR += percona57-server
+    SUBDIR += pgFormatter
     SUBDIR += pg_activity
     SUBDIR += pg_citus
     SUBDIR += pg_dirtyread
@@ -584,7 +586,6 @@
     SUBDIR += pgbouncer
     SUBDIR += pgdbf
     SUBDIR += pgespresso
-    SUBDIR += pgFormatter
     SUBDIR += pgfouine
     SUBDIR += pgloader
     SUBDIR += pgloader3
@@ -777,6 +778,7 @@
     SUBDIR += py-htsql-pgsql
     SUBDIR += py-kyotocabinet
     SUBDIR += py-leveldb
+    SUBDIR += py-lmdb
     SUBDIR += py-motor
     SUBDIR += py-mycli
     SUBDIR += py-mysql-connector-python
diff --git a/databases/bbdb/Makefile b/databases/bbdb/Makefile
index 424206865790..7be38b5661d0 100644
--- a/databases/bbdb/Makefile
+++ b/databases/bbdb/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	bbdb
 PORTVERSION=	2.35
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	databases elisp
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/databases/cego/Makefile b/databases/cego/Makefile
index 86833c014106..5ce0af4d5c9a 100644
--- a/databases/cego/Makefile
+++ b/databases/cego/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cego
-PORTVERSION=	2.35.4
+PORTVERSION=	2.35.8
 CATEGORIES=	databases
 MASTER_SITES=	http://www.lemke-it.com/
 
diff --git a/databases/cego/distinfo b/databases/cego/distinfo
index 96c0f3b324e2..43c6183d8513 100644
--- a/databases/cego/distinfo
+++ b/databases/cego/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504431444
-SHA256 (cego-2.35.4.tar.gz) = 09c365b29d7acc113e7f9d0b68eadfd4f8e10a271e46665e68536ab8ae3c865f
-SIZE (cego-2.35.4.tar.gz) = 1415732
+TIMESTAMP = 1504989098
+SHA256 (cego-2.35.8.tar.gz) = 46356414492f8e114d301043e607c3b6821d4ceac24eb49746947fbf7a705307
+SIZE (cego-2.35.8.tar.gz) = 1415296
diff --git a/databases/clickhouse/Makefile b/databases/clickhouse/Makefile
index e9ab305edfc1..191a8ce4d654 100644
--- a/databases/clickhouse/Makefile
+++ b/databases/clickhouse/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	clickhouse
 PORTVERSION=	1.1.54245
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 DISTVERSIONSUFFIX=	-stable
 #PORTREVISION=	1
diff --git a/databases/dalmp/Makefile b/databases/dalmp/Makefile
index 4e80861924a4..bec9923f468f 100644
--- a/databases/dalmp/Makefile
+++ b/databases/dalmp/Makefile
@@ -7,7 +7,7 @@ DISTVERSIONPREFIX=	v
 PORTREVISION=	1
 CATEGORIES=	databases
 
-MAINTAINER=	nbari@dalmp.com
+MAINTAINER=	nbari@tequila.io
 COMMENT=	Database Abstraction Layer for MySQL using PHP
 
 LICENSE=	BSD3CLAUSE
diff --git a/databases/elixir-ecto/Makefile b/databases/elixir-ecto/Makefile
index 6b04ef4f9c05..d9ce2c5055de 100644
--- a/databases/elixir-ecto/Makefile
+++ b/databases/elixir-ecto/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	ecto
-PORTVERSION=	2.2.1
+PORTVERSION=	2.2.3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 PKGNAMEPREFIX=	elixir-
diff --git a/databases/elixir-ecto/distinfo b/databases/elixir-ecto/distinfo
index 194cf5b60987..6a69197ddc8f 100644
--- a/databases/elixir-ecto/distinfo
+++ b/databases/elixir-ecto/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504379308
-SHA256 (elixir-ecto-ecto-v2.2.1_GH0.tar.gz) = b7072e48d9f9ca0b4a5527d3c68d3ee385e5bbba2ddc60570bc73790f384fd68
-SIZE (elixir-ecto-ecto-v2.2.1_GH0.tar.gz) = 354032
+TIMESTAMP = 1505251065
+SHA256 (elixir-ecto-ecto-v2.2.3_GH0.tar.gz) = a367bae27e46858904b281f49b60876ec8ec3bcc52db3b8a71b7fd3d79f8d375
+SIZE (elixir-ecto-ecto-v2.2.3_GH0.tar.gz) = 356424
diff --git a/databases/fastdb/Makefile b/databases/fastdb/Makefile
index aac248ea930e..00815d84ff6f 100644
--- a/databases/fastdb/Makefile
+++ b/databases/fastdb/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	fastdb
 PORTVERSION=	3.75
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases
 MASTER_SITES=	SF
 
diff --git a/databases/gigabase/Makefile b/databases/gigabase/Makefile
index e4d8c520a45c..44175279333f 100644
--- a/databases/gigabase/Makefile
+++ b/databases/gigabase/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gigabase
 PORTVERSION=	3.91
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-src/${PORTVERSION} \
 		http://www.garret.ru/
diff --git a/databases/gnats4/Makefile b/databases/gnats4/Makefile
index 1152d8c3a432..0a01f1fb468a 100644
--- a/databases/gnats4/Makefile
+++ b/databases/gnats4/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gnats
 PORTVERSION=	4.1.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	databases devel
 MASTER_SITES=	GNU
 PKGNAMESUFFIX=	4
diff --git a/databases/gomdb/Makefile b/databases/gomdb/Makefile
index 942e04364ae7..13eb7fe46955 100644
--- a/databases/gomdb/Makefile
+++ b/databases/gomdb/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	gomdb
 PORTVERSION=	20140824
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases
 
 MAINTAINER=	cheffo@freebsd-bg.org
diff --git a/databases/grass6/Makefile b/databases/grass6/Makefile
index 5cb92070e0d9..3b4d441e3276 100644
--- a/databases/grass6/Makefile
+++ b/databases/grass6/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	grass
 PORTVERSION=	6.4.6
-PORTREVISION=	8
+PORTREVISION=	10
 PORTEPOCH=	2
 CATEGORIES=	databases geography
 MASTER_SITES=	http://grass.osgeo.org/%SUBDIR%/ \
diff --git a/databases/grass7/Makefile b/databases/grass7/Makefile
index 11591dfe7166..cff30c754bc6 100644
--- a/databases/grass7/Makefile
+++ b/databases/grass7/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	grass
 PORTVERSION=	7.2.1
+PORTREVISION=	2
 CATEGORIES=	databases geography
 MASTER_SITES=	http://grass.osgeo.org/%SUBDIR%/ \
 		http://grass.cict.fr/%SUBDIR%/ \
diff --git a/databases/influxdb/Makefile b/databases/influxdb/Makefile
index 9c89655c52d2..d5c90cfc4725 100644
--- a/databases/influxdb/Makefile
+++ b/databases/influxdb/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	influxdb
 PORTVERSION=	1.3.3
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	databases net-mgmt
 
 MAINTAINER=	cheffo@freebsd-bg.org
@@ -72,6 +73,15 @@ INFLUXD_DBDIR=	/var/db/${PORTNAME}/
 INFLUXD_LOGDIR=	/var/log/${PORTNAME}/
 INFLUXD_PIDDIR=	/var/run/${PORTNAME}/
 
+.include <bsd.port.pre.mk>
+
+.if ${OPSYS} == "FreeBSD" && ((${OSVERSION} >= 1100513 && ${OSVERSION} < 1200000) || \
+    	${OSVERSION} >= 1200015)
+SUB_LIST+=	INFLUXD_LOGCMD="daemon"
+.else
+SUB_LIST+=	INFLUXD_LOGCMD="logger"
+.endif
+
 post-patch:
 	@${MKDIR} ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME}
 	@cd ${WRKSRC} && \
@@ -115,4 +125,4 @@ do-install-MANPAGES-on:
 		${INSTALL_MAN} ${WRKSRC}/src/github.com/influxdata/influxdb/man/$i ${STAGEDIR}${MAN8PREFIX}/man/man1
 .endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/databases/influxdb/files/influxd.in b/databases/influxdb/files/influxd.in
index 657458f569e9..92f67b61067c 100644
--- a/databases/influxdb/files/influxd.in
+++ b/databases/influxdb/files/influxd.in
@@ -18,6 +18,11 @@
 # influxd_group (str):		influxd daemon group
 #				Default: influxd
 # influxd_flags (str):		Extra flags passed to influxd
+#
+# influxd_facility (str):       Syslog facility to use
+#                               Default: daemon
+# influxd_priority (str):       Syslog priority to use
+#                               Default: info
 
 . /etc/rc.subr
 
@@ -29,19 +34,35 @@ load_rc_config $name
 : ${influxd_user:="%%INFLUXD_USER%%"}
 : ${influxd_group:="%%INFLUXD_GROUP%%"}
 : ${influxd_flags:=""}
+: ${influxd_facility:="daemon"}
+: ${influxd_priority:="info"}
 : ${influxd_conf:="%%PREFIX%%/etc/${name}.conf"}
-: ${influxd_options:="${influxdb_flags} -config=${influxd_conf} 2> %%INFLUXD_LOGDIR%%/influxdb.log"}
+: ${influxd_options:="${influxdb_flags} -config=${influxd_conf}"}
 
 # daemon
 influxd_pidfile="%%INFLUXD_PIDDIR%%${name}.pid"
 procname="%%PREFIX%%/bin/${name}"
 command=/usr/sbin/daemon
-command_args="-c -p ${influxd_pidfile} ${procname} ${influxd_options}"
 start_precmd="influxd_precmd"
+start_cmd="influxd_startcmd_%%INFLUXD_LOGCMD%%"        
 
 influxd_precmd()
 {
     install -d -o ${influxd_user} %%INFLUXD_PIDDIR%%
 }
 
+influxd_startcmd_daemon()                      
+{   
+    echo "Starting ${name}."                   
+    /usr/sbin/daemon -c -p ${influxd_pidfile} -S -s ${influxd_priority} -l ${influxd_facility} \
+        -u ${influxd_user} ${procname} ${influxd_options}
+}                                              
+
+influxd_startcmd_logger()                      
+{   
+    echo "Starting ${name}."                   
+    /usr/sbin/daemon -c -p ${influxd_pidfile} -u ${influxd_user} /bin/sh -c "${procname} ${influxd_options} 2>&1 \
+        | /usr/bin/logger -t ${name} -p ${influxd_facility}.${influxd_priority}"
+}                                              
+
 run_rc_command "$1"
diff --git a/databases/kdb/files/patch-src_CMakeLists.txt b/databases/kdb/files/patch-src_CMakeLists.txt
new file mode 100644
index 000000000000..647f1820b9c3
--- /dev/null
+++ b/databases/kdb/files/patch-src_CMakeLists.txt
@@ -0,0 +1,31 @@
+This has been submitted upstream; the # TODO (GEN) is a comment used
+elsewhere upstream to mark things commented-out for generated files.
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index c63ab1f2..73d15fce 100644
+--- src/CMakeLists.txt
++++ src/CMakeLists.txt
+@@ -56,18 +56,18 @@ endif()
+ # Mark files as generated, set compile flags
+ set_source_files_properties(${PARSER_SOURCE_DIR}/generated/sqlparser.cpp
+     PROPERTIES
+-        GENERATED TRUE
++        #TODO(GEN) GENERATED TRUE
+         # YYERROR_VERBOSE=1 needed to get a token table for tokenName() even for release builds
+         COMPILE_FLAGS "-DYYERROR_VERBOSE=1 ${EXTRA_PARSER_COMPILE_FLAGS} "
+ )
+-set_source_files_properties(${PARSER_SOURCE_DIR}/generated/sqlparser.h PROPERTIES GENERATED TRUE)
+-set_source_files_properties(${PARSER_SOURCE_DIR}/generated/KDbToken.h PROPERTIES GENERATED TRUE)
+-set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/KDbConnectionData_sdc.cpp PROPERTIES GENERATED TRUE)
++# TODO(GEN) set_source_files_properties(${PARSER_SOURCE_DIR}/generated/sqlparser.h PROPERTIES GENERATED TRUE)
++# TODO(GEN) set_source_files_properties(${PARSER_SOURCE_DIR}/generated/KDbToken.h PROPERTIES GENERATED TRUE)
++# TODO(GEN) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/KDbConnectionData_sdc.cpp PROPERTIES GENERATED TRUE)
+ 
+ set_source_files_properties(
+     ${PARSER_SOURCE_DIR}/generated/sqlscanner.cpp
+     PROPERTIES
+-        GENERATED TRUE
++        #TODO(GEN) GENERATED TRUE
+         COMPILE_FLAGS "${EXTRA_SCANNER_COMPILE_FLAGS} "
+ )
+ 
diff --git a/databases/leveldb/Makefile b/databases/leveldb/Makefile
index cbaf1f95e4d6..ec84adfe77ea 100644
--- a/databases/leveldb/Makefile
+++ b/databases/leveldb/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	leveldb
 PORTVERSION=	1.20
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 
diff --git a/databases/levigo/Makefile b/databases/levigo/Makefile
index 3fd926a0d100..cebe164e5c13 100644
--- a/databases/levigo/Makefile
+++ b/databases/levigo/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	levigo
 PORTVERSION=	20150216
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases
 
 MAINTAINER=	cheffo@freebsd-bg.org
diff --git a/databases/libgdamm5/Makefile b/databases/libgdamm5/Makefile
index 60aa23a92088..aea0188d85c2 100644
--- a/databases/libgdamm5/Makefile
+++ b/databases/libgdamm5/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libgdamm
 PORTVERSION=	4.99.8
+PORTREVISION=	1
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
diff --git a/databases/mariadb-connector-c/Makefile b/databases/mariadb-connector-c/Makefile
index d664e463f303..5d23975359d4 100644
--- a/databases/mariadb-connector-c/Makefile
+++ b/databases/mariadb-connector-c/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	mariadb-connector-c
 PORTVERSION=	3.0.2
+PORTREVISION=	1
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://ftp.osuosl.org/pub/${SITESDIR}/ \
 		http://mirrors.supportex.net/${SITESDIR}/ \
diff --git a/databases/mariadb100-server/Makefile b/databases/mariadb100-server/Makefile
index 36ad8259b6e3..fdf7f7e4687f 100644
--- a/databases/mariadb100-server/Makefile
+++ b/databases/mariadb100-server/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME?=	mariadb
 PORTVERSION=	10.0.32
-PORTREVISION?=	0
+PORTREVISION?=	2
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://ftp.osuosl.org/pub/${SITESDIR}/ \
 		http://mirrors.supportex.net/${SITESDIR}/ \
diff --git a/databases/mariadb101-server/Makefile b/databases/mariadb101-server/Makefile
index b982a0f6a0a4..66ca7f89bc96 100644
--- a/databases/mariadb101-server/Makefile
+++ b/databases/mariadb101-server/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME?=	mariadb
 PORTVERSION=	10.1.26
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://ftp.osuosl.org/pub/${SITESDIR}/ \
 		http://mirrors.supportex.net/${SITESDIR}/ \
diff --git a/databases/mariadb102-server/Makefile b/databases/mariadb102-server/Makefile
index 251cc9550bf0..17511ab59683 100644
--- a/databases/mariadb102-server/Makefile
+++ b/databases/mariadb102-server/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME?=	mariadb
 PORTVERSION=	10.2.7
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://mirrors.supportex.net/${SITESDIR}/ \
 		http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \
diff --git a/databases/mariadb55-server/Makefile b/databases/mariadb55-server/Makefile
index 752c642e4141..2e41dceb091c 100644
--- a/databases/mariadb55-server/Makefile
+++ b/databases/mariadb55-server/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME?=	mariadb
 PORTVERSION=	5.5.57
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
 		http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
diff --git a/databases/mongodb34-rocks/Makefile b/databases/mongodb34-rocks/Makefile
index 81624749d9f4..72b8421b4d3d 100644
--- a/databases/mongodb34-rocks/Makefile
+++ b/databases/mongodb34-rocks/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	mongodb
 PORTVERSION=	3.4.6
+PORTREVISION=	1
 DISTVERSIONPREFIX=	r
 CATEGORIES=	databases net
 MASTER_SITES=	https://fastdl.mongodb.org/src/ \
diff --git a/databases/mongodb34/Makefile b/databases/mongodb34/Makefile
index 6d309c6262a8..83146d7f1d12 100644
--- a/databases/mongodb34/Makefile
+++ b/databases/mongodb34/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	mongodb
 DISTVERSIONPREFIX=	r
 DISTVERSION=	3.4.6
+PORTREVISION=	1
 CATEGORIES=	databases net
 MASTER_SITES=	https://fastdl.mongodb.org/src/ \
 		http://fastdl.mongodb.org/src/ \
diff --git a/databases/mydumper/Makefile b/databases/mydumper/Makefile
index 5fdfb4210aa5..26c5deb095b6 100644
--- a/databases/mydumper/Makefile
+++ b/databases/mydumper/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mydumper
-PORTVERSION=	0.9.1
+PORTVERSION=	0.9.3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 
diff --git a/databases/mydumper/distinfo b/databases/mydumper/distinfo
index 79bb4de37f37..d16b1d62801b 100644
--- a/databases/mydumper/distinfo
+++ b/databases/mydumper/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1481642232
-SHA256 (maxbube-mydumper-v0.9.1_GH0.tar.gz) = 662ae410dbc5072136a9db3476514dc243c2f64189e1074a811ff03af1c05d79
-SIZE (maxbube-mydumper-v0.9.1_GH0.tar.gz) = 44692
+TIMESTAMP = 1505043409
+SHA256 (maxbube-mydumper-v0.9.3_GH0.tar.gz) = 2cd6a074bac7072905bd044ec20955c53c81b10e877ac9c644509940a8d201fb
+SIZE (maxbube-mydumper-v0.9.3_GH0.tar.gz) = 45320
diff --git a/databases/mysql-q4m/Makefile b/databases/mysql-q4m/Makefile
index 000608ef9c77..2d65ae8679b0 100644
--- a/databases/mysql-q4m/Makefile
+++ b/databases/mysql-q4m/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	q4m
 PORTVERSION=	0.9.14
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://q4m.kazuhooku.com/dist/
 PKGNAMEPREFIX=	${_MYSQL_SERVER:T:C/-server$/-/}
diff --git a/databases/mysql56-server/Makefile b/databases/mysql56-server/Makefile
index 9619b70111ab..c2ac25b25642 100644
--- a/databases/mysql56-server/Makefile
+++ b/databases/mysql56-server/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME?=	mysql
 PORTVERSION=	5.6.37
+PORTREVISION=	1
 CATEGORIES=	databases ipv6
 MASTER_SITES=	MYSQL/MySQL-5.6
 PKGNAMESUFFIX?=	56-server
diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile
index 75f72e0cd90e..b247218cf18d 100644
--- a/databases/mysql57-server/Makefile
+++ b/databases/mysql57-server/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME?=	mysql
 PORTVERSION=	5.7.19
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases ipv6
 MASTER_SITES=	MYSQL/MySQL-5.7
 PKGNAMESUFFIX?=	57-server
diff --git a/databases/mysql80-server/Makefile b/databases/mysql80-server/Makefile
index 0ce957f36169..a65c6ec1ef50 100644
--- a/databases/mysql80-server/Makefile
+++ b/databases/mysql80-server/Makefile
@@ -4,7 +4,7 @@
 PORTNAME?=		mysql
 PORTVERSION=		8.0.0
 DISTVERSIONSUFFIX?=	-dmr
-PORTREVISION?=		4
+PORTREVISION?=		5
 CATEGORIES=		databases ipv6
 MASTER_SITES=		MYSQL/MySQL-8.0
 PKGNAMESUFFIX?=		80-server
diff --git a/databases/p5-DBD-Sybase/Makefile b/databases/p5-DBD-Sybase/Makefile
index ac46f718eecf..914a6d17c649 100644
--- a/databases/p5-DBD-Sybase/Makefile
+++ b/databases/p5-DBD-Sybase/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	DBD-Sybase
-PORTVERSION=	1.15
-PORTREVISION=	2
+PORTVERSION=	1.16
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -11,9 +10,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Sybase DBI driver for Perl 5
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 BUILD_DEPENDS=	p5-DBI>=0:databases/p5-DBI
 LIB_DEPENDS=	libct.so:databases/freetds
-RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 CONFIGURE_ENV=	SYBASE=${LOCALBASE}
 USES=		gettext perl5
@@ -23,4 +25,7 @@ USE_PERL5=	configure
 CONFIGURE_ARGS=	< /dev/null
 .endif
 
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/DBD/Sybase/Sybase.so
+
 .include <bsd.port.mk>
diff --git a/databases/p5-DBD-Sybase/distinfo b/databases/p5-DBD-Sybase/distinfo
index 43edd0348f5f..1d0763fb4767 100644
--- a/databases/p5-DBD-Sybase/distinfo
+++ b/databases/p5-DBD-Sybase/distinfo
@@ -1,2 +1,3 @@
-SHA256 (DBD-Sybase-1.15.tar.gz) = 0b53aa979dde6ab56c9f35f35ca5002cbb041aa8a38e3c4a9dea74a0b31c1584
-SIZE (DBD-Sybase-1.15.tar.gz) = 199856
+TIMESTAMP = 1505127704
+SHA256 (DBD-Sybase-1.16.tar.gz) = 67f427e8b7ffae2acc3cc8984463d878abbb2289bc17db79a294e56c8311d6cc
+SIZE (DBD-Sybase-1.16.tar.gz) = 200419
diff --git a/databases/pecl-rrd/Makefile b/databases/pecl-rrd/Makefile
index 631c65250e25..d20de02cf563 100644
--- a/databases/pecl-rrd/Makefile
+++ b/databases/pecl-rrd/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	rrd
-DISTVERSION=	1.1.3
-PORTREVISION=	4
+DISTVERSION=	2.0.1
+PORTREVISION=	1
 CATEGORIES=	databases pear
 
 MAINTAINER=	flo@FreeBSD.org
@@ -10,11 +10,8 @@ COMMENT=	PHP bindings to rrd tool system
 
 LICENSE=	PHP301
 
+IGNORE_WITH_PHP=56
 LIB_DEPENDS=	librrd.so:databases/rrdtool
-
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-USES=		php:pecl
-IGNORE_WITH_PHP=	70
+USES=		php:pecl localbase pkgconfig
 
 .include <bsd.port.mk>
diff --git a/databases/pecl-rrd/distinfo b/databases/pecl-rrd/distinfo
index af5f7c091750..e31049fe6644 100644
--- a/databases/pecl-rrd/distinfo
+++ b/databases/pecl-rrd/distinfo
@@ -1,2 +1,3 @@
-SHA256 (PECL/rrd-1.1.3.tgz) = 0415ac51e09fe2e7a999d155d10d6af42ddf40ab0b4847a63ed1f9458533858e
-SIZE (PECL/rrd-1.1.3.tgz) = 19229
+TIMESTAMP = 1497340386
+SHA256 (PECL/rrd-2.0.1.tgz) = 39f5ae515de003d8dad6bfd77db60f5bd5b4a9f6caa41479b1b24b0d6592715d
+SIZE (PECL/rrd-2.0.1.tgz) = 18880
diff --git a/databases/pecl-rrd/files/patch-config.m4 b/databases/pecl-rrd/files/patch-config.m4
deleted file mode 100644
index 919d9a8b87b1..000000000000
--- a/databases/pecl-rrd/files/patch-config.m4
+++ /dev/null
@@ -1,24 +0,0 @@
---- config.m4.orig	2016-01-12 12:40:08 UTC
-+++ config.m4
-@@ -59,9 +59,11 @@ if test "$PHP_RRD" != "no"; then
-   LDFLAGS="$LDFLAGS -L$RRDTOOL_LIBDIR"
- 
-   dnl rrd_graph_v is available in 1.3.0+
-+  rrd_graph_c=""
-   PHP_CHECK_FUNC(rrd_graph_v, rrd)
--  if test "$ac_cv_func_rrd_graph_v" != yes; then
--    AC_MSG_ERROR([rrd lib version seems older than 1.3.0, update to 1.3.0+])
-+  if test "$ac_cv_func_rrd_graph_v" == yes; then
-+    AC_DEFINE(HAVE_RRD_GRAPH, 1, [ ])
-+    rrd_graph_c="rrd_graph.c"
-   fi
- 
-   dnl rrd_lastupdate_r available in 1.4.0+
-@@ -72,6 +74,6 @@ if test "$PHP_RRD" != "no"; then
- 
-   LDFLAGS=$old_LDFLAGS
- 
--  PHP_NEW_EXTENSION(rrd, rrd.c rrd_graph.c rrd_create.c rrd_update.c rrd_info.c, $ext_shared)
-+  PHP_NEW_EXTENSION(rrd, rrd.c $rrd_graph_c rrd_create.c rrd_update.c rrd_info.c, $ext_shared)
-   PHP_SUBST(RRD_SHARED_LIBADD)
- fi
diff --git a/databases/pecl-rrd/files/patch-rrd.c b/databases/pecl-rrd/files/patch-rrd.c
deleted file mode 100644
index 2140a8be3c92..000000000000
--- a/databases/pecl-rrd/files/patch-rrd.c
+++ /dev/null
@@ -1,81 +0,0 @@
---- rrd.c.orig	2016-01-12 12:42:39 UTC
-+++ rrd.c
-@@ -19,7 +19,9 @@
- #include <rrd.h>
- 
- #include "php_rrd.h"
-+#ifdef HAVE_RRD_GRAPH
- #include "rrd_graph.h"
-+#endif
- #include "rrd_create.h"
- #include "rrd_update.h"
- #include "rrd_info.h"
-@@ -387,6 +389,7 @@ PHP_FUNCTION(rrd_tune)
- }
- /* }}} */
- 
-+#ifdef HAVE_RRD_GRAPH
- /* {{{ proto array rrd_xport(array options)
-  * Creates a graph based on options passed via an array
-  */
-@@ -480,6 +483,7 @@ PHP_FUNCTION(rrd_xport)
- 	free(data);
- }
- /* }}} */
-+#endif
- 
- #ifdef HAVE_RRDC_DISCONNECT
- /* {{{ proto void rrdc_disconnect()
-@@ -537,18 +541,22 @@ ZEND_BEGIN_ARG_INFO(arginfo_rrd_tune, 0)
- 	ZEND_ARG_INFO(0, options)
- ZEND_END_ARG_INFO()
- 
-+#ifdef HAVE_RRD_GRAPH
- ZEND_BEGIN_ARG_INFO(arginfo_rrd_xport, 0)
- 	ZEND_ARG_INFO(0, options)
- ZEND_END_ARG_INFO()
-+#endif
- 
- ZEND_BEGIN_ARG_INFO(arginfo_rrd_info, 0)
- 	ZEND_ARG_INFO(0, file)
- ZEND_END_ARG_INFO()
- 
-+#ifdef HAVE_RRD_GRAPH
- ZEND_BEGIN_ARG_INFO(arginfo_rrd_graph, 0)
- 	ZEND_ARG_INFO(0, file)
- 	ZEND_ARG_INFO(0, options)
- ZEND_END_ARG_INFO()
-+#endif
- 
- ZEND_BEGIN_ARG_INFO(arginfo_rrd_create, 0)
- 	ZEND_ARG_INFO(0, filename)
-@@ -565,7 +573,9 @@ ZEND_END_ARG_INFO()
- static zend_function_entry rrd_functions[] = {
- 	PHP_FE(rrd_update, arginfo_rrd_update)
- 	PHP_FE(rrd_create, arginfo_rrd_create)
-+#ifdef HAVE_RRD_GRAPH
- 	PHP_FE(rrd_graph, arginfo_rrd_graph)
-+#endif
- 	PHP_FE(rrd_error, NULL)
- 	PHP_FE(rrd_fetch, arginfo_rrd_fetch)
- 	PHP_FE(rrd_first, arginfo_rrd_first)
-@@ -574,7 +584,9 @@ static zend_function_entry rrd_functions
- 	PHP_FE(rrd_lastupdate, arginfo_rrd_lastupdate)
- 	PHP_FE(rrd_restore, arginfo_rrd_restore)
- 	PHP_FE(rrd_tune, arginfo_rrd_tune)
-+#ifdef HAVE_RRD_GRAPH
- 	PHP_FE(rrd_xport, arginfo_rrd_xport)
-+#endif
- #ifdef HAVE_RRDC_DISCONNECT
- 	PHP_FE(rrdc_disconnect, NULL)
- #endif
-@@ -590,7 +602,9 @@ static zend_function_entry rrd_functions
- /* {{{ PHP_MINIT_FUNCTION */
- static PHP_MINIT_FUNCTION(rrd)
- {
-+#ifdef HAVE_RRD_GRAPH
- 	rrd_graph_minit(TSRMLS_C);
-+#endif
- 	rrd_create_minit(TSRMLS_C);
- 	rrd_update_minit(TSRMLS_C);
- 	return SUCCESS;
diff --git a/databases/pecl-rrd1/Makefile b/databases/pecl-rrd1/Makefile
new file mode 100644
index 000000000000..92c4c1f7252b
--- /dev/null
+++ b/databases/pecl-rrd1/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME=	rrd
+DISTVERSION=	1.1.3
+CATEGORIES=	databases pear
+PKGNAMESUFFIX=	1
+
+MAINTAINER=	daniel@blodan.se
+COMMENT=	PHP bindings to rrd tool system
+
+LICENSE=	PHP301
+
+IGNORE_WITH_PHP=70 71
+LIB_DEPENDS=	librrd.so:databases/rrdtool
+USES=		php:pecl localbase pkgconfig
+
+.include <bsd.port.mk>
diff --git a/databases/pecl-rrd1/distinfo b/databases/pecl-rrd1/distinfo
new file mode 100644
index 000000000000..ef5a964c5328
--- /dev/null
+++ b/databases/pecl-rrd1/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1504786291
+SHA256 (PECL/rrd-1.1.3.tgz) = 0415ac51e09fe2e7a999d155d10d6af42ddf40ab0b4847a63ed1f9458533858e
+SIZE (PECL/rrd-1.1.3.tgz) = 19229
diff --git a/databases/pecl-rrd1/pkg-descr b/databases/pecl-rrd1/pkg-descr
new file mode 100644
index 000000000000..c554acbebd09
--- /dev/null
+++ b/databases/pecl-rrd1/pkg-descr
@@ -0,0 +1,4 @@
+Procedural and simple OO wrapper for rrdtool - data logging and graphing system
+for time series data.
+
+WWW: http://www.pecl.php.net/package/rrd/
diff --git a/databases/percona57-server/Makefile b/databases/percona57-server/Makefile
index d174ad1a1e0d..892cb82b9c8b 100644
--- a/databases/percona57-server/Makefile
+++ b/databases/percona57-server/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME?=	percona
 DISTVERSION=	5.7.16-10
-PORTREVISION?=	4
+PORTREVISION?=	5
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://www.percona.com/downloads/Percona-Server-5.7/Percona-Server-${DISTVERSION}/source/tarball/:percona \
 		SF/boost/boost/1.59.0:boost
diff --git a/databases/pg_citus/Makefile b/databases/pg_citus/Makefile
index 43038adae82e..c7a137f167de 100644
--- a/databases/pg_citus/Makefile
+++ b/databases/pg_citus/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	citus
-PORTVERSION=	7.0.0
+PORTVERSION=	7.0.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 PKGNAMEPREFIX=	pg_
diff --git a/databases/pg_citus/distinfo b/databases/pg_citus/distinfo
index 569f6f31a5df..56c6f19c1449 100644
--- a/databases/pg_citus/distinfo
+++ b/databases/pg_citus/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504009654
-SHA256 (citusdata-citus-v7.0.0_GH0.tar.gz) = bdfa80356480ebaa770b54e438fb263b3e524be45492412befd6825199c3c59e
-SIZE (citusdata-citus-v7.0.0_GH0.tar.gz) = 2451397
+TIMESTAMP = 1505338245
+SHA256 (citusdata-citus-v7.0.1_GH0.tar.gz) = 3a2e976014a98739ab49f1ac7988ea2c72de7fd6735c5eb8d4d8b818267d93e4
+SIZE (citusdata-citus-v7.0.1_GH0.tar.gz) = 2454792
diff --git a/databases/pgaccess/Makefile b/databases/pgaccess/Makefile
index c9d604e4d05d..ee5c17c211ad 100644
--- a/databases/pgaccess/Makefile
+++ b/databases/pgaccess/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pgaccess
 PORTVERSION=	1.00.20140902
+PORTREVISION=	1
 CATEGORIES=	databases tcl tk
 MASTER_SITES=	http://bsdforge.com/projects/source/databases/pgaccess/
 
@@ -13,7 +14,7 @@ LICENSE=	BSD4CLAUSE
 
 RUN_DEPENDS=	${LOCALBASE}/lib/pgtcl/pkgIndex.tcl:databases/pgtcl
 
-USES=		pgsql tk:84+ tar:xz
+USES=		pgsql tk:85+ tar:xz
 
 NO_ARCH=	yes
 
diff --git a/databases/pgadmin3/Makefile b/databases/pgadmin3/Makefile
index 0934420c41f8..fff0980151e4 100644
--- a/databases/pgadmin3/Makefile
+++ b/databases/pgadmin3/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pgadmin3
 PORTVERSION=	1.22.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	databases
 MASTER_SITES=	PGSQL/pgadmin3/release/v${PORTVERSION}/src
 DIST_SUBDIR=	postgresql
diff --git a/databases/pgmodeler/Makefile b/databases/pgmodeler/Makefile
index 8e4e8a1310f8..16e7275e5f4a 100644
--- a/databases/pgmodeler/Makefile
+++ b/databases/pgmodeler/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pgmodeler
 PORTVERSION=	0.9.0
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 
diff --git a/databases/pgmodeler/pkg-descr b/databases/pgmodeler/pkg-descr
index 16fed597504c..77b37369d156 100644
--- a/databases/pgmodeler/pkg-descr
+++ b/databases/pgmodeler/pkg-descr
@@ -1,7 +1,7 @@
-pgModeler - PostgreSQL Database Modeler - is an open source data modeling tool
- designed for PostgreSQL. No more DDL commands written by hand let pgModeler 
-do the job for you! This software reunites the concepts of entity-relationship 
-diagrams and the features that PostgreSQL implements as extensions of
- SQL standards.
+pgModeler - PostgreSQL Database Modeler - is an open source data modeling
+tool designed for PostgreSQL. No more DDL commands written by hand: let
+pgModeler do the job for you! This software reunites the concepts of
+entity-relationship diagrams and the features that PostgreSQL implements as
+extensions of SQL standards.
 
 WWW: http://pgmodeler.com.br/
diff --git a/databases/pgrouting/Makefile b/databases/pgrouting/Makefile
index fdecd24a2815..00b6c517cd5e 100644
--- a/databases/pgrouting/Makefile
+++ b/databases/pgrouting/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pgrouting
 PORTVERSION=	2.4.2
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases geography
 
diff --git a/databases/php5-pdo_cassandra/Makefile b/databases/php5-pdo_cassandra/Makefile
index c64426be11c4..db5f8940d03b 100644
--- a/databases/php5-pdo_cassandra/Makefile
+++ b/databases/php5-pdo_cassandra/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pdo_cassandra
 PORTVERSION=	0.2.1
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	databases
 PKGNAMEPREFIX=	php5-
 
diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile
index 5a5b6719f88e..43fe620969bd 100644
--- a/databases/phpmyadmin/Makefile
+++ b/databases/phpmyadmin/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	phpMyAdmin
 DISTVERSION=	4.7.4
+PORTREVISION=	1
 CATEGORIES=	databases www
 MASTER_SITES=	https://files.phpmyadmin.net/${PORTNAME}/${DISTVERSION}/
 DISTNAME=	${PORTNAME}-${DISTVERSION}-all-languages
@@ -25,12 +26,11 @@ USE_PHP=	ctype session filter mbstring json spl mysqli
 # want this, either turn off GD in the config dialog, or else turn off
 # FONTCONFIG in the graphics/gd port options.
 
-OPTIONS_DEFINE=		BZ2 GD MCRYPT OPENSSL PDF XML ZIP ZLIB
-OPTIONS_DEFAULT=	BZ2 GD MCRYPT OPENSSL XML ZIP ZLIB
+OPTIONS_DEFINE=		BZ2 GD OPENSSL PDF XML ZIP ZLIB
+OPTIONS_DEFAULT=	BZ2 GD OPENSSL XML ZIP ZLIB
 
 BZ2_DESC=	PHP bzip2 library support
 GD_DESC=	PHP GD library support (requires X11)
-MCRYPT_DESC=	PHP MCrypt library support
 OPENSSL_DESC=	PHP OpenSSL support
 PDF_DESC=	PHP PDFlib support
 XML_DESC=	PHP XML support (Export to OpenDoc)
diff --git a/databases/postgresql-plv8js/Makefile b/databases/postgresql-plv8js/Makefile
index 6819f247975b..eb2318561c44 100644
--- a/databases/postgresql-plv8js/Makefile
+++ b/databases/postgresql-plv8js/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	plv8
 PORTVERSION=	1.4.8
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 PKGNAMEPREFIX=	postgresql${PGSQL_VER:S/.//}-
diff --git a/databases/puppetdb-terminus3/Makefile b/databases/puppetdb-terminus3/Makefile
index 991192a33853..96b10e18fa82 100644
--- a/databases/puppetdb-terminus3/Makefile
+++ b/databases/puppetdb-terminus3/Makefile
@@ -11,6 +11,9 @@ COMMENT=	PuppetDB storeconfigs backend terminus module
 
 LICENSE=	APACHE20
 
+DEPRECATED=	End of life upstream
+EXPIRATION_DATE=	2017-11-01
+
 BUILD_DEPENDS=	puppet:sysutils/puppet4
 
 CONFLICTS_INSTALL=	puppetdb-terminus4-* puppetdb-terminus5-*
diff --git a/databases/py-lmdb/Makefile b/databases/py-lmdb/Makefile
new file mode 100644
index 000000000000..98a040237e6b
--- /dev/null
+++ b/databases/py-lmdb/Makefile
@@ -0,0 +1,30 @@
+# Created by: Keith Gaughan <k@sterechro.me>
+# $FreeBSD$
+
+PORTNAME=	lmdb
+PORTVERSION=	0.93
+CATEGORIES=	databases python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	k@stereochro.me
+COMMENT=	Python bindings for LMDB
+
+LICENSE=	OPENLDAP
+LICENSE_NAME=	OpenLDAP Public LIcense
+LICENSE_FILE=	${WRKSRC}/LICENSE
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>0.8:devel/py-cffi
+LIB_DEPENDS=	liblmdb.so:databases/lmdb
+
+USES=		localbase python
+USE_PYTHON=	autoplist distutils
+
+MAKE_ENV=	LMDB_FORCE_SYSTEM=1 \
+		LMDB_FORCE_CFFI=1
+
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/lmdb/lmdb_cffi.so
+
+.include <bsd.port.mk>
diff --git a/databases/py-lmdb/distinfo b/databases/py-lmdb/distinfo
new file mode 100644
index 000000000000..0c9f8c8323ed
--- /dev/null
+++ b/databases/py-lmdb/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1505036252
+SHA256 (lmdb-0.93.tar.gz) = 146b085b698bf480b35da4eac3a0bd8e331e002a9bafa69842867a879258b775
+SIZE (lmdb-0.93.tar.gz) = 870651
diff --git a/databases/py-lmdb/pkg-descr b/databases/py-lmdb/pkg-descr
new file mode 100644
index 000000000000..cd8c33df5034
--- /dev/null
+++ b/databases/py-lmdb/pkg-descr
@@ -0,0 +1,4 @@
+This is a port of py-lmdb, which provides bindings for OpenLDAP's Lightning
+Memory-mapped Database (LMDB).
+
+WWW: https://github.com/dw/py-lmdb/
diff --git a/databases/py-python-swiftclient/Makefile b/databases/py-python-swiftclient/Makefile
index 52678c339958..412aa90a75d4 100644
--- a/databases/py-python-swiftclient/Makefile
+++ b/databases/py-python-swiftclient/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	python-swiftclient
-PORTVERSION=	3.3.0
+PORTVERSION=	3.4.0
 CATEGORIES=	databases python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/databases/py-python-swiftclient/distinfo b/databases/py-python-swiftclient/distinfo
index 52a13d450b72..f26d9d65eea3 100644
--- a/databases/py-python-swiftclient/distinfo
+++ b/databases/py-python-swiftclient/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1485608811
-SHA256 (python-swiftclient-3.3.0.tar.gz) = 8b4d38d73ceb2ef4984b39fb924bf9b265050ca2beb5c6bf29cb9f34ccd0bf7d
-SIZE (python-swiftclient-3.3.0.tar.gz) = 166092
+TIMESTAMP = 1505065615
+SHA256 (python-swiftclient-3.4.0.tar.gz) = 54f7ae339bd076e295dd576ec98e55ba71205ee7e62964b27c8ec80c9351067d
+SIZE (python-swiftclient-3.4.0.tar.gz) = 175823
diff --git a/databases/py-sqlalchemy11/Makefile b/databases/py-sqlalchemy11/Makefile
index b68372475cd3..6f415678c839 100644
--- a/databases/py-sqlalchemy11/Makefile
+++ b/databases/py-sqlalchemy11/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	sqlalchemy
-PORTVERSION=	1.1.13
-PORTREVISION=	1
+PORTVERSION=	1.1.14
 CATEGORIES=	databases python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/databases/py-sqlalchemy11/distinfo b/databases/py-sqlalchemy11/distinfo
index ab219c011ac6..e8a307c3d9ae 100644
--- a/databases/py-sqlalchemy11/distinfo
+++ b/databases/py-sqlalchemy11/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501862649
-SHA256 (SQLAlchemy-1.1.13.tar.gz) = 2a98ac87b30eaa2bee1f1044848b9590e476e7f93d033c6542e60b993a5cf898
-SIZE (SQLAlchemy-1.1.13.tar.gz) = 5179952
+TIMESTAMP = 1504718687
+SHA256 (SQLAlchemy-1.1.14.tar.gz) = f1191e29e35b6fe1aef7175a09b1707ebb7bd08d0b17cb0feada76c49e5a2d1e
+SIZE (SQLAlchemy-1.1.14.tar.gz) = 5183519
diff --git a/databases/riak2/Makefile b/databases/riak2/Makefile
index 1bb09385dfa0..2aad457d9307 100644
--- a/databases/riak2/Makefile
+++ b/databases/riak2/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	riak2
 PORTVERSION=	2.1.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	databases
 MASTER_SITES=	http://s3.amazonaws.com/downloads.basho.com/riak/${PORTVERSION:R}/${PORTVERSION}/ \
 	http://downloads.basho.com.s3.amazonaws.com/riak/${PORTVERSION:R}/${PORTVERSION}/ \
diff --git a/databases/rocksdb/Makefile b/databases/rocksdb/Makefile
index 1e72d66c1d6f..c17b0fa682c2 100644
--- a/databases/rocksdb/Makefile
+++ b/databases/rocksdb/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	rocksdb
 PORTVERSION=	5.7.3
+PORTREVISION=	1
 DISTVERSIONPREFIX=	${PORTNAME}-
 CATEGORIES=	databases
 
diff --git a/databases/rubygem-active_model_serializers/Makefile b/databases/rubygem-active_model_serializers/Makefile
index 8f7adcf402ca..77d1830737c5 100644
--- a/databases/rubygem-active_model_serializers/Makefile
+++ b/databases/rubygem-active_model_serializers/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	active_model_serializers
 PORTVERSION=	0.10.6
+PORTREVISION=	1
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 
@@ -9,16 +10,15 @@ MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Conventions-based JSON generation for Rails
 
 LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-activemodel5>0:databases/rubygem-activemodel5 \
-		rubygem-actionpack5>0:www/rubygem-actionpack5 \
-		rubygem-railties5>0:www/rubygem-railties5 \
-		rubygem-jsonapi-renderer>0.1:devel/rubygem-jsonapi-renderer \
-		rubygem-case_transform>=0.2:textproc/rubygem-case_transform
+RUN_DEPENDS=	rubygem-activemodel5>=4.1:databases/rubygem-activemodel5 \
+		rubygem-actionpack5>=4.1:www/rubygem-actionpack5 \
+		rubygem-case_transform>=0.2:textproc/rubygem-case_transform \
+		rubygem-jsonapi-renderer>=0.1.1:devel/rubygem-jsonapi-renderer
 
+NO_ARCH=	yes
 USES=		gem
 USE_RUBY=	yes
 
-NO_ARCH=	yes
-
 .include <bsd.port.mk>
diff --git a/databases/rubygem-active_model_serializers/files/patch-gemspec b/databases/rubygem-active_model_serializers/files/patch-gemspec
new file mode 100644
index 000000000000..f37dafb507dd
--- /dev/null
+++ b/databases/rubygem-active_model_serializers/files/patch-gemspec
@@ -0,0 +1,11 @@
+--- active_model_serializers.gemspec.orig	2017-09-11 11:20:46 UTC
++++ active_model_serializers.gemspec
+@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
+       s.add_runtime_dependency(%q<activemodel>.freeze, ["< 6", ">= 4.1"])
+       s.add_runtime_dependency(%q<actionpack>.freeze, ["< 6", ">= 4.1"])
+       s.add_development_dependency(%q<railties>.freeze, ["< 6", ">= 4.1"])
+-      s.add_runtime_dependency(%q<jsonapi-renderer>.freeze, ["< 0.2", ">= 0.1.1.beta1"])
++      s.add_runtime_dependency(%q<jsonapi-renderer>.freeze, [">= 0.1.1.beta1"])
+       s.add_runtime_dependency(%q<case_transform>.freeze, [">= 0.2"])
+       s.add_development_dependency(%q<activerecord>.freeze, ["< 6", ">= 4.1"])
+       s.add_development_dependency(%q<kaminari>.freeze, ["~> 0.16.3"])
diff --git a/databases/rubygem-activemodel5/Makefile b/databases/rubygem-activemodel5/Makefile
index 8da4e41e8658..9c7d8b31f344 100644
--- a/databases/rubygem-activemodel5/Makefile
+++ b/databases/rubygem-activemodel5/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	activemodel
-PORTVERSION=	5.1.3
+PORTVERSION=	5.1.4
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	5
diff --git a/databases/rubygem-activemodel5/distinfo b/databases/rubygem-activemodel5/distinfo
index b42270b76da7..c4a0de67608d 100644
--- a/databases/rubygem-activemodel5/distinfo
+++ b/databases/rubygem-activemodel5/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501862665
-SHA256 (rubygem/activemodel-5.1.3.gem) = ad3aa2e0dd9a003ea530e0806dd685e9c5574bfa36bb28aa3d182577c121babb
-SIZE (rubygem/activemodel-5.1.3.gem) = 51200
+TIMESTAMP = 1504891636
+SHA256 (rubygem/activemodel-5.1.4.gem) = 4008ad8f54e149ddf3a7173aba743bf8b39e4eba517e91ba8704aea739129a63
+SIZE (rubygem/activemodel-5.1.4.gem) = 51200
diff --git a/databases/rubygem-activemodel50/Makefile b/databases/rubygem-activemodel50/Makefile
index bcb242eadbd8..1199e407572c 100644
--- a/databases/rubygem-activemodel50/Makefile
+++ b/databases/rubygem-activemodel50/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	activemodel
-PORTVERSION=	5.0.5
+PORTVERSION=	5.0.6
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	50
diff --git a/databases/rubygem-activemodel50/distinfo b/databases/rubygem-activemodel50/distinfo
index 03bbe3508e8f..d7baab6d6a17 100644
--- a/databases/rubygem-activemodel50/distinfo
+++ b/databases/rubygem-activemodel50/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501604005
-SHA256 (rubygem/activemodel-5.0.5.gem) = e6b8fc4ffb6ab748b28e5a234d1d2f3e49689b0655166e188014a582b50cdee2
-SIZE (rubygem/activemodel-5.0.5.gem) = 53760
+TIMESTAMP = 1504891726
+SHA256 (rubygem/activemodel-5.0.6.gem) = f8f7d7e18df7fef01c1c299619c60e9b2becafc141450c3482b95ea85b6eebd6
+SIZE (rubygem/activemodel-5.0.6.gem) = 53760
diff --git a/databases/rubygem-activerecord-import/Makefile b/databases/rubygem-activerecord-import/Makefile
index 3449f3f1f0d2..0f00b80873eb 100644
--- a/databases/rubygem-activerecord-import/Makefile
+++ b/databases/rubygem-activerecord-import/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	activerecord-import
-PORTVERSION=	0.19.1
+PORTVERSION=	0.20.0
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 
diff --git a/databases/rubygem-activerecord-import/distinfo b/databases/rubygem-activerecord-import/distinfo
index 886354bdd39b..5082ec470ef4 100644
--- a/databases/rubygem-activerecord-import/distinfo
+++ b/databases/rubygem-activerecord-import/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500642211
-SHA256 (rubygem/activerecord-import-0.19.1.gem) = 3990047f5fe5a90594e26001f9eef85614355fdc557d491af6babd2c72e9e812
-SIZE (rubygem/activerecord-import-0.19.1.gem) = 49664
+TIMESTAMP = 1505293212
+SHA256 (rubygem/activerecord-import-0.20.0.gem) = b692da7946c75aa9777b6b1a7bd492c0835c0989d6905411775031af57d85a92
+SIZE (rubygem/activerecord-import-0.20.0.gem) = 51200
diff --git a/databases/rubygem-activerecord5/Makefile b/databases/rubygem-activerecord5/Makefile
index db0f004fd021..e16e2e23abae 100644
--- a/databases/rubygem-activerecord5/Makefile
+++ b/databases/rubygem-activerecord5/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	activerecord
-PORTVERSION=	5.1.3
+PORTVERSION=	5.1.4
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	5
diff --git a/databases/rubygem-activerecord5/distinfo b/databases/rubygem-activerecord5/distinfo
index 3d53d83a434f..ab490ef99671 100644
--- a/databases/rubygem-activerecord5/distinfo
+++ b/databases/rubygem-activerecord5/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501862673
-SHA256 (rubygem/activerecord-5.1.3.gem) = e83b04f42519e94a0aa51af06e61ea8aaacfa5cb8d67a1aebaf6f11d96ba7725
-SIZE (rubygem/activerecord-5.1.3.gem) = 352768
+TIMESTAMP = 1504891643
+SHA256 (rubygem/activerecord-5.1.4.gem) = 89be7874c962070c47ce52ea1182b9920c40f74f27da6d43670ed976aeb2413e
+SIZE (rubygem/activerecord-5.1.4.gem) = 353280
diff --git a/databases/rubygem-activerecord50/Makefile b/databases/rubygem-activerecord50/Makefile
index 1652f0b4cf4b..222005c58ca6 100644
--- a/databases/rubygem-activerecord50/Makefile
+++ b/databases/rubygem-activerecord50/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	activerecord
-PORTVERSION=	5.0.5
+PORTVERSION=	5.0.6
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	50
diff --git a/databases/rubygem-activerecord50/distinfo b/databases/rubygem-activerecord50/distinfo
index d72348204bb7..39aa4f377e85 100644
--- a/databases/rubygem-activerecord50/distinfo
+++ b/databases/rubygem-activerecord50/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501604013
-SHA256 (rubygem/activerecord-5.0.5.gem) = 89651a138aaf0755d2a9db7cda3e914e93f86b4504bcb31b41fb379e2dde28de
-SIZE (rubygem/activerecord-5.0.5.gem) = 361984
+TIMESTAMP = 1504891734
+SHA256 (rubygem/activerecord-5.0.6.gem) = f0065962596bb8d483e0e308bca2611357e4844e86a9d53a99bbee826aa85a19
+SIZE (rubygem/activerecord-5.0.6.gem) = 361984
diff --git a/databases/speedtables/Makefile b/databases/speedtables/Makefile
index 11386cee2b93..ef4a69125c1d 100644
--- a/databases/speedtables/Makefile
+++ b/databases/speedtables/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	speedtables
-PORTVERSION=	1.13.3
-#DISTVERSIONPREFIX=	v
-PORTREVISION=	0
+PORTVERSION=	1.13.5
+DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 
 MAINTAINER=	gahr@FreeBSD.org
@@ -17,14 +16,14 @@ LIB_DEPENDS=	libtclx8.4.so:lang/tclX \
 		libboost_graph.so:devel/boost-libs
 RUN_DEPENDS=	${LOCALBASE}/lib/tcllib/ncgi/ncgi.tcl:devel/tcllib
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	flightaware
-
 USES=		autoreconf tcl:tea
 CONFIGURE_ARGS=	--with-boost=${LOCALBASE}
 MAKE_ENV=	TCLSH=${TCLSH}
 TEST_TARGET=	test
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	flightaware
+
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS PGSQL CASSANDRA
@@ -34,14 +33,6 @@ PGSQL_LIB_DEPENDS=	libpgtcl2.0.0.so:databases/postgresql94-pgtcl
 CASSANDRA_CONFIGURE_ON=	--with-casstcl=${LOCALBASE}
 CASSANDRA_LIB_DEPENDS=	libcasstcl.so:databases/casstcl
 
-post-patch:
-	# https://github.com/flightaware/speedtables/commit/33d3d
-	${REINPLACE_CMD} -e 's|fixed-defaults|fixed-default|' \
-	    ${WRKSRC}/ctables/tests/Makefile.in
-
-post-configure:
-	${CHMOD} a+x ${WRKSRC}/ctable_server/sttp
-
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/ctables/docs/manual && \
diff --git a/databases/speedtables/distinfo b/databases/speedtables/distinfo
index 89b0b76e7b0b..0f6d6740e5c0 100644
--- a/databases/speedtables/distinfo
+++ b/databases/speedtables/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504255513
-SHA256 (flightaware-speedtables-1.13.3_GH0.tar.gz) = 4cb7e44ffbbfcc8cee3da4b3a7ef454eb6229ebd111be45446323fe11ee81a3b
-SIZE (flightaware-speedtables-1.13.3_GH0.tar.gz) = 737623
+TIMESTAMP = 1505293476
+SHA256 (flightaware-speedtables-v1.13.5_GH0.tar.gz) = 5a39a335e415b82f6206e319ec5795da8d341aa0239b7ffee4f1aaa27f5b39b5
+SIZE (flightaware-speedtables-v1.13.5_GH0.tar.gz) = 738053
diff --git a/databases/sqlitestudio/Makefile b/databases/sqlitestudio/Makefile
index 531585e21b1c..7e40bac82bd2 100644
--- a/databases/sqlitestudio/Makefile
+++ b/databases/sqlitestudio/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	sqlitestudio
 PORTVERSION=	3.1.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases
 MASTER_SITES=	http://sqlitestudio.pl/files/sqlitestudio3/complete/tar/
 
diff --git a/databases/tarantool/Makefile b/databases/tarantool/Makefile
index 69343463716d..fa0dc8bc238a 100644
--- a/databases/tarantool/Makefile
+++ b/databases/tarantool/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	tarantool
 PORTVERSION=	1.7.4.260
+PORTREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	http://download.tarantool.org/tarantool/1.7/src/
 
diff --git a/databases/tarantool/files/tarantool.in b/databases/tarantool/files/tarantool.in
index 68a440cd3b4a..ad8b5645e29d 100644
--- a/databases/tarantool/files/tarantool.in
+++ b/databases/tarantool/files/tarantool.in
@@ -24,7 +24,7 @@ start_cmd="${name}_start"
 stop_cmd="${name}_stop"
 restart_cmd="${name}_restart"
 
-INSTANCES=$(find ${tarantool_instances} -type l -name '*.lua')
+INSTANCES=$(find ${tarantool_instances} -type l -name '*.lua' 2>/dev/null)
 TDAEMON=%%PREFIX%%/bin/tarantool
 TCTL=%%PREFIX%%/bin/tarantoolctl
 
diff --git a/databases/timescaledb/Makefile b/databases/timescaledb/Makefile
index 58311b5637f4..2c311e0559e5 100644
--- a/databases/timescaledb/Makefile
+++ b/databases/timescaledb/Makefile
@@ -2,13 +2,15 @@
 # $FreeBSD$
 
 PORTNAME=	timescaledb
-PORTVERSION=	0.4.0
+PORTVERSION=	0.4.1
+PORTREVISION=	1
 CATEGORIES=	databases
 
 MAINTAINER=	kbowling@FreeBSD.org
 COMMENT=	Time-series database built on PostgreSQL
 
 LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		compiler:c11 gmake pgsql:9.6
 USE_LDCONFIG=	yes
@@ -25,7 +27,8 @@ PLIST_FILES=	lib/postgresql/timescaledb.so \
 		share/postgresql/extension/timescaledb--0.1.0--0.2.0.sql \
 		share/postgresql/extension/timescaledb--0.2.0--0.3.0.sql \
 		share/postgresql/extension/timescaledb--0.3.0--0.4.0.sql \
-		share/postgresql/extension/timescaledb--0.4.0.sql \
+		share/postgresql/extension/timescaledb--0.4.0--0.4.1.sql \
+		share/postgresql/extension/timescaledb--0.4.1.sql \
 		share/postgresql/extension/timescaledb.control
 
 post-install:
diff --git a/databases/timescaledb/distinfo b/databases/timescaledb/distinfo
index ebe4cbae9892..a747f681caa7 100644
--- a/databases/timescaledb/distinfo
+++ b/databases/timescaledb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503805812
-SHA256 (timescale-timescaledb-0.4.0_GH0.tar.gz) = 4febba22891bfb3dd3b6e5515a27012faa3cdc30ff5a22a904c947456c9625c5
-SIZE (timescale-timescaledb-0.4.0_GH0.tar.gz) = 194933
+TIMESTAMP = 1504590249
+SHA256 (timescale-timescaledb-0.4.1_GH0.tar.gz) = 2e1520646c2a8c6eaa5626d2dbc0d9befef8c7e181f4dbf5982535d96953afed
+SIZE (timescale-timescaledb-0.4.1_GH0.tar.gz) = 215040
diff --git a/databases/timescaledb/pkg-message b/databases/timescaledb/pkg-message
index 213a6fc01fdb..12195de2759a 100644
--- a/databases/timescaledb/pkg-message
+++ b/databases/timescaledb/pkg-message
@@ -4,4 +4,4 @@ run
 	CREATE EXTENSION IF NOT EXISTS timescaledb CASCADE;
 
 If you are upgrading, restart PostgreSQL server and run
-	ALTER EXTENSION timescaledb UPDATE TO '0.4.0';
+	ALTER EXTENSION timescaledb UPDATE TO '0.4.1';
diff --git a/databases/vsqlite/Makefile b/databases/vsqlite/Makefile
index fb56f076b279..e8eb7340b005 100644
--- a/databases/vsqlite/Makefile
+++ b/databases/vsqlite/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	vsqlite
 PORTVERSION=	0.3.13
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	databases
 
 MAINTAINER=	kwm@FreeBSD.org
diff --git a/deskutils/easystroke/Makefile b/deskutils/easystroke/Makefile
index 36a7d75eeed5..6c95f115af93 100644
--- a/deskutils/easystroke/Makefile
+++ b/deskutils/easystroke/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	easystroke
 PORTVERSION=	0.6.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	deskutils
 MASTER_SITES=	SF
 
diff --git a/deskutils/etask/Makefile b/deskutils/etask/Makefile
index 3161ca13a86c..9a8d93e9293d 100644
--- a/deskutils/etask/Makefile
+++ b/deskutils/etask/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	etask
 PORTVERSION=	0.3.91
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	deskutils elisp
 MASTER_SITES=	http://members.chello.at/rene.weichselbaum/ \
 		http://dryice.name/computer/FreeBSD/distfiles/
diff --git a/deskutils/fusenshi/Makefile b/deskutils/fusenshi/Makefile
index 85999a2f73f7..10453a868247 100644
--- a/deskutils/fusenshi/Makefile
+++ b/deskutils/fusenshi/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	fusenshi
 PORTVERSION=	0.9.0
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	deskutils
 MASTER_SITES=	http://www.ongs.co.jp/projects/fusenshi/
 
diff --git a/deskutils/gnome-photos/Makefile b/deskutils/gnome-photos/Makefile
index 6d6ce22d4cb1..3387e73191e1 100644
--- a/deskutils/gnome-photos/Makefile
+++ b/deskutils/gnome-photos/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gnome-photos
 PORTVERSION=	3.24.2
+PORTREVISION=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
diff --git a/deskutils/go-for-it/Makefile b/deskutils/go-for-it/Makefile
index 3ab62f905c16..6a96a0e5b078 100644
--- a/deskutils/go-for-it/Makefile
+++ b/deskutils/go-for-it/Makefile
@@ -14,15 +14,15 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BUILD_DEPENDS=	valac:lang/vala
 LIB_DEPENDS=	libnotify.so:devel/libnotify
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	mank319
-GH_PROJECT=	Go-For-It
-
-GNU_CONFIGURE=	yes
 USES=		cmake gettext pkgconfig
 USE_GNOME=	cairo glib20 gtk30
+GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	mank319
+GH_PROJECT=	Go-For-It
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/data/go-for-it.desktop \
 		${STAGEDIR}${PREFIX}/share/applications
diff --git a/deskutils/go-for-it/files/patch-src_TaskStore.vala b/deskutils/go-for-it/files/patch-src_TaskStore.vala
new file mode 100644
index 000000000000..febf49197355
--- /dev/null
+++ b/deskutils/go-for-it/files/patch-src_TaskStore.vala
@@ -0,0 +1,14 @@
+--- src/TaskStore.vala.orig	2016-12-18 13:54:36 UTC
++++ src/TaskStore.vala
+@@ -86,7 +86,11 @@ class TaskStore : Gtk.ListStore {
+     public void remove_task (Gtk.TreeIter iter) {
+         bool is_active_task = compare_tasks (iter);
+         var _active_task = active_task;
++#if VALA_0_36
++        this.remove (ref iter);
++#else
+         this.remove (iter);
++#endif
+         if (is_active_task && _active_task == active_task) {
+             active_task = null;
+             refresh_active_task ();
diff --git a/deskutils/growl-for-linux/Makefile b/deskutils/growl-for-linux/Makefile
index b51cfc4ea59b..3c810463a66d 100644
--- a/deskutils/growl-for-linux/Makefile
+++ b/deskutils/growl-for-linux/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	growl-for-linux
 PORTVERSION=	0.8.5
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	deskutils
 
 MAINTAINER=	nivit@FreeBSD.org
diff --git a/deskutils/homerun/Makefile b/deskutils/homerun/Makefile
index ac46512e5717..e3ff7fd66090 100644
--- a/deskutils/homerun/Makefile
+++ b/deskutils/homerun/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	homerun
 PORTVERSION=	0.2.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	deskutils
 MASTER_SITES=	KDE/unstable/${PORTNAME}/src/
 
diff --git a/deskutils/howm/Makefile b/deskutils/howm/Makefile
index 1573b0507f96..5cec2172d5f3 100644
--- a/deskutils/howm/Makefile
+++ b/deskutils/howm/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	howm
 PORTVERSION=	1.4.3
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	http://howm.sourceforge.jp/a/
 
diff --git a/deskutils/kdeconnect/Makefile b/deskutils/kdeconnect/Makefile
index 59e13050e6dc..a7bddcce4f60 100644
--- a/deskutils/kdeconnect/Makefile
+++ b/deskutils/kdeconnect/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kdeconnect-kde
 PORTVERSION=	0.7.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	deskutils
 MASTER_SITES=	KDE/unstable/kdeconnect/${PORTVERSION}/src/
 
diff --git a/deskutils/owncloudclient/Makefile b/deskutils/owncloudclient/Makefile
index b2ef38db8842..780970ecdca7 100644
--- a/deskutils/owncloudclient/Makefile
+++ b/deskutils/owncloudclient/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	owncloudclient
 PORTVERSION=	2.3.2
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	deskutils
 
diff --git a/deskutils/pinot/Makefile b/deskutils/pinot/Makefile
index 39b1772ec41d..425b18ec1bdc 100644
--- a/deskutils/pinot/Makefile
+++ b/deskutils/pinot/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pinot
 PORTVERSION=	1.09
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	deskutils
 
 MAINTAINER=	thierry@FreeBSD.org
diff --git a/deskutils/py-vobject/Makefile b/deskutils/py-vobject/Makefile
index 3cf435077ba8..913b0710ae21 100644
--- a/deskutils/py-vobject/Makefile
+++ b/deskutils/py-vobject/Makefile
@@ -2,18 +2,27 @@
 # $FreeBSD$
 
 PORTNAME=	vobject
-PORTVERSION=	0.8.1c
-PORTREVISION=	2
+PORTVERSION=	0.9.5
 CATEGORIES=	deskutils python
-MASTER_SITES=	http://vobject.skyhouseconsulting.com/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	jun-g@daemonfreaks.com
 COMMENT=	ICalendar library
 
-RUN_DEPENDS=	py*-dateutil>=1.1:devel/py-dateutil
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE-2.0.txt
 
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=2.4.0:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
+
+NO_ARCH=	yes
 USES=		python
 USE_PYTHON=	distutils autoplist
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	eventable
+
+do-test:
+	@cd ${WRKSRC} && ${PYTHON_CMD} tests.py
+
 .include <bsd.port.mk>
diff --git a/deskutils/py-vobject/distinfo b/deskutils/py-vobject/distinfo
index 9763b8c5d2a7..aefcfd21b45a 100644
--- a/deskutils/py-vobject/distinfo
+++ b/deskutils/py-vobject/distinfo
@@ -1,2 +1,3 @@
-SHA256 (vobject-0.8.1c.tar.gz) = 594113117f2017ed837c8f3ce727616f9053baa5a5463a7420c8249b8fc556f5
-SIZE (vobject-0.8.1c.tar.gz) = 59925
+TIMESTAMP = 1502588702
+SHA256 (eventable-vobject-0.9.5_GH0.tar.gz) = 344bd0e2b95c507a1b99fee44f4f2bf3e12991f14b6f181bf98eed42162db764
+SIZE (eventable-vobject-0.9.5_GH0.tar.gz) = 215577
diff --git a/deskutils/py-vobject/pkg-descr b/deskutils/py-vobject/pkg-descr
index 70c39272ca81..de93a649952f 100644
--- a/deskutils/py-vobject/pkg-descr
+++ b/deskutils/py-vobject/pkg-descr
@@ -2,4 +2,4 @@ Vobject parses iCalendar and vCard files into Python data structures,
 decoding the relevant encodings. Also serializes vobject data structures
 to iCalendar, vCard, or (expirementally) hCalendar unicode strings.
 
-WWW: http://vobject.skyhouseconsulting.com/
+WWW: http://eventable.github.io/vobject/
diff --git a/deskutils/qorganizer/pkg-descr b/deskutils/qorganizer/pkg-descr
index a29927c42143..cc258f4a8587 100644
--- a/deskutils/qorganizer/pkg-descr
+++ b/deskutils/qorganizer/pkg-descr
@@ -1,6 +1,6 @@
 qOrganizer is a general organizer that includes a calendar with schedule,
-reminders,journal/notes for every day, to-do list.But provides features
-useful for students such as:timetable and a booklet for marks and absences.
+reminders, journal/notes for every day, to-do list. But provides features
+useful for students, such as timetable and a booklet for marks and absences.
 It's designed to be easy to use.
 
 WWW: http://qorganizer.sourceforge.net/
diff --git a/deskutils/sliderule/Makefile b/deskutils/sliderule/Makefile
index 294f8d4b5802..bd61cbdb0e52 100644
--- a/deskutils/sliderule/Makefile
+++ b/deskutils/sliderule/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	sliderule
 PORTVERSION=	1.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	deskutils
 MASTER_SITES=	LOCAL/joerg
 DISTNAME=	${PORTNAME}
diff --git a/deskutils/taskd/Makefile b/deskutils/taskd/Makefile
index 6a667df3e40f..c4353c50ef92 100644
--- a/deskutils/taskd/Makefile
+++ b/deskutils/taskd/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	taskd
 PORTVERSION=	1.1.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	deskutils
 MASTER_SITES=	http://taskwarrior.org/download/
 
diff --git a/deskutils/taskwarrior/Makefile b/deskutils/taskwarrior/Makefile
index 4415c3914125..b9164071ff16 100644
--- a/deskutils/taskwarrior/Makefile
+++ b/deskutils/taskwarrior/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	taskwarrior
 PORTVERSION=	2.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils
 
 MAINTAINER=	skreuzer@FreeBSD.org
diff --git a/deskutils/treesheets/Makefile b/deskutils/treesheets/Makefile
index 1b7f0d51c67f..67819bb71523 100644
--- a/deskutils/treesheets/Makefile
+++ b/deskutils/treesheets/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	treesheets
 PORTVERSION=	0.0.20170806
+PORTREVISION=	1
 CATEGORIES=	deskutils
 
 MAINTAINER=	lightside@gmx.com
diff --git a/deskutils/xneur/Makefile b/deskutils/xneur/Makefile
index 7ac4daf92a9c..6914fcc12980 100644
--- a/deskutils/xneur/Makefile
+++ b/deskutils/xneur/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xneur
 PORTVERSION=	0.17.0
-PORTREVISION=	2
+PORTREVISION=	3
 DISTVERSIONSUFFIX=.orig
 CATEGORIES=	deskutils
 MASTER_SITES=	https://launchpad.net/~andrew-crew-kuznetsov/+archive/xneur-stable/+files/
diff --git a/devel/Makefile b/devel/Makefile
index 4740a91a9158..abdbcba0068d 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -35,8 +35,10 @@
     SUBDIR += R-cran-gmodels
     SUBDIR += R-cran-gsubfn
     SUBDIR += R-cran-gtools
+    SUBDIR += R-cran-hms
     SUBDIR += R-cran-iterators
     SUBDIR += R-cran-itertools
+    SUBDIR += R-cran-lubridate
     SUBDIR += R-cran-magrittr
     SUBDIR += R-cran-memoise
     SUBDIR += R-cran-microbenchmark
@@ -61,6 +63,7 @@
     SUBDIR += R-cran-tibble
     SUBDIR += R-cran-tidyr
     SUBDIR += R-cran-tidyselect
+    SUBDIR += R-cran-withr
     SUBDIR += SpecTcl
     SUBDIR += aap
     SUBDIR += aarch64-binutils
@@ -132,6 +135,7 @@
     SUBDIR += arm-none-eabi-gdb
     SUBDIR += arm-none-eabi-newlib
     SUBDIR += aros-sdk
+    SUBDIR += arpc
     SUBDIR += art
     SUBDIR += artifactory
     SUBDIR += as31
@@ -319,7 +323,6 @@
     SUBDIR += cmake-doc
     SUBDIR += cmake-fedora
     SUBDIR += cmake-gui
-    SUBDIR += cmake-modules
     SUBDIR += cmake-modules-webos
     SUBDIR += cmph
     SUBDIR += cmunge
@@ -407,8 +410,8 @@
     SUBDIR += cxref
     SUBDIR += cxxtest
     SUBDIR += cxxtools
-    SUBDIR += d-scanner
     SUBDIR += d-feet
+    SUBDIR += d-scanner
     SUBDIR += darts
     SUBDIR += dash.el
     SUBDIR += datadraw
@@ -511,6 +514,7 @@
     SUBDIR += elixir-exjsx
     SUBDIR += elixir-exprotobuf
     SUBDIR += elixir-exrm
+    SUBDIR += elixir-gen_stage
     SUBDIR += elixir-gen_state_machine
     SUBDIR += elixir-gettext
     SUBDIR += elixir-hex
@@ -1083,9 +1087,9 @@
     SUBDIR += hs-mueval
     SUBDIR += hs-murmur-hash
     SUBDIR += hs-mutable-containers
-    SUBDIR += hs-newtype-generics
     SUBDIR += hs-ncurses
     SUBDIR += hs-newtype
+    SUBDIR += hs-newtype-generics
     SUBDIR += hs-old-locale
     SUBDIR += hs-old-time
     SUBDIR += hs-optparse-applicative
@@ -1186,8 +1190,8 @@
     SUBDIR += idutils
     SUBDIR += imake
     SUBDIR += include-what-you-use
-    SUBDIR += inilib
     SUBDIR += inifiled
+    SUBDIR += inilib
     SUBDIR += iniparser
     SUBDIR += initutil
     SUBDIR += injeqt
@@ -1571,6 +1575,7 @@
     SUBDIR += libxalloc
     SUBDIR += libxo
     SUBDIR += libxs
+    SUBDIR += libzim
     SUBDIR += libzookeeper
     SUBDIR += libzrtpcpp
     SUBDIR += libzvbi
@@ -1620,6 +1625,7 @@
     SUBDIR += llvm38
     SUBDIR += llvm39
     SUBDIR += llvm40
+    SUBDIR += llvm50
     SUBDIR += lm4tools
     SUBDIR += lmdbg
     SUBDIR += lndir
@@ -1675,8 +1681,8 @@
     SUBDIR += marisa-trie
     SUBDIR += mate-common
     SUBDIR += matreshka
-    SUBDIR += maven-wrapper
     SUBDIR += maven
+    SUBDIR += maven-wrapper
     SUBDIR += maven3
     SUBDIR += maven31
     SUBDIR += maven33
@@ -1722,8 +1728,8 @@
     SUBDIR += mpatrol
     SUBDIR += mph
     SUBDIR += mq4cpp
-    SUBDIR += msgpack-d
     SUBDIR += msgpack
+    SUBDIR += msgpack-d
     SUBDIR += msgpuck
     SUBDIR += msp430-debug-stack
     SUBDIR += mspdebug
@@ -4226,8 +4232,8 @@
     SUBDIR += py-asyncio
     SUBDIR += py-atomiclong
     SUBDIR += py-atomicwrites
-    SUBDIR += py-attrs
     SUBDIR += py-atpublic
+    SUBDIR += py-attrs
     SUBDIR += py-automaton
     SUBDIR += py-avro
     SUBDIR += py-babel
@@ -4918,8 +4924,8 @@
     SUBDIR += py-vcrpy
     SUBDIR += py-vcversioner
     SUBDIR += py-venusian
-    SUBDIR += py-versiontools
     SUBDIR += py-verboselogs
+    SUBDIR += py-versiontools
     SUBDIR += py-virtualenv
     SUBDIR += py-virtualenv-clone
     SUBDIR += py-virtualenvwrapper
@@ -5100,6 +5106,7 @@
     SUBDIR += py3-six
     SUBDIR += py3-tabulate
     SUBDIR += py3-threema-msgapi
+    SUBDIR += py3-toposort
     SUBDIR += py3-tox
     SUBDIR += py3-tzlocal
     SUBDIR += py3-urwid
@@ -6060,6 +6067,7 @@
     SUBDIR += yajl-tcl
     SUBDIR += yaml-cpp
     SUBDIR += yaml-cpp03
+    SUBDIR += yaml2argdata
     SUBDIR += yasm
     SUBDIR += yasm-devel
     SUBDIR += z80-asm
diff --git a/devel/R-cran-caret/Makefile b/devel/R-cran-caret/Makefile
index bc7f0292ef07..f39191e3bffd 100644
--- a/devel/R-cran-caret/Makefile
+++ b/devel/R-cran-caret/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	caret
-DISTVERSION=	6.0-76
+DISTVERSION=	6.0-77
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
@@ -12,11 +12,12 @@ COMMENT=	Classification and Regression Training
 LICENSE=	GPLv2+
 
 CRAN_DEPENDS=	R-cran-ggplot2>0:graphics/R-cran-ggplot2 \
-		R-cran-car>0:math/R-cran-car \
 		R-cran-foreach>0:devel/R-cran-foreach \
 		R-cran-plyr>0:devel/R-cran-plyr \
 		R-cran-ModelMetrics>=1.1.0:devel/R-cran-ModelMetrics \
-		R-cran-reshape2>0:devel/R-cran-reshape2
+		R-cran-reshape2>0:devel/R-cran-reshape2 \
+		R-cran-recipes>0.0.1:math/R-cran-recipes \
+		R-cran-withr>=2.0.0:devel/R-cran-withr
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
diff --git a/devel/R-cran-caret/distinfo b/devel/R-cran-caret/distinfo
index 98dbe3dc8ea7..c83259cc1aee 100644
--- a/devel/R-cran-caret/distinfo
+++ b/devel/R-cran-caret/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1493943975
-SHA256 (caret_6.0-76.tar.gz) = 8c210893d9be02b5ce09153302d72205dba8bab47c077db4c9e62259efef61f0
-SIZE (caret_6.0-76.tar.gz) = 2362161
+TIMESTAMP = 1504921326
+SHA256 (caret_6.0-77.tar.gz) = beec200e18a0bbcefa6ba0380b50bea2faf535ac66c4e7febd56e8630a018515
+SIZE (caret_6.0-77.tar.gz) = 4668444
diff --git a/devel/R-cran-hms/Makefile b/devel/R-cran-hms/Makefile
new file mode 100644
index 000000000000..1c9160c368ab
--- /dev/null
+++ b/devel/R-cran-hms/Makefile
@@ -0,0 +1,16 @@
+# Created by: TAKATSU Tomonari <tota@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	hms
+PORTVERSION=	0.3
+CATEGORIES=	devel
+DISTNAME=	${PORTNAME}_${PORTVERSION}
+
+MAINTAINER=	tota@FreeBSD.org
+COMMENT=	Pretty Time of Day
+
+LICENSE=	GPLv3
+
+USES=		cran:auto-plist
+
+.include <bsd.port.mk>
diff --git a/devel/R-cran-hms/distinfo b/devel/R-cran-hms/distinfo
new file mode 100644
index 000000000000..ba42e5deecb2
--- /dev/null
+++ b/devel/R-cran-hms/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1504684615
+SHA256 (hms_0.3.tar.gz) = 9368259cbc1094ce0e4cf61544875ec30088ef690d6667e6b0b564218ab3ff88
+SIZE (hms_0.3.tar.gz) = 7271
diff --git a/devel/R-cran-hms/pkg-descr b/devel/R-cran-hms/pkg-descr
new file mode 100644
index 000000000000..64cc372be5ba
--- /dev/null
+++ b/devel/R-cran-hms/pkg-descr
@@ -0,0 +1,4 @@
+Implements an S3 class for storing and formatting time-of-day values,
+based on the 'difftime' class.
+
+WWW: https://cran.r-project.org/web/packages/hms/
diff --git a/devel/R-cran-lubridate/Makefile b/devel/R-cran-lubridate/Makefile
new file mode 100644
index 000000000000..f5ee33e5c486
--- /dev/null
+++ b/devel/R-cran-lubridate/Makefile
@@ -0,0 +1,20 @@
+# Created by: TAKATSU Tomonari <tota@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	lubridate
+PORTVERSION=	1.6.0
+CATEGORIES=	devel
+DISTNAME=	${PORTNAME}_${PORTVERSION}
+
+MAINTAINER=	tota@FreeBSD.org
+COMMENT=	Make Dealing with Dates a Little Easier
+
+LICENSE=	GPLv2
+
+CRAN_DEPENDS=	R-cran-stringr>0:textproc/R-cran-stringr
+BUILD_DEPENDS=	${CRAN_DEPENDS}
+RUN_DEPENDS=	${CRAN_DEPENDS}
+
+USES=		cran:auto-plist,compiles
+
+.include <bsd.port.mk>
diff --git a/devel/R-cran-lubridate/distinfo b/devel/R-cran-lubridate/distinfo
new file mode 100644
index 000000000000..b74cbd6c8864
--- /dev/null
+++ b/devel/R-cran-lubridate/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1505036380
+SHA256 (lubridate_1.6.0.tar.gz) = 1a87edfc2c57b22b6d9b49354545dd063e6c03a415544090b531c42423cf2632
+SIZE (lubridate_1.6.0.tar.gz) = 317672
diff --git a/devel/R-cran-lubridate/pkg-descr b/devel/R-cran-lubridate/pkg-descr
new file mode 100644
index 000000000000..ac6097c415de
--- /dev/null
+++ b/devel/R-cran-lubridate/pkg-descr
@@ -0,0 +1,8 @@
+Functions to work with date-times and time-spans: fast and user
+friendly parsing of date-time data, extraction and updating of
+components of a date-time (years, months, days, hours, minutes, and
+seconds), algebraic manipulation on date-time and time-span objects.
+The 'lubridate' package has a consistent and memorable syntax that
+makes working with dates easy and fun.
+
+WWW: https://cran.r-project.org/web/packages/lubridate/
diff --git a/devel/R-cran-rstudioapi/Makefile b/devel/R-cran-rstudioapi/Makefile
index b9f612480b66..6f766de90b36 100644
--- a/devel/R-cran-rstudioapi/Makefile
+++ b/devel/R-cran-rstudioapi/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	rstudioapi
-PORTVERSION=	0.6
+PORTVERSION=	0.7
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
diff --git a/devel/R-cran-rstudioapi/distinfo b/devel/R-cran-rstudioapi/distinfo
index c123f67c116f..4656cf1536a1 100644
--- a/devel/R-cran-rstudioapi/distinfo
+++ b/devel/R-cran-rstudioapi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1467261897
-SHA256 (rstudioapi_0.6.tar.gz) = da24c6cdb13af1bdf4261671a065dcca4c1b7af1412cb810eb805bf3c5f97bfe
-SIZE (rstudioapi_0.6.tar.gz) = 12024
+TIMESTAMP = 1505080783
+SHA256 (rstudioapi_0.7.tar.gz) = a541bc76ef082d2c27e42fd683f8262cb195b1497af3509178d2642870397a8c
+SIZE (rstudioapi_0.7.tar.gz) = 39845
diff --git a/devel/R-cran-withr/Makefile b/devel/R-cran-withr/Makefile
new file mode 100644
index 000000000000..714044339ebd
--- /dev/null
+++ b/devel/R-cran-withr/Makefile
@@ -0,0 +1,16 @@
+# Created by: TAKATSU Tomonari <tota@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	withr
+PORTVERSION=	2.0.0
+CATEGORIES=	devel
+DISTNAME=	${PORTNAME}_${PORTVERSION}
+
+MAINTAINER=	tota@FreeBSD.org
+COMMENT=	Run Code 'With' Temporarily Modified Global State
+
+LICENSE=	GPLv2+
+
+USES=		cran:auto-plist
+
+.include <bsd.port.mk>
diff --git a/devel/R-cran-withr/distinfo b/devel/R-cran-withr/distinfo
new file mode 100644
index 000000000000..94d9f9b91859
--- /dev/null
+++ b/devel/R-cran-withr/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1505053715
+SHA256 (withr_2.0.0.tar.gz) = 36be55ca44cdf30517677f2e6e32d8bde4b581027714fb953a3d8fd19f4f9859
+SIZE (withr_2.0.0.tar.gz) = 16956
diff --git a/devel/R-cran-withr/pkg-descr b/devel/R-cran-withr/pkg-descr
new file mode 100644
index 000000000000..e8e28fb1fb34
--- /dev/null
+++ b/devel/R-cran-withr/pkg-descr
@@ -0,0 +1,6 @@
+A set of functions to run code 'with' safely and temporarily modified
+global state. Many of these functions were originally a part of the
+'devtools' package, this provides a simple package with limited
+dependencies to provide access to these functions.
+
+WWW: https://cran.r-project.org/web/packages/withr/
diff --git a/devel/acsccid/Makefile b/devel/acsccid/Makefile
index 579ee4fa1491..d1c76ff43fc0 100644
--- a/devel/acsccid/Makefile
+++ b/devel/acsccid/Makefile
@@ -9,7 +9,8 @@ MASTER_SITES=	SF
 MAINTAINER=	mp39590@gmail.com
 COMMENT=	PC/SC driver for CS CCID smart card readers
 
-LICENSE=	GPLv2
+LICENSE=	LGPL21+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpcsclite.so:devel/pcsc-lite
 
diff --git a/devel/acsccid/pkg-descr b/devel/acsccid/pkg-descr
index f15be82ce154..fb2203ffd888 100644
--- a/devel/acsccid/pkg-descr
+++ b/devel/acsccid/pkg-descr
@@ -3,4 +3,4 @@ smart card readers. This library provides a PC/SC IFD handler
 implementation and communicates with the readers through the PC/SC Lite
 resource manager (pcscd).
 
-WWW: http://www.acs.com.hk/en/driver/4/acr38-smart-card-reader/
+WWW: https://www.acs.com.hk/en/driver/4/acr38-smart-card-reader/
diff --git a/devel/aegis/Makefile b/devel/aegis/Makefile
index 6ff9b5a0bec1..252cfb87bb7d 100644
--- a/devel/aegis/Makefile
+++ b/devel/aegis/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	aegis
 PORTVERSION=	4.25
 DISTVERSIONSUFFIX=	.D510
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel
 MASTER_SITES=	SF
 
diff --git a/devel/android-tools-adb-devel/Makefile b/devel/android-tools-adb-devel/Makefile
index 38dc4519e904..000bd95ed727 100644
--- a/devel/android-tools-adb-devel/Makefile
+++ b/devel/android-tools-adb-devel/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 # Hint: git describe --abbrev=12 --match android-o-preview-4
-DISTVERSION=	o-preview-4-185
-DISTVERSIONSUFFIX=	-g2066e0585e9d
+DISTVERSION=	o-preview-4-4407
+DISTVERSIONSUFFIX=	-gcfadedb1391f
 PKGNAMESUFFIX=	-devel
 
 CONFLICTS_INSTALL=	${PORTNAME}-[0-9]*
diff --git a/devel/android-tools-adb-devel/distinfo b/devel/android-tools-adb-devel/distinfo
index f9c5b131cecb..7c1828a0013b 100644
--- a/devel/android-tools-adb-devel/distinfo
+++ b/devel/android-tools-adb-devel/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1503358470
-SHA256 (android-platform_system_core-android-o-preview-4-185-g2066e0585e9d_GH0.tar.gz) = 4bfa0a0dcb2da1b043668d95b474bdfb8733476f82b364647e4b633e623b8fc6
-SIZE (android-platform_system_core-android-o-preview-4-185-g2066e0585e9d_GH0.tar.gz) = 5228016
+TIMESTAMP = 1504840524
+SHA256 (android-platform_system_core-android-o-preview-4-4407-gcfadedb1391f_GH0.tar.gz) = 234a3c2d5f5b79946cf8cb2960c59c65eb46bea3e1f0a75130d55113db23503c
+SIZE (android-platform_system_core-android-o-preview-4-4407-gcfadedb1391f_GH0.tar.gz) = 5257246
 SHA256 (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = ca3311ba47a5edd56c929ac9aae57c02c2c3f1636519c5f67abb00b6e3ecd75c
 SIZE (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = 5967
 SHA256 (android-platform_development-android-o-preview-4-62-g417a8e237642_GH0.tar.gz) = 44ecd4159178ab9410c883954c0a3bf5b3bc6d6d6e485dad75267626e186604e
diff --git a/devel/android-tools-adb-devel/files/Makefile b/devel/android-tools-adb-devel/files/Makefile
index cf962936890a..615dd16f40de 100644
--- a/devel/android-tools-adb-devel/files/Makefile
+++ b/devel/android-tools-adb-devel/files/Makefile
@@ -101,7 +101,7 @@ SRCS+= stderr_write.c
 
 REVISION?= $$(${GIT} rev-parse --short=12 HEAD 2>/dev/null || echo unknown)
 
-CPPFLAGS+= -DADB_VERSION="\"0.0.0-${REVISION}-android\""
+CPPFLAGS+= -DADB_VERSION="\"26.0.0 rc1-${REVISION}-android\""
 CPPFLAGS+= -DADB_HOST=1
 CPPFLAGS+= -DHAVE_FORKEXEC=1
 CPPFLAGS+= -DHAVE_SYMLINKS
diff --git a/devel/android-tools-adb/Makefile b/devel/android-tools-adb/Makefile
index ba03bba95c76..6d8f2ba11e5a 100644
--- a/devel/android-tools-adb/Makefile
+++ b/devel/android-tools-adb/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	android-tools-adb
 DISTVERSIONPREFIX=	android-
 DISTVERSION?=	8.0.0_r4
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	devel comms
 
 .ifndef EXTRA_PATCHES
diff --git a/devel/android-tools-fastboot-devel/files/Makefile b/devel/android-tools-fastboot-devel/files/Makefile
index 82ef3a1d91d9..fedcf0098b17 100644
--- a/devel/android-tools-fastboot-devel/files/Makefile
+++ b/devel/android-tools-fastboot-devel/files/Makefile
@@ -101,7 +101,7 @@ SRCS+=	zip_archive.cc
 
 REVISION?=	$$(${GIT} rev-parse --short=12 HEAD 2>/dev/null || echo unknown)
 
-CPPFLAGS+=	-DFASTBOOT_VERSION="\"0.0.0-${REVISION}-android\""
+CPPFLAGS+=	-DFASTBOOT_VERSION="\"26.0.0 rc1-${REVISION}-android\""
 CPPFLAGS+=	-Doff64_t=off_t
 CPPFLAGS+=	-Dftruncate64=ftruncate
 CPPFLAGS+=	-Dlseek64=lseek
diff --git a/devel/android-tools-fastboot/Makefile b/devel/android-tools-fastboot/Makefile
index de2ff840700e..2d50d1bf2832 100644
--- a/devel/android-tools-fastboot/Makefile
+++ b/devel/android-tools-fastboot/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	android-tools-fastboot
 DISTVERSIONPREFIX=	android-
 DISTVERSION?=	8.0.0_r4
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	devel sysutils
 MASTER_SITES=	https://anonscm.debian.org/cgit/android-tools/android-tools.git/plain/debian/:manpage
 DISTFILES=	fastboot.1?id=706e754:manpage
diff --git a/devel/android-tools-simpleperf/Makefile b/devel/android-tools-simpleperf/Makefile
index 120d6ef72b1e..1027061cb5dd 100644
--- a/devel/android-tools-simpleperf/Makefile
+++ b/devel/android-tools-simpleperf/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	android-tools-simpleperf
 DISTVERSIONPREFIX=	android-
 DISTVERSION=	7.1.2_r17
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/devel/api-sanity-autotest/Makefile b/devel/api-sanity-autotest/Makefile
index 43c87fc92390..a71ae8b04213 100644
--- a/devel/api-sanity-autotest/Makefile
+++ b/devel/api-sanity-autotest/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	api-sanity-checker
 PORTVERSION=	1.98.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel perl5
 MASTER_SITES=	LOCAL/bf/${PORTNAME}
 
diff --git a/devel/argdata/Makefile b/devel/argdata/Makefile
index 0e63b2dc6a5b..51c9a8cfcdfc 100644
--- a/devel/argdata/Makefile
+++ b/devel/argdata/Makefile
@@ -2,8 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	argdata
-PORTVERSION=	0.6
-DISTVERSIONPREFIX=v
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.7
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	ed@FreeBSD.org
@@ -12,10 +13,9 @@ COMMENT=	Binary serialisation format inspired by YAML, MessagePack and nvlists
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	NuxiNL
-
 USES=		cmake compiler:c11 tar:xz
 USE_LDCONFIG=	yes
+USE_GITHUB=	yes
+GH_ACCOUNT=	NuxiNL
 
 .include <bsd.port.mk>
diff --git a/devel/argdata/distinfo b/devel/argdata/distinfo
index 9bf0a32abfff..d3dde195c281 100644
--- a/devel/argdata/distinfo
+++ b/devel/argdata/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502984887
-SHA256 (NuxiNL-argdata-v0.6_GH0.tar.gz) = 15983371932190f7488c5e0a597bc4c2510c35ed336cbbfb3407d78e2fbc303e
-SIZE (NuxiNL-argdata-v0.6_GH0.tar.gz) = 26548
+TIMESTAMP = 1504791313
+SHA256 (NuxiNL-argdata-v0.7_GH0.tar.gz) = ed48e65c9e4d1ee0d3d72adee9d7a64690e2afd15e0e4eec799ddf409f89799c
+SIZE (NuxiNL-argdata-v0.7_GH0.tar.gz) = 26849
diff --git a/devel/arpc/Makefile b/devel/arpc/Makefile
new file mode 100644
index 000000000000..12e7efc68018
--- /dev/null
+++ b/devel/arpc/Makefile
@@ -0,0 +1,39 @@
+# Created by: Ed Schouten <ed@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	arpc
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.5
+CATEGORIES=	devel
+
+MAINTAINER=	ed@FreeBSD.org
+COMMENT=	GRPC-like RPC library that supports file descriptor passing
+
+LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyPEG2>=2.15.2:textproc/py3-pyPEG2 \
+		${PYTHON_PKGNAMEPREFIX}toposort>=1.5:devel/py3-toposort
+LIB_DEPENDS=	libargdata.so:devel/argdata
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyPEG2>=2.15.2:textproc/py3-pyPEG2 \
+		${PYTHON_PKGNAMEPREFIX}toposort>=1.5:devel/py3-toposort
+
+USES=		cmake localbase:ldflags python:3 tar:xz
+USE_LDCONFIG=	yes
+USE_GITHUB=	yes
+GH_ACCOUNT=	NuxiNL
+
+PLIST_FILES=	bin/aprotoc include/arpc++/arpc++.h \
+		lib/libarpc.so lib/libarpc.so.1
+
+.include <bsd.port.pre.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100511
+IGNORE=		requires various C++17 features
+.endif
+
+# Require the unit tests to pass prior to installing.
+post-build:
+	@trap '' PIPE && ${WRKSRC}/arpc_tests
+
+.include <bsd.port.post.mk>
diff --git a/devel/arpc/distinfo b/devel/arpc/distinfo
new file mode 100644
index 000000000000..c87cb4fc0b29
--- /dev/null
+++ b/devel/arpc/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1502895324
+SHA256 (NuxiNL-arpc-v0.5_GH0.tar.gz) = 754853d37d83138e62f23eff95be8b3fa200238387d83e83453e6a5519458bed
+SIZE (NuxiNL-arpc-v0.5_GH0.tar.gz) = 1301060
diff --git a/devel/arpc/pkg-descr b/devel/arpc/pkg-descr
new file mode 100644
index 000000000000..55d6fb8ba99d
--- /dev/null
+++ b/devel/arpc/pkg-descr
@@ -0,0 +1,10 @@
+ARPC is a GRPC-like library that supports file descriptor passing.
+
+ARPC ships with a script, aprotoc, that works similar to Protobuf/GRPC's
+protoc. It generates message and service bindings, taking a .proto file
+as an input. Where ARPC differs from GRPC is that messages may contain
+file descriptors. These file descriptors are passed on to the remote
+side transparently. This makes ARPC useful for implementing privilege
+separation between processes.
+
+WWW: https://github.com/NuxiNL/arpc
diff --git a/devel/asmutils/Makefile b/devel/asmutils/Makefile
index e9a1d662aa9f..a7e639b9c229 100644
--- a/devel/asmutils/Makefile
+++ b/devel/asmutils/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	asmutils
 PORTVERSION=	0.18
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	http://asm.sourceforge.net/asmutils/
 
diff --git a/devel/atlas-devel/Makefile b/devel/atlas-devel/Makefile
index 17bf2a74aec9..ede9df28a97d 100644
--- a/devel/atlas-devel/Makefile
+++ b/devel/atlas-devel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Atlas
 PORTVERSION=	0.6.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel
 MASTER_SITES=	SF/worldforge/${PORTNAME}-C%2B%2B%20%28protocol%20lib%29/${PORTVERSION}
 DISTNAME=	${PORTNAME}-C++-${PORTVERSION:S/.r/rc/}
diff --git a/devel/aws-sdk-cpp/Makefile b/devel/aws-sdk-cpp/Makefile
index bb3ad4c81061..f64f1876e347 100644
--- a/devel/aws-sdk-cpp/Makefile
+++ b/devel/aws-sdk-cpp/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	aws-sdk-cpp
 PORTVERSION=	1.1.33
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/devel/bisoncpp/Makefile b/devel/bisoncpp/Makefile
index 54e5e44fac1c..80fc1f678bc6 100644
--- a/devel/bisoncpp/Makefile
+++ b/devel/bisoncpp/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	bisoncpp
 PORTVERSION=	4.10.01
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/bisonc%2B%2B/${PORTVERSION}
 DISTNAME=	bisonc++_${PORTVERSION}.orig
diff --git a/devel/bmake/Makefile b/devel/bmake/Makefile
index 443317b05f34..5ea6a9721ad6 100644
--- a/devel/bmake/Makefile
+++ b/devel/bmake/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bmake
-PORTVERSION=	20170510
+PORTVERSION=	20170812
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.netbsd.org/pub/NetBSD/misc/sjg/
 DISTFILES=	bmake-${PORTVERSION}.tar.gz mk-20170505.tar.gz
diff --git a/devel/bmake/distinfo b/devel/bmake/distinfo
index 6e22dd46691f..526a467bcbb3 100644
--- a/devel/bmake/distinfo
+++ b/devel/bmake/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1498422769
-SHA256 (bmake-20170510.tar.gz) = ce5d73a8b5267495132bd00392a411178155dafecd66b50860419e9cf8683e3c
-SIZE (bmake-20170510.tar.gz) = 552370
+TIMESTAMP = 1505064863
+SHA256 (bmake-20170812.tar.gz) = cdd9ea1aa5b84b7b892ddf2dccb1c21028de6ce0edf5684432e1f4bf861179c6
+SIZE (bmake-20170812.tar.gz) = 554613
 SHA256 (mk-20170505.tar.gz) = d0b83b19d87ff3228704ed32825cda5ae0091bdf7bda0121ee64fb831c592a24
 SIZE (mk-20170505.tar.gz) = 94846
diff --git a/devel/bossa/Makefile b/devel/bossa/Makefile
index 9e39cc90fddd..540053399839 100644
--- a/devel/bossa/Makefile
+++ b/devel/bossa/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	bossa
 PORTVERSION=	1.7.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 
 MAINTAINER=	kevans@FreeBSD.org
diff --git a/devel/bullet/Makefile b/devel/bullet/Makefile
index 1174201479ca..b0abe4d91d13 100644
--- a/devel/bullet/Makefile
+++ b/devel/bullet/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	bullet
 PORTVERSION=	2.86.1
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	acm@FreeBSD.org
diff --git a/devel/caf/Makefile b/devel/caf/Makefile
index 984387aa77cc..aa2c25baef14 100644
--- a/devel/caf/Makefile
+++ b/devel/caf/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	caf
 PORTVERSION=	0.15.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 
 MAINTAINER=	vallentin@icir.org
diff --git a/devel/cask/Makefile b/devel/cask/Makefile
index e8b6bfb02541..cb3cb1f1f500 100644
--- a/devel/cask/Makefile
+++ b/devel/cask/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	cask
 PORTVERSION=	0.8.1
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel elisp
 
diff --git a/devel/cccc/Makefile b/devel/cccc/Makefile
index 50f885dc8666..74757e330049 100644
--- a/devel/cccc/Makefile
+++ b/devel/cccc/Makefile
@@ -2,22 +2,24 @@
 # $FreeBSD$
 
 PORTNAME=	cccc
-PORTVERSION=	3.1.4
-PORTREVISION=	2
+DISTVERSION=	3.1.5
 CATEGORIES=	devel textproc www
-MASTER_SITES=	SF
 
 MAINTAINER=	pizzamig@FreeBSD.org
 COMMENT=	C and C++ Code Counter
 
 LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/cccc/COPYING
 
 USES=		gmake
+USE_GITHUB=	yes
+GH_ACCOUNT=	sarnold
+
 MAKEFILE=	makefile
 MAKE_ENV=	CCC="${CXX}" LD="${CXX}" CFLAGS_DEBUG="${CXXFLAGS}"
+ALL_TARGET=	cccc
 MAKE_JOBS_UNSAFE=	yes
-
-PORTDOCS=	readme.txt changes.txt
+PORTDOCS=	README.md CHANGELOG.md
 PLIST_FILES=	bin/cccc
 
 OPTIONS_DEFINE=	DOCS DEBUG
diff --git a/devel/cccc/distinfo b/devel/cccc/distinfo
index 96cb2150eef4..47a8d1b95624 100644
--- a/devel/cccc/distinfo
+++ b/devel/cccc/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cccc-3.1.4.tar.gz) = 27b3eca9a83a66799332363a80cc4bcd6db9869eddbda1a59a25cdace3ff4dbf
-SIZE (cccc-3.1.4.tar.gz) = 632007
+TIMESTAMP = 1504624763
+SHA256 (sarnold-cccc-3.1.5_GH0.tar.gz) = 6fe91eae83ad0ff4c1fe4277aabb6e7554a4dec1bb266b5657c064ef48a23142
+SIZE (sarnold-cccc-3.1.5_GH0.tar.gz) = 662760
diff --git a/devel/cccc/files/patch-cccc__cccc_tbl.cc b/devel/cccc/files/patch-cccc__cccc_tbl.cc
deleted file mode 100644
index 4520ecbe61aa..000000000000
--- a/devel/cccc/files/patch-cccc__cccc_tbl.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- cccc/cccc_tbl.cc.orig	2006-01-05 16:05:30 UTC
-+++ cccc/cccc_tbl.cc
-@@ -96,7 +96,7 @@ bool CCCC_Table<T>::remove(T* old_item_p
-   typename map_t::iterator value_iterator=map_t::find(old_item_ptr->key());
-   if(value_iterator!=map_t::end())
-     {
--      erase(value_iterator);
-+      map_t::erase(value_iterator);
-       retval=true;
-     }
-   return retval;
diff --git a/devel/ccrtp/Makefile b/devel/ccrtp/Makefile
index e4e64946f248..1a93a3774427 100644
--- a/devel/ccrtp/Makefile
+++ b/devel/ccrtp/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ccrtp
 PORTVERSION=	2.0.9
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	GNU
 
diff --git a/devel/cctz/Makefile b/devel/cctz/Makefile
index c8cb11ae2e58..6f264b9463d2 100644
--- a/devel/cctz/Makefile
+++ b/devel/cctz/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	cctz
 PORTVERSION=	2.0
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
diff --git a/devel/cheritrace-devel/Makefile b/devel/cheritrace-devel/Makefile
index 8b9ae976d357..47b89d7032e6 100644
--- a/devel/cheritrace-devel/Makefile
+++ b/devel/cheritrace-devel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cheritrace
 PORTVERSION=	0.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel security
 
 MAINTAINER=	theraven@FreeBSD.org
diff --git a/devel/cjose/Makefile b/devel/cjose/Makefile
index 69c8fe052e36..6816f685c629 100644
--- a/devel/cjose/Makefile
+++ b/devel/cjose/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	cjose
 PORTVERSION=	0.4.1
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	jamie@chair6.net
diff --git a/devel/cjose/files/patch-cjose.pc.in b/devel/cjose/files/patch-cjose.pc.in
new file mode 100644
index 000000000000..a4860f8eea40
--- /dev/null
+++ b/devel/cjose/files/patch-cjose.pc.in
@@ -0,0 +1,10 @@
+--- cjose.pc.in.orig	2017-09-13 01:19:02 UTC
++++ cjose.pc.in
+@@ -11,6 +11,6 @@ Name: cjose
+ URL: https://github.com/cisco/cjose
+ Description: JOSE implementation for C
+ Version: @VERSION@
+-Requires: jansson >= 2.3, libcrypto >= 1.0.1
++Requires: jansson >= 2.3
+ Cflags: -I${includedir}
+ Libs: -L${libdir} -lcjose
diff --git a/devel/cl-alexandria-sbcl/Makefile b/devel/cl-alexandria-sbcl/Makefile
index 11d380641212..db223601b507 100644
--- a/devel/cl-alexandria-sbcl/Makefile
+++ b/devel/cl-alexandria-sbcl/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	alexandria
 PORTVERSION=	2010.01.16
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	devel lisp
 PKGNAMEPREFIX=	cl-
 DISTFILES=	# none
diff --git a/devel/cl-infix-sbcl/Makefile b/devel/cl-infix-sbcl/Makefile
index d8e33072b228..6a21e151ea3b 100644
--- a/devel/cl-infix-sbcl/Makefile
+++ b/devel/cl-infix-sbcl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	infix
 PORTVERSION=	19960628
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	devel lisp
 PKGNAMEPREFIX=	cl-
 DISTFILES=	# none
diff --git a/devel/cl-port-sbcl/Makefile b/devel/cl-port-sbcl/Makefile
index 631799faa1f9..c2a270e16268 100644
--- a/devel/cl-port-sbcl/Makefile
+++ b/devel/cl-port-sbcl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	port
 PORTVERSION=	2002.10.02.1
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	devel lisp
 PKGNAMEPREFIX=	cl-
 DISTFILES=	# none
diff --git a/devel/cl-split-sequence-sbcl/Makefile b/devel/cl-split-sequence-sbcl/Makefile
index 3ae45da4295d..a7daedfc1ce5 100644
--- a/devel/cl-split-sequence-sbcl/Makefile
+++ b/devel/cl-split-sequence-sbcl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	split-sequence
 PORTVERSION=	20011114.1
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	devel lisp
 PKGNAMEPREFIX=	cl-
 DISTFILES=	# none
diff --git a/devel/cl-trivial-features-sbcl/Makefile b/devel/cl-trivial-features-sbcl/Makefile
index b472016dcee3..4d4bdcd7810d 100644
--- a/devel/cl-trivial-features-sbcl/Makefile
+++ b/devel/cl-trivial-features-sbcl/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	trivial-features
 PORTVERSION=	2010.01.16
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	devel lisp
 PKGNAMEPREFIX=	cl-
 DISTFILES=	# none
diff --git a/devel/cl-trivial-gray-streams-sbcl/Makefile b/devel/cl-trivial-gray-streams-sbcl/Makefile
index c27a5b3bafa3..e80fa044766d 100644
--- a/devel/cl-trivial-gray-streams-sbcl/Makefile
+++ b/devel/cl-trivial-gray-streams-sbcl/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	trivial-gray-streams
 PORTVERSION=	2008.11.02
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	devel lisp
 PKGNAMEPREFIX=	cl-
 DISTFILES=	# none
diff --git a/devel/clanlib/Makefile b/devel/clanlib/Makefile
index 26bf5f8ea0c1..fbfc54a97987 100644
--- a/devel/clanlib/Makefile
+++ b/devel/clanlib/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	clanlib
 PORTVERSION=	2.3.7
-PORTREVISION=	14
+PORTREVISION=	15
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.clanlib.org/download/releases-2.0/
diff --git a/devel/clojure-cider/Makefile b/devel/clojure-cider/Makefile
index d8c5ca6fc750..17c666956050 100644
--- a/devel/clojure-cider/Makefile
+++ b/devel/clojure-cider/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	clojure-cider
 PORTVERSION=	0.15.0
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel elisp
 
diff --git a/devel/cloudabi/Makefile b/devel/cloudabi/Makefile
index 841146ea8b3f..a5d6bf8b3815 100644
--- a/devel/cloudabi/Makefile
+++ b/devel/cloudabi/Makefile
@@ -2,14 +2,15 @@
 # $FreeBSD$
 
 PORTNAME=	cloudabi
-PORTVERSION=	0.12
-DISTVERSIONPREFIX=v
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.15
 CATEGORIES=	devel
 
 MAINTAINER=	ed@FreeBSD.org
 COMMENT=	Constants, types and data structures used by CloudABI
 
 LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	NuxiNL
diff --git a/devel/cloudabi/distinfo b/devel/cloudabi/distinfo
index 9e3103afa571..a3eb8c35fad3 100644
--- a/devel/cloudabi/distinfo
+++ b/devel/cloudabi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500995346
-SHA256 (NuxiNL-cloudabi-v0.12_GH0.tar.gz) = e3e9b4045ce9cdece50252107c0b9156c39ce723586cafba5ddb569aa34d2844
-SIZE (NuxiNL-cloudabi-v0.12_GH0.tar.gz) = 109352
+TIMESTAMP = 1504786436
+SHA256 (NuxiNL-cloudabi-v0.15_GH0.tar.gz) = c4dbb8a1c53597cfb0ef1645c1fcd2bbcef91cbfc95cc2e4b2740e5cb42f28f4
+SIZE (NuxiNL-cloudabi-v0.15_GH0.tar.gz) = 104693
diff --git a/devel/cmake-doc/Makefile b/devel/cmake-doc/Makefile
index 719320c0a6ed..eb6614f5b1b2 100644
--- a/devel/cmake-doc/Makefile
+++ b/devel/cmake-doc/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cmake
-PORTVERSION=	3.8.2
+DISTVERSION=	3.9.2
 CATEGORIES=	devel
 MASTER_SITES=	https://www.cmake.org/files/v${PORTVERSION:R}/
 PKGNAMESUFFIX=	-doc
diff --git a/devel/cmake-doc/pkg-plist b/devel/cmake-doc/pkg-plist
index 201d87231f7e..c46c5f33aa5a 100644
--- a/devel/cmake-doc/pkg-plist
+++ b/devel/cmake-doc/pkg-plist
@@ -183,6 +183,7 @@
 %%DOCSDIR%%/html/_sources/module/CMakePushCheckState.txt
 %%DOCSDIR%%/html/_sources/module/CMakeVerifyManifest.txt
 %%DOCSDIR%%/html/_sources/module/CPack.txt
+%%DOCSDIR%%/html/_sources/module/CPackArchive.txt
 %%DOCSDIR%%/html/_sources/module/CPackBundle.txt
 %%DOCSDIR%%/html/_sources/module/CPackComponent.txt
 %%DOCSDIR%%/html/_sources/module/CPackCygwin.txt
@@ -195,6 +196,7 @@
 %%DOCSDIR%%/html/_sources/module/CPackProductBuild.txt
 %%DOCSDIR%%/html/_sources/module/CPackRPM.txt
 %%DOCSDIR%%/html/_sources/module/CPackWIX.txt
+%%DOCSDIR%%/html/_sources/module/CSharpUtilities.txt
 %%DOCSDIR%%/html/_sources/module/CTest.txt
 %%DOCSDIR%%/html/_sources/module/CTestCoverageCollectGCOV.txt
 %%DOCSDIR%%/html/_sources/module/CTestScriptMode.txt
@@ -210,6 +212,7 @@
 %%DOCSDIR%%/html/_sources/module/CheckFortranFunctionExists.txt
 %%DOCSDIR%%/html/_sources/module/CheckFortranSourceCompiles.txt
 %%DOCSDIR%%/html/_sources/module/CheckFunctionExists.txt
+%%DOCSDIR%%/html/_sources/module/CheckIPOSupported.txt
 %%DOCSDIR%%/html/_sources/module/CheckIncludeFile.txt
 %%DOCSDIR%%/html/_sources/module/CheckIncludeFileCXX.txt
 %%DOCSDIR%%/html/_sources/module/CheckIncludeFiles.txt
@@ -220,7 +223,6 @@
 %%DOCSDIR%%/html/_sources/module/CheckSymbolExists.txt
 %%DOCSDIR%%/html/_sources/module/CheckTypeSize.txt
 %%DOCSDIR%%/html/_sources/module/CheckVariableExists.txt
-%%DOCSDIR%%/html/_sources/module/CSharpUtilities.txt
 %%DOCSDIR%%/html/_sources/module/Dart.txt
 %%DOCSDIR%%/html/_sources/module/DeployQt4.txt
 %%DOCSDIR%%/html/_sources/module/Documentation.txt
@@ -379,6 +381,7 @@
 %%DOCSDIR%%/html/_sources/module/GNUInstallDirs.txt
 %%DOCSDIR%%/html/_sources/module/GenerateExportHeader.txt
 %%DOCSDIR%%/html/_sources/module/GetPrerequisites.txt
+%%DOCSDIR%%/html/_sources/module/GoogleTest.txt
 %%DOCSDIR%%/html/_sources/module/InstallRequiredSystemLibraries.txt
 %%DOCSDIR%%/html/_sources/module/MacroAddFileDependencies.txt
 %%DOCSDIR%%/html/_sources/module/ProcessorCount.txt
@@ -468,6 +471,8 @@
 %%DOCSDIR%%/html/_sources/policy/CMP0065.txt
 %%DOCSDIR%%/html/_sources/policy/CMP0066.txt
 %%DOCSDIR%%/html/_sources/policy/CMP0067.txt
+%%DOCSDIR%%/html/_sources/policy/CMP0068.txt
+%%DOCSDIR%%/html/_sources/policy/CMP0069.txt
 %%DOCSDIR%%/html/_sources/prop_cache/ADVANCED.txt
 %%DOCSDIR%%/html/_sources/prop_cache/HELPSTRING.txt
 %%DOCSDIR%%/html/_sources/prop_cache/MODIFIED.txt
@@ -505,8 +510,11 @@
 %%DOCSDIR%%/html/_sources/prop_dir/VS_GLOBAL_SECTION_PRE_section.txt
 %%DOCSDIR%%/html/_sources/prop_dir/VS_STARTUP_PROJECT.txt
 %%DOCSDIR%%/html/_sources/prop_gbl/ALLOW_DUPLICATE_CUSTOM_TARGETS.txt
+%%DOCSDIR%%/html/_sources/prop_gbl/AUTOGEN_SOURCE_GROUP.txt
 %%DOCSDIR%%/html/_sources/prop_gbl/AUTOGEN_TARGETS_FOLDER.txt
+%%DOCSDIR%%/html/_sources/prop_gbl/AUTOMOC_SOURCE_GROUP.txt
 %%DOCSDIR%%/html/_sources/prop_gbl/AUTOMOC_TARGETS_FOLDER.txt
+%%DOCSDIR%%/html/_sources/prop_gbl/AUTORCC_SOURCE_GROUP.txt
 %%DOCSDIR%%/html/_sources/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.txt
 %%DOCSDIR%%/html/_sources/prop_gbl/CMAKE_C_KNOWN_FEATURES.txt
 %%DOCSDIR%%/html/_sources/prop_gbl/DEBUG_CONFIGURATIONS.txt
@@ -516,7 +524,9 @@
 %%DOCSDIR%%/html/_sources/prop_gbl/ENABLED_LANGUAGES.txt
 %%DOCSDIR%%/html/_sources/prop_gbl/FIND_LIBRARY_USE_LIB32_PATHS.txt
 %%DOCSDIR%%/html/_sources/prop_gbl/FIND_LIBRARY_USE_LIB64_PATHS.txt
+%%DOCSDIR%%/html/_sources/prop_gbl/FIND_LIBRARY_USE_LIBX32_PATHS.txt
 %%DOCSDIR%%/html/_sources/prop_gbl/FIND_LIBRARY_USE_OPENBSD_VERSIONING.txt
+%%DOCSDIR%%/html/_sources/prop_gbl/GENERATOR_IS_MULTI_CONFIG.txt
 %%DOCSDIR%%/html/_sources/prop_gbl/GLOBAL_DEPENDS_DEBUG_MODE.txt
 %%DOCSDIR%%/html/_sources/prop_gbl/GLOBAL_DEPENDS_NO_CYCLES.txt
 %%DOCSDIR%%/html/_sources/prop_gbl/IN_TRY_COMPILE.txt
@@ -582,6 +592,7 @@
 %%DOCSDIR%%/html/_sources/prop_test/ATTACHED_FILES_ON_FAIL.txt
 %%DOCSDIR%%/html/_sources/prop_test/COST.txt
 %%DOCSDIR%%/html/_sources/prop_test/DEPENDS.txt
+%%DOCSDIR%%/html/_sources/prop_test/DISABLED.txt
 %%DOCSDIR%%/html/_sources/prop_test/ENVIRONMENT.txt
 %%DOCSDIR%%/html/_sources/prop_test/FAIL_REGULAR_EXPRESSION.txt
 %%DOCSDIR%%/html/_sources/prop_test/FIXTURES_CLEANUP.txt
@@ -621,15 +632,19 @@
 %%DOCSDIR%%/html/_sources/prop_tgt/ARCHIVE_OUTPUT_DIRECTORY_CONFIG.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/ARCHIVE_OUTPUT_NAME.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/ARCHIVE_OUTPUT_NAME_CONFIG.txt
+%%DOCSDIR%%/html/_sources/prop_tgt/AUTOGEN_BUILD_DIR.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/AUTOGEN_TARGET_DEPENDS.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/AUTOMOC.txt
+%%DOCSDIR%%/html/_sources/prop_tgt/AUTOMOC_DEPEND_FILTERS.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/AUTOMOC_MOC_OPTIONS.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/AUTORCC.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/AUTORCC_OPTIONS.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/AUTOUIC.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/AUTOUIC_OPTIONS.txt
+%%DOCSDIR%%/html/_sources/prop_tgt/AUTOUIC_SEARCH_PATHS.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/BINARY_DIR.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/BUILD_RPATH.txt
+%%DOCSDIR%%/html/_sources/prop_tgt/BUILD_WITH_INSTALL_NAME_DIR.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/BUILD_WITH_INSTALL_RPATH.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/BUNDLE.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/BUNDLE_EXTENSION.txt
@@ -650,6 +665,8 @@
 %%DOCSDIR%%/html/_sources/prop_tgt/CONFIG_POSTFIX.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/CROSSCOMPILING_EMULATOR.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/CUDA_EXTENSIONS.txt
+%%DOCSDIR%%/html/_sources/prop_tgt/CUDA_PTX_COMPILATION.txt
+%%DOCSDIR%%/html/_sources/prop_tgt/CUDA_RESOLVE_DEVICE_SYMBOLS.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/CUDA_SEPARABLE_COMPILATION.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/CUDA_STANDARD.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/CUDA_STANDARD_REQUIRED.txt
@@ -695,6 +712,8 @@
 %%DOCSDIR%%/html/_sources/prop_tgt/IMPORTED_LOCATION_CONFIG.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/IMPORTED_NO_SONAME.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/IMPORTED_NO_SONAME_CONFIG.txt
+%%DOCSDIR%%/html/_sources/prop_tgt/IMPORTED_OBJECTS.txt
+%%DOCSDIR%%/html/_sources/prop_tgt/IMPORTED_OBJECTS_CONFIG.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/IMPORTED_SONAME.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/IMPORTED_SONAME_CONFIG.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/IMPORT_PREFIX.txt
@@ -824,6 +843,7 @@
 %%DOCSDIR%%/html/_sources/%%CMAKE_BUILD_TYPE%%/3.6.txt
 %%DOCSDIR%%/html/_sources/%%CMAKE_BUILD_TYPE%%/3.7.txt
 %%DOCSDIR%%/html/_sources/%%CMAKE_BUILD_TYPE%%/3.8.txt
+%%DOCSDIR%%/html/_sources/%%CMAKE_BUILD_TYPE%%/3.9.txt
 %%DOCSDIR%%/html/_sources/%%CMAKE_BUILD_TYPE%%/index.txt
 %%DOCSDIR%%/html/_sources/variable/ANDROID.txt
 %%DOCSDIR%%/html/_sources/variable/APPLE.txt
@@ -845,6 +865,7 @@
 %%DOCSDIR%%/html/_sources/variable/CMAKE_ANDROID_NATIVE_LIB_DEPENDENCIES.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_ANDROID_NATIVE_LIB_DIRECTORIES.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_ANDROID_NDK.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_ANDROID_NDK_DEPRECATED_HEADERS.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_ANDROID_PROCESS_MAX.txt
@@ -861,17 +882,20 @@
 %%DOCSDIR%%/html/_sources/variable/CMAKE_ARGC.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_ARGV0.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_AUTOMOC.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_AUTOMOC_DEPEND_FILTERS.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_AUTOMOC_MOC_OPTIONS.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_AUTOMOC_RELAXED_MODE.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_AUTORCC.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_AUTORCC_OPTIONS.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_AUTOUIC.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_AUTOUIC_OPTIONS.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_AUTOUIC_SEARCH_PATHS.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_BACKWARDS_COMPATIBILITY.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_BINARY_DIR.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_BUILD_RPATH.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_BUILD_TOOL.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_BUILD_TYPE.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_BUILD_WITH_INSTALL_NAME_DIR.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_BUILD_WITH_INSTALL_RPATH.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_CACHEFILE_DIR.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_CACHE_MAJOR_VERSION.txt
@@ -934,6 +958,7 @@
 %%DOCSDIR%%/html/_sources/variable/CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_FIND_APPBUNDLE.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_FIND_FRAMEWORK.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_FIND_LIBRARY_PREFIXES.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_FIND_LIBRARY_SUFFIXES.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_FIND_NO_INSTALL_PREFIX.txt
@@ -983,6 +1008,8 @@
 %%DOCSDIR%%/html/_sources/variable/CMAKE_INSTALL_RPATH.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_INSTALL_RPATH_USE_LINK_PATH.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_INTERNAL_PLATFORM_ABI.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_INTERPROCEDURAL_OPTIMIZATION.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_INTERPROCEDURAL_OPTIMIZATION_CONFIG.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_IOS_INSTALL_COMBINED.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_JOB_POOL_COMPILE.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_JOB_POOL_LINK.txt
@@ -995,10 +1022,12 @@
 %%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_CLANG_TIDY.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_COMPILER.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_COMPILER_ABI.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_COMPILER_AR.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_COMPILER_EXTERNAL_TOOLCHAIN.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_COMPILER_ID.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_COMPILER_LAUNCHER.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_COMPILER_LOADED.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_COMPILER_RANLIB.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_COMPILER_TARGET.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_COMPILER_VERSION.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_COMPILE_OBJECT.txt
@@ -1060,6 +1089,7 @@
 %%DOCSDIR%%/html/_sources/variable/CMAKE_MAKE_PROGRAM.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_MAP_IMPORTED_CONFIG_CONFIG.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_MATCH_COUNT.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_MATCH_n.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_MFC_FLAG.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_MINIMUM_REQUIRED_VERSION.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_MINOR_VERSION.txt
@@ -1085,6 +1115,7 @@
 %%DOCSDIR%%/html/_sources/variable/CMAKE_POSITION_INDEPENDENT_CODE.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_PREFIX_PATH.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_PROGRAM_PATH.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_PROJECT_DESCRIPTION.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_PROJECT_NAME.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_PROJECT_PROJECT-NAME_INCLUDE.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_RANLIB.txt
@@ -1117,6 +1148,8 @@
 %%DOCSDIR%%/html/_sources/variable/CMAKE_SUBLIME_TEXT_2_ENV_SETTINGS.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_SUBLIME_TEXT_2_EXCLUDE_BUILD_TREE.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_SYSROOT.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_SYSROOT_COMPILE.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_SYSROOT_LINK.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_SYSTEM.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_SYSTEM_APPBUNDLE_PATH.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_SYSTEM_FRAMEWORK_PATH.txt
@@ -1148,6 +1181,7 @@
 %%DOCSDIR%%/html/_sources/variable/CMAKE_VS_NsightTegra_VERSION.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_VS_PLATFORM_NAME.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_VS_PLATFORM_TOOLSET.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_VS_PLATFORM_TOOLSET_CUDA.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_WARN_DEPRECATED.txt
@@ -1155,6 +1189,7 @@
 %%DOCSDIR%%/html/_sources/variable/CMAKE_WIN32_EXECUTABLE.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_XCODE_ATTRIBUTE_an-attribute.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_XCODE_GENERATE_SCHEME.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_XCODE_PLATFORM_TOOLSET.txt
 %%DOCSDIR%%/html/_sources/variable/CPACK_ABSOLUTE_DESTINATION_FILES.txt
 %%DOCSDIR%%/html/_sources/variable/CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY.txt
@@ -1258,6 +1293,7 @@
 %%DOCSDIR%%/html/_sources/variable/PROJECT-NAME_VERSION_PATCH.txt
 %%DOCSDIR%%/html/_sources/variable/PROJECT-NAME_VERSION_TWEAK.txt
 %%DOCSDIR%%/html/_sources/variable/PROJECT_BINARY_DIR.txt
+%%DOCSDIR%%/html/_sources/variable/PROJECT_DESCRIPTION.txt
 %%DOCSDIR%%/html/_sources/variable/PROJECT_NAME.txt
 %%DOCSDIR%%/html/_sources/variable/PROJECT_SOURCE_DIR.txt
 %%DOCSDIR%%/html/_sources/variable/PROJECT_VERSION.txt
@@ -1483,6 +1519,7 @@
 %%DOCSDIR%%/html/module/CMakePushCheckState.html
 %%DOCSDIR%%/html/module/CMakeVerifyManifest.html
 %%DOCSDIR%%/html/module/CPack.html
+%%DOCSDIR%%/html/module/CPackArchive.html
 %%DOCSDIR%%/html/module/CPackBundle.html
 %%DOCSDIR%%/html/module/CPackComponent.html
 %%DOCSDIR%%/html/module/CPackCygwin.html
@@ -1495,6 +1532,7 @@
 %%DOCSDIR%%/html/module/CPackProductBuild.html
 %%DOCSDIR%%/html/module/CPackRPM.html
 %%DOCSDIR%%/html/module/CPackWIX.html
+%%DOCSDIR%%/html/module/CSharpUtilities.html
 %%DOCSDIR%%/html/module/CTest.html
 %%DOCSDIR%%/html/module/CTestCoverageCollectGCOV.html
 %%DOCSDIR%%/html/module/CTestScriptMode.html
@@ -1510,6 +1548,7 @@
 %%DOCSDIR%%/html/module/CheckFortranFunctionExists.html
 %%DOCSDIR%%/html/module/CheckFortranSourceCompiles.html
 %%DOCSDIR%%/html/module/CheckFunctionExists.html
+%%DOCSDIR%%/html/module/CheckIPOSupported.html
 %%DOCSDIR%%/html/module/CheckIncludeFile.html
 %%DOCSDIR%%/html/module/CheckIncludeFileCXX.html
 %%DOCSDIR%%/html/module/CheckIncludeFiles.html
@@ -1520,7 +1559,6 @@
 %%DOCSDIR%%/html/module/CheckSymbolExists.html
 %%DOCSDIR%%/html/module/CheckTypeSize.html
 %%DOCSDIR%%/html/module/CheckVariableExists.html
-%%DOCSDIR%%/html/module/CSharpUtilities.html
 %%DOCSDIR%%/html/module/Dart.html
 %%DOCSDIR%%/html/module/DeployQt4.html
 %%DOCSDIR%%/html/module/Documentation.html
@@ -1679,6 +1717,7 @@
 %%DOCSDIR%%/html/module/GNUInstallDirs.html
 %%DOCSDIR%%/html/module/GenerateExportHeader.html
 %%DOCSDIR%%/html/module/GetPrerequisites.html
+%%DOCSDIR%%/html/module/GoogleTest.html
 %%DOCSDIR%%/html/module/InstallRequiredSystemLibraries.html
 %%DOCSDIR%%/html/module/MacroAddFileDependencies.html
 %%DOCSDIR%%/html/module/ProcessorCount.html
@@ -1769,6 +1808,8 @@
 %%DOCSDIR%%/html/policy/CMP0065.html
 %%DOCSDIR%%/html/policy/CMP0066.html
 %%DOCSDIR%%/html/policy/CMP0067.html
+%%DOCSDIR%%/html/policy/CMP0068.html
+%%DOCSDIR%%/html/policy/CMP0069.html
 %%DOCSDIR%%/html/prop_cache/ADVANCED.html
 %%DOCSDIR%%/html/prop_cache/HELPSTRING.html
 %%DOCSDIR%%/html/prop_cache/MODIFIED.html
@@ -1806,8 +1847,11 @@
 %%DOCSDIR%%/html/prop_dir/VS_GLOBAL_SECTION_PRE_section.html
 %%DOCSDIR%%/html/prop_dir/VS_STARTUP_PROJECT.html
 %%DOCSDIR%%/html/prop_gbl/ALLOW_DUPLICATE_CUSTOM_TARGETS.html
+%%DOCSDIR%%/html/prop_gbl/AUTOGEN_SOURCE_GROUP.html
 %%DOCSDIR%%/html/prop_gbl/AUTOGEN_TARGETS_FOLDER.html
+%%DOCSDIR%%/html/prop_gbl/AUTOMOC_SOURCE_GROUP.html
 %%DOCSDIR%%/html/prop_gbl/AUTOMOC_TARGETS_FOLDER.html
+%%DOCSDIR%%/html/prop_gbl/AUTORCC_SOURCE_GROUP.html
 %%DOCSDIR%%/html/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.html
 %%DOCSDIR%%/html/prop_gbl/CMAKE_C_KNOWN_FEATURES.html
 %%DOCSDIR%%/html/prop_gbl/DEBUG_CONFIGURATIONS.html
@@ -1817,7 +1861,9 @@
 %%DOCSDIR%%/html/prop_gbl/ENABLED_LANGUAGES.html
 %%DOCSDIR%%/html/prop_gbl/FIND_LIBRARY_USE_LIB32_PATHS.html
 %%DOCSDIR%%/html/prop_gbl/FIND_LIBRARY_USE_LIB64_PATHS.html
+%%DOCSDIR%%/html/prop_gbl/FIND_LIBRARY_USE_LIBX32_PATHS.html
 %%DOCSDIR%%/html/prop_gbl/FIND_LIBRARY_USE_OPENBSD_VERSIONING.html
+%%DOCSDIR%%/html/prop_gbl/GENERATOR_IS_MULTI_CONFIG.html
 %%DOCSDIR%%/html/prop_gbl/GLOBAL_DEPENDS_DEBUG_MODE.html
 %%DOCSDIR%%/html/prop_gbl/GLOBAL_DEPENDS_NO_CYCLES.html
 %%DOCSDIR%%/html/prop_gbl/IN_TRY_COMPILE.html
@@ -1883,6 +1929,7 @@
 %%DOCSDIR%%/html/prop_test/ATTACHED_FILES_ON_FAIL.html
 %%DOCSDIR%%/html/prop_test/COST.html
 %%DOCSDIR%%/html/prop_test/DEPENDS.html
+%%DOCSDIR%%/html/prop_test/DISABLED.html
 %%DOCSDIR%%/html/prop_test/ENVIRONMENT.html
 %%DOCSDIR%%/html/prop_test/FAIL_REGULAR_EXPRESSION.html
 %%DOCSDIR%%/html/prop_test/FIXTURES_CLEANUP.html
@@ -1922,15 +1969,19 @@
 %%DOCSDIR%%/html/prop_tgt/ARCHIVE_OUTPUT_DIRECTORY_CONFIG.html
 %%DOCSDIR%%/html/prop_tgt/ARCHIVE_OUTPUT_NAME.html
 %%DOCSDIR%%/html/prop_tgt/ARCHIVE_OUTPUT_NAME_CONFIG.html
+%%DOCSDIR%%/html/prop_tgt/AUTOGEN_BUILD_DIR.html
 %%DOCSDIR%%/html/prop_tgt/AUTOGEN_TARGET_DEPENDS.html
 %%DOCSDIR%%/html/prop_tgt/AUTOMOC.html
+%%DOCSDIR%%/html/prop_tgt/AUTOMOC_DEPEND_FILTERS.html
 %%DOCSDIR%%/html/prop_tgt/AUTOMOC_MOC_OPTIONS.html
 %%DOCSDIR%%/html/prop_tgt/AUTORCC.html
 %%DOCSDIR%%/html/prop_tgt/AUTORCC_OPTIONS.html
 %%DOCSDIR%%/html/prop_tgt/AUTOUIC.html
 %%DOCSDIR%%/html/prop_tgt/AUTOUIC_OPTIONS.html
+%%DOCSDIR%%/html/prop_tgt/AUTOUIC_SEARCH_PATHS.html
 %%DOCSDIR%%/html/prop_tgt/BINARY_DIR.html
 %%DOCSDIR%%/html/prop_tgt/BUILD_RPATH.html
+%%DOCSDIR%%/html/prop_tgt/BUILD_WITH_INSTALL_NAME_DIR.html
 %%DOCSDIR%%/html/prop_tgt/BUILD_WITH_INSTALL_RPATH.html
 %%DOCSDIR%%/html/prop_tgt/BUNDLE.html
 %%DOCSDIR%%/html/prop_tgt/BUNDLE_EXTENSION.html
@@ -1951,6 +2002,8 @@
 %%DOCSDIR%%/html/prop_tgt/CONFIG_POSTFIX.html
 %%DOCSDIR%%/html/prop_tgt/CROSSCOMPILING_EMULATOR.html
 %%DOCSDIR%%/html/prop_tgt/CUDA_EXTENSIONS.html
+%%DOCSDIR%%/html/prop_tgt/CUDA_PTX_COMPILATION.html
+%%DOCSDIR%%/html/prop_tgt/CUDA_RESOLVE_DEVICE_SYMBOLS.html
 %%DOCSDIR%%/html/prop_tgt/CUDA_SEPARABLE_COMPILATION.html
 %%DOCSDIR%%/html/prop_tgt/CUDA_STANDARD.html
 %%DOCSDIR%%/html/prop_tgt/CUDA_STANDARD_REQUIRED.html
@@ -1996,6 +2049,8 @@
 %%DOCSDIR%%/html/prop_tgt/IMPORTED_LOCATION_CONFIG.html
 %%DOCSDIR%%/html/prop_tgt/IMPORTED_NO_SONAME.html
 %%DOCSDIR%%/html/prop_tgt/IMPORTED_NO_SONAME_CONFIG.html
+%%DOCSDIR%%/html/prop_tgt/IMPORTED_OBJECTS.html
+%%DOCSDIR%%/html/prop_tgt/IMPORTED_OBJECTS_CONFIG.html
 %%DOCSDIR%%/html/prop_tgt/IMPORTED_SONAME.html
 %%DOCSDIR%%/html/prop_tgt/IMPORTED_SONAME_CONFIG.html
 %%DOCSDIR%%/html/prop_tgt/IMPORT_PREFIX.html
@@ -2125,6 +2180,7 @@
 %%DOCSDIR%%/html/%%CMAKE_BUILD_TYPE%%/3.6.html
 %%DOCSDIR%%/html/%%CMAKE_BUILD_TYPE%%/3.7.html
 %%DOCSDIR%%/html/%%CMAKE_BUILD_TYPE%%/3.8.html
+%%DOCSDIR%%/html/%%CMAKE_BUILD_TYPE%%/3.9.html
 %%DOCSDIR%%/html/%%CMAKE_BUILD_TYPE%%/index.html
 %%DOCSDIR%%/html/search.html
 %%DOCSDIR%%/html/searchindex.js
@@ -2148,6 +2204,7 @@
 %%DOCSDIR%%/html/variable/CMAKE_ANDROID_NATIVE_LIB_DEPENDENCIES.html
 %%DOCSDIR%%/html/variable/CMAKE_ANDROID_NATIVE_LIB_DIRECTORIES.html
 %%DOCSDIR%%/html/variable/CMAKE_ANDROID_NDK.html
+%%DOCSDIR%%/html/variable/CMAKE_ANDROID_NDK_DEPRECATED_HEADERS.html
 %%DOCSDIR%%/html/variable/CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG.html
 %%DOCSDIR%%/html/variable/CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION.html
 %%DOCSDIR%%/html/variable/CMAKE_ANDROID_PROCESS_MAX.html
@@ -2164,17 +2221,20 @@
 %%DOCSDIR%%/html/variable/CMAKE_ARGC.html
 %%DOCSDIR%%/html/variable/CMAKE_ARGV0.html
 %%DOCSDIR%%/html/variable/CMAKE_AUTOMOC.html
+%%DOCSDIR%%/html/variable/CMAKE_AUTOMOC_DEPEND_FILTERS.html
 %%DOCSDIR%%/html/variable/CMAKE_AUTOMOC_MOC_OPTIONS.html
 %%DOCSDIR%%/html/variable/CMAKE_AUTOMOC_RELAXED_MODE.html
 %%DOCSDIR%%/html/variable/CMAKE_AUTORCC.html
 %%DOCSDIR%%/html/variable/CMAKE_AUTORCC_OPTIONS.html
 %%DOCSDIR%%/html/variable/CMAKE_AUTOUIC.html
 %%DOCSDIR%%/html/variable/CMAKE_AUTOUIC_OPTIONS.html
+%%DOCSDIR%%/html/variable/CMAKE_AUTOUIC_SEARCH_PATHS.html
 %%DOCSDIR%%/html/variable/CMAKE_BACKWARDS_COMPATIBILITY.html
 %%DOCSDIR%%/html/variable/CMAKE_BINARY_DIR.html
 %%DOCSDIR%%/html/variable/CMAKE_BUILD_RPATH.html
 %%DOCSDIR%%/html/variable/CMAKE_BUILD_TOOL.html
 %%DOCSDIR%%/html/variable/CMAKE_BUILD_TYPE.html
+%%DOCSDIR%%/html/variable/CMAKE_BUILD_WITH_INSTALL_NAME_DIR.html
 %%DOCSDIR%%/html/variable/CMAKE_BUILD_WITH_INSTALL_RPATH.html
 %%DOCSDIR%%/html/variable/CMAKE_CACHEFILE_DIR.html
 %%DOCSDIR%%/html/variable/CMAKE_CACHE_MAJOR_VERSION.html
@@ -2237,6 +2297,7 @@
 %%DOCSDIR%%/html/variable/CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES.html
 %%DOCSDIR%%/html/variable/CMAKE_FIND_APPBUNDLE.html
 %%DOCSDIR%%/html/variable/CMAKE_FIND_FRAMEWORK.html
+%%DOCSDIR%%/html/variable/CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX.html
 %%DOCSDIR%%/html/variable/CMAKE_FIND_LIBRARY_PREFIXES.html
 %%DOCSDIR%%/html/variable/CMAKE_FIND_LIBRARY_SUFFIXES.html
 %%DOCSDIR%%/html/variable/CMAKE_FIND_NO_INSTALL_PREFIX.html
@@ -2286,6 +2347,8 @@
 %%DOCSDIR%%/html/variable/CMAKE_INSTALL_RPATH.html
 %%DOCSDIR%%/html/variable/CMAKE_INSTALL_RPATH_USE_LINK_PATH.html
 %%DOCSDIR%%/html/variable/CMAKE_INTERNAL_PLATFORM_ABI.html
+%%DOCSDIR%%/html/variable/CMAKE_INTERPROCEDURAL_OPTIMIZATION.html
+%%DOCSDIR%%/html/variable/CMAKE_INTERPROCEDURAL_OPTIMIZATION_CONFIG.html
 %%DOCSDIR%%/html/variable/CMAKE_IOS_INSTALL_COMBINED.html
 %%DOCSDIR%%/html/variable/CMAKE_JOB_POOL_COMPILE.html
 %%DOCSDIR%%/html/variable/CMAKE_JOB_POOL_LINK.html
@@ -2298,10 +2361,12 @@
 %%DOCSDIR%%/html/variable/CMAKE_LANG_CLANG_TIDY.html
 %%DOCSDIR%%/html/variable/CMAKE_LANG_COMPILER.html
 %%DOCSDIR%%/html/variable/CMAKE_LANG_COMPILER_ABI.html
+%%DOCSDIR%%/html/variable/CMAKE_LANG_COMPILER_AR.html
 %%DOCSDIR%%/html/variable/CMAKE_LANG_COMPILER_EXTERNAL_TOOLCHAIN.html
 %%DOCSDIR%%/html/variable/CMAKE_LANG_COMPILER_ID.html
 %%DOCSDIR%%/html/variable/CMAKE_LANG_COMPILER_LAUNCHER.html
 %%DOCSDIR%%/html/variable/CMAKE_LANG_COMPILER_LOADED.html
+%%DOCSDIR%%/html/variable/CMAKE_LANG_COMPILER_RANLIB.html
 %%DOCSDIR%%/html/variable/CMAKE_LANG_COMPILER_TARGET.html
 %%DOCSDIR%%/html/variable/CMAKE_LANG_COMPILER_VERSION.html
 %%DOCSDIR%%/html/variable/CMAKE_LANG_COMPILE_OBJECT.html
@@ -2363,6 +2428,7 @@
 %%DOCSDIR%%/html/variable/CMAKE_MAKE_PROGRAM.html
 %%DOCSDIR%%/html/variable/CMAKE_MAP_IMPORTED_CONFIG_CONFIG.html
 %%DOCSDIR%%/html/variable/CMAKE_MATCH_COUNT.html
+%%DOCSDIR%%/html/variable/CMAKE_MATCH_n.html
 %%DOCSDIR%%/html/variable/CMAKE_MFC_FLAG.html
 %%DOCSDIR%%/html/variable/CMAKE_MINIMUM_REQUIRED_VERSION.html
 %%DOCSDIR%%/html/variable/CMAKE_MINOR_VERSION.html
@@ -2388,6 +2454,7 @@
 %%DOCSDIR%%/html/variable/CMAKE_POSITION_INDEPENDENT_CODE.html
 %%DOCSDIR%%/html/variable/CMAKE_PREFIX_PATH.html
 %%DOCSDIR%%/html/variable/CMAKE_PROGRAM_PATH.html
+%%DOCSDIR%%/html/variable/CMAKE_PROJECT_DESCRIPTION.html
 %%DOCSDIR%%/html/variable/CMAKE_PROJECT_NAME.html
 %%DOCSDIR%%/html/variable/CMAKE_PROJECT_PROJECT-NAME_INCLUDE.html
 %%DOCSDIR%%/html/variable/CMAKE_RANLIB.html
@@ -2420,6 +2487,8 @@
 %%DOCSDIR%%/html/variable/CMAKE_SUBLIME_TEXT_2_ENV_SETTINGS.html
 %%DOCSDIR%%/html/variable/CMAKE_SUBLIME_TEXT_2_EXCLUDE_BUILD_TREE.html
 %%DOCSDIR%%/html/variable/CMAKE_SYSROOT.html
+%%DOCSDIR%%/html/variable/CMAKE_SYSROOT_COMPILE.html
+%%DOCSDIR%%/html/variable/CMAKE_SYSROOT_LINK.html
 %%DOCSDIR%%/html/variable/CMAKE_SYSTEM.html
 %%DOCSDIR%%/html/variable/CMAKE_SYSTEM_APPBUNDLE_PATH.html
 %%DOCSDIR%%/html/variable/CMAKE_SYSTEM_FRAMEWORK_PATH.html
@@ -2451,6 +2520,7 @@
 %%DOCSDIR%%/html/variable/CMAKE_VS_NsightTegra_VERSION.html
 %%DOCSDIR%%/html/variable/CMAKE_VS_PLATFORM_NAME.html
 %%DOCSDIR%%/html/variable/CMAKE_VS_PLATFORM_TOOLSET.html
+%%DOCSDIR%%/html/variable/CMAKE_VS_PLATFORM_TOOLSET_CUDA.html
 %%DOCSDIR%%/html/variable/CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE.html
 %%DOCSDIR%%/html/variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION.html
 %%DOCSDIR%%/html/variable/CMAKE_WARN_DEPRECATED.html
@@ -2458,6 +2528,7 @@
 %%DOCSDIR%%/html/variable/CMAKE_WIN32_EXECUTABLE.html
 %%DOCSDIR%%/html/variable/CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS.html
 %%DOCSDIR%%/html/variable/CMAKE_XCODE_ATTRIBUTE_an-attribute.html
+%%DOCSDIR%%/html/variable/CMAKE_XCODE_GENERATE_SCHEME.html
 %%DOCSDIR%%/html/variable/CMAKE_XCODE_PLATFORM_TOOLSET.html
 %%DOCSDIR%%/html/variable/CPACK_ABSOLUTE_DESTINATION_FILES.html
 %%DOCSDIR%%/html/variable/CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY.html
@@ -2561,6 +2632,7 @@
 %%DOCSDIR%%/html/variable/PROJECT-NAME_VERSION_PATCH.html
 %%DOCSDIR%%/html/variable/PROJECT-NAME_VERSION_TWEAK.html
 %%DOCSDIR%%/html/variable/PROJECT_BINARY_DIR.html
+%%DOCSDIR%%/html/variable/PROJECT_DESCRIPTION.html
 %%DOCSDIR%%/html/variable/PROJECT_NAME.html
 %%DOCSDIR%%/html/variable/PROJECT_SOURCE_DIR.html
 %%DOCSDIR%%/html/variable/PROJECT_VERSION.html
diff --git a/devel/cmake-gui/Makefile b/devel/cmake-gui/Makefile
index a8c8c4a670f6..374abf3d6802 100644
--- a/devel/cmake-gui/Makefile
+++ b/devel/cmake-gui/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cmake
-PORTVERSION=	3.8.2
+DISTVERSION=	3.9.2
 CATEGORIES=	devel
 MASTER_SITES=	https://www.cmake.org/files/v${PORTVERSION:R}/
 PKGNAMESUFFIX=	-gui
@@ -27,7 +27,8 @@ CMAKE_ARGS=	-DBUILD_QtDialog:bool=on \
 		-DSPHINX_MAN:BOOL=ON \
 		-DCMAKE_USE_SYSTEM_LIBRARIES:BOOL=ON \
 		-DCMAKE_DATA_DIR:STRING="/${DATADIR_REL}" \
-		-DCMAKE_DOC_DIR:STRING="/${DOCSDIR_REL}"
+		-DCMAKE_DOC_DIR:STRING="/${DOCSDIR_REL}" \
+		-DCMake_SPHINX_DEPEND_ON_EXECUTABLES:BOOL=OFF
 
 ALL_TARGET=	cmake-gui documentation
 INSTALL_WRKSRC=	${WRKSRC}/Source/QtDialog
diff --git a/devel/cmake-gui/files/patch-Utilities__Sphinx__CMakeLists.txt b/devel/cmake-gui/files/patch-Utilities__Sphinx__CMakeLists.txt
deleted file mode 100644
index 238355f035ea..000000000000
--- a/devel/cmake-gui/files/patch-Utilities__Sphinx__CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-Make the `documentation' target stop depending on basically all other targets,
-since we are only interested in building the cmake-gui one. If we don't do
-this, building the documentation will build all other targets which are only
-needed by devel/cmake itself.
---- Utilities/Sphinx/CMakeLists.txt
-+++ Utilities/Sphinx/CMakeLists.txt
-@@ -93,19 +93,6 @@ endforeach()
- 
- add_custom_target(documentation ALL DEPENDS ${doc_format_outputs})
- 
--foreach(t
--    cmake
--    ccmake
--    cmake-gui
--    cpack
--    ctest
--    )
--  if(TARGET ${t})
--    # Build documentation after main executables.
--    add_dependencies(documentation ${t})
--  endif()
--endforeach()
--
- if(SPHINX_MAN)
-   file(GLOB man_rst RELATIVE ${CMake_SOURCE_DIR}/Help/manual
-     ${CMake_SOURCE_DIR}/Help/manual/*.[1-9].rst)
diff --git a/devel/cmake-gui/pkg-plist b/devel/cmake-gui/pkg-plist
index 3e4944508056..c8776a4ce24e 100644
--- a/devel/cmake-gui/pkg-plist
+++ b/devel/cmake-gui/pkg-plist
@@ -1,6 +1,6 @@
 bin/cmake-gui
 man/man1/cmake-gui.1.gz
-share/applications/CMake.desktop
+share/applications/cmake-gui.desktop
 share/icons/hicolor/128x128/apps/CMakeSetup.png
 share/icons/hicolor/32x32/apps/CMakeSetup.png
 share/mime/packages/cmakecache.xml
diff --git a/devel/cmake-modules/Makefile b/devel/cmake-modules/Makefile
deleted file mode 100644
index b2aa3d22abc8..000000000000
--- a/devel/cmake-modules/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# Created by: gahr
-# $FreeBSD$
-
-PORTREVISION=	0
-PKGNAMESUFFIX=	-modules
-
-COMMENT=	Modules and Templates for CMake
-
-CMAKE_MODULES=	yes
-
-do-install:
-	${MKDIR} ${STAGEDIR}${DATADIR}/Modules
-	${MKDIR} ${STAGEDIR}${DATADIR}/Templates
-	cd ${WRKSRC}/Modules && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}/Modules
-	cd ${WRKSRC}/Templates && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}/Templates
-
-NO_BUILD=	yes
-
-PLIST=		${.CURDIR}/pkg-plist
-DESCR=		${.CURDIR}/pkg-descr
-
-MASTERDIR=	${.CURDIR}/../cmake
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/cmake-modules/pkg-descr b/devel/cmake-modules/pkg-descr
deleted file mode 100644
index 0e19e5cbb4ea..000000000000
--- a/devel/cmake-modules/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-CMake is used to control the software compilation process using simple
-platform and compiler independent configuration files. CMake generates native
-makefiles and workspaces that can be used in the compiler environment of your
-choice. CMake is quite sophisticated: it is possible to support complex
-environments requiring system configuration, pre-processor generation, code
-generation, and template instantiation.
-
-This port includes CMake's modules and templates.
-
-WWW: http://www.cmake.org/
diff --git a/devel/cmake-modules/pkg-plist b/devel/cmake-modules/pkg-plist
deleted file mode 100644
index 63b0c79cfd93..000000000000
--- a/devel/cmake-modules/pkg-plist
+++ /dev/null
@@ -1,868 +0,0 @@
-%%DATADIR%%/Modules/AddFileDependencies.cmake
-%%DATADIR%%/Modules/AndroidTestUtilities.cmake
-%%DATADIR%%/Modules/AndroidTestUtilities/PushToAndroidDevice.cmake
-%%DATADIR%%/Modules/AutogenInfo.cmake.in
-%%DATADIR%%/Modules/BasicConfigVersion-AnyNewerVersion.cmake.in
-%%DATADIR%%/Modules/BasicConfigVersion-ExactVersion.cmake.in
-%%DATADIR%%/Modules/BasicConfigVersion-SameMajorVersion.cmake.in
-%%DATADIR%%/Modules/BundleUtilities.cmake
-%%DATADIR%%/Modules/CMake.cmake
-%%DATADIR%%/Modules/CMakeASM-ATTInformation.cmake
-%%DATADIR%%/Modules/CMakeASMCompiler.cmake.in
-%%DATADIR%%/Modules/CMakeASMInformation.cmake
-%%DATADIR%%/Modules/CMakeASM_MASMInformation.cmake
-%%DATADIR%%/Modules/CMakeASM_NASMInformation.cmake
-%%DATADIR%%/Modules/CMakeAddFortranSubdirectory.cmake
-%%DATADIR%%/Modules/CMakeAddFortranSubdirectory/build_mingw.cmake.in
-%%DATADIR%%/Modules/CMakeAddFortranSubdirectory/config_mingw.cmake.in
-%%DATADIR%%/Modules/CMakeAddNewLanguage.txt
-%%DATADIR%%/Modules/CMakeBackwardCompatibilityC.cmake
-%%DATADIR%%/Modules/CMakeBackwardCompatibilityCXX.cmake
-%%DATADIR%%/Modules/CMakeBorlandFindMake.cmake
-%%DATADIR%%/Modules/CMakeBuildSettings.cmake.in
-%%DATADIR%%/Modules/CMakeCCompiler.cmake.in
-%%DATADIR%%/Modules/CMakeCCompilerABI.c
-%%DATADIR%%/Modules/CMakeCCompilerId.c.in
-%%DATADIR%%/Modules/CMakeCInformation.cmake
-%%DATADIR%%/Modules/CMakeCSharpCompiler.cmake.in
-%%DATADIR%%/Modules/CMakeCSharpCompilerId.cs.in
-%%DATADIR%%/Modules/CMakeCSharpInformation.cmake
-%%DATADIR%%/Modules/CMakeCUDACompiler.cmake.in
-%%DATADIR%%/Modules/CMakeCUDACompilerABI.cu
-%%DATADIR%%/Modules/CMakeCUDACompilerId.cu.in
-%%DATADIR%%/Modules/CMakeCUDAInformation.cmake
-%%DATADIR%%/Modules/CMakeCXXCompiler.cmake.in
-%%DATADIR%%/Modules/CMakeCXXCompilerABI.cpp
-%%DATADIR%%/Modules/CMakeCXXCompilerId.cpp.in
-%%DATADIR%%/Modules/CMakeCXXInformation.cmake
-%%DATADIR%%/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake
-%%DATADIR%%/Modules/CMakeCommonLanguageInclude.cmake
-%%DATADIR%%/Modules/CMakeCompilerABI.h
-%%DATADIR%%/Modules/CMakeCompilerIdDetection.cmake
-%%DATADIR%%/Modules/CMakeConfigurableFile.in
-%%DATADIR%%/Modules/CMakeDependentOption.cmake
-%%DATADIR%%/Modules/CMakeDetermineASM-ATTCompiler.cmake
-%%DATADIR%%/Modules/CMakeDetermineASMCompiler.cmake
-%%DATADIR%%/Modules/CMakeDetermineASM_MASMCompiler.cmake
-%%DATADIR%%/Modules/CMakeDetermineASM_NASMCompiler.cmake
-%%DATADIR%%/Modules/CMakeDetermineCCompiler.cmake
-%%DATADIR%%/Modules/CMakeDetermineCSharpCompiler.cmake
-%%DATADIR%%/Modules/CMakeDetermineCUDACompiler.cmake
-%%DATADIR%%/Modules/CMakeDetermineCXXCompiler.cmake
-%%DATADIR%%/Modules/CMakeDetermineCompileFeatures.cmake
-%%DATADIR%%/Modules/CMakeDetermineCompiler.cmake
-%%DATADIR%%/Modules/CMakeDetermineCompilerABI.cmake
-%%DATADIR%%/Modules/CMakeDetermineCompilerId.cmake
-%%DATADIR%%/Modules/CMakeDetermineFortranCompiler.cmake
-%%DATADIR%%/Modules/CMakeDetermineJavaCompiler.cmake
-%%DATADIR%%/Modules/CMakeDetermineRCCompiler.cmake
-%%DATADIR%%/Modules/CMakeDetermineSwiftCompiler.cmake
-%%DATADIR%%/Modules/CMakeDetermineSystem.cmake
-%%DATADIR%%/Modules/CMakeDetermineVSServicePack.cmake
-%%DATADIR%%/Modules/CMakeExpandImportedTargets.cmake
-%%DATADIR%%/Modules/CMakeExportBuildSettings.cmake
-%%DATADIR%%/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
-%%DATADIR%%/Modules/CMakeFindBinUtils.cmake
-%%DATADIR%%/Modules/CMakeFindCodeBlocks.cmake
-%%DATADIR%%/Modules/CMakeFindDependencyMacro.cmake
-%%DATADIR%%/Modules/CMakeFindEclipseCDT4.cmake
-%%DATADIR%%/Modules/CMakeFindFrameworks.cmake
-%%DATADIR%%/Modules/CMakeFindJavaCommon.cmake
-%%DATADIR%%/Modules/CMakeFindKDevelop3.cmake
-%%DATADIR%%/Modules/CMakeFindKate.cmake
-%%DATADIR%%/Modules/CMakeFindPackageMode.cmake
-%%DATADIR%%/Modules/CMakeFindWMake.cmake
-%%DATADIR%%/Modules/CMakeFindXCode.cmake
-%%DATADIR%%/Modules/CMakeForceCompiler.cmake
-%%DATADIR%%/Modules/CMakeFortranCompiler.cmake.in
-%%DATADIR%%/Modules/CMakeFortranCompilerABI.F
-%%DATADIR%%/Modules/CMakeFortranCompilerId.F.in
-%%DATADIR%%/Modules/CMakeFortranInformation.cmake
-%%DATADIR%%/Modules/CMakeGenericSystem.cmake
-%%DATADIR%%/Modules/CMakeGraphVizOptions.cmake
-%%DATADIR%%/Modules/CMakeIOSInstallCombined.cmake
-%%DATADIR%%/Modules/CMakeImportBuildSettings.cmake
-%%DATADIR%%/Modules/CMakeJOMFindMake.cmake
-%%DATADIR%%/Modules/CMakeJavaCompiler.cmake.in
-%%DATADIR%%/Modules/CMakeJavaInformation.cmake
-%%DATADIR%%/Modules/CMakeLanguageInformation.cmake
-%%DATADIR%%/Modules/CMakeMSYSFindMake.cmake
-%%DATADIR%%/Modules/CMakeMinGWFindMake.cmake
-%%DATADIR%%/Modules/CMakeNMakeFindMake.cmake
-%%DATADIR%%/Modules/CMakeNinjaFindMake.cmake
-%%DATADIR%%/Modules/CMakePackageConfigHelpers.cmake
-%%DATADIR%%/Modules/CMakeParseArguments.cmake
-%%DATADIR%%/Modules/CMakeParseImplicitLinkInfo.cmake
-%%DATADIR%%/Modules/CMakePlatformId.h.in
-%%DATADIR%%/Modules/CMakePrintHelpers.cmake
-%%DATADIR%%/Modules/CMakePrintSystemInformation.cmake
-%%DATADIR%%/Modules/CMakePushCheckState.cmake
-%%DATADIR%%/Modules/CMakeRCCompiler.cmake.in
-%%DATADIR%%/Modules/CMakeRCInformation.cmake
-%%DATADIR%%/Modules/CMakeSwiftCompiler.cmake.in
-%%DATADIR%%/Modules/CMakeSwiftInformation.cmake
-%%DATADIR%%/Modules/CMakeSystem.cmake.in
-%%DATADIR%%/Modules/CMakeSystemSpecificInformation.cmake
-%%DATADIR%%/Modules/CMakeSystemSpecificInitialize.cmake
-%%DATADIR%%/Modules/CMakeTestASM-ATTCompiler.cmake
-%%DATADIR%%/Modules/CMakeTestASMCompiler.cmake
-%%DATADIR%%/Modules/CMakeTestASM_MASMCompiler.cmake
-%%DATADIR%%/Modules/CMakeTestASM_NASMCompiler.cmake
-%%DATADIR%%/Modules/CMakeTestCCompiler.cmake
-%%DATADIR%%/Modules/CMakeTestCSharpCompiler.cmake
-%%DATADIR%%/Modules/CMakeTestCUDACompiler.cmake
-%%DATADIR%%/Modules/CMakeTestCXXCompiler.cmake
-%%DATADIR%%/Modules/CMakeTestCompilerCommon.cmake
-%%DATADIR%%/Modules/CMakeTestFortranCompiler.cmake
-%%DATADIR%%/Modules/CMakeTestGNU.c
-%%DATADIR%%/Modules/CMakeTestJavaCompiler.cmake
-%%DATADIR%%/Modules/CMakeTestRCCompiler.cmake
-%%DATADIR%%/Modules/CMakeTestSwiftCompiler.cmake
-%%DATADIR%%/Modules/CMakeUnixFindMake.cmake
-%%DATADIR%%/Modules/CMakeVS7BackwardCompatibility.cmake
-%%DATADIR%%/Modules/CMakeVerifyManifest.cmake
-%%DATADIR%%/Modules/CPack.DS_Store.in
-%%DATADIR%%/Modules/CPack.Description.plist.in
-%%DATADIR%%/Modules/CPack.Info.plist.in
-%%DATADIR%%/Modules/CPack.OSXScriptLauncher.in
-%%DATADIR%%/Modules/CPack.OSXScriptLauncher.rsrc.in
-%%DATADIR%%/Modules/CPack.OSXX11.Info.plist.in
-%%DATADIR%%/Modules/CPack.OSXX11.main.scpt.in
-%%DATADIR%%/Modules/CPack.RuntimeScript.in
-%%DATADIR%%/Modules/CPack.STGZ_Header.sh.in
-%%DATADIR%%/Modules/CPack.VolumeIcon.icns.in
-%%DATADIR%%/Modules/CPack.background.png.in
-%%DATADIR%%/Modules/CPack.cmake
-%%DATADIR%%/Modules/CPack.distribution.dist.in
-%%DATADIR%%/Modules/CPackBundle.cmake
-%%DATADIR%%/Modules/CPackComponent.cmake
-%%DATADIR%%/Modules/CPackCygwin.cmake
-%%DATADIR%%/Modules/CPackDMG.cmake
-%%DATADIR%%/Modules/CPackDeb.cmake
-%%DATADIR%%/Modules/CPackIFW.cmake
-%%DATADIR%%/Modules/CPackIFWConfigureFile.cmake
-%%DATADIR%%/Modules/CPackNSIS.cmake
-%%DATADIR%%/Modules/CPackPackageMaker.cmake
-%%DATADIR%%/Modules/CPackProductBuild.cmake
-%%DATADIR%%/Modules/CPackRPM.cmake
-%%DATADIR%%/Modules/CPackWIX.cmake
-%%DATADIR%%/Modules/CPackZIP.cmake
-%%DATADIR%%/Modules/CTest.cmake
-%%DATADIR%%/Modules/CTestCoverageCollectGCOV.cmake
-%%DATADIR%%/Modules/CTestScriptMode.cmake
-%%DATADIR%%/Modules/CTestTargets.cmake
-%%DATADIR%%/Modules/CTestUseLaunchers.cmake
-%%DATADIR%%/Modules/CheckCCompilerFlag.cmake
-%%DATADIR%%/Modules/CheckCSourceCompiles.cmake
-%%DATADIR%%/Modules/CheckCSourceRuns.cmake
-%%DATADIR%%/Modules/CheckCXXCompilerFlag.cmake
-%%DATADIR%%/Modules/CheckCXXSourceCompiles.cmake
-%%DATADIR%%/Modules/CheckCXXSourceRuns.cmake
-%%DATADIR%%/Modules/CheckCXXSymbolExists.cmake
-%%DATADIR%%/Modules/CheckForPthreads.c
-%%DATADIR%%/Modules/CheckFortranCompilerFlag.cmake
-%%DATADIR%%/Modules/CheckFortranFunctionExists.cmake
-%%DATADIR%%/Modules/CheckFortranSourceCompiles.cmake
-%%DATADIR%%/Modules/CheckFunctionExists.c
-%%DATADIR%%/Modules/CheckFunctionExists.cmake
-%%DATADIR%%/Modules/CheckIncludeFile.c.in
-%%DATADIR%%/Modules/CheckIncludeFile.cmake
-%%DATADIR%%/Modules/CheckIncludeFile.cxx.in
-%%DATADIR%%/Modules/CheckIncludeFileCXX.cmake
-%%DATADIR%%/Modules/CheckIncludeFiles.cmake
-%%DATADIR%%/Modules/CheckLanguage.cmake
-%%DATADIR%%/Modules/CheckLibraryExists.cmake
-%%DATADIR%%/Modules/CheckLibraryExists.lists.in
-%%DATADIR%%/Modules/CheckPrototypeDefinition.c.in
-%%DATADIR%%/Modules/CheckPrototypeDefinition.cmake
-%%DATADIR%%/Modules/CheckSizeOf.cmake
-%%DATADIR%%/Modules/CheckStructHasMember.cmake
-%%DATADIR%%/Modules/CheckSymbolExists.cmake
-%%DATADIR%%/Modules/CheckTypeSize.c.in
-%%DATADIR%%/Modules/CheckTypeSize.cmake
-%%DATADIR%%/Modules/CheckTypeSizeMap.cmake.in
-%%DATADIR%%/Modules/CheckVariableExists.c
-%%DATADIR%%/Modules/CheckVariableExists.cmake
-%%DATADIR%%/Modules/Compiler/ADSP-DetermineCompiler.cmake
-%%DATADIR%%/Modules/Compiler/ARMCC-ASM.cmake
-%%DATADIR%%/Modules/Compiler/ARMCC-C.cmake
-%%DATADIR%%/Modules/Compiler/ARMCC-CXX.cmake
-%%DATADIR%%/Modules/Compiler/ARMCC-DetermineCompiler.cmake
-%%DATADIR%%/Modules/Compiler/ARMCC.cmake
-%%DATADIR%%/Modules/Compiler/Absoft-Fortran.cmake
-%%DATADIR%%/Modules/Compiler/AppleClang-ASM.cmake
-%%DATADIR%%/Modules/Compiler/AppleClang-C-FeatureTests.cmake
-%%DATADIR%%/Modules/Compiler/AppleClang-C.cmake
-%%DATADIR%%/Modules/Compiler/AppleClang-CXX-FeatureTests.cmake
-%%DATADIR%%/Modules/Compiler/AppleClang-CXX.cmake
-%%DATADIR%%/Modules/Compiler/AppleClang-DetermineCompiler.cmake
-%%DATADIR%%/Modules/Compiler/Borland-DetermineCompiler.cmake
-%%DATADIR%%/Modules/Compiler/Bruce-C-DetermineCompiler.cmake
-%%DATADIR%%/Modules/Compiler/Bruce-C.cmake
-%%DATADIR%%/Modules/Compiler/CCur-Fortran.cmake
-%%DATADIR%%/Modules/Compiler/Clang-ASM.cmake
-%%DATADIR%%/Modules/Compiler/Clang-C-FeatureTests.cmake
-%%DATADIR%%/Modules/Compiler/Clang-C.cmake
-%%DATADIR%%/Modules/Compiler/Clang-CXX-FeatureTests.cmake
-%%DATADIR%%/Modules/Compiler/Clang-CXX-TestableFeatures.cmake
-%%DATADIR%%/Modules/Compiler/Clang-CXX.cmake
-%%DATADIR%%/Modules/Compiler/Clang-DetermineCompiler.cmake
-%%DATADIR%%/Modules/Compiler/Clang-DetermineCompilerInternal.cmake
-%%DATADIR%%/Modules/Compiler/Clang.cmake
-%%DATADIR%%/Modules/Compiler/Comeau-CXX-DetermineCompiler.cmake
-%%DATADIR%%/Modules/Compiler/Compaq-C-DetermineCompiler.cmake
-%%DATADIR%%/Modules/Compiler/Compaq-CXX-DetermineCompiler.cmake
-%%DATADIR%%/Modules/Compiler/Cray-C.cmake
-%%DATADIR%%/Modules/Compiler/Cray-CXX.cmake
-%%DATADIR%%/Modules/Compiler/Cray-DetermineCompiler.cmake
-%%DATADIR%%/Modules/Compiler/Cray-Fortran.cmake
-%%DATADIR%%/Modules/Compiler/CrayPrgEnv-C.cmake
-%%DATADIR%%/Modules/Compiler/CrayPrgEnv-CXX.cmake
-%%DATADIR%%/Modules/Compiler/CrayPrgEnv-Cray-C.cmake
-%%DATADIR%%/Modules/Compiler/CrayPrgEnv-Cray-CXX.cmake
-%%DATADIR%%/Modules/Compiler/CrayPrgEnv-Cray-Fortran.cmake
-%%DATADIR%%/Modules/Compiler/CrayPrgEnv-Fortran.cmake
-%%DATADIR%%/Modules/Compiler/CrayPrgEnv-GNU-C.cmake
-%%DATADIR%%/Modules/Compiler/CrayPrgEnv-GNU-CXX.cmake
-%%DATADIR%%/Modules/Compiler/CrayPrgEnv-GNU-Fortran.cmake
-%%DATADIR%%/Modules/Compiler/CrayPrgEnv-Intel-C.cmake
-%%DATADIR%%/Modules/Compiler/CrayPrgEnv-Intel-CXX.cmake
-%%DATADIR%%/Modules/Compiler/CrayPrgEnv-Intel-Fortran.cmake
-%%DATADIR%%/Modules/Compiler/CrayPrgEnv-PGI-C.cmake
-%%DATADIR%%/Modules/Compiler/CrayPrgEnv-PGI-CXX.cmake
-%%DATADIR%%/Modules/Compiler/CrayPrgEnv-PGI-Fortran.cmake
-%%DATADIR%%/Modules/Compiler/CrayPrgEnv.cmake
-%%DATADIR%%/Modules/Compiler/Embarcadero-DetermineCompiler.cmake
-%%DATADIR%%/Modules/Compiler/Fujitsu-DetermineCompiler.cmake
-%%DATADIR%%/Modules/Compiler/G95-Fortran.cmake
-%%DATADIR%%/Modules/Compiler/GHS-C.cmake
-%%DATADIR%%/Modules/Compiler/GHS-CXX.cmake
-%%DATADIR%%/Modules/Compiler/GHS-DetermineCompiler.cmake
-%%DATADIR%%/Modules/Compiler/GHS.cmake
-%%DATADIR%%/Modules/Compiler/GNU-ASM.cmake
-%%DATADIR%%/Modules/Compiler/GNU-C-DetermineCompiler.cmake
-%%DATADIR%%/Modules/Compiler/GNU-C-FeatureTests.cmake
-%%DATADIR%%/Modules/Compiler/GNU-C.cmake
-%%DATADIR%%/Modules/Compiler/GNU-CXX-DetermineCompiler.cmake
-%%DATADIR%%/Modules/Compiler/GNU-CXX-FeatureTests.cmake
-%%DATADIR%%/Modules/Compiler/GNU-CXX.cmake
-%%DATADIR%%/Modules/Compiler/GNU-Fortran.cmake
-%%DATADIR%%/Modules/Compiler/GNU.cmake
-%%DATADIR%%/Modules/Compiler/HP-ASM.cmake
-%%DATADIR%%/Modules/Compiler/HP-C-DetermineCompiler.cmake
-%%DATADIR%%/Modules/Compiler/HP-C.cmake
-%%DATADIR%%/Modules/Compiler/HP-CXX-DetermineCompiler.cmake
-%%DATADIR%%/Modules/Compiler/HP-CXX.cmake
-%%DATADIR%%/Modules/Compiler/HP-Fortran.cmake
-%%DATADIR%%/Modules/Compiler/IAR-ASM.cmake
-%%DATADIR%%/Modules/Compiler/IAR-C.cmake
-%%DATADIR%%/Modules/Compiler/IAR-CXX.cmake
-%%DATADIR%%/Modules/Compiler/IAR-DetermineCompiler.cmake
-%%DATADIR%%/Modules/Compiler/IAR.cmake
-%%DATADIR%%/Modules/Compiler/IBMCPP-C-DetermineVersionInternal.cmake
-%%DATADIR%%/Modules/Compiler/IBMCPP-CXX-DetermineVersionInternal.cmake
-%%DATADIR%%/Modules/Compiler/Intel-ASM.cmake
-%%DATADIR%%/Modules/Compiler/Intel-C-FeatureTests.cmake
-%%DATADIR%%/Modules/Compiler/Intel-C.cmake
-%%DATADIR%%/Modules/Compiler/Intel-CXX-FeatureTests.cmake
-%%DATADIR%%/Modules/Compiler/Intel-CXX.cmake
-%%DATADIR%%/Modules/Compiler/Intel-DetermineCompiler.cmake
-%%DATADIR%%/Modules/Compiler/Intel-Fortran.cmake
-%%DATADIR%%/Modules/Compiler/Intel.cmake
-%%DATADIR%%/Modules/Compiler/MIPSpro-C.cmake
-%%DATADIR%%/Modules/Compiler/MIPSpro-CXX.cmake
-%%DATADIR%%/Modules/Compiler/MIPSpro-DetermineCompiler.cmake
-%%DATADIR%%/Modules/Compiler/MIPSpro-Fortran.cmake
-%%DATADIR%%/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
-%%DATADIR%%/Modules/Compiler/MSVC-CXX.cmake
-%%DATADIR%%/Modules/Compiler/MSVC-DetermineCompiler.cmake
-%%DATADIR%%/Modules/Compiler/NAG-Fortran.cmake
-%%DATADIR%%/Modules/Compiler/NVIDIA-CUDA.cmake
-%%DATADIR%%/Modules/Compiler/NVIDIA-DetermineCompiler.cmake
-%%DATADIR%%/Modules/Compiler/OpenWatcom-DetermineCompiler.cmake
-%%DATADIR%%/Modules/Compiler/PGI-C.cmake
-%%DATADIR%%/Modules/Compiler/PGI-CXX.cmake
-%%DATADIR%%/Modules/Compiler/PGI-DetermineCompiler.cmake
-%%DATADIR%%/Modules/Compiler/PGI-Fortran.cmake
-%%DATADIR%%/Modules/Compiler/PGI.cmake
-%%DATADIR%%/Modules/Compiler/PathScale-C.cmake
-%%DATADIR%%/Modules/Compiler/PathScale-CXX.cmake
-%%DATADIR%%/Modules/Compiler/PathScale-DetermineCompiler.cmake
-%%DATADIR%%/Modules/Compiler/PathScale-Fortran.cmake
-%%DATADIR%%/Modules/Compiler/PathScale.cmake
-%%DATADIR%%/Modules/Compiler/QCC-C.cmake
-%%DATADIR%%/Modules/Compiler/QCC-CXX.cmake
-%%DATADIR%%/Modules/Compiler/QCC.cmake
-%%DATADIR%%/Modules/Compiler/SCO-C.cmake
-%%DATADIR%%/Modules/Compiler/SCO-CXX.cmake
-%%DATADIR%%/Modules/Compiler/SCO-DetermineCompiler.cmake
-%%DATADIR%%/Modules/Compiler/SCO.cmake
-%%DATADIR%%/Modules/Compiler/SDCC-C-DetermineCompiler.cmake
-%%DATADIR%%/Modules/Compiler/SunPro-ASM.cmake
-%%DATADIR%%/Modules/Compiler/SunPro-C-DetermineCompiler.cmake
-%%DATADIR%%/Modules/Compiler/SunPro-C.cmake
-%%DATADIR%%/Modules/Compiler/SunPro-CXX-DetermineCompiler.cmake
-%%DATADIR%%/Modules/Compiler/SunPro-CXX-FeatureTests.cmake
-%%DATADIR%%/Modules/Compiler/SunPro-CXX.cmake
-%%DATADIR%%/Modules/Compiler/SunPro-Fortran.cmake
-%%DATADIR%%/Modules/Compiler/TI-ASM.cmake
-%%DATADIR%%/Modules/Compiler/TI-C.cmake
-%%DATADIR%%/Modules/Compiler/TI-CXX.cmake
-%%DATADIR%%/Modules/Compiler/TI-DetermineCompiler.cmake
-%%DATADIR%%/Modules/Compiler/TinyCC-C-DetermineCompiler.cmake
-%%DATADIR%%/Modules/Compiler/TinyCC-C.cmake
-%%DATADIR%%/Modules/Compiler/VisualAge-C-DetermineCompiler.cmake
-%%DATADIR%%/Modules/Compiler/VisualAge-C.cmake
-%%DATADIR%%/Modules/Compiler/VisualAge-CXX-DetermineCompiler.cmake
-%%DATADIR%%/Modules/Compiler/VisualAge-CXX.cmake
-%%DATADIR%%/Modules/Compiler/VisualAge-Fortran.cmake
-%%DATADIR%%/Modules/Compiler/Watcom-DetermineCompiler.cmake
-%%DATADIR%%/Modules/Compiler/XL-ASM.cmake
-%%DATADIR%%/Modules/Compiler/XL-C-DetermineCompiler.cmake
-%%DATADIR%%/Modules/Compiler/XL-C.cmake
-%%DATADIR%%/Modules/Compiler/XL-CXX-DetermineCompiler.cmake
-%%DATADIR%%/Modules/Compiler/XL-CXX.cmake
-%%DATADIR%%/Modules/Compiler/XL-Fortran.cmake
-%%DATADIR%%/Modules/Compiler/XL.cmake
-%%DATADIR%%/Modules/Compiler/zOS-C-DetermineCompiler.cmake
-%%DATADIR%%/Modules/Compiler/zOS-CXX-DetermineCompiler.cmake
-%%DATADIR%%/Modules/CompilerId/VS-10.csproj.in
-%%DATADIR%%/Modules/CompilerId/VS-10.vcxproj.in
-%%DATADIR%%/Modules/CompilerId/VS-7.vcproj.in
-%%DATADIR%%/Modules/CompilerId/VS-Intel.vfproj.in
-%%DATADIR%%/Modules/CompilerId/VS-NsightTegra.vcxproj.in
-%%DATADIR%%/Modules/CompilerId/Xcode-1.pbxproj.in
-%%DATADIR%%/Modules/CompilerId/Xcode-2.pbxproj.in
-%%DATADIR%%/Modules/CompilerId/Xcode-3.pbxproj.in
-%%DATADIR%%/Modules/CompilerId/main.swift.in
-%%DATADIR%%/Modules/CSharpUtilities.cmake
-%%DATADIR%%/Modules/Dart.cmake
-%%DATADIR%%/Modules/DartConfiguration.tcl.in
-%%DATADIR%%/Modules/DeployQt4.cmake
-%%DATADIR%%/Modules/Documentation.cmake
-%%DATADIR%%/Modules/DummyCXXFile.cxx
-%%DATADIR%%/Modules/ExternalData.cmake
-%%DATADIR%%/Modules/ExternalData_config.cmake.in
-%%DATADIR%%/Modules/ExternalProject-download.cmake.in
-%%DATADIR%%/Modules/ExternalProject-verify.cmake.in
-%%DATADIR%%/Modules/ExternalProject.cmake
-%%DATADIR%%/Modules/FLTKCompatibility.cmake
-%%DATADIR%%/Modules/FeatureSummary.cmake
-%%DATADIR%%/Modules/FindALSA.cmake
-%%DATADIR%%/Modules/FindASPELL.cmake
-%%DATADIR%%/Modules/FindAVIFile.cmake
-%%DATADIR%%/Modules/FindArmadillo.cmake
-%%DATADIR%%/Modules/FindBISON.cmake
-%%DATADIR%%/Modules/FindBLAS.cmake
-%%DATADIR%%/Modules/FindBZip2.cmake
-%%DATADIR%%/Modules/FindBacktrace.cmake
-%%DATADIR%%/Modules/FindBoost.cmake
-%%DATADIR%%/Modules/FindBullet.cmake
-%%DATADIR%%/Modules/FindCABLE.cmake
-%%DATADIR%%/Modules/FindCUDA.cmake
-%%DATADIR%%/Modules/FindCUDA/make2cmake.cmake
-%%DATADIR%%/Modules/FindCUDA/parse_cubin.cmake
-%%DATADIR%%/Modules/FindCUDA/run_nvcc.cmake
-%%DATADIR%%/Modules/FindCUDA/select_compute_arch.cmake
-%%DATADIR%%/Modules/FindCURL.cmake
-%%DATADIR%%/Modules/FindCVS.cmake
-%%DATADIR%%/Modules/FindCoin3D.cmake
-%%DATADIR%%/Modules/FindCups.cmake
-%%DATADIR%%/Modules/FindCurses.cmake
-%%DATADIR%%/Modules/FindCxxTest.cmake
-%%DATADIR%%/Modules/FindCygwin.cmake
-%%DATADIR%%/Modules/FindDCMTK.cmake
-%%DATADIR%%/Modules/FindDart.cmake
-%%DATADIR%%/Modules/FindDevIL.cmake
-%%DATADIR%%/Modules/FindDoxygen.cmake
-%%DATADIR%%/Modules/FindEXPAT.cmake
-%%DATADIR%%/Modules/FindFLEX.cmake
-%%DATADIR%%/Modules/FindFLTK.cmake
-%%DATADIR%%/Modules/FindFLTK2.cmake
-%%DATADIR%%/Modules/FindFreetype.cmake
-%%DATADIR%%/Modules/FindGCCXML.cmake
-%%DATADIR%%/Modules/FindGDAL.cmake
-%%DATADIR%%/Modules/FindGIF.cmake
-%%DATADIR%%/Modules/FindGLEW.cmake
-%%DATADIR%%/Modules/FindGLU.cmake
-%%DATADIR%%/Modules/FindGLUT.cmake
-%%DATADIR%%/Modules/FindGSL.cmake
-%%DATADIR%%/Modules/FindGTK.cmake
-%%DATADIR%%/Modules/FindGTK2.cmake
-%%DATADIR%%/Modules/FindGTest.cmake
-%%DATADIR%%/Modules/FindGettext.cmake
-%%DATADIR%%/Modules/FindGit.cmake
-%%DATADIR%%/Modules/FindGnuTLS.cmake
-%%DATADIR%%/Modules/FindGnuplot.cmake
-%%DATADIR%%/Modules/FindHDF5.cmake
-%%DATADIR%%/Modules/FindHSPELL.cmake
-%%DATADIR%%/Modules/FindHTMLHelp.cmake
-%%DATADIR%%/Modules/FindHg.cmake
-%%DATADIR%%/Modules/FindICU.cmake
-%%DATADIR%%/Modules/FindIce.cmake
-%%DATADIR%%/Modules/FindIcotool.cmake
-%%DATADIR%%/Modules/FindImageMagick.cmake
-%%DATADIR%%/Modules/FindIntl.cmake
-%%DATADIR%%/Modules/FindJNI.cmake
-%%DATADIR%%/Modules/FindJPEG.cmake
-%%DATADIR%%/Modules/FindJasper.cmake
-%%DATADIR%%/Modules/FindJava.cmake
-%%DATADIR%%/Modules/FindKDE3.cmake
-%%DATADIR%%/Modules/FindKDE4.cmake
-%%DATADIR%%/Modules/FindLAPACK.cmake
-%%DATADIR%%/Modules/FindLATEX.cmake
-%%DATADIR%%/Modules/FindLTTngUST.cmake
-%%DATADIR%%/Modules/FindLibArchive.cmake
-%%DATADIR%%/Modules/FindLibLZMA.cmake
-%%DATADIR%%/Modules/FindLibXml2.cmake
-%%DATADIR%%/Modules/FindLibXslt.cmake
-%%DATADIR%%/Modules/FindLua.cmake
-%%DATADIR%%/Modules/FindLua50.cmake
-%%DATADIR%%/Modules/FindLua51.cmake
-%%DATADIR%%/Modules/FindMFC.cmake
-%%DATADIR%%/Modules/FindMPEG.cmake
-%%DATADIR%%/Modules/FindMPEG2.cmake
-%%DATADIR%%/Modules/FindMPI.cmake
-%%DATADIR%%/Modules/FindMatlab.cmake
-%%DATADIR%%/Modules/FindMotif.cmake
-%%DATADIR%%/Modules/FindOpenAL.cmake
-%%DATADIR%%/Modules/FindOpenCL.cmake
-%%DATADIR%%/Modules/FindOpenGL.cmake
-%%DATADIR%%/Modules/FindOpenMP.cmake
-%%DATADIR%%/Modules/FindOpenSSL.cmake
-%%DATADIR%%/Modules/FindOpenSceneGraph.cmake
-%%DATADIR%%/Modules/FindOpenThreads.cmake
-%%DATADIR%%/Modules/FindPHP4.cmake
-%%DATADIR%%/Modules/FindPNG.cmake
-%%DATADIR%%/Modules/FindPackageHandleStandardArgs.cmake
-%%DATADIR%%/Modules/FindPackageMessage.cmake
-%%DATADIR%%/Modules/FindPerl.cmake
-%%DATADIR%%/Modules/FindPerlLibs.cmake
-%%DATADIR%%/Modules/FindPhysFS.cmake
-%%DATADIR%%/Modules/FindPike.cmake
-%%DATADIR%%/Modules/FindPkgConfig.cmake
-%%DATADIR%%/Modules/FindPostgreSQL.cmake
-%%DATADIR%%/Modules/FindProducer.cmake
-%%DATADIR%%/Modules/FindProtobuf.cmake
-%%DATADIR%%/Modules/FindPythonInterp.cmake
-%%DATADIR%%/Modules/FindPythonLibs.cmake
-%%DATADIR%%/Modules/FindQt.cmake
-%%DATADIR%%/Modules/FindQt3.cmake
-%%DATADIR%%/Modules/FindQt4.cmake
-%%DATADIR%%/Modules/FindQuickTime.cmake
-%%DATADIR%%/Modules/FindRTI.cmake
-%%DATADIR%%/Modules/FindRuby.cmake
-%%DATADIR%%/Modules/FindSDL.cmake
-%%DATADIR%%/Modules/FindSDL_image.cmake
-%%DATADIR%%/Modules/FindSDL_mixer.cmake
-%%DATADIR%%/Modules/FindSDL_net.cmake
-%%DATADIR%%/Modules/FindSDL_sound.cmake
-%%DATADIR%%/Modules/FindSDL_ttf.cmake
-%%DATADIR%%/Modules/FindSWIG.cmake
-%%DATADIR%%/Modules/FindSelfPackers.cmake
-%%DATADIR%%/Modules/FindSquish.cmake
-%%DATADIR%%/Modules/FindSubversion.cmake
-%%DATADIR%%/Modules/FindTCL.cmake
-%%DATADIR%%/Modules/FindTIFF.cmake
-%%DATADIR%%/Modules/FindTclStub.cmake
-%%DATADIR%%/Modules/FindTclsh.cmake
-%%DATADIR%%/Modules/FindThreads.cmake
-%%DATADIR%%/Modules/FindUnixCommands.cmake
-%%DATADIR%%/Modules/FindVulkan.cmake
-%%DATADIR%%/Modules/FindWget.cmake
-%%DATADIR%%/Modules/FindWish.cmake
-%%DATADIR%%/Modules/FindX11.cmake
-%%DATADIR%%/Modules/FindXCTest.cmake
-%%DATADIR%%/Modules/FindXMLRPC.cmake
-%%DATADIR%%/Modules/FindXalanC.cmake
-%%DATADIR%%/Modules/FindXercesC.cmake
-%%DATADIR%%/Modules/FindZLIB.cmake
-%%DATADIR%%/Modules/Findosg.cmake
-%%DATADIR%%/Modules/FindosgAnimation.cmake
-%%DATADIR%%/Modules/FindosgDB.cmake
-%%DATADIR%%/Modules/FindosgFX.cmake
-%%DATADIR%%/Modules/FindosgGA.cmake
-%%DATADIR%%/Modules/FindosgIntrospection.cmake
-%%DATADIR%%/Modules/FindosgManipulator.cmake
-%%DATADIR%%/Modules/FindosgParticle.cmake
-%%DATADIR%%/Modules/FindosgPresentation.cmake
-%%DATADIR%%/Modules/FindosgProducer.cmake
-%%DATADIR%%/Modules/FindosgQt.cmake
-%%DATADIR%%/Modules/FindosgShadow.cmake
-%%DATADIR%%/Modules/FindosgSim.cmake
-%%DATADIR%%/Modules/FindosgTerrain.cmake
-%%DATADIR%%/Modules/FindosgText.cmake
-%%DATADIR%%/Modules/FindosgUtil.cmake
-%%DATADIR%%/Modules/FindosgViewer.cmake
-%%DATADIR%%/Modules/FindosgVolume.cmake
-%%DATADIR%%/Modules/FindosgWidget.cmake
-%%DATADIR%%/Modules/Findosg_functions.cmake
-%%DATADIR%%/Modules/FindwxWidgets.cmake
-%%DATADIR%%/Modules/FindwxWindows.cmake
-%%DATADIR%%/Modules/FortranCInterface.cmake
-%%DATADIR%%/Modules/FortranCInterface/CMakeLists.txt
-%%DATADIR%%/Modules/FortranCInterface/Detect.cmake
-%%DATADIR%%/Modules/FortranCInterface/Input.cmake.in
-%%DATADIR%%/Modules/FortranCInterface/Macro.h.in
-%%DATADIR%%/Modules/FortranCInterface/Output.cmake.in
-%%DATADIR%%/Modules/FortranCInterface/Verify/CMakeLists.txt
-%%DATADIR%%/Modules/FortranCInterface/Verify/VerifyC.c
-%%DATADIR%%/Modules/FortranCInterface/Verify/VerifyCXX.cxx
-%%DATADIR%%/Modules/FortranCInterface/Verify/VerifyFortran.f
-%%DATADIR%%/Modules/FortranCInterface/Verify/main.c
-%%DATADIR%%/Modules/FortranCInterface/call_mod.f90
-%%DATADIR%%/Modules/FortranCInterface/call_sub.f
-%%DATADIR%%/Modules/FortranCInterface/main.F
-%%DATADIR%%/Modules/FortranCInterface/my_module.f90
-%%DATADIR%%/Modules/FortranCInterface/my_module_.c
-%%DATADIR%%/Modules/FortranCInterface/my_sub.f
-%%DATADIR%%/Modules/FortranCInterface/mymodule.f90
-%%DATADIR%%/Modules/FortranCInterface/mymodule_.c
-%%DATADIR%%/Modules/FortranCInterface/mysub.f
-%%DATADIR%%/Modules/FortranCInterface/symbol.c.in
-%%DATADIR%%/Modules/GNUInstallDirs.cmake
-%%DATADIR%%/Modules/GenerateExportHeader.cmake
-%%DATADIR%%/Modules/GetPrerequisites.cmake
-%%DATADIR%%/Modules/ITKCompatibility.cmake
-%%DATADIR%%/Modules/InstallRequiredSystemLibraries.cmake
-%%DATADIR%%/Modules/IntelVSImplicitPath/CMakeLists.txt
-%%DATADIR%%/Modules/IntelVSImplicitPath/detect.cmake
-%%DATADIR%%/Modules/IntelVSImplicitPath/hello.f
-%%DATADIR%%/Modules/Internal/FeatureTesting.cmake
-%%DATADIR%%/Modules/KDE3Macros.cmake
-%%DATADIR%%/Modules/MacOSXBundleInfo.plist.in
-%%DATADIR%%/Modules/MacOSXFrameworkInfo.plist.in
-%%DATADIR%%/Modules/MacroAddFileDependencies.cmake
-%%DATADIR%%/Modules/MatlabTestsRedirect.cmake
-%%DATADIR%%/Modules/NSIS.InstallOptions.ini.in
-%%DATADIR%%/Modules/NSIS.template.in
-%%DATADIR%%/Modules/Platform/AIX-Clang-C.cmake
-%%DATADIR%%/Modules/Platform/AIX-Clang-CXX.cmake
-%%DATADIR%%/Modules/Platform/AIX-GNU-ASM.cmake
-%%DATADIR%%/Modules/Platform/AIX-GNU-C.cmake
-%%DATADIR%%/Modules/Platform/AIX-GNU-CXX.cmake
-%%DATADIR%%/Modules/Platform/AIX-GNU-Fortran.cmake
-%%DATADIR%%/Modules/Platform/AIX-GNU.cmake
-%%DATADIR%%/Modules/Platform/AIX-VisualAge-C.cmake
-%%DATADIR%%/Modules/Platform/AIX-VisualAge-CXX.cmake
-%%DATADIR%%/Modules/Platform/AIX-VisualAge-Fortran.cmake
-%%DATADIR%%/Modules/Platform/AIX-XL-ASM.cmake
-%%DATADIR%%/Modules/Platform/AIX-XL-C.cmake
-%%DATADIR%%/Modules/Platform/AIX-XL-CXX.cmake
-%%DATADIR%%/Modules/Platform/AIX-XL-Fortran.cmake
-%%DATADIR%%/Modules/Platform/AIX-XL.cmake
-%%DATADIR%%/Modules/Platform/AIX.cmake
-%%DATADIR%%/Modules/Platform/ARTOS-GNU-C.cmake
-%%DATADIR%%/Modules/Platform/ARTOS.cmake
-%%DATADIR%%/Modules/Platform/Android-Clang-ASM.cmake
-%%DATADIR%%/Modules/Platform/Android-Clang-C.cmake
-%%DATADIR%%/Modules/Platform/Android-Clang-CXX.cmake
-%%DATADIR%%/Modules/Platform/Android-Clang.cmake
-%%DATADIR%%/Modules/Platform/Android-Common.cmake
-%%DATADIR%%/Modules/Platform/Android-Determine-C.cmake
-%%DATADIR%%/Modules/Platform/Android-Determine-CXX.cmake
-%%DATADIR%%/Modules/Platform/Android-Determine.cmake
-%%DATADIR%%/Modules/Platform/Android-GNU-C.cmake
-%%DATADIR%%/Modules/Platform/Android-GNU-CXX.cmake
-%%DATADIR%%/Modules/Platform/Android-GNU.cmake
-%%DATADIR%%/Modules/Platform/Android-Initialize.cmake
-%%DATADIR%%/Modules/Platform/Android.cmake
-%%DATADIR%%/Modules/Platform/Android/Determine-Compiler-NDK.cmake
-%%DATADIR%%/Modules/Platform/Android/Determine-Compiler-Standalone.cmake
-%%DATADIR%%/Modules/Platform/Android/Determine-Compiler.cmake
-%%DATADIR%%/Modules/Platform/Android/abi-arm64-v8a-Clang.cmake
-%%DATADIR%%/Modules/Platform/Android/abi-arm64-v8a-GNU.cmake
-%%DATADIR%%/Modules/Platform/Android/abi-armeabi-Clang.cmake
-%%DATADIR%%/Modules/Platform/Android/abi-armeabi-GNU.cmake
-%%DATADIR%%/Modules/Platform/Android/abi-armeabi-v6-Clang.cmake
-%%DATADIR%%/Modules/Platform/Android/abi-armeabi-v6-GNU.cmake
-%%DATADIR%%/Modules/Platform/Android/abi-armeabi-v7a-Clang.cmake
-%%DATADIR%%/Modules/Platform/Android/abi-armeabi-v7a-GNU.cmake
-%%DATADIR%%/Modules/Platform/Android/abi-common-Clang.cmake
-%%DATADIR%%/Modules/Platform/Android/abi-common-GNU.cmake
-%%DATADIR%%/Modules/Platform/Android/abi-common.cmake
-%%DATADIR%%/Modules/Platform/Android/abi-mips-Clang.cmake
-%%DATADIR%%/Modules/Platform/Android/abi-mips-GNU.cmake
-%%DATADIR%%/Modules/Platform/Android/abi-mips64-Clang.cmake
-%%DATADIR%%/Modules/Platform/Android/abi-mips64-GNU.cmake
-%%DATADIR%%/Modules/Platform/Android/abi-x86-Clang.cmake
-%%DATADIR%%/Modules/Platform/Android/abi-x86-GNU.cmake
-%%DATADIR%%/Modules/Platform/Android/abi-x86_64-Clang.cmake
-%%DATADIR%%/Modules/Platform/Android/abi-x86_64-GNU.cmake
-%%DATADIR%%/Modules/Platform/Android/ndk-stl-c++.cmake
-%%DATADIR%%/Modules/Platform/Android/ndk-stl-c++_shared.cmake
-%%DATADIR%%/Modules/Platform/Android/ndk-stl-c++_static.cmake
-%%DATADIR%%/Modules/Platform/Android/ndk-stl-gabi++.cmake
-%%DATADIR%%/Modules/Platform/Android/ndk-stl-gabi++_shared.cmake
-%%DATADIR%%/Modules/Platform/Android/ndk-stl-gabi++_static.cmake
-%%DATADIR%%/Modules/Platform/Android/ndk-stl-gnustl.cmake
-%%DATADIR%%/Modules/Platform/Android/ndk-stl-gnustl_shared.cmake
-%%DATADIR%%/Modules/Platform/Android/ndk-stl-gnustl_static.cmake
-%%DATADIR%%/Modules/Platform/Android/ndk-stl-none.cmake
-%%DATADIR%%/Modules/Platform/Android/ndk-stl-stlport.cmake
-%%DATADIR%%/Modules/Platform/Android/ndk-stl-stlport_shared.cmake
-%%DATADIR%%/Modules/Platform/Android/ndk-stl-stlport_static.cmake
-%%DATADIR%%/Modules/Platform/Android/ndk-stl-system.cmake
-%%DATADIR%%/Modules/Platform/BSDOS.cmake
-%%DATADIR%%/Modules/Platform/BeOS.cmake
-%%DATADIR%%/Modules/Platform/BlueGeneL.cmake
-%%DATADIR%%/Modules/Platform/BlueGeneP-base.cmake
-%%DATADIR%%/Modules/Platform/BlueGeneP-dynamic-GNU-C.cmake
-%%DATADIR%%/Modules/Platform/BlueGeneP-dynamic-GNU-CXX.cmake
-%%DATADIR%%/Modules/Platform/BlueGeneP-dynamic-GNU-Fortran.cmake
-%%DATADIR%%/Modules/Platform/BlueGeneP-dynamic-XL-C.cmake
-%%DATADIR%%/Modules/Platform/BlueGeneP-dynamic-XL-CXX.cmake
-%%DATADIR%%/Modules/Platform/BlueGeneP-dynamic-XL-Fortran.cmake
-%%DATADIR%%/Modules/Platform/BlueGeneP-dynamic.cmake
-%%DATADIR%%/Modules/Platform/BlueGeneP-static-GNU-C.cmake
-%%DATADIR%%/Modules/Platform/BlueGeneP-static-GNU-CXX.cmake
-%%DATADIR%%/Modules/Platform/BlueGeneP-static-GNU-Fortran.cmake
-%%DATADIR%%/Modules/Platform/BlueGeneP-static-XL-C.cmake
-%%DATADIR%%/Modules/Platform/BlueGeneP-static-XL-CXX.cmake
-%%DATADIR%%/Modules/Platform/BlueGeneP-static-XL-Fortran.cmake
-%%DATADIR%%/Modules/Platform/BlueGeneP-static.cmake
-%%DATADIR%%/Modules/Platform/BlueGeneQ-base.cmake
-%%DATADIR%%/Modules/Platform/BlueGeneQ-dynamic-GNU-C.cmake
-%%DATADIR%%/Modules/Platform/BlueGeneQ-dynamic-GNU-CXX.cmake
-%%DATADIR%%/Modules/Platform/BlueGeneQ-dynamic-GNU-Fortran.cmake
-%%DATADIR%%/Modules/Platform/BlueGeneQ-dynamic-XL-C.cmake
-%%DATADIR%%/Modules/Platform/BlueGeneQ-dynamic-XL-CXX.cmake
-%%DATADIR%%/Modules/Platform/BlueGeneQ-dynamic-XL-Fortran.cmake
-%%DATADIR%%/Modules/Platform/BlueGeneQ-dynamic.cmake
-%%DATADIR%%/Modules/Platform/BlueGeneQ-static-GNU-C.cmake
-%%DATADIR%%/Modules/Platform/BlueGeneQ-static-GNU-CXX.cmake
-%%DATADIR%%/Modules/Platform/BlueGeneQ-static-GNU-Fortran.cmake
-%%DATADIR%%/Modules/Platform/BlueGeneQ-static-XL-C.cmake
-%%DATADIR%%/Modules/Platform/BlueGeneQ-static-XL-CXX.cmake
-%%DATADIR%%/Modules/Platform/BlueGeneQ-static-XL-Fortran.cmake
-%%DATADIR%%/Modules/Platform/BlueGeneQ-static.cmake
-%%DATADIR%%/Modules/Platform/CYGWIN-Clang-C.cmake
-%%DATADIR%%/Modules/Platform/CYGWIN-Clang-CXX.cmake
-%%DATADIR%%/Modules/Platform/CYGWIN-Determine-CXX.cmake
-%%DATADIR%%/Modules/Platform/CYGWIN-GNU-C.cmake
-%%DATADIR%%/Modules/Platform/CYGWIN-GNU-CXX.cmake
-%%DATADIR%%/Modules/Platform/CYGWIN-GNU-Fortran.cmake
-%%DATADIR%%/Modules/Platform/CYGWIN-GNU.cmake
-%%DATADIR%%/Modules/Platform/CYGWIN-windres.cmake
-%%DATADIR%%/Modules/Platform/CYGWIN.cmake
-%%DATADIR%%/Modules/Platform/Catamount.cmake
-%%DATADIR%%/Modules/Platform/CrayLinuxEnvironment.cmake
-%%DATADIR%%/Modules/Platform/Darwin-Absoft-Fortran.cmake
-%%DATADIR%%/Modules/Platform/Darwin-AppleClang-C.cmake
-%%DATADIR%%/Modules/Platform/Darwin-AppleClang-CXX.cmake
-%%DATADIR%%/Modules/Platform/Darwin-Clang-C.cmake
-%%DATADIR%%/Modules/Platform/Darwin-Clang-CXX.cmake
-%%DATADIR%%/Modules/Platform/Darwin-Clang.cmake
-%%DATADIR%%/Modules/Platform/Darwin-Determine-CXX.cmake
-%%DATADIR%%/Modules/Platform/Darwin-GNU-C.cmake
-%%DATADIR%%/Modules/Platform/Darwin-GNU-CXX.cmake
-%%DATADIR%%/Modules/Platform/Darwin-GNU-Fortran.cmake
-%%DATADIR%%/Modules/Platform/Darwin-GNU.cmake
-%%DATADIR%%/Modules/Platform/Darwin-Initialize.cmake
-%%DATADIR%%/Modules/Platform/Darwin-Intel-C.cmake
-%%DATADIR%%/Modules/Platform/Darwin-Intel-CXX.cmake
-%%DATADIR%%/Modules/Platform/Darwin-Intel-Fortran.cmake
-%%DATADIR%%/Modules/Platform/Darwin-Intel.cmake
-%%DATADIR%%/Modules/Platform/Darwin-NAG-Fortran.cmake
-%%DATADIR%%/Modules/Platform/Darwin-PGI-C.cmake
-%%DATADIR%%/Modules/Platform/Darwin-PGI-CXX.cmake
-%%DATADIR%%/Modules/Platform/Darwin-PGI-Fortran.cmake
-%%DATADIR%%/Modules/Platform/Darwin-PGI.cmake
-%%DATADIR%%/Modules/Platform/Darwin-VisualAge-C.cmake
-%%DATADIR%%/Modules/Platform/Darwin-VisualAge-CXX.cmake
-%%DATADIR%%/Modules/Platform/Darwin-XL-C.cmake
-%%DATADIR%%/Modules/Platform/Darwin-XL-CXX.cmake
-%%DATADIR%%/Modules/Platform/Darwin.cmake
-%%DATADIR%%/Modules/Platform/DragonFly.cmake
-%%DATADIR%%/Modules/Platform/Euros.cmake
-%%DATADIR%%/Modules/Platform/FreeBSD.cmake
-%%DATADIR%%/Modules/Platform/Fuchsia.cmake
-%%DATADIR%%/Modules/Platform/GHS-MULTI-Initialize.cmake
-%%DATADIR%%/Modules/Platform/GHS-MULTI.cmake
-%%DATADIR%%/Modules/Platform/GNU.cmake
-%%DATADIR%%/Modules/Platform/GNUtoMS_lib.bat.in
-%%DATADIR%%/Modules/Platform/GNUtoMS_lib.cmake
-%%DATADIR%%/Modules/Platform/Generic-ADSP-ASM.cmake
-%%DATADIR%%/Modules/Platform/Generic-ADSP-C.cmake
-%%DATADIR%%/Modules/Platform/Generic-ADSP-CXX.cmake
-%%DATADIR%%/Modules/Platform/Generic-ADSP-Common.cmake
-%%DATADIR%%/Modules/Platform/Generic-SDCC-C.cmake
-%%DATADIR%%/Modules/Platform/Generic.cmake
-%%DATADIR%%/Modules/Platform/HP-UX-GNU-ASM.cmake
-%%DATADIR%%/Modules/Platform/HP-UX-GNU-C.cmake
-%%DATADIR%%/Modules/Platform/HP-UX-GNU-CXX.cmake
-%%DATADIR%%/Modules/Platform/HP-UX-GNU-Fortran.cmake
-%%DATADIR%%/Modules/Platform/HP-UX-GNU.cmake
-%%DATADIR%%/Modules/Platform/HP-UX-HP-ASM.cmake
-%%DATADIR%%/Modules/Platform/HP-UX-HP-C.cmake
-%%DATADIR%%/Modules/Platform/HP-UX-HP-CXX.cmake
-%%DATADIR%%/Modules/Platform/HP-UX-HP-Fortran.cmake
-%%DATADIR%%/Modules/Platform/HP-UX-HP.cmake
-%%DATADIR%%/Modules/Platform/HP-UX.cmake
-%%DATADIR%%/Modules/Platform/Haiku.cmake
-%%DATADIR%%/Modules/Platform/IRIX.cmake
-%%DATADIR%%/Modules/Platform/IRIX64.cmake
-%%DATADIR%%/Modules/Platform/Linux-Absoft-Fortran.cmake
-%%DATADIR%%/Modules/Platform/Linux-CCur-Fortran.cmake
-%%DATADIR%%/Modules/Platform/Linux-Clang-C.cmake
-%%DATADIR%%/Modules/Platform/Linux-Clang-CXX.cmake
-%%DATADIR%%/Modules/Platform/Linux-Determine-CXX.cmake
-%%DATADIR%%/Modules/Platform/Linux-GNU-C.cmake
-%%DATADIR%%/Modules/Platform/Linux-GNU-CXX.cmake
-%%DATADIR%%/Modules/Platform/Linux-GNU-Fortran.cmake
-%%DATADIR%%/Modules/Platform/Linux-GNU.cmake
-%%DATADIR%%/Modules/Platform/Linux-Intel-C.cmake
-%%DATADIR%%/Modules/Platform/Linux-Intel-CXX.cmake
-%%DATADIR%%/Modules/Platform/Linux-Intel-Fortran.cmake
-%%DATADIR%%/Modules/Platform/Linux-Intel.cmake
-%%DATADIR%%/Modules/Platform/Linux-NAG-Fortran.cmake
-%%DATADIR%%/Modules/Platform/Linux-PGI-C.cmake
-%%DATADIR%%/Modules/Platform/Linux-PGI-CXX.cmake
-%%DATADIR%%/Modules/Platform/Linux-PGI-Fortran.cmake
-%%DATADIR%%/Modules/Platform/Linux-PGI.cmake
-%%DATADIR%%/Modules/Platform/Linux-PathScale-C.cmake
-%%DATADIR%%/Modules/Platform/Linux-PathScale-CXX.cmake
-%%DATADIR%%/Modules/Platform/Linux-PathScale-Fortran.cmake
-%%DATADIR%%/Modules/Platform/Linux-PathScale.cmake
-%%DATADIR%%/Modules/Platform/Linux-SunPro-CXX.cmake
-%%DATADIR%%/Modules/Platform/Linux-TinyCC-C.cmake
-%%DATADIR%%/Modules/Platform/Linux-VisualAge-C.cmake
-%%DATADIR%%/Modules/Platform/Linux-VisualAge-CXX.cmake
-%%DATADIR%%/Modules/Platform/Linux-VisualAge-Fortran.cmake
-%%DATADIR%%/Modules/Platform/Linux-XL-C.cmake
-%%DATADIR%%/Modules/Platform/Linux-XL-CXX.cmake
-%%DATADIR%%/Modules/Platform/Linux-XL-Fortran.cmake
-%%DATADIR%%/Modules/Platform/Linux-como.cmake
-%%DATADIR%%/Modules/Platform/Linux.cmake
-%%DATADIR%%/Modules/Platform/MP-RAS.cmake
-%%DATADIR%%/Modules/Platform/MirBSD.cmake
-%%DATADIR%%/Modules/Platform/NetBSD.cmake
-%%DATADIR%%/Modules/Platform/OSF1.cmake
-%%DATADIR%%/Modules/Platform/OpenBSD.cmake
-%%DATADIR%%/Modules/Platform/OpenVMS.cmake
-%%DATADIR%%/Modules/Platform/QNX.cmake
-%%DATADIR%%/Modules/Platform/RISCos.cmake
-%%DATADIR%%/Modules/Platform/SCO_SV.cmake
-%%DATADIR%%/Modules/Platform/SINIX.cmake
-%%DATADIR%%/Modules/Platform/SunOS-GNU-C.cmake
-%%DATADIR%%/Modules/Platform/SunOS-GNU-CXX.cmake
-%%DATADIR%%/Modules/Platform/SunOS-GNU-Fortran.cmake
-%%DATADIR%%/Modules/Platform/SunOS-GNU.cmake
-%%DATADIR%%/Modules/Platform/SunOS-PathScale-C.cmake
-%%DATADIR%%/Modules/Platform/SunOS-PathScale-CXX.cmake
-%%DATADIR%%/Modules/Platform/SunOS-PathScale-Fortran.cmake
-%%DATADIR%%/Modules/Platform/SunOS-PathScale.cmake
-%%DATADIR%%/Modules/Platform/SunOS.cmake
-%%DATADIR%%/Modules/Platform/Tru64.cmake
-%%DATADIR%%/Modules/Platform/ULTRIX.cmake
-%%DATADIR%%/Modules/Platform/UNIX_SV.cmake
-%%DATADIR%%/Modules/Platform/UnixPaths.cmake
-%%DATADIR%%/Modules/Platform/UnixWare.cmake
-%%DATADIR%%/Modules/Platform/Windows-Borland-C.cmake
-%%DATADIR%%/Modules/Platform/Windows-Borland-CXX.cmake
-%%DATADIR%%/Modules/Platform/Windows-Clang-C.cmake
-%%DATADIR%%/Modules/Platform/Windows-Clang-CXX.cmake
-%%DATADIR%%/Modules/Platform/Windows-Clang.cmake
-%%DATADIR%%/Modules/Platform/Windows-Determine-CXX.cmake
-%%DATADIR%%/Modules/Platform/Windows-Embarcadero-C.cmake
-%%DATADIR%%/Modules/Platform/Windows-Embarcadero-CXX.cmake
-%%DATADIR%%/Modules/Platform/Windows-Embarcadero.cmake
-%%DATADIR%%/Modules/Platform/Windows-G95-Fortran.cmake
-%%DATADIR%%/Modules/Platform/Windows-GNU-C-ABI.cmake
-%%DATADIR%%/Modules/Platform/Windows-GNU-C.cmake
-%%DATADIR%%/Modules/Platform/Windows-GNU-CXX-ABI.cmake
-%%DATADIR%%/Modules/Platform/Windows-GNU-CXX.cmake
-%%DATADIR%%/Modules/Platform/Windows-GNU-Fortran-ABI.cmake
-%%DATADIR%%/Modules/Platform/Windows-GNU-Fortran.cmake
-%%DATADIR%%/Modules/Platform/Windows-GNU.cmake
-%%DATADIR%%/Modules/Platform/Windows-Intel-ASM.cmake
-%%DATADIR%%/Modules/Platform/Windows-Intel-C.cmake
-%%DATADIR%%/Modules/Platform/Windows-Intel-CXX.cmake
-%%DATADIR%%/Modules/Platform/Windows-Intel-Fortran.cmake
-%%DATADIR%%/Modules/Platform/Windows-Intel.cmake
-%%DATADIR%%/Modules/Platform/Windows-MSVC-C.cmake
-%%DATADIR%%/Modules/Platform/Windows-MSVC-CXX.cmake
-%%DATADIR%%/Modules/Platform/Windows-MSVC.cmake
-%%DATADIR%%/Modules/Platform/Windows-NMcl.cmake
-%%DATADIR%%/Modules/Platform/Windows-NVIDIA-CUDA.cmake
-%%DATADIR%%/Modules/Platform/Windows-OpenWatcom-C.cmake
-%%DATADIR%%/Modules/Platform/Windows-OpenWatcom-CXX.cmake
-%%DATADIR%%/Modules/Platform/Windows-OpenWatcom.cmake
-%%DATADIR%%/Modules/Platform/Windows-Watcom-C.cmake
-%%DATADIR%%/Modules/Platform/Windows-Watcom-CXX.cmake
-%%DATADIR%%/Modules/Platform/Windows-df.cmake
-%%DATADIR%%/Modules/Platform/Windows-windres.cmake
-%%DATADIR%%/Modules/Platform/Windows.cmake
-%%DATADIR%%/Modules/Platform/WindowsCE-MSVC-C.cmake
-%%DATADIR%%/Modules/Platform/WindowsCE-MSVC-CXX.cmake
-%%DATADIR%%/Modules/Platform/WindowsCE.cmake
-%%DATADIR%%/Modules/Platform/WindowsPaths.cmake
-%%DATADIR%%/Modules/Platform/WindowsPhone-MSVC-C.cmake
-%%DATADIR%%/Modules/Platform/WindowsPhone-MSVC-CXX.cmake
-%%DATADIR%%/Modules/Platform/WindowsPhone.cmake
-%%DATADIR%%/Modules/Platform/WindowsStore-MSVC-C.cmake
-%%DATADIR%%/Modules/Platform/WindowsStore-MSVC-CXX.cmake
-%%DATADIR%%/Modules/Platform/WindowsStore.cmake
-%%DATADIR%%/Modules/Platform/Xenix.cmake
-%%DATADIR%%/Modules/Platform/eCos.cmake
-%%DATADIR%%/Modules/Platform/gas.cmake
-%%DATADIR%%/Modules/Platform/kFreeBSD.cmake
-%%DATADIR%%/Modules/Platform/syllable.cmake
-%%DATADIR%%/Modules/ProcessorCount.cmake
-%%DATADIR%%/Modules/Qt4ConfigDependentSettings.cmake
-%%DATADIR%%/Modules/Qt4Macros.cmake
-%%DATADIR%%/Modules/RepositoryInfo.txt.in
-%%DATADIR%%/Modules/SelectLibraryConfigurations.cmake
-%%DATADIR%%/Modules/Squish4RunTestCase.bat
-%%DATADIR%%/Modules/Squish4RunTestCase.sh
-%%DATADIR%%/Modules/SquishRunTestCase.bat
-%%DATADIR%%/Modules/SquishRunTestCase.sh
-%%DATADIR%%/Modules/SquishTestScript.cmake
-%%DATADIR%%/Modules/SystemInformation.cmake
-%%DATADIR%%/Modules/SystemInformation.in
-%%DATADIR%%/Modules/TestBigEndian.cmake
-%%DATADIR%%/Modules/TestCXXAcceptsFlag.cmake
-%%DATADIR%%/Modules/TestEndianess.c.in
-%%DATADIR%%/Modules/TestForANSIForScope.cmake
-%%DATADIR%%/Modules/TestForANSIStreamHeaders.cmake
-%%DATADIR%%/Modules/TestForANSIStreamHeaders.cxx
-%%DATADIR%%/Modules/TestForAnsiForScope.cxx
-%%DATADIR%%/Modules/TestForSSTREAM.cmake
-%%DATADIR%%/Modules/TestForSSTREAM.cxx
-%%DATADIR%%/Modules/TestForSTDNamespace.cmake
-%%DATADIR%%/Modules/TestForSTDNamespace.cxx
-%%DATADIR%%/Modules/UseEcos.cmake
-%%DATADIR%%/Modules/UseJava.cmake
-%%DATADIR%%/Modules/UseJavaClassFilelist.cmake
-%%DATADIR%%/Modules/UseJavaSymlinks.cmake
-%%DATADIR%%/Modules/UsePkgConfig.cmake
-%%DATADIR%%/Modules/UseQt4.cmake
-%%DATADIR%%/Modules/UseSWIG.cmake
-%%DATADIR%%/Modules/Use_wxWindows.cmake
-%%DATADIR%%/Modules/UsewxWidgets.cmake
-%%DATADIR%%/Modules/VTKCompatibility.cmake
-%%DATADIR%%/Modules/WIX.template.in
-%%DATADIR%%/Modules/WriteBasicConfigVersionFile.cmake
-%%DATADIR%%/Modules/WriteCompilerDetectionHeader.cmake
-%%DATADIR%%/Modules/ecos_clean.cmake
-%%DATADIR%%/Modules/exportheader.cmake.in
-%%DATADIR%%/Modules/javaTargets.cmake.in
-%%DATADIR%%/Modules/kde3init_dummy.cpp.in
-%%DATADIR%%/Modules/kde3uic.cmake
-%%DATADIR%%/Modules/readme.txt
-%%DATADIR%%/Templates/AppleInfo.plist
-%%DATADIR%%/Templates/CMakeVSMacros1.vsmacros
-%%DATADIR%%/Templates/CMakeVSMacros2.vsmacros
-%%DATADIR%%/Templates/CPack.GenericDescription.txt
-%%DATADIR%%/Templates/CPack.GenericLicense.txt
-%%DATADIR%%/Templates/CPack.GenericWelcome.txt
-%%DATADIR%%/Templates/CPackConfig.cmake.in
-%%DATADIR%%/Templates/CTestScript.cmake.in
-%%DATADIR%%/Templates/TestDriver.cxx.in
-%%DATADIR%%/Templates/Windows/ApplicationIcon.png
-%%DATADIR%%/Templates/Windows/Logo.png
-%%DATADIR%%/Templates/Windows/SmallLogo.png
-%%DATADIR%%/Templates/Windows/SmallLogo44x44.png
-%%DATADIR%%/Templates/Windows/SplashScreen.png
-%%DATADIR%%/Templates/Windows/StoreLogo.png
-%%DATADIR%%/Templates/Windows/Windows_TemporaryKey.pfx
diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index 33c6228ab4b1..e7568fc4265a 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -2,13 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	cmake
-DISTVERSION=	3.8.2
-PORTREVISION?=	0
+DISTVERSION=	3.9.2
 CATEGORIES=	devel
 MASTER_SITES=	https://www.cmake.org/files/v${PORTVERSION:R}/
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT?=	Cross-platform Makefile generator
+COMMENT=	Cross-platform Makefile generator
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/Copyright.txt
@@ -21,11 +20,10 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--parallel=${MAKE_JOBS_NUMBER} \
 		--init="${PATCHDIR}/InitialCache.cmake"
 
-.if !defined(CMAKE_MODULES)
 OPTIONS_DEFINE=	DOCS MANPAGES
 OPTIONS_DEFAULT=MANPAGES
 OPTIONS_SUB=	yes
-USES+=		execinfo libarchive ncurses
+USES=		execinfo libarchive ncurses
 HAS_CONFIGURE=	yes
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
@@ -33,11 +31,11 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libjsoncpp.so:devel/jsoncpp \
 		libuv.so:devel/libuv \
 		librhash.so:security/rhash
-RUN_DEPENDS=	${LOCALBASE}/share/cmake/Modules/CMake.cmake:devel/cmake-modules
 
 MANPAGES_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 MANPAGES_CONFIGURE_ON=	--sphinx-man
-.endif
+
+CONFLICTS_INSTALL=	cmake-modules-*
 
 .include <bsd.port.pre.mk>
 
@@ -64,9 +62,10 @@ post-patch:
 # prevent it from being built/installed by devel/cmake.
 	${RM} ${WRKSRC}/Help/manual/cmake-gui.1.rst
 
-.if !defined(CMAKE_MODULES)
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/Auxiliary/cmake-mode.el ${STAGEDIR}${PREFIX}/share/emacs/site-lisp
-.endif
+	# The .NoDartCoverage is supposed to suppress testing in the
+	# source directories, but gets accidentally installed.
+	@${FIND} ${STAGEDIR}${PREFIX} -name ".NoDartCoverage" -delete
 
 .include <bsd.port.post.mk>
diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo
index 23ff5ede1e02..7b7455bb5e43 100644
--- a/devel/cmake/distinfo
+++ b/devel/cmake/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1496307017
-SHA256 (cmake-3.8.2.tar.gz) = da3072794eb4c09f2d782fcee043847b99bb4cf8d4573978d9b2024214d6e92d
-SIZE (cmake-3.8.2.tar.gz) = 7504706
+TIMESTAMP = 1504850116
+SHA256 (cmake-3.9.2.tar.gz) = 954a5801a456ee48e76f01107c9a4961677dd0f3e115275bbd18410dc22ba3c1
+SIZE (cmake-3.9.2.tar.gz) = 7703777
diff --git a/devel/cmake/files/patch-CMakeLists.txt b/devel/cmake/files/patch-CMakeLists.txt
deleted file mode 100644
index 1937d9091bb4..000000000000
--- a/devel/cmake/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Modules/ and Templates/ are installed by devel/cmake-modules.
-
-Not upstreamable.
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -605,7 +605,7 @@
- 
-   # Install script directories.
-   install(
--    DIRECTORY Help Modules Templates
-+    DIRECTORY Help
-     DESTINATION ${CMAKE_DATA_DIR}
-     FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
-     DIRECTORY_PERMISSIONS OWNER_READ OWNER_EXECUTE OWNER_WRITE
diff --git a/devel/cmake/files/patch-Modules_FindImageMagick.cmake b/devel/cmake/files/patch-Modules_FindImageMagick.cmake
index 13554a1e9aff..29749b313d9f 100644
--- a/devel/cmake/files/patch-Modules_FindImageMagick.cmake
+++ b/devel/cmake/files/patch-Modules_FindImageMagick.cmake
@@ -1,23 +1,38 @@
---- Modules/FindImageMagick.cmake.orig	2015-01-18 20:59:07.643587544 +0100
-+++ Modules/FindImageMagick.cmake	2015-01-18 21:00:52.175617819 +0100
-@@ -207,17 +207,17 @@
-     )
+Insert an additional search item when finding ImageMagick, originally
+from kwm (see below), adjusted for new organization of search paths.
+
+Author: kwm <kwm@FreeBSD.org>
+Date:   Sun Jan 18 21:12:42 2015 +0000
+
+    Update ImageMagick to 6.9.0.4.
+    
+    - Normalize the ImageMagick library name so it stays the same regardless of
+      what the 16-bit and HDRI option are set to [1]. Teach cmake to look for
+      the new name. Bump ports that link to the libraries due to this.
+
+--- Modules/FindImageMagick.cmake.orig	2017-07-27 18:33:53.634381000 +0200
++++ Modules/FindImageMagick.cmake	2017-07-27 18:36:31.110708000 +0200
+@@ -196,6 +196,7 @@
    if(component STREQUAL "Magick++")
      FIND_IMAGEMAGICK_API(Magick++ Magick++.h
--      Magick++ CORE_RL_Magick++_ Magick++-6.Q16 Magick++-Q16 Magick++-6.Q8 Magick++-Q8 Magick++-6.Q16HDRI Magick++-Q16HDRI Magick++-6.Q8HDRI Magick++-Q8HDRI
-+      Magick++ CORE_RL_Magick++_ Magick++-6 Magick++-6.Q16 Magick++-Q16 Magick++-6.Q8 Magick++-Q8 Magick++-6.Q16HDRI Magick++-Q16HDRI Magick++-6.Q8HDRI Magick++-Q8HDRI
-       )
-     list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_Magick++_LIBRARY)
+       Magick++ CORE_RL_Magick++_
++      Magick++-6
+       Magick++-Q8 Magick++-Q16 Magick++-Q16HDRI Magick++-Q8HDRI
+       Magick++-6.Q16 Magick++-6.Q8 Magick++-6.Q16HDRI Magick++-6.Q8HDRI
+       Magick++-7.Q16 Magick++-7.Q8 Magick++-7.Q16HDRI Magick++-7.Q8HDRI
+@@ -204,6 +205,7 @@
    elseif(component STREQUAL "MagickWand")
-     FIND_IMAGEMAGICK_API(MagickWand wand/MagickWand.h
--      Wand MagickWand CORE_RL_wand_ MagickWand-6.Q16 MagickWand-Q16 MagickWand-6.Q8 MagickWand-Q8 MagickWand-6.Q16HDRI MagickWand-Q16HDRI MagickWand-6.Q8HDRI MagickWand-Q8HDRI
-+      Wand MagickWand CORE_RL_wand_ MagickWand-6 MagickWand-6.Q16 MagickWand-Q16 MagickWand-6.Q8 MagickWand-Q8 MagickWand-6.Q16HDRI MagickWand-Q16HDRI MagickWand-6.Q8HDRI MagickWand-Q8HDRI
-       )
-     list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickWand_LIBRARY)
+     FIND_IMAGEMAGICK_API(MagickWand "wand/MagickWand.h;MagickWand/MagickWand.h"
+       Wand MagickWand CORE_RL_wand_
++      MagickWand-6
+       MagickWand-Q16 MagickWand-Q8 MagickWand-Q16HDRI MagickWand-Q8HDRI
+       MagickWand-6.Q16 MagickWand-6.Q8 MagickWand-6.Q16HDRI MagickWand-6.Q8HDRI
+       MagickWand-7.Q16 MagickWand-7.Q8 MagickWand-7.Q16HDRI MagickWand-7.Q8HDRI
+@@ -212,6 +214,7 @@
    elseif(component STREQUAL "MagickCore")
-     FIND_IMAGEMAGICK_API(MagickCore magick/MagickCore.h
--      Magick MagickCore CORE_RL_magick_ MagickCore-6.Q16 MagickCore-Q16 MagickCore-6.Q8 MagickCore-Q8 MagickCore-6.Q16HDRI MagickCore-Q16HDRI MagickCore-6.Q8HDRI MagickCore-Q8HDRI
-+      Magick MagickCore CORE_RL_magick_ MagickCore-6 MagickCore-6.Q16 MagickCore-Q16 MagickCore-6.Q8 MagickCore-Q8 MagickCore-6.Q16HDRI MagickCore-Q16HDRI MagickCore-6.Q8HDRI MagickCore-Q8HDRI
-       )
-     list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickCore_LIBRARY)
-   else()
+     FIND_IMAGEMAGICK_API(MagickCore "magick/MagickCore.h;MagickCore/MagickCore.h"
+       Magick MagickCore CORE_RL_magick_
++      MagickCore-6
+       MagickCore-Q16 MagickCore-Q8 MagickCore-Q16HDRI MagickCore-Q8HDRI
+       MagickCore-6.Q16 MagickCore-6.Q8 MagickCore-6.Q16HDRI MagickCore-6.Q8HDRI
+       MagickCore-7.Q16 MagickCore-7.Q8 MagickCore-7.Q16HDRI MagickCore-7.Q8HDRI
diff --git a/devel/cmake/files/patch-Modules_FindQt4.cmake b/devel/cmake/files/patch-Modules_FindQt4.cmake
index bb5b21d7f49e..bfdf9a57e651 100644
--- a/devel/cmake/files/patch-Modules_FindQt4.cmake
+++ b/devel/cmake/files/patch-Modules_FindQt4.cmake
@@ -1,6 +1,6 @@
---- Modules/FindQt4.cmake.orig	2014-07-27 16:08:51.000000000 +0300
-+++ Modules/FindQt4.cmake	2014-07-27 16:10:01.000000000 +0300
-@@ -701,14 +701,7 @@
+--- Modules/FindQt4.cmake.orig	2017-05-31 14:00:09 UTC
++++ Modules/FindQt4.cmake
+@@ -706,14 +706,7 @@ if (QT_QMAKE_EXECUTABLE AND
    # ask qmake for the plugins directory
    if (QT_LIBRARY_DIR AND NOT QT_PLUGINS_DIR  OR  QT_QMAKE_CHANGED)
      _qt4_query_qmake(QT_INSTALL_PLUGINS qt_plugins_dir)
@@ -16,7 +16,7 @@
    endif ()
  
    # ask qmake for the translations directory
-@@ -721,16 +714,7 @@
+@@ -726,16 +719,7 @@ if (QT_QMAKE_EXECUTABLE AND
    if (QT_LIBRARY_DIR AND NOT QT_IMPORTS_DIR OR QT_QMAKE_CHANGED)
      _qt4_query_qmake(QT_INSTALL_IMPORTS qt_imports_dir)
      if(qt_imports_dir)
diff --git a/devel/cmake/files/patch-Modules_FindSDL.cmake b/devel/cmake/files/patch-Modules_FindSDL.cmake
index e2cafbf2afe4..4c296bf05932 100644
--- a/devel/cmake/files/patch-Modules_FindSDL.cmake
+++ b/devel/cmake/files/patch-Modules_FindSDL.cmake
@@ -1,8 +1,8 @@
---- Modules/FindSDL.cmake.orig	2012-11-06 21:41:36.000000000 +0200
-+++ Modules/FindSDL.cmake	2012-11-27 22:34:53.000000000 +0200
-@@ -73,6 +73,11 @@
-   PATH_SUFFIXES include/SDL include/SDL12 include/SDL11 include
- )
+--- Modules/FindSDL.cmake.orig	2017-05-31 14:00:09 UTC
++++ Modules/FindSDL.cmake
+@@ -85,6 +85,11 @@ else()
+   set(VC_LIB_PATH_SUFFIX lib/x86)
+ endif()
  
 +# On FreeBSD SDL depends on libiconv and SDL_stdinc.h includes iconv.h, which is
 +# located in ${LOCALBASE}/include. Append {LOCALBASE}/include to
diff --git a/devel/cmake/files/patch-Modules_FindwxWidgets.cmake b/devel/cmake/files/patch-Modules_FindwxWidgets.cmake
index d83377372598..d270d6eb5642 100644
--- a/devel/cmake/files/patch-Modules_FindwxWidgets.cmake
+++ b/devel/cmake/files/patch-Modules_FindwxWidgets.cmake
@@ -1,6 +1,6 @@
---- Modules/FindwxWidgets.cmake.orig	2015-07-23 15:59:33.000000000 +0200
-+++ Modules/FindwxWidgets.cmake	2015-08-10 20:04:36.068295000 +0200
-@@ -741,7 +741,7 @@
+--- Modules/FindwxWidgets.cmake.orig	2017-05-31 14:00:09 UTC
++++ Modules/FindwxWidgets.cmake
+@@ -747,7 +747,7 @@ else()
      #-----------------------------------------------------------------
      # Support cross-compiling, only search in the target platform.
      find_program(wxWidgets_CONFIG_EXECUTABLE
diff --git a/devel/cmake/files/patch-Modules_FindwxWindows.cmake b/devel/cmake/files/patch-Modules_FindwxWindows.cmake
index d8ffa99e3a96..b2a967ec0d93 100644
--- a/devel/cmake/files/patch-Modules_FindwxWindows.cmake
+++ b/devel/cmake/files/patch-Modules_FindwxWindows.cmake
@@ -1,6 +1,6 @@
---- Modules/FindwxWindows.cmake.orig	2012-11-06 21:41:36.000000000 +0200
-+++ Modules/FindwxWindows.cmake	2012-11-27 22:39:17.000000000 +0200
-@@ -598,7 +598,7 @@
+--- Modules/FindwxWindows.cmake.orig	2017-05-31 14:00:09 UTC
++++ Modules/FindwxWindows.cmake
+@@ -617,7 +617,7 @@ else()
  
      # wx-config should be in your path anyhow, usually no need to set WXWIN or
      # search in ../wx or ../../wx
diff --git a/devel/cmake/files/patch-Modules_Platform_FreeBSD-CXX.cmake b/devel/cmake/files/patch-Modules_Platform_FreeBSD-CXX.cmake
new file mode 100644
index 000000000000..62bfa17b9159
--- /dev/null
+++ b/devel/cmake/files/patch-Modules_Platform_FreeBSD-CXX.cmake
@@ -0,0 +1,8 @@
+This prefers c++ over CC as the C++ compiler command. See PR 203793.
+
+--- Modules/Platform/FreeBSD-CXX.cmake.orig	2017-06-14 21:54:30 UTC
++++ Modules/Platform/FreeBSD-CXX.cmake
+@@ -0,0 +1,3 @@
++if(NOT CMAKE_CXX_COMPILER_NAMES)
++  set(CMAKE_CXX_COMPILER_NAMES c++)
++endif()
diff --git a/devel/cmake/pkg-plist b/devel/cmake/pkg-plist
index e4408b4c9796..194c568a9e35 100644
--- a/devel/cmake/pkg-plist
+++ b/devel/cmake/pkg-plist
@@ -215,6 +215,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/module/CMakePushCheckState.rst
 %%DATADIR%%/Help/module/CMakeVerifyManifest.rst
 %%DATADIR%%/Help/module/CPack.rst
+%%DATADIR%%/Help/module/CPackArchive.rst
 %%DATADIR%%/Help/module/CPackBundle.rst
 %%DATADIR%%/Help/module/CPackComponent.rst
 %%DATADIR%%/Help/module/CPackCygwin.rst
@@ -227,6 +228,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/module/CPackProductBuild.rst
 %%DATADIR%%/Help/module/CPackRPM.rst
 %%DATADIR%%/Help/module/CPackWIX.rst
+%%DATADIR%%/Help/module/CSharpUtilities.rst
 %%DATADIR%%/Help/module/CTest.rst
 %%DATADIR%%/Help/module/CTestCoverageCollectGCOV.rst
 %%DATADIR%%/Help/module/CTestScriptMode.rst
@@ -242,6 +244,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/module/CheckFortranFunctionExists.rst
 %%DATADIR%%/Help/module/CheckFortranSourceCompiles.rst
 %%DATADIR%%/Help/module/CheckFunctionExists.rst
+%%DATADIR%%/Help/module/CheckIPOSupported.rst
 %%DATADIR%%/Help/module/CheckIncludeFile.rst
 %%DATADIR%%/Help/module/CheckIncludeFileCXX.rst
 %%DATADIR%%/Help/module/CheckIncludeFiles.rst
@@ -252,7 +255,6 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/module/CheckSymbolExists.rst
 %%DATADIR%%/Help/module/CheckTypeSize.rst
 %%DATADIR%%/Help/module/CheckVariableExists.rst
-%%DATADIR%%/Help/module/CSharpUtilities.rst
 %%DATADIR%%/Help/module/Dart.rst
 %%DATADIR%%/Help/module/DeployQt4.rst
 %%DATADIR%%/Help/module/Documentation.rst
@@ -411,6 +413,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/module/GNUInstallDirs.rst
 %%DATADIR%%/Help/module/GenerateExportHeader.rst
 %%DATADIR%%/Help/module/GetPrerequisites.rst
+%%DATADIR%%/Help/module/GoogleTest.rst
 %%DATADIR%%/Help/module/InstallRequiredSystemLibraries.rst
 %%DATADIR%%/Help/module/MacroAddFileDependencies.rst
 %%DATADIR%%/Help/module/ProcessorCount.rst
@@ -500,6 +503,8 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/policy/CMP0065.rst
 %%DATADIR%%/Help/policy/CMP0066.rst
 %%DATADIR%%/Help/policy/CMP0067.rst
+%%DATADIR%%/Help/policy/CMP0068.rst
+%%DATADIR%%/Help/policy/CMP0069.rst
 %%DATADIR%%/Help/policy/DEPRECATED.txt
 %%DATADIR%%/Help/policy/DISALLOWED_COMMAND.txt
 %%DATADIR%%/Help/prop_cache/ADVANCED.rst
@@ -539,8 +544,11 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/prop_dir/VS_GLOBAL_SECTION_PRE_section.rst
 %%DATADIR%%/Help/prop_dir/VS_STARTUP_PROJECT.rst
 %%DATADIR%%/Help/prop_gbl/ALLOW_DUPLICATE_CUSTOM_TARGETS.rst
+%%DATADIR%%/Help/prop_gbl/AUTOGEN_SOURCE_GROUP.rst
 %%DATADIR%%/Help/prop_gbl/AUTOGEN_TARGETS_FOLDER.rst
+%%DATADIR%%/Help/prop_gbl/AUTOMOC_SOURCE_GROUP.rst
 %%DATADIR%%/Help/prop_gbl/AUTOMOC_TARGETS_FOLDER.rst
+%%DATADIR%%/Help/prop_gbl/AUTORCC_SOURCE_GROUP.rst
 %%DATADIR%%/Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst
 %%DATADIR%%/Help/prop_gbl/CMAKE_C_KNOWN_FEATURES.rst
 %%DATADIR%%/Help/prop_gbl/DEBUG_CONFIGURATIONS.rst
@@ -550,7 +558,9 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/prop_gbl/ENABLED_LANGUAGES.rst
 %%DATADIR%%/Help/prop_gbl/FIND_LIBRARY_USE_LIB32_PATHS.rst
 %%DATADIR%%/Help/prop_gbl/FIND_LIBRARY_USE_LIB64_PATHS.rst
+%%DATADIR%%/Help/prop_gbl/FIND_LIBRARY_USE_LIBX32_PATHS.rst
 %%DATADIR%%/Help/prop_gbl/FIND_LIBRARY_USE_OPENBSD_VERSIONING.rst
+%%DATADIR%%/Help/prop_gbl/GENERATOR_IS_MULTI_CONFIG.rst
 %%DATADIR%%/Help/prop_gbl/GLOBAL_DEPENDS_DEBUG_MODE.rst
 %%DATADIR%%/Help/prop_gbl/GLOBAL_DEPENDS_NO_CYCLES.rst
 %%DATADIR%%/Help/prop_gbl/IN_TRY_COMPILE.rst
@@ -616,6 +626,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/prop_test/ATTACHED_FILES_ON_FAIL.rst
 %%DATADIR%%/Help/prop_test/COST.rst
 %%DATADIR%%/Help/prop_test/DEPENDS.rst
+%%DATADIR%%/Help/prop_test/DISABLED.rst
 %%DATADIR%%/Help/prop_test/ENVIRONMENT.rst
 %%DATADIR%%/Help/prop_test/FAIL_REGULAR_EXPRESSION.rst
 %%DATADIR%%/Help/prop_test/FIXTURES_CLEANUP.rst
@@ -655,15 +666,19 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/prop_tgt/ARCHIVE_OUTPUT_DIRECTORY_CONFIG.rst
 %%DATADIR%%/Help/prop_tgt/ARCHIVE_OUTPUT_NAME.rst
 %%DATADIR%%/Help/prop_tgt/ARCHIVE_OUTPUT_NAME_CONFIG.rst
+%%DATADIR%%/Help/prop_tgt/AUTOGEN_BUILD_DIR.rst
 %%DATADIR%%/Help/prop_tgt/AUTOGEN_TARGET_DEPENDS.rst
 %%DATADIR%%/Help/prop_tgt/AUTOMOC.rst
+%%DATADIR%%/Help/prop_tgt/AUTOMOC_DEPEND_FILTERS.rst
 %%DATADIR%%/Help/prop_tgt/AUTOMOC_MOC_OPTIONS.rst
 %%DATADIR%%/Help/prop_tgt/AUTORCC.rst
 %%DATADIR%%/Help/prop_tgt/AUTORCC_OPTIONS.rst
 %%DATADIR%%/Help/prop_tgt/AUTOUIC.rst
 %%DATADIR%%/Help/prop_tgt/AUTOUIC_OPTIONS.rst
+%%DATADIR%%/Help/prop_tgt/AUTOUIC_SEARCH_PATHS.rst
 %%DATADIR%%/Help/prop_tgt/BINARY_DIR.rst
 %%DATADIR%%/Help/prop_tgt/BUILD_RPATH.rst
+%%DATADIR%%/Help/prop_tgt/BUILD_WITH_INSTALL_NAME_DIR.rst
 %%DATADIR%%/Help/prop_tgt/BUILD_WITH_INSTALL_RPATH.rst
 %%DATADIR%%/Help/prop_tgt/BUNDLE.rst
 %%DATADIR%%/Help/prop_tgt/BUNDLE_EXTENSION.rst
@@ -685,6 +700,8 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/prop_tgt/CONFIG_POSTFIX.rst
 %%DATADIR%%/Help/prop_tgt/CROSSCOMPILING_EMULATOR.rst
 %%DATADIR%%/Help/prop_tgt/CUDA_EXTENSIONS.rst
+%%DATADIR%%/Help/prop_tgt/CUDA_PTX_COMPILATION.rst
+%%DATADIR%%/Help/prop_tgt/CUDA_RESOLVE_DEVICE_SYMBOLS.rst
 %%DATADIR%%/Help/prop_tgt/CUDA_SEPARABLE_COMPILATION.rst
 %%DATADIR%%/Help/prop_tgt/CUDA_STANDARD.rst
 %%DATADIR%%/Help/prop_tgt/CUDA_STANDARD_REQUIRED.rst
@@ -730,6 +747,8 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/prop_tgt/IMPORTED_LOCATION_CONFIG.rst
 %%DATADIR%%/Help/prop_tgt/IMPORTED_NO_SONAME.rst
 %%DATADIR%%/Help/prop_tgt/IMPORTED_NO_SONAME_CONFIG.rst
+%%DATADIR%%/Help/prop_tgt/IMPORTED_OBJECTS.rst
+%%DATADIR%%/Help/prop_tgt/IMPORTED_OBJECTS_CONFIG.rst
 %%DATADIR%%/Help/prop_tgt/IMPORTED_SONAME.rst
 %%DATADIR%%/Help/prop_tgt/IMPORTED_SONAME_CONFIG.rst
 %%DATADIR%%/Help/prop_tgt/IMPORT_PREFIX.rst
@@ -863,6 +882,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/release/3.6.rst
 %%DATADIR%%/Help/release/3.7.rst
 %%DATADIR%%/Help/release/3.8.rst
+%%DATADIR%%/Help/release/3.9.rst
 %%DATADIR%%/Help/release/dev.txt
 %%DATADIR%%/Help/release/index.rst
 %%DATADIR%%/Help/variable/ANDROID.rst
@@ -885,6 +905,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/CMAKE_ANDROID_NATIVE_LIB_DEPENDENCIES.rst
 %%DATADIR%%/Help/variable/CMAKE_ANDROID_NATIVE_LIB_DIRECTORIES.rst
 %%DATADIR%%/Help/variable/CMAKE_ANDROID_NDK.rst
+%%DATADIR%%/Help/variable/CMAKE_ANDROID_NDK_DEPRECATED_HEADERS.rst
 %%DATADIR%%/Help/variable/CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG.rst
 %%DATADIR%%/Help/variable/CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION.rst
 %%DATADIR%%/Help/variable/CMAKE_ANDROID_PROCESS_MAX.rst
@@ -901,17 +922,20 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/CMAKE_ARGC.rst
 %%DATADIR%%/Help/variable/CMAKE_ARGV0.rst
 %%DATADIR%%/Help/variable/CMAKE_AUTOMOC.rst
+%%DATADIR%%/Help/variable/CMAKE_AUTOMOC_DEPEND_FILTERS.rst
 %%DATADIR%%/Help/variable/CMAKE_AUTOMOC_MOC_OPTIONS.rst
 %%DATADIR%%/Help/variable/CMAKE_AUTOMOC_RELAXED_MODE.rst
 %%DATADIR%%/Help/variable/CMAKE_AUTORCC.rst
 %%DATADIR%%/Help/variable/CMAKE_AUTORCC_OPTIONS.rst
 %%DATADIR%%/Help/variable/CMAKE_AUTOUIC.rst
 %%DATADIR%%/Help/variable/CMAKE_AUTOUIC_OPTIONS.rst
+%%DATADIR%%/Help/variable/CMAKE_AUTOUIC_SEARCH_PATHS.rst
 %%DATADIR%%/Help/variable/CMAKE_BACKWARDS_COMPATIBILITY.rst
 %%DATADIR%%/Help/variable/CMAKE_BINARY_DIR.rst
 %%DATADIR%%/Help/variable/CMAKE_BUILD_RPATH.rst
 %%DATADIR%%/Help/variable/CMAKE_BUILD_TOOL.rst
 %%DATADIR%%/Help/variable/CMAKE_BUILD_TYPE.rst
+%%DATADIR%%/Help/variable/CMAKE_BUILD_WITH_INSTALL_NAME_DIR.rst
 %%DATADIR%%/Help/variable/CMAKE_BUILD_WITH_INSTALL_RPATH.rst
 %%DATADIR%%/Help/variable/CMAKE_CACHEFILE_DIR.rst
 %%DATADIR%%/Help/variable/CMAKE_CACHE_MAJOR_VERSION.rst
@@ -974,6 +998,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES.rst
 %%DATADIR%%/Help/variable/CMAKE_FIND_APPBUNDLE.rst
 %%DATADIR%%/Help/variable/CMAKE_FIND_FRAMEWORK.rst
+%%DATADIR%%/Help/variable/CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX.rst
 %%DATADIR%%/Help/variable/CMAKE_FIND_LIBRARY_PREFIXES.rst
 %%DATADIR%%/Help/variable/CMAKE_FIND_LIBRARY_SUFFIXES.rst
 %%DATADIR%%/Help/variable/CMAKE_FIND_NO_INSTALL_PREFIX.rst
@@ -1024,6 +1049,8 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/CMAKE_INSTALL_RPATH.rst
 %%DATADIR%%/Help/variable/CMAKE_INSTALL_RPATH_USE_LINK_PATH.rst
 %%DATADIR%%/Help/variable/CMAKE_INTERNAL_PLATFORM_ABI.rst
+%%DATADIR%%/Help/variable/CMAKE_INTERPROCEDURAL_OPTIMIZATION.rst
+%%DATADIR%%/Help/variable/CMAKE_INTERPROCEDURAL_OPTIMIZATION_CONFIG.rst
 %%DATADIR%%/Help/variable/CMAKE_IOS_INSTALL_COMBINED.rst
 %%DATADIR%%/Help/variable/CMAKE_JOB_POOL_COMPILE.rst
 %%DATADIR%%/Help/variable/CMAKE_JOB_POOL_LINK.rst
@@ -1036,10 +1063,12 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/CMAKE_LANG_CLANG_TIDY.rst
 %%DATADIR%%/Help/variable/CMAKE_LANG_COMPILER.rst
 %%DATADIR%%/Help/variable/CMAKE_LANG_COMPILER_ABI.rst
+%%DATADIR%%/Help/variable/CMAKE_LANG_COMPILER_AR.rst
 %%DATADIR%%/Help/variable/CMAKE_LANG_COMPILER_EXTERNAL_TOOLCHAIN.rst
 %%DATADIR%%/Help/variable/CMAKE_LANG_COMPILER_ID.rst
 %%DATADIR%%/Help/variable/CMAKE_LANG_COMPILER_LAUNCHER.rst
 %%DATADIR%%/Help/variable/CMAKE_LANG_COMPILER_LOADED.rst
+%%DATADIR%%/Help/variable/CMAKE_LANG_COMPILER_RANLIB.rst
 %%DATADIR%%/Help/variable/CMAKE_LANG_COMPILER_TARGET.rst
 %%DATADIR%%/Help/variable/CMAKE_LANG_COMPILER_VERSION.rst
 %%DATADIR%%/Help/variable/CMAKE_LANG_COMPILE_OBJECT.rst
@@ -1101,6 +1130,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/CMAKE_MAKE_PROGRAM.rst
 %%DATADIR%%/Help/variable/CMAKE_MAP_IMPORTED_CONFIG_CONFIG.rst
 %%DATADIR%%/Help/variable/CMAKE_MATCH_COUNT.rst
+%%DATADIR%%/Help/variable/CMAKE_MATCH_n.rst
 %%DATADIR%%/Help/variable/CMAKE_MFC_FLAG.rst
 %%DATADIR%%/Help/variable/CMAKE_MINIMUM_REQUIRED_VERSION.rst
 %%DATADIR%%/Help/variable/CMAKE_MINOR_VERSION.rst
@@ -1127,6 +1157,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/CMAKE_POSITION_INDEPENDENT_CODE.rst
 %%DATADIR%%/Help/variable/CMAKE_PREFIX_PATH.rst
 %%DATADIR%%/Help/variable/CMAKE_PROGRAM_PATH.rst
+%%DATADIR%%/Help/variable/CMAKE_PROJECT_DESCRIPTION.rst
 %%DATADIR%%/Help/variable/CMAKE_PROJECT_NAME.rst
 %%DATADIR%%/Help/variable/CMAKE_PROJECT_PROJECT-NAME_INCLUDE.rst
 %%DATADIR%%/Help/variable/CMAKE_RANLIB.rst
@@ -1159,6 +1190,8 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/CMAKE_SUBLIME_TEXT_2_ENV_SETTINGS.rst
 %%DATADIR%%/Help/variable/CMAKE_SUBLIME_TEXT_2_EXCLUDE_BUILD_TREE.rst
 %%DATADIR%%/Help/variable/CMAKE_SYSROOT.rst
+%%DATADIR%%/Help/variable/CMAKE_SYSROOT_COMPILE.rst
+%%DATADIR%%/Help/variable/CMAKE_SYSROOT_LINK.rst
 %%DATADIR%%/Help/variable/CMAKE_SYSTEM.rst
 %%DATADIR%%/Help/variable/CMAKE_SYSTEM_APPBUNDLE_PATH.rst
 %%DATADIR%%/Help/variable/CMAKE_SYSTEM_FRAMEWORK_PATH.rst
@@ -1190,6 +1223,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/CMAKE_VS_NsightTegra_VERSION.rst
 %%DATADIR%%/Help/variable/CMAKE_VS_PLATFORM_NAME.rst
 %%DATADIR%%/Help/variable/CMAKE_VS_PLATFORM_TOOLSET.rst
+%%DATADIR%%/Help/variable/CMAKE_VS_PLATFORM_TOOLSET_CUDA.rst
 %%DATADIR%%/Help/variable/CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE.rst
 %%DATADIR%%/Help/variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION.rst
 %%DATADIR%%/Help/variable/CMAKE_WARN_DEPRECATED.rst
@@ -1197,6 +1231,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/CMAKE_WIN32_EXECUTABLE.rst
 %%DATADIR%%/Help/variable/CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS.rst
 %%DATADIR%%/Help/variable/CMAKE_XCODE_ATTRIBUTE_an-attribute.rst
+%%DATADIR%%/Help/variable/CMAKE_XCODE_GENERATE_SCHEME.rst
 %%DATADIR%%/Help/variable/CMAKE_XCODE_PLATFORM_TOOLSET.rst
 %%DATADIR%%/Help/variable/CPACK_ABSOLUTE_DESTINATION_FILES.rst
 %%DATADIR%%/Help/variable/CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY.rst
@@ -1301,6 +1336,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/PROJECT-NAME_VERSION_PATCH.rst
 %%DATADIR%%/Help/variable/PROJECT-NAME_VERSION_TWEAK.rst
 %%DATADIR%%/Help/variable/PROJECT_BINARY_DIR.rst
+%%DATADIR%%/Help/variable/PROJECT_DESCRIPTION.rst
 %%DATADIR%%/Help/variable/PROJECT_NAME.rst
 %%DATADIR%%/Help/variable/PROJECT_SOURCE_DIR.rst
 %%DATADIR%%/Help/variable/PROJECT_VERSION.rst
@@ -1315,6 +1351,898 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/WINDOWS_STORE.rst
 %%DATADIR%%/Help/variable/XCODE.rst
 %%DATADIR%%/Help/variable/XCODE_VERSION.rst
+%%DATADIR%%/Modules/AddFileDependencies.cmake
+%%DATADIR%%/Modules/AndroidTestUtilities.cmake
+%%DATADIR%%/Modules/AndroidTestUtilities/PushToAndroidDevice.cmake
+%%DATADIR%%/Modules/AutogenInfo.cmake.in
+%%DATADIR%%/Modules/BasicConfigVersion-AnyNewerVersion.cmake.in
+%%DATADIR%%/Modules/BasicConfigVersion-ExactVersion.cmake.in
+%%DATADIR%%/Modules/BasicConfigVersion-SameMajorVersion.cmake.in
+%%DATADIR%%/Modules/BundleUtilities.cmake
+%%DATADIR%%/Modules/CMake.cmake
+%%DATADIR%%/Modules/CMakeASM-ATTInformation.cmake
+%%DATADIR%%/Modules/CMakeASMCompiler.cmake.in
+%%DATADIR%%/Modules/CMakeASMInformation.cmake
+%%DATADIR%%/Modules/CMakeASM_MASMInformation.cmake
+%%DATADIR%%/Modules/CMakeASM_NASMInformation.cmake
+%%DATADIR%%/Modules/CMakeAddFortranSubdirectory.cmake
+%%DATADIR%%/Modules/CMakeAddFortranSubdirectory/build_mingw.cmake.in
+%%DATADIR%%/Modules/CMakeAddFortranSubdirectory/config_mingw.cmake.in
+%%DATADIR%%/Modules/CMakeAddNewLanguage.txt
+%%DATADIR%%/Modules/CMakeBackwardCompatibilityC.cmake
+%%DATADIR%%/Modules/CMakeBackwardCompatibilityCXX.cmake
+%%DATADIR%%/Modules/CMakeBorlandFindMake.cmake
+%%DATADIR%%/Modules/CMakeBuildSettings.cmake.in
+%%DATADIR%%/Modules/CMakeCCompiler.cmake.in
+%%DATADIR%%/Modules/CMakeCCompilerABI.c
+%%DATADIR%%/Modules/CMakeCCompilerId.c.in
+%%DATADIR%%/Modules/CMakeCInformation.cmake
+%%DATADIR%%/Modules/CMakeCSharpCompiler.cmake.in
+%%DATADIR%%/Modules/CMakeCSharpCompilerId.cs.in
+%%DATADIR%%/Modules/CMakeCSharpInformation.cmake
+%%DATADIR%%/Modules/CMakeCUDACompiler.cmake.in
+%%DATADIR%%/Modules/CMakeCUDACompilerABI.cu
+%%DATADIR%%/Modules/CMakeCUDACompilerId.cu.in
+%%DATADIR%%/Modules/CMakeCUDAInformation.cmake
+%%DATADIR%%/Modules/CMakeCXXCompiler.cmake.in
+%%DATADIR%%/Modules/CMakeCXXCompilerABI.cpp
+%%DATADIR%%/Modules/CMakeCXXCompilerId.cpp.in
+%%DATADIR%%/Modules/CMakeCXXInformation.cmake
+%%DATADIR%%/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake
+%%DATADIR%%/Modules/CMakeCommonLanguageInclude.cmake
+%%DATADIR%%/Modules/CMakeCompilerABI.h
+%%DATADIR%%/Modules/CMakeCompilerIdDetection.cmake
+%%DATADIR%%/Modules/CMakeConfigurableFile.in
+%%DATADIR%%/Modules/CMakeDependentOption.cmake
+%%DATADIR%%/Modules/CMakeDetermineASM-ATTCompiler.cmake
+%%DATADIR%%/Modules/CMakeDetermineASMCompiler.cmake
+%%DATADIR%%/Modules/CMakeDetermineASM_MASMCompiler.cmake
+%%DATADIR%%/Modules/CMakeDetermineASM_NASMCompiler.cmake
+%%DATADIR%%/Modules/CMakeDetermineCCompiler.cmake
+%%DATADIR%%/Modules/CMakeDetermineCSharpCompiler.cmake
+%%DATADIR%%/Modules/CMakeDetermineCUDACompiler.cmake
+%%DATADIR%%/Modules/CMakeDetermineCXXCompiler.cmake
+%%DATADIR%%/Modules/CMakeDetermineCompileFeatures.cmake
+%%DATADIR%%/Modules/CMakeDetermineCompiler.cmake
+%%DATADIR%%/Modules/CMakeDetermineCompilerABI.cmake
+%%DATADIR%%/Modules/CMakeDetermineCompilerId.cmake
+%%DATADIR%%/Modules/CMakeDetermineFortranCompiler.cmake
+%%DATADIR%%/Modules/CMakeDetermineJavaCompiler.cmake
+%%DATADIR%%/Modules/CMakeDetermineRCCompiler.cmake
+%%DATADIR%%/Modules/CMakeDetermineSwiftCompiler.cmake
+%%DATADIR%%/Modules/CMakeDetermineSystem.cmake
+%%DATADIR%%/Modules/CMakeDetermineVSServicePack.cmake
+%%DATADIR%%/Modules/CMakeExpandImportedTargets.cmake
+%%DATADIR%%/Modules/CMakeExportBuildSettings.cmake
+%%DATADIR%%/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
+%%DATADIR%%/Modules/CMakeFindBinUtils.cmake
+%%DATADIR%%/Modules/CMakeFindCodeBlocks.cmake
+%%DATADIR%%/Modules/CMakeFindDependencyMacro.cmake
+%%DATADIR%%/Modules/CMakeFindEclipseCDT4.cmake
+%%DATADIR%%/Modules/CMakeFindFrameworks.cmake
+%%DATADIR%%/Modules/CMakeFindJavaCommon.cmake
+%%DATADIR%%/Modules/CMakeFindKDevelop3.cmake
+%%DATADIR%%/Modules/CMakeFindKate.cmake
+%%DATADIR%%/Modules/CMakeFindPackageMode.cmake
+%%DATADIR%%/Modules/CMakeFindWMake.cmake
+%%DATADIR%%/Modules/CMakeFindXCode.cmake
+%%DATADIR%%/Modules/CMakeForceCompiler.cmake
+%%DATADIR%%/Modules/CMakeFortranCompiler.cmake.in
+%%DATADIR%%/Modules/CMakeFortranCompilerABI.F
+%%DATADIR%%/Modules/CMakeFortranCompilerId.F.in
+%%DATADIR%%/Modules/CMakeFortranInformation.cmake
+%%DATADIR%%/Modules/CMakeGenericSystem.cmake
+%%DATADIR%%/Modules/CMakeGraphVizOptions.cmake
+%%DATADIR%%/Modules/CMakeIOSInstallCombined.cmake
+%%DATADIR%%/Modules/CMakeImportBuildSettings.cmake
+%%DATADIR%%/Modules/CMakeJOMFindMake.cmake
+%%DATADIR%%/Modules/CMakeJavaCompiler.cmake.in
+%%DATADIR%%/Modules/CMakeJavaInformation.cmake
+%%DATADIR%%/Modules/CMakeLanguageInformation.cmake
+%%DATADIR%%/Modules/CMakeMSYSFindMake.cmake
+%%DATADIR%%/Modules/CMakeMinGWFindMake.cmake
+%%DATADIR%%/Modules/CMakeNMakeFindMake.cmake
+%%DATADIR%%/Modules/CMakeNinjaFindMake.cmake
+%%DATADIR%%/Modules/CMakePackageConfigHelpers.cmake
+%%DATADIR%%/Modules/CMakeParseArguments.cmake
+%%DATADIR%%/Modules/CMakeParseImplicitLinkInfo.cmake
+%%DATADIR%%/Modules/CMakePlatformId.h.in
+%%DATADIR%%/Modules/CMakePrintHelpers.cmake
+%%DATADIR%%/Modules/CMakePrintSystemInformation.cmake
+%%DATADIR%%/Modules/CMakePushCheckState.cmake
+%%DATADIR%%/Modules/CMakeRCCompiler.cmake.in
+%%DATADIR%%/Modules/CMakeRCInformation.cmake
+%%DATADIR%%/Modules/CMakeSwiftCompiler.cmake.in
+%%DATADIR%%/Modules/CMakeSwiftInformation.cmake
+%%DATADIR%%/Modules/CMakeSystem.cmake.in
+%%DATADIR%%/Modules/CMakeSystemSpecificInformation.cmake
+%%DATADIR%%/Modules/CMakeSystemSpecificInitialize.cmake
+%%DATADIR%%/Modules/CMakeTestASM-ATTCompiler.cmake
+%%DATADIR%%/Modules/CMakeTestASMCompiler.cmake
+%%DATADIR%%/Modules/CMakeTestASM_MASMCompiler.cmake
+%%DATADIR%%/Modules/CMakeTestASM_NASMCompiler.cmake
+%%DATADIR%%/Modules/CMakeTestCCompiler.cmake
+%%DATADIR%%/Modules/CMakeTestCSharpCompiler.cmake
+%%DATADIR%%/Modules/CMakeTestCUDACompiler.cmake
+%%DATADIR%%/Modules/CMakeTestCXXCompiler.cmake
+%%DATADIR%%/Modules/CMakeTestCompilerCommon.cmake
+%%DATADIR%%/Modules/CMakeTestFortranCompiler.cmake
+%%DATADIR%%/Modules/CMakeTestGNU.c
+%%DATADIR%%/Modules/CMakeTestJavaCompiler.cmake
+%%DATADIR%%/Modules/CMakeTestRCCompiler.cmake
+%%DATADIR%%/Modules/CMakeTestSwiftCompiler.cmake
+%%DATADIR%%/Modules/CMakeUnixFindMake.cmake
+%%DATADIR%%/Modules/CMakeVerifyManifest.cmake
+%%DATADIR%%/Modules/CPack.DS_Store.in
+%%DATADIR%%/Modules/CPack.Description.plist.in
+%%DATADIR%%/Modules/CPack.Info.plist.in
+%%DATADIR%%/Modules/CPack.OSXScriptLauncher.in
+%%DATADIR%%/Modules/CPack.OSXScriptLauncher.rsrc.in
+%%DATADIR%%/Modules/CPack.OSXX11.Info.plist.in
+%%DATADIR%%/Modules/CPack.OSXX11.main.scpt.in
+%%DATADIR%%/Modules/CPack.RuntimeScript.in
+%%DATADIR%%/Modules/CPack.STGZ_Header.sh.in
+%%DATADIR%%/Modules/CPack.VolumeIcon.icns.in
+%%DATADIR%%/Modules/CPack.background.png.in
+%%DATADIR%%/Modules/CPack.cmake
+%%DATADIR%%/Modules/CPack.distribution.dist.in
+%%DATADIR%%/Modules/CPackArchive.cmake
+%%DATADIR%%/Modules/CPackBundle.cmake
+%%DATADIR%%/Modules/CPackComponent.cmake
+%%DATADIR%%/Modules/CPackCygwin.cmake
+%%DATADIR%%/Modules/CPackDMG.cmake
+%%DATADIR%%/Modules/CPackDeb.cmake
+%%DATADIR%%/Modules/CPackIFW.cmake
+%%DATADIR%%/Modules/CPackIFWConfigureFile.cmake
+%%DATADIR%%/Modules/CPackNSIS.cmake
+%%DATADIR%%/Modules/CPackPackageMaker.cmake
+%%DATADIR%%/Modules/CPackProductBuild.cmake
+%%DATADIR%%/Modules/CPackRPM.cmake
+%%DATADIR%%/Modules/CPackWIX.cmake
+%%DATADIR%%/Modules/CPackZIP.cmake
+%%DATADIR%%/Modules/CSharpUtilities.cmake
+%%DATADIR%%/Modules/CTest.cmake
+%%DATADIR%%/Modules/CTestCoverageCollectGCOV.cmake
+%%DATADIR%%/Modules/CTestScriptMode.cmake
+%%DATADIR%%/Modules/CTestTargets.cmake
+%%DATADIR%%/Modules/CTestUseLaunchers.cmake
+%%DATADIR%%/Modules/CheckCCompilerFlag.cmake
+%%DATADIR%%/Modules/CheckCSourceCompiles.cmake
+%%DATADIR%%/Modules/CheckCSourceRuns.cmake
+%%DATADIR%%/Modules/CheckCXXCompilerFlag.cmake
+%%DATADIR%%/Modules/CheckCXXSourceCompiles.cmake
+%%DATADIR%%/Modules/CheckCXXSourceRuns.cmake
+%%DATADIR%%/Modules/CheckCXXSymbolExists.cmake
+%%DATADIR%%/Modules/CheckForPthreads.c
+%%DATADIR%%/Modules/CheckFortranCompilerFlag.cmake
+%%DATADIR%%/Modules/CheckFortranFunctionExists.cmake
+%%DATADIR%%/Modules/CheckFortranSourceCompiles.cmake
+%%DATADIR%%/Modules/CheckFunctionExists.c
+%%DATADIR%%/Modules/CheckFunctionExists.cmake
+%%DATADIR%%/Modules/CheckIPOSupported.cmake
+%%DATADIR%%/Modules/CheckIPOSupported/CMakeLists-C.txt.in
+%%DATADIR%%/Modules/CheckIPOSupported/CMakeLists-CXX.txt.in
+%%DATADIR%%/Modules/CheckIPOSupported/CMakeLists-Fortran.txt.in
+%%DATADIR%%/Modules/CheckIPOSupported/foo.c
+%%DATADIR%%/Modules/CheckIPOSupported/foo.cpp
+%%DATADIR%%/Modules/CheckIPOSupported/foo.f
+%%DATADIR%%/Modules/CheckIPOSupported/main.c
+%%DATADIR%%/Modules/CheckIPOSupported/main.cpp
+%%DATADIR%%/Modules/CheckIPOSupported/main.f
+%%DATADIR%%/Modules/CheckIncludeFile.c.in
+%%DATADIR%%/Modules/CheckIncludeFile.cmake
+%%DATADIR%%/Modules/CheckIncludeFile.cxx.in
+%%DATADIR%%/Modules/CheckIncludeFileCXX.cmake
+%%DATADIR%%/Modules/CheckIncludeFiles.cmake
+%%DATADIR%%/Modules/CheckLanguage.cmake
+%%DATADIR%%/Modules/CheckLibraryExists.cmake
+%%DATADIR%%/Modules/CheckLibraryExists.lists.in
+%%DATADIR%%/Modules/CheckPrototypeDefinition.c.in
+%%DATADIR%%/Modules/CheckPrototypeDefinition.cmake
+%%DATADIR%%/Modules/CheckSizeOf.cmake
+%%DATADIR%%/Modules/CheckStructHasMember.cmake
+%%DATADIR%%/Modules/CheckSymbolExists.cmake
+%%DATADIR%%/Modules/CheckTypeSize.c.in
+%%DATADIR%%/Modules/CheckTypeSize.cmake
+%%DATADIR%%/Modules/CheckTypeSizeMap.cmake.in
+%%DATADIR%%/Modules/CheckVariableExists.c
+%%DATADIR%%/Modules/CheckVariableExists.cmake
+%%DATADIR%%/Modules/Compiler/ADSP-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/ARMCC-ASM.cmake
+%%DATADIR%%/Modules/Compiler/ARMCC-C.cmake
+%%DATADIR%%/Modules/Compiler/ARMCC-CXX.cmake
+%%DATADIR%%/Modules/Compiler/ARMCC-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/ARMCC.cmake
+%%DATADIR%%/Modules/Compiler/Absoft-Fortran.cmake
+%%DATADIR%%/Modules/Compiler/AppleClang-ASM.cmake
+%%DATADIR%%/Modules/Compiler/AppleClang-C-FeatureTests.cmake
+%%DATADIR%%/Modules/Compiler/AppleClang-C.cmake
+%%DATADIR%%/Modules/Compiler/AppleClang-CXX-FeatureTests.cmake
+%%DATADIR%%/Modules/Compiler/AppleClang-CXX.cmake
+%%DATADIR%%/Modules/Compiler/AppleClang-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/Borland-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/Bruce-C-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/Bruce-C.cmake
+%%DATADIR%%/Modules/Compiler/CCur-Fortran.cmake
+%%DATADIR%%/Modules/Compiler/CMakeCommonCompilerMacros.cmake
+%%DATADIR%%/Modules/Compiler/Clang-ASM.cmake
+%%DATADIR%%/Modules/Compiler/Clang-C-FeatureTests.cmake
+%%DATADIR%%/Modules/Compiler/Clang-C.cmake
+%%DATADIR%%/Modules/Compiler/Clang-CXX-FeatureTests.cmake
+%%DATADIR%%/Modules/Compiler/Clang-CXX-TestableFeatures.cmake
+%%DATADIR%%/Modules/Compiler/Clang-CXX.cmake
+%%DATADIR%%/Modules/Compiler/Clang-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/Clang-DetermineCompilerInternal.cmake
+%%DATADIR%%/Modules/Compiler/Clang-FindBinUtils.cmake
+%%DATADIR%%/Modules/Compiler/Clang.cmake
+%%DATADIR%%/Modules/Compiler/Comeau-CXX-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/Compaq-C-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/Compaq-CXX-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/Cray-C.cmake
+%%DATADIR%%/Modules/Compiler/Cray-CXX.cmake
+%%DATADIR%%/Modules/Compiler/Cray-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/Cray-Fortran.cmake
+%%DATADIR%%/Modules/Compiler/Cray.cmake
+%%DATADIR%%/Modules/Compiler/CrayPrgEnv-C.cmake
+%%DATADIR%%/Modules/Compiler/CrayPrgEnv-CXX.cmake
+%%DATADIR%%/Modules/Compiler/CrayPrgEnv-Cray-C.cmake
+%%DATADIR%%/Modules/Compiler/CrayPrgEnv-Cray-CXX.cmake
+%%DATADIR%%/Modules/Compiler/CrayPrgEnv-Cray-Fortran.cmake
+%%DATADIR%%/Modules/Compiler/CrayPrgEnv-Fortran.cmake
+%%DATADIR%%/Modules/Compiler/CrayPrgEnv-GNU-C.cmake
+%%DATADIR%%/Modules/Compiler/CrayPrgEnv-GNU-CXX.cmake
+%%DATADIR%%/Modules/Compiler/CrayPrgEnv-GNU-Fortran.cmake
+%%DATADIR%%/Modules/Compiler/CrayPrgEnv-Intel-C.cmake
+%%DATADIR%%/Modules/Compiler/CrayPrgEnv-Intel-CXX.cmake
+%%DATADIR%%/Modules/Compiler/CrayPrgEnv-Intel-Fortran.cmake
+%%DATADIR%%/Modules/Compiler/CrayPrgEnv-PGI-C.cmake
+%%DATADIR%%/Modules/Compiler/CrayPrgEnv-PGI-CXX.cmake
+%%DATADIR%%/Modules/Compiler/CrayPrgEnv-PGI-Fortran.cmake
+%%DATADIR%%/Modules/Compiler/CrayPrgEnv.cmake
+%%DATADIR%%/Modules/Compiler/Embarcadero-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/Fujitsu-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/G95-Fortran.cmake
+%%DATADIR%%/Modules/Compiler/GHS-C.cmake
+%%DATADIR%%/Modules/Compiler/GHS-CXX.cmake
+%%DATADIR%%/Modules/Compiler/GHS-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/GHS.cmake
+%%DATADIR%%/Modules/Compiler/GNU-ASM.cmake
+%%DATADIR%%/Modules/Compiler/GNU-C-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/GNU-C-FeatureTests.cmake
+%%DATADIR%%/Modules/Compiler/GNU-C.cmake
+%%DATADIR%%/Modules/Compiler/GNU-CXX-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/GNU-CXX-FeatureTests.cmake
+%%DATADIR%%/Modules/Compiler/GNU-CXX.cmake
+%%DATADIR%%/Modules/Compiler/GNU-FindBinUtils.cmake
+%%DATADIR%%/Modules/Compiler/GNU-Fortran.cmake
+%%DATADIR%%/Modules/Compiler/GNU.cmake
+%%DATADIR%%/Modules/Compiler/HP-ASM.cmake
+%%DATADIR%%/Modules/Compiler/HP-C-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/HP-C.cmake
+%%DATADIR%%/Modules/Compiler/HP-CXX-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/HP-CXX.cmake
+%%DATADIR%%/Modules/Compiler/HP-Fortran.cmake
+%%DATADIR%%/Modules/Compiler/IAR-ASM.cmake
+%%DATADIR%%/Modules/Compiler/IAR-C.cmake
+%%DATADIR%%/Modules/Compiler/IAR-CXX.cmake
+%%DATADIR%%/Modules/Compiler/IAR-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/IAR.cmake
+%%DATADIR%%/Modules/Compiler/IBMCPP-C-DetermineVersionInternal.cmake
+%%DATADIR%%/Modules/Compiler/IBMCPP-CXX-DetermineVersionInternal.cmake
+%%DATADIR%%/Modules/Compiler/Intel-ASM.cmake
+%%DATADIR%%/Modules/Compiler/Intel-C-FeatureTests.cmake
+%%DATADIR%%/Modules/Compiler/Intel-C.cmake
+%%DATADIR%%/Modules/Compiler/Intel-CXX-FeatureTests.cmake
+%%DATADIR%%/Modules/Compiler/Intel-CXX.cmake
+%%DATADIR%%/Modules/Compiler/Intel-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/Intel-Fortran.cmake
+%%DATADIR%%/Modules/Compiler/Intel.cmake
+%%DATADIR%%/Modules/Compiler/MIPSpro-C.cmake
+%%DATADIR%%/Modules/Compiler/MIPSpro-CXX.cmake
+%%DATADIR%%/Modules/Compiler/MIPSpro-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/MIPSpro-Fortran.cmake
+%%DATADIR%%/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
+%%DATADIR%%/Modules/Compiler/MSVC-CXX.cmake
+%%DATADIR%%/Modules/Compiler/MSVC-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/NAG-Fortran.cmake
+%%DATADIR%%/Modules/Compiler/NVIDIA-CUDA.cmake
+%%DATADIR%%/Modules/Compiler/NVIDIA-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/OpenWatcom-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/PGI-C.cmake
+%%DATADIR%%/Modules/Compiler/PGI-CXX.cmake
+%%DATADIR%%/Modules/Compiler/PGI-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/PGI-Fortran.cmake
+%%DATADIR%%/Modules/Compiler/PGI.cmake
+%%DATADIR%%/Modules/Compiler/PathScale-C.cmake
+%%DATADIR%%/Modules/Compiler/PathScale-CXX.cmake
+%%DATADIR%%/Modules/Compiler/PathScale-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/PathScale-Fortran.cmake
+%%DATADIR%%/Modules/Compiler/PathScale.cmake
+%%DATADIR%%/Modules/Compiler/QCC-C.cmake
+%%DATADIR%%/Modules/Compiler/QCC-CXX.cmake
+%%DATADIR%%/Modules/Compiler/QCC.cmake
+%%DATADIR%%/Modules/Compiler/SCO-C.cmake
+%%DATADIR%%/Modules/Compiler/SCO-CXX.cmake
+%%DATADIR%%/Modules/Compiler/SCO-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/SCO.cmake
+%%DATADIR%%/Modules/Compiler/SDCC-C-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/SunPro-ASM.cmake
+%%DATADIR%%/Modules/Compiler/SunPro-C-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/SunPro-C-FeatureTests.cmake
+%%DATADIR%%/Modules/Compiler/SunPro-C.cmake
+%%DATADIR%%/Modules/Compiler/SunPro-CXX-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/SunPro-CXX-FeatureTests.cmake
+%%DATADIR%%/Modules/Compiler/SunPro-CXX.cmake
+%%DATADIR%%/Modules/Compiler/SunPro-Fortran.cmake
+%%DATADIR%%/Modules/Compiler/SunPro.cmake
+%%DATADIR%%/Modules/Compiler/TI-ASM.cmake
+%%DATADIR%%/Modules/Compiler/TI-C.cmake
+%%DATADIR%%/Modules/Compiler/TI-CXX.cmake
+%%DATADIR%%/Modules/Compiler/TI-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/TinyCC-C-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/TinyCC-C.cmake
+%%DATADIR%%/Modules/Compiler/VisualAge-C-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/VisualAge-C.cmake
+%%DATADIR%%/Modules/Compiler/VisualAge-CXX-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/VisualAge-CXX.cmake
+%%DATADIR%%/Modules/Compiler/VisualAge-Fortran.cmake
+%%DATADIR%%/Modules/Compiler/Watcom-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/XL-ASM.cmake
+%%DATADIR%%/Modules/Compiler/XL-C-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/XL-C.cmake
+%%DATADIR%%/Modules/Compiler/XL-CXX-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/XL-CXX.cmake
+%%DATADIR%%/Modules/Compiler/XL-Fortran.cmake
+%%DATADIR%%/Modules/Compiler/XL.cmake
+%%DATADIR%%/Modules/Compiler/zOS-C-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/zOS-CXX-DetermineCompiler.cmake
+%%DATADIR%%/Modules/CompilerId/VS-10.csproj.in
+%%DATADIR%%/Modules/CompilerId/VS-10.vcxproj.in
+%%DATADIR%%/Modules/CompilerId/VS-7.vcproj.in
+%%DATADIR%%/Modules/CompilerId/VS-Intel.vfproj.in
+%%DATADIR%%/Modules/CompilerId/VS-NsightTegra.vcxproj.in
+%%DATADIR%%/Modules/CompilerId/Xcode-3.pbxproj.in
+%%DATADIR%%/Modules/CompilerId/main.swift.in
+%%DATADIR%%/Modules/Dart.cmake
+%%DATADIR%%/Modules/DartConfiguration.tcl.in
+%%DATADIR%%/Modules/DeployQt4.cmake
+%%DATADIR%%/Modules/Documentation.cmake
+%%DATADIR%%/Modules/DummyCXXFile.cxx
+%%DATADIR%%/Modules/ExternalData.cmake
+%%DATADIR%%/Modules/ExternalData_config.cmake.in
+%%DATADIR%%/Modules/ExternalProject-download.cmake.in
+%%DATADIR%%/Modules/ExternalProject-verify.cmake.in
+%%DATADIR%%/Modules/ExternalProject.cmake
+%%DATADIR%%/Modules/FLTKCompatibility.cmake
+%%DATADIR%%/Modules/FeatureSummary.cmake
+%%DATADIR%%/Modules/FindALSA.cmake
+%%DATADIR%%/Modules/FindASPELL.cmake
+%%DATADIR%%/Modules/FindAVIFile.cmake
+%%DATADIR%%/Modules/FindArmadillo.cmake
+%%DATADIR%%/Modules/FindBISON.cmake
+%%DATADIR%%/Modules/FindBLAS.cmake
+%%DATADIR%%/Modules/FindBZip2.cmake
+%%DATADIR%%/Modules/FindBacktrace.cmake
+%%DATADIR%%/Modules/FindBoost.cmake
+%%DATADIR%%/Modules/FindBullet.cmake
+%%DATADIR%%/Modules/FindCABLE.cmake
+%%DATADIR%%/Modules/FindCUDA.cmake
+%%DATADIR%%/Modules/FindCUDA/make2cmake.cmake
+%%DATADIR%%/Modules/FindCUDA/parse_cubin.cmake
+%%DATADIR%%/Modules/FindCUDA/run_nvcc.cmake
+%%DATADIR%%/Modules/FindCUDA/select_compute_arch.cmake
+%%DATADIR%%/Modules/FindCURL.cmake
+%%DATADIR%%/Modules/FindCVS.cmake
+%%DATADIR%%/Modules/FindCoin3D.cmake
+%%DATADIR%%/Modules/FindCups.cmake
+%%DATADIR%%/Modules/FindCurses.cmake
+%%DATADIR%%/Modules/FindCxxTest.cmake
+%%DATADIR%%/Modules/FindCygwin.cmake
+%%DATADIR%%/Modules/FindDCMTK.cmake
+%%DATADIR%%/Modules/FindDart.cmake
+%%DATADIR%%/Modules/FindDevIL.cmake
+%%DATADIR%%/Modules/FindDoxygen.cmake
+%%DATADIR%%/Modules/FindEXPAT.cmake
+%%DATADIR%%/Modules/FindFLEX.cmake
+%%DATADIR%%/Modules/FindFLTK.cmake
+%%DATADIR%%/Modules/FindFLTK2.cmake
+%%DATADIR%%/Modules/FindFreetype.cmake
+%%DATADIR%%/Modules/FindGCCXML.cmake
+%%DATADIR%%/Modules/FindGDAL.cmake
+%%DATADIR%%/Modules/FindGIF.cmake
+%%DATADIR%%/Modules/FindGLEW.cmake
+%%DATADIR%%/Modules/FindGLU.cmake
+%%DATADIR%%/Modules/FindGLUT.cmake
+%%DATADIR%%/Modules/FindGSL.cmake
+%%DATADIR%%/Modules/FindGTK.cmake
+%%DATADIR%%/Modules/FindGTK2.cmake
+%%DATADIR%%/Modules/FindGTest.cmake
+%%DATADIR%%/Modules/FindGettext.cmake
+%%DATADIR%%/Modules/FindGit.cmake
+%%DATADIR%%/Modules/FindGnuTLS.cmake
+%%DATADIR%%/Modules/FindGnuplot.cmake
+%%DATADIR%%/Modules/FindHDF5.cmake
+%%DATADIR%%/Modules/FindHSPELL.cmake
+%%DATADIR%%/Modules/FindHTMLHelp.cmake
+%%DATADIR%%/Modules/FindHg.cmake
+%%DATADIR%%/Modules/FindICU.cmake
+%%DATADIR%%/Modules/FindIce.cmake
+%%DATADIR%%/Modules/FindIcotool.cmake
+%%DATADIR%%/Modules/FindImageMagick.cmake
+%%DATADIR%%/Modules/FindIntl.cmake
+%%DATADIR%%/Modules/FindJNI.cmake
+%%DATADIR%%/Modules/FindJPEG.cmake
+%%DATADIR%%/Modules/FindJasper.cmake
+%%DATADIR%%/Modules/FindJava.cmake
+%%DATADIR%%/Modules/FindKDE3.cmake
+%%DATADIR%%/Modules/FindKDE4.cmake
+%%DATADIR%%/Modules/FindLAPACK.cmake
+%%DATADIR%%/Modules/FindLATEX.cmake
+%%DATADIR%%/Modules/FindLTTngUST.cmake
+%%DATADIR%%/Modules/FindLibArchive.cmake
+%%DATADIR%%/Modules/FindLibLZMA.cmake
+%%DATADIR%%/Modules/FindLibXml2.cmake
+%%DATADIR%%/Modules/FindLibXslt.cmake
+%%DATADIR%%/Modules/FindLua.cmake
+%%DATADIR%%/Modules/FindLua50.cmake
+%%DATADIR%%/Modules/FindLua51.cmake
+%%DATADIR%%/Modules/FindMFC.cmake
+%%DATADIR%%/Modules/FindMPEG.cmake
+%%DATADIR%%/Modules/FindMPEG2.cmake
+%%DATADIR%%/Modules/FindMPI.cmake
+%%DATADIR%%/Modules/FindMatlab.cmake
+%%DATADIR%%/Modules/FindMotif.cmake
+%%DATADIR%%/Modules/FindOpenAL.cmake
+%%DATADIR%%/Modules/FindOpenCL.cmake
+%%DATADIR%%/Modules/FindOpenGL.cmake
+%%DATADIR%%/Modules/FindOpenMP.cmake
+%%DATADIR%%/Modules/FindOpenSSL.cmake
+%%DATADIR%%/Modules/FindOpenSceneGraph.cmake
+%%DATADIR%%/Modules/FindOpenThreads.cmake
+%%DATADIR%%/Modules/FindPHP4.cmake
+%%DATADIR%%/Modules/FindPNG.cmake
+%%DATADIR%%/Modules/FindPackageHandleStandardArgs.cmake
+%%DATADIR%%/Modules/FindPackageMessage.cmake
+%%DATADIR%%/Modules/FindPerl.cmake
+%%DATADIR%%/Modules/FindPerlLibs.cmake
+%%DATADIR%%/Modules/FindPhysFS.cmake
+%%DATADIR%%/Modules/FindPike.cmake
+%%DATADIR%%/Modules/FindPkgConfig.cmake
+%%DATADIR%%/Modules/FindPostgreSQL.cmake
+%%DATADIR%%/Modules/FindProducer.cmake
+%%DATADIR%%/Modules/FindProtobuf.cmake
+%%DATADIR%%/Modules/FindPythonInterp.cmake
+%%DATADIR%%/Modules/FindPythonLibs.cmake
+%%DATADIR%%/Modules/FindQt.cmake
+%%DATADIR%%/Modules/FindQt3.cmake
+%%DATADIR%%/Modules/FindQt4.cmake
+%%DATADIR%%/Modules/FindQuickTime.cmake
+%%DATADIR%%/Modules/FindRTI.cmake
+%%DATADIR%%/Modules/FindRuby.cmake
+%%DATADIR%%/Modules/FindSDL.cmake
+%%DATADIR%%/Modules/FindSDL_image.cmake
+%%DATADIR%%/Modules/FindSDL_mixer.cmake
+%%DATADIR%%/Modules/FindSDL_net.cmake
+%%DATADIR%%/Modules/FindSDL_sound.cmake
+%%DATADIR%%/Modules/FindSDL_ttf.cmake
+%%DATADIR%%/Modules/FindSWIG.cmake
+%%DATADIR%%/Modules/FindSelfPackers.cmake
+%%DATADIR%%/Modules/FindSquish.cmake
+%%DATADIR%%/Modules/FindSubversion.cmake
+%%DATADIR%%/Modules/FindTCL.cmake
+%%DATADIR%%/Modules/FindTIFF.cmake
+%%DATADIR%%/Modules/FindTclStub.cmake
+%%DATADIR%%/Modules/FindTclsh.cmake
+%%DATADIR%%/Modules/FindThreads.cmake
+%%DATADIR%%/Modules/FindUnixCommands.cmake
+%%DATADIR%%/Modules/FindVulkan.cmake
+%%DATADIR%%/Modules/FindWget.cmake
+%%DATADIR%%/Modules/FindWish.cmake
+%%DATADIR%%/Modules/FindX11.cmake
+%%DATADIR%%/Modules/FindXCTest.cmake
+%%DATADIR%%/Modules/FindXMLRPC.cmake
+%%DATADIR%%/Modules/FindXalanC.cmake
+%%DATADIR%%/Modules/FindXercesC.cmake
+%%DATADIR%%/Modules/FindZLIB.cmake
+%%DATADIR%%/Modules/Findosg.cmake
+%%DATADIR%%/Modules/FindosgAnimation.cmake
+%%DATADIR%%/Modules/FindosgDB.cmake
+%%DATADIR%%/Modules/FindosgFX.cmake
+%%DATADIR%%/Modules/FindosgGA.cmake
+%%DATADIR%%/Modules/FindosgIntrospection.cmake
+%%DATADIR%%/Modules/FindosgManipulator.cmake
+%%DATADIR%%/Modules/FindosgParticle.cmake
+%%DATADIR%%/Modules/FindosgPresentation.cmake
+%%DATADIR%%/Modules/FindosgProducer.cmake
+%%DATADIR%%/Modules/FindosgQt.cmake
+%%DATADIR%%/Modules/FindosgShadow.cmake
+%%DATADIR%%/Modules/FindosgSim.cmake
+%%DATADIR%%/Modules/FindosgTerrain.cmake
+%%DATADIR%%/Modules/FindosgText.cmake
+%%DATADIR%%/Modules/FindosgUtil.cmake
+%%DATADIR%%/Modules/FindosgViewer.cmake
+%%DATADIR%%/Modules/FindosgVolume.cmake
+%%DATADIR%%/Modules/FindosgWidget.cmake
+%%DATADIR%%/Modules/Findosg_functions.cmake
+%%DATADIR%%/Modules/FindwxWidgets.cmake
+%%DATADIR%%/Modules/FindwxWindows.cmake
+%%DATADIR%%/Modules/FortranCInterface.cmake
+%%DATADIR%%/Modules/FortranCInterface/CMakeLists.txt
+%%DATADIR%%/Modules/FortranCInterface/Detect.cmake
+%%DATADIR%%/Modules/FortranCInterface/Input.cmake.in
+%%DATADIR%%/Modules/FortranCInterface/MYMODULE.c
+%%DATADIR%%/Modules/FortranCInterface/MY_MODULE.c
+%%DATADIR%%/Modules/FortranCInterface/Macro.h.in
+%%DATADIR%%/Modules/FortranCInterface/Output.cmake.in
+%%DATADIR%%/Modules/FortranCInterface/Verify/CMakeLists.txt
+%%DATADIR%%/Modules/FortranCInterface/Verify/VerifyC.c
+%%DATADIR%%/Modules/FortranCInterface/Verify/VerifyCXX.cxx
+%%DATADIR%%/Modules/FortranCInterface/Verify/VerifyFortran.f
+%%DATADIR%%/Modules/FortranCInterface/Verify/main.c
+%%DATADIR%%/Modules/FortranCInterface/call_mod.f90
+%%DATADIR%%/Modules/FortranCInterface/call_sub.f
+%%DATADIR%%/Modules/FortranCInterface/main.F
+%%DATADIR%%/Modules/FortranCInterface/my_module.f90
+%%DATADIR%%/Modules/FortranCInterface/my_module_.c
+%%DATADIR%%/Modules/FortranCInterface/my_sub.f
+%%DATADIR%%/Modules/FortranCInterface/mymodule.f90
+%%DATADIR%%/Modules/FortranCInterface/mymodule_.c
+%%DATADIR%%/Modules/FortranCInterface/mysub.f
+%%DATADIR%%/Modules/FortranCInterface/symbol.c.in
+%%DATADIR%%/Modules/GNUInstallDirs.cmake
+%%DATADIR%%/Modules/GenerateExportHeader.cmake
+%%DATADIR%%/Modules/GetPrerequisites.cmake
+%%DATADIR%%/Modules/GoogleTest.cmake
+%%DATADIR%%/Modules/ITKCompatibility.cmake
+%%DATADIR%%/Modules/InstallRequiredSystemLibraries.cmake
+%%DATADIR%%/Modules/IntelVSImplicitPath/CMakeLists.txt
+%%DATADIR%%/Modules/IntelVSImplicitPath/detect.cmake
+%%DATADIR%%/Modules/IntelVSImplicitPath/hello.f
+%%DATADIR%%/Modules/Internal/FeatureTesting.cmake
+%%DATADIR%%/Modules/KDE3Macros.cmake
+%%DATADIR%%/Modules/MacOSXBundleInfo.plist.in
+%%DATADIR%%/Modules/MacOSXFrameworkInfo.plist.in
+%%DATADIR%%/Modules/MacroAddFileDependencies.cmake
+%%DATADIR%%/Modules/MatlabTestsRedirect.cmake
+%%DATADIR%%/Modules/NSIS.InstallOptions.ini.in
+%%DATADIR%%/Modules/NSIS.template.in
+%%DATADIR%%/Modules/Platform/AIX-Clang-C.cmake
+%%DATADIR%%/Modules/Platform/AIX-Clang-CXX.cmake
+%%DATADIR%%/Modules/Platform/AIX-GNU-ASM.cmake
+%%DATADIR%%/Modules/Platform/AIX-GNU-C.cmake
+%%DATADIR%%/Modules/Platform/AIX-GNU-CXX.cmake
+%%DATADIR%%/Modules/Platform/AIX-GNU-Fortran.cmake
+%%DATADIR%%/Modules/Platform/AIX-GNU.cmake
+%%DATADIR%%/Modules/Platform/AIX-VisualAge-C.cmake
+%%DATADIR%%/Modules/Platform/AIX-VisualAge-CXX.cmake
+%%DATADIR%%/Modules/Platform/AIX-VisualAge-Fortran.cmake
+%%DATADIR%%/Modules/Platform/AIX-XL-ASM.cmake
+%%DATADIR%%/Modules/Platform/AIX-XL-C.cmake
+%%DATADIR%%/Modules/Platform/AIX-XL-CXX.cmake
+%%DATADIR%%/Modules/Platform/AIX-XL-Fortran.cmake
+%%DATADIR%%/Modules/Platform/AIX-XL.cmake
+%%DATADIR%%/Modules/Platform/AIX.cmake
+%%DATADIR%%/Modules/Platform/ARTOS-GNU-C.cmake
+%%DATADIR%%/Modules/Platform/ARTOS.cmake
+%%DATADIR%%/Modules/Platform/Android-Clang-ASM.cmake
+%%DATADIR%%/Modules/Platform/Android-Clang-C.cmake
+%%DATADIR%%/Modules/Platform/Android-Clang-CXX.cmake
+%%DATADIR%%/Modules/Platform/Android-Clang.cmake
+%%DATADIR%%/Modules/Platform/Android-Common.cmake
+%%DATADIR%%/Modules/Platform/Android-Determine-C.cmake
+%%DATADIR%%/Modules/Platform/Android-Determine-CXX.cmake
+%%DATADIR%%/Modules/Platform/Android-Determine.cmake
+%%DATADIR%%/Modules/Platform/Android-GNU-C.cmake
+%%DATADIR%%/Modules/Platform/Android-GNU-CXX.cmake
+%%DATADIR%%/Modules/Platform/Android-GNU.cmake
+%%DATADIR%%/Modules/Platform/Android-Initialize.cmake
+%%DATADIR%%/Modules/Platform/Android.cmake
+%%DATADIR%%/Modules/Platform/Android/Determine-Compiler-NDK.cmake
+%%DATADIR%%/Modules/Platform/Android/Determine-Compiler-Standalone.cmake
+%%DATADIR%%/Modules/Platform/Android/Determine-Compiler.cmake
+%%DATADIR%%/Modules/Platform/Android/abi-arm64-v8a-Clang.cmake
+%%DATADIR%%/Modules/Platform/Android/abi-arm64-v8a-GNU.cmake
+%%DATADIR%%/Modules/Platform/Android/abi-armeabi-Clang.cmake
+%%DATADIR%%/Modules/Platform/Android/abi-armeabi-GNU.cmake
+%%DATADIR%%/Modules/Platform/Android/abi-armeabi-v6-Clang.cmake
+%%DATADIR%%/Modules/Platform/Android/abi-armeabi-v6-GNU.cmake
+%%DATADIR%%/Modules/Platform/Android/abi-armeabi-v7a-Clang.cmake
+%%DATADIR%%/Modules/Platform/Android/abi-armeabi-v7a-GNU.cmake
+%%DATADIR%%/Modules/Platform/Android/abi-common-Clang.cmake
+%%DATADIR%%/Modules/Platform/Android/abi-common-GNU.cmake
+%%DATADIR%%/Modules/Platform/Android/abi-common.cmake
+%%DATADIR%%/Modules/Platform/Android/abi-mips-Clang.cmake
+%%DATADIR%%/Modules/Platform/Android/abi-mips-GNU.cmake
+%%DATADIR%%/Modules/Platform/Android/abi-mips64-Clang.cmake
+%%DATADIR%%/Modules/Platform/Android/abi-mips64-GNU.cmake
+%%DATADIR%%/Modules/Platform/Android/abi-x86-Clang.cmake
+%%DATADIR%%/Modules/Platform/Android/abi-x86-GNU.cmake
+%%DATADIR%%/Modules/Platform/Android/abi-x86_64-Clang.cmake
+%%DATADIR%%/Modules/Platform/Android/abi-x86_64-GNU.cmake
+%%DATADIR%%/Modules/Platform/Android/ndk-stl-c++.cmake
+%%DATADIR%%/Modules/Platform/Android/ndk-stl-c++_shared.cmake
+%%DATADIR%%/Modules/Platform/Android/ndk-stl-c++_static.cmake
+%%DATADIR%%/Modules/Platform/Android/ndk-stl-gabi++.cmake
+%%DATADIR%%/Modules/Platform/Android/ndk-stl-gabi++_shared.cmake
+%%DATADIR%%/Modules/Platform/Android/ndk-stl-gabi++_static.cmake
+%%DATADIR%%/Modules/Platform/Android/ndk-stl-gnustl.cmake
+%%DATADIR%%/Modules/Platform/Android/ndk-stl-gnustl_shared.cmake
+%%DATADIR%%/Modules/Platform/Android/ndk-stl-gnustl_static.cmake
+%%DATADIR%%/Modules/Platform/Android/ndk-stl-none.cmake
+%%DATADIR%%/Modules/Platform/Android/ndk-stl-stlport.cmake
+%%DATADIR%%/Modules/Platform/Android/ndk-stl-stlport_shared.cmake
+%%DATADIR%%/Modules/Platform/Android/ndk-stl-stlport_static.cmake
+%%DATADIR%%/Modules/Platform/Android/ndk-stl-system.cmake
+%%DATADIR%%/Modules/Platform/BSDOS.cmake
+%%DATADIR%%/Modules/Platform/BeOS.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneL.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneP-base.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneP-dynamic-GNU-C.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneP-dynamic-GNU-CXX.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneP-dynamic-GNU-Fortran.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneP-dynamic-XL-C.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneP-dynamic-XL-CXX.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneP-dynamic-XL-Fortran.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneP-dynamic.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneP-static-GNU-C.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneP-static-GNU-CXX.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneP-static-GNU-Fortran.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneP-static-XL-C.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneP-static-XL-CXX.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneP-static-XL-Fortran.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneP-static.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneQ-base.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneQ-dynamic-GNU-C.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneQ-dynamic-GNU-CXX.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneQ-dynamic-GNU-Fortran.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneQ-dynamic-XL-C.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneQ-dynamic-XL-CXX.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneQ-dynamic-XL-Fortran.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneQ-dynamic.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneQ-static-GNU-C.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneQ-static-GNU-CXX.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneQ-static-GNU-Fortran.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneQ-static-XL-C.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneQ-static-XL-CXX.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneQ-static-XL-Fortran.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneQ-static.cmake
+%%DATADIR%%/Modules/Platform/CYGWIN-Clang-C.cmake
+%%DATADIR%%/Modules/Platform/CYGWIN-Clang-CXX.cmake
+%%DATADIR%%/Modules/Platform/CYGWIN-Determine-CXX.cmake
+%%DATADIR%%/Modules/Platform/CYGWIN-GNU-C.cmake
+%%DATADIR%%/Modules/Platform/CYGWIN-GNU-CXX.cmake
+%%DATADIR%%/Modules/Platform/CYGWIN-GNU-Fortran.cmake
+%%DATADIR%%/Modules/Platform/CYGWIN-GNU.cmake
+%%DATADIR%%/Modules/Platform/CYGWIN-windres.cmake
+%%DATADIR%%/Modules/Platform/CYGWIN.cmake
+%%DATADIR%%/Modules/Platform/Catamount.cmake
+%%DATADIR%%/Modules/Platform/CrayLinuxEnvironment.cmake
+%%DATADIR%%/Modules/Platform/Darwin-Absoft-Fortran.cmake
+%%DATADIR%%/Modules/Platform/Darwin-AppleClang-C.cmake
+%%DATADIR%%/Modules/Platform/Darwin-AppleClang-CXX.cmake
+%%DATADIR%%/Modules/Platform/Darwin-Clang-C.cmake
+%%DATADIR%%/Modules/Platform/Darwin-Clang-CXX.cmake
+%%DATADIR%%/Modules/Platform/Darwin-Clang.cmake
+%%DATADIR%%/Modules/Platform/Darwin-Determine-CXX.cmake
+%%DATADIR%%/Modules/Platform/Darwin-GNU-C.cmake
+%%DATADIR%%/Modules/Platform/Darwin-GNU-CXX.cmake
+%%DATADIR%%/Modules/Platform/Darwin-GNU-Fortran.cmake
+%%DATADIR%%/Modules/Platform/Darwin-GNU.cmake
+%%DATADIR%%/Modules/Platform/Darwin-Initialize.cmake
+%%DATADIR%%/Modules/Platform/Darwin-Intel-C.cmake
+%%DATADIR%%/Modules/Platform/Darwin-Intel-CXX.cmake
+%%DATADIR%%/Modules/Platform/Darwin-Intel-Fortran.cmake
+%%DATADIR%%/Modules/Platform/Darwin-Intel.cmake
+%%DATADIR%%/Modules/Platform/Darwin-NAG-Fortran.cmake
+%%DATADIR%%/Modules/Platform/Darwin-PGI-C.cmake
+%%DATADIR%%/Modules/Platform/Darwin-PGI-CXX.cmake
+%%DATADIR%%/Modules/Platform/Darwin-PGI-Fortran.cmake
+%%DATADIR%%/Modules/Platform/Darwin-PGI.cmake
+%%DATADIR%%/Modules/Platform/Darwin-VisualAge-C.cmake
+%%DATADIR%%/Modules/Platform/Darwin-VisualAge-CXX.cmake
+%%DATADIR%%/Modules/Platform/Darwin-XL-C.cmake
+%%DATADIR%%/Modules/Platform/Darwin-XL-CXX.cmake
+%%DATADIR%%/Modules/Platform/Darwin.cmake
+%%DATADIR%%/Modules/Platform/DragonFly.cmake
+%%DATADIR%%/Modules/Platform/Euros.cmake
+%%DATADIR%%/Modules/Platform/FreeBSD-CXX.cmake
+%%DATADIR%%/Modules/Platform/FreeBSD.cmake
+%%DATADIR%%/Modules/Platform/Fuchsia.cmake
+%%DATADIR%%/Modules/Platform/GHS-MULTI-Initialize.cmake
+%%DATADIR%%/Modules/Platform/GHS-MULTI.cmake
+%%DATADIR%%/Modules/Platform/GNU.cmake
+%%DATADIR%%/Modules/Platform/GNUtoMS_lib.bat.in
+%%DATADIR%%/Modules/Platform/GNUtoMS_lib.cmake
+%%DATADIR%%/Modules/Platform/Generic-ADSP-ASM.cmake
+%%DATADIR%%/Modules/Platform/Generic-ADSP-C.cmake
+%%DATADIR%%/Modules/Platform/Generic-ADSP-CXX.cmake
+%%DATADIR%%/Modules/Platform/Generic-ADSP-Common.cmake
+%%DATADIR%%/Modules/Platform/Generic-SDCC-C.cmake
+%%DATADIR%%/Modules/Platform/Generic.cmake
+%%DATADIR%%/Modules/Platform/HP-UX-GNU-ASM.cmake
+%%DATADIR%%/Modules/Platform/HP-UX-GNU-C.cmake
+%%DATADIR%%/Modules/Platform/HP-UX-GNU-CXX.cmake
+%%DATADIR%%/Modules/Platform/HP-UX-GNU-Fortran.cmake
+%%DATADIR%%/Modules/Platform/HP-UX-GNU.cmake
+%%DATADIR%%/Modules/Platform/HP-UX-HP-ASM.cmake
+%%DATADIR%%/Modules/Platform/HP-UX-HP-C.cmake
+%%DATADIR%%/Modules/Platform/HP-UX-HP-CXX.cmake
+%%DATADIR%%/Modules/Platform/HP-UX-HP-Fortran.cmake
+%%DATADIR%%/Modules/Platform/HP-UX-HP.cmake
+%%DATADIR%%/Modules/Platform/HP-UX.cmake
+%%DATADIR%%/Modules/Platform/Haiku.cmake
+%%DATADIR%%/Modules/Platform/IRIX.cmake
+%%DATADIR%%/Modules/Platform/IRIX64.cmake
+%%DATADIR%%/Modules/Platform/Linux-Absoft-Fortran.cmake
+%%DATADIR%%/Modules/Platform/Linux-CCur-Fortran.cmake
+%%DATADIR%%/Modules/Platform/Linux-Clang-C.cmake
+%%DATADIR%%/Modules/Platform/Linux-Clang-CXX.cmake
+%%DATADIR%%/Modules/Platform/Linux-Determine-CXX.cmake
+%%DATADIR%%/Modules/Platform/Linux-GNU-C.cmake
+%%DATADIR%%/Modules/Platform/Linux-GNU-CXX.cmake
+%%DATADIR%%/Modules/Platform/Linux-GNU-Fortran.cmake
+%%DATADIR%%/Modules/Platform/Linux-GNU.cmake
+%%DATADIR%%/Modules/Platform/Linux-Intel-C.cmake
+%%DATADIR%%/Modules/Platform/Linux-Intel-CXX.cmake
+%%DATADIR%%/Modules/Platform/Linux-Intel-Fortran.cmake
+%%DATADIR%%/Modules/Platform/Linux-Intel.cmake
+%%DATADIR%%/Modules/Platform/Linux-NAG-Fortran.cmake
+%%DATADIR%%/Modules/Platform/Linux-PGI-C.cmake
+%%DATADIR%%/Modules/Platform/Linux-PGI-CXX.cmake
+%%DATADIR%%/Modules/Platform/Linux-PGI-Fortran.cmake
+%%DATADIR%%/Modules/Platform/Linux-PGI.cmake
+%%DATADIR%%/Modules/Platform/Linux-PathScale-C.cmake
+%%DATADIR%%/Modules/Platform/Linux-PathScale-CXX.cmake
+%%DATADIR%%/Modules/Platform/Linux-PathScale-Fortran.cmake
+%%DATADIR%%/Modules/Platform/Linux-PathScale.cmake
+%%DATADIR%%/Modules/Platform/Linux-SunPro-CXX.cmake
+%%DATADIR%%/Modules/Platform/Linux-TinyCC-C.cmake
+%%DATADIR%%/Modules/Platform/Linux-VisualAge-C.cmake
+%%DATADIR%%/Modules/Platform/Linux-VisualAge-CXX.cmake
+%%DATADIR%%/Modules/Platform/Linux-VisualAge-Fortran.cmake
+%%DATADIR%%/Modules/Platform/Linux-XL-C.cmake
+%%DATADIR%%/Modules/Platform/Linux-XL-CXX.cmake
+%%DATADIR%%/Modules/Platform/Linux-XL-Fortran.cmake
+%%DATADIR%%/Modules/Platform/Linux-como.cmake
+%%DATADIR%%/Modules/Platform/Linux.cmake
+%%DATADIR%%/Modules/Platform/MP-RAS.cmake
+%%DATADIR%%/Modules/Platform/MirBSD.cmake
+%%DATADIR%%/Modules/Platform/NetBSD.cmake
+%%DATADIR%%/Modules/Platform/OSF1.cmake
+%%DATADIR%%/Modules/Platform/OpenBSD.cmake
+%%DATADIR%%/Modules/Platform/OpenVMS.cmake
+%%DATADIR%%/Modules/Platform/QNX.cmake
+%%DATADIR%%/Modules/Platform/RISCos.cmake
+%%DATADIR%%/Modules/Platform/SCO_SV.cmake
+%%DATADIR%%/Modules/Platform/SINIX.cmake
+%%DATADIR%%/Modules/Platform/SunOS-GNU-C.cmake
+%%DATADIR%%/Modules/Platform/SunOS-GNU-CXX.cmake
+%%DATADIR%%/Modules/Platform/SunOS-GNU-Fortran.cmake
+%%DATADIR%%/Modules/Platform/SunOS-GNU.cmake
+%%DATADIR%%/Modules/Platform/SunOS-PathScale-C.cmake
+%%DATADIR%%/Modules/Platform/SunOS-PathScale-CXX.cmake
+%%DATADIR%%/Modules/Platform/SunOS-PathScale-Fortran.cmake
+%%DATADIR%%/Modules/Platform/SunOS-PathScale.cmake
+%%DATADIR%%/Modules/Platform/SunOS.cmake
+%%DATADIR%%/Modules/Platform/Tru64.cmake
+%%DATADIR%%/Modules/Platform/ULTRIX.cmake
+%%DATADIR%%/Modules/Platform/UNIX_SV.cmake
+%%DATADIR%%/Modules/Platform/UnixPaths.cmake
+%%DATADIR%%/Modules/Platform/UnixWare.cmake
+%%DATADIR%%/Modules/Platform/Windows-Borland-C.cmake
+%%DATADIR%%/Modules/Platform/Windows-Borland-CXX.cmake
+%%DATADIR%%/Modules/Platform/Windows-Clang-C.cmake
+%%DATADIR%%/Modules/Platform/Windows-Clang-CXX.cmake
+%%DATADIR%%/Modules/Platform/Windows-Clang.cmake
+%%DATADIR%%/Modules/Platform/Windows-Determine-CXX.cmake
+%%DATADIR%%/Modules/Platform/Windows-Embarcadero-C.cmake
+%%DATADIR%%/Modules/Platform/Windows-Embarcadero-CXX.cmake
+%%DATADIR%%/Modules/Platform/Windows-Embarcadero.cmake
+%%DATADIR%%/Modules/Platform/Windows-G95-Fortran.cmake
+%%DATADIR%%/Modules/Platform/Windows-GNU-C-ABI.cmake
+%%DATADIR%%/Modules/Platform/Windows-GNU-C.cmake
+%%DATADIR%%/Modules/Platform/Windows-GNU-CXX-ABI.cmake
+%%DATADIR%%/Modules/Platform/Windows-GNU-CXX.cmake
+%%DATADIR%%/Modules/Platform/Windows-GNU-Fortran-ABI.cmake
+%%DATADIR%%/Modules/Platform/Windows-GNU-Fortran.cmake
+%%DATADIR%%/Modules/Platform/Windows-GNU.cmake
+%%DATADIR%%/Modules/Platform/Windows-Intel-ASM.cmake
+%%DATADIR%%/Modules/Platform/Windows-Intel-C.cmake
+%%DATADIR%%/Modules/Platform/Windows-Intel-CXX.cmake
+%%DATADIR%%/Modules/Platform/Windows-Intel-Fortran.cmake
+%%DATADIR%%/Modules/Platform/Windows-Intel.cmake
+%%DATADIR%%/Modules/Platform/Windows-MSVC-C.cmake
+%%DATADIR%%/Modules/Platform/Windows-MSVC-CXX.cmake
+%%DATADIR%%/Modules/Platform/Windows-MSVC.cmake
+%%DATADIR%%/Modules/Platform/Windows-NMcl.cmake
+%%DATADIR%%/Modules/Platform/Windows-NVIDIA-CUDA.cmake
+%%DATADIR%%/Modules/Platform/Windows-OpenWatcom-C.cmake
+%%DATADIR%%/Modules/Platform/Windows-OpenWatcom-CXX.cmake
+%%DATADIR%%/Modules/Platform/Windows-OpenWatcom.cmake
+%%DATADIR%%/Modules/Platform/Windows-PGI-C.cmake
+%%DATADIR%%/Modules/Platform/Windows-PGI-Fortran.cmake
+%%DATADIR%%/Modules/Platform/Windows-PGI.cmake
+%%DATADIR%%/Modules/Platform/Windows-Watcom-C.cmake
+%%DATADIR%%/Modules/Platform/Windows-Watcom-CXX.cmake
+%%DATADIR%%/Modules/Platform/Windows-df.cmake
+%%DATADIR%%/Modules/Platform/Windows-windres.cmake
+%%DATADIR%%/Modules/Platform/Windows.cmake
+%%DATADIR%%/Modules/Platform/WindowsCE-MSVC-C.cmake
+%%DATADIR%%/Modules/Platform/WindowsCE-MSVC-CXX.cmake
+%%DATADIR%%/Modules/Platform/WindowsCE.cmake
+%%DATADIR%%/Modules/Platform/WindowsPaths.cmake
+%%DATADIR%%/Modules/Platform/WindowsPhone-MSVC-C.cmake
+%%DATADIR%%/Modules/Platform/WindowsPhone-MSVC-CXX.cmake
+%%DATADIR%%/Modules/Platform/WindowsPhone.cmake
+%%DATADIR%%/Modules/Platform/WindowsStore-MSVC-C.cmake
+%%DATADIR%%/Modules/Platform/WindowsStore-MSVC-CXX.cmake
+%%DATADIR%%/Modules/Platform/WindowsStore.cmake
+%%DATADIR%%/Modules/Platform/Xenix.cmake
+%%DATADIR%%/Modules/Platform/eCos.cmake
+%%DATADIR%%/Modules/Platform/gas.cmake
+%%DATADIR%%/Modules/Platform/kFreeBSD.cmake
+%%DATADIR%%/Modules/Platform/syllable.cmake
+%%DATADIR%%/Modules/ProcessorCount.cmake
+%%DATADIR%%/Modules/Qt4ConfigDependentSettings.cmake
+%%DATADIR%%/Modules/Qt4Macros.cmake
+%%DATADIR%%/Modules/RepositoryInfo.txt.in
+%%DATADIR%%/Modules/SelectLibraryConfigurations.cmake
+%%DATADIR%%/Modules/Squish4RunTestCase.bat
+%%DATADIR%%/Modules/Squish4RunTestCase.sh
+%%DATADIR%%/Modules/SquishRunTestCase.bat
+%%DATADIR%%/Modules/SquishRunTestCase.sh
+%%DATADIR%%/Modules/SquishTestScript.cmake
+%%DATADIR%%/Modules/SystemInformation.cmake
+%%DATADIR%%/Modules/SystemInformation.in
+%%DATADIR%%/Modules/TestBigEndian.cmake
+%%DATADIR%%/Modules/TestCXXAcceptsFlag.cmake
+%%DATADIR%%/Modules/TestEndianess.c.in
+%%DATADIR%%/Modules/TestForANSIForScope.cmake
+%%DATADIR%%/Modules/TestForANSIStreamHeaders.cmake
+%%DATADIR%%/Modules/TestForANSIStreamHeaders.cxx
+%%DATADIR%%/Modules/TestForAnsiForScope.cxx
+%%DATADIR%%/Modules/TestForSSTREAM.cmake
+%%DATADIR%%/Modules/TestForSSTREAM.cxx
+%%DATADIR%%/Modules/TestForSTDNamespace.cmake
+%%DATADIR%%/Modules/TestForSTDNamespace.cxx
+%%DATADIR%%/Modules/UseEcos.cmake
+%%DATADIR%%/Modules/UseJava.cmake
+%%DATADIR%%/Modules/UseJavaClassFilelist.cmake
+%%DATADIR%%/Modules/UseJavaSymlinks.cmake
+%%DATADIR%%/Modules/UsePkgConfig.cmake
+%%DATADIR%%/Modules/UseQt4.cmake
+%%DATADIR%%/Modules/UseSWIG.cmake
+%%DATADIR%%/Modules/Use_wxWindows.cmake
+%%DATADIR%%/Modules/UsewxWidgets.cmake
+%%DATADIR%%/Modules/VTKCompatibility.cmake
+%%DATADIR%%/Modules/WIX.template.in
+%%DATADIR%%/Modules/WriteBasicConfigVersionFile.cmake
+%%DATADIR%%/Modules/WriteCompilerDetectionHeader.cmake
+%%DATADIR%%/Modules/ecos_clean.cmake
+%%DATADIR%%/Modules/exportheader.cmake.in
+%%DATADIR%%/Modules/javaTargets.cmake.in
+%%DATADIR%%/Modules/kde3init_dummy.cpp.in
+%%DATADIR%%/Modules/kde3uic.cmake
+%%DATADIR%%/Modules/readme.txt
+%%DATADIR%%/Templates/AppleInfo.plist
+%%DATADIR%%/Templates/CMakeVSMacros1.vsmacros
+%%DATADIR%%/Templates/CMakeVSMacros2.vsmacros
+%%DATADIR%%/Templates/CPack.GenericDescription.txt
+%%DATADIR%%/Templates/CPack.GenericLicense.txt
+%%DATADIR%%/Templates/CPack.GenericWelcome.txt
+%%DATADIR%%/Templates/CPackConfig.cmake.in
+%%DATADIR%%/Templates/CTestScript.cmake.in
+%%DATADIR%%/Templates/MSBuild/nasm.props.in
+%%DATADIR%%/Templates/MSBuild/nasm.targets
+%%DATADIR%%/Templates/MSBuild/nasm.xml
+%%DATADIR%%/Templates/TestDriver.cxx.in
+%%DATADIR%%/Templates/Windows/ApplicationIcon.png
+%%DATADIR%%/Templates/Windows/Logo.png
+%%DATADIR%%/Templates/Windows/SmallLogo.png
+%%DATADIR%%/Templates/Windows/SmallLogo44x44.png
+%%DATADIR%%/Templates/Windows/SplashScreen.png
+%%DATADIR%%/Templates/Windows/StoreLogo.png
+%%DATADIR%%/Templates/Windows/Windows_TemporaryKey.pfx
 %%DATADIR%%/completions/cmake
 %%DATADIR%%/completions/cpack
 %%DATADIR%%/completions/ctest
diff --git a/devel/covtool/Makefile b/devel/covtool/Makefile
index a78eadb284d8..825b86a7a866 100644
--- a/devel/covtool/Makefile
+++ b/devel/covtool/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	covtool
 PORTVERSION=	2.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/rel_2.0
 
diff --git a/devel/cpp-hocon/Makefile b/devel/cpp-hocon/Makefile
index fdb0bb4a289e..1e1e928cb50e 100644
--- a/devel/cpp-hocon/Makefile
+++ b/devel/cpp-hocon/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	cpp-hocon
 PORTVERSION=	0.1.5
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	puppet@FreeBSD.org
diff --git a/devel/cppcheck/Makefile b/devel/cppcheck/Makefile
index 4efd9bee1e4a..92905c9aa0b9 100644
--- a/devel/cppcheck/Makefile
+++ b/devel/cppcheck/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	cppcheck
 PORTVERSION=	1.80
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	SF
 
diff --git a/devel/cssc/Makefile b/devel/cssc/Makefile
index f55d6cd8fc90..1fd7f4373efc 100644
--- a/devel/cssc/Makefile
+++ b/devel/cssc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cssc
 PORTVERSION=	1.4.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	GNU
 DISTNAME=	CSSC-${PORTVERSION}
diff --git a/devel/cx_Freeze/Makefile b/devel/cx_Freeze/Makefile
index 7e4a6d66f2d2..0672d5e3cb80 100644
--- a/devel/cx_Freeze/Makefile
+++ b/devel/cx_Freeze/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	cx_Freeze
 PORTVERSION=	4.3.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel python
 MASTER_SITES=	SF/cx-freeze/${PORTVERSION}
 
diff --git a/devel/dash.el/Makefile b/devel/dash.el/Makefile
index 7fc3340fd0ba..1dc95e0d0a80 100644
--- a/devel/dash.el/Makefile
+++ b/devel/dash.el/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	dash.el
 PORTVERSION=	2.13.0
+PORTREVISION=	1
 CATEGORIES=	devel elisp
 
 MAINTAINER=	hrs@FreeBSD.org
diff --git a/devel/dbus-c++/Makefile b/devel/dbus-c++/Makefile
index 056d55c46ae8..3768b767aaa5 100644
--- a/devel/dbus-c++/Makefile
+++ b/devel/dbus-c++/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dbus-c++
 PORTVERSION=	0.9.1
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 DISTVERSIONSUFFIX=	pw
 CATEGORIES=	devel gnome
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index be14c1afca05..8e5e57e1cc5d 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	devhelp
 PORTVERSION=	3.24.0
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
diff --git a/devel/dia2code+/Makefile b/devel/dia2code+/Makefile
index 3ece282bad26..31846bf74dee 100644
--- a/devel/dia2code+/Makefile
+++ b/devel/dia2code+/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dia2code+
 PORTVERSION=	1.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	SF/dia2code/dia2code+/${PORTVERSION}
 DISTNAME=	dia2code-${PORTVERSION}
diff --git a/devel/distel/Makefile b/devel/distel/Makefile
index 8b207eddc883..a3360a04ac0d 100644
--- a/devel/distel/Makefile
+++ b/devel/distel/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	distel
 PORTVERSION=	4.1.1
+PORTREVISION=	1
 CATEGORIES=	devel elisp
 
 MAINTAINER=	olgeni@FreeBSD.org
diff --git a/devel/drpython/Makefile b/devel/drpython/Makefile
index fdc105f69b0a..fa362256d705 100644
--- a/devel/drpython/Makefile
+++ b/devel/drpython/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	drpython
 PORTVERSION=	3.11.4
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	devel python
 MASTER_SITES=	SF/${PORTNAME}/DrPython%20%283.x%29/${PORTVERSION}
 PKGNAMESUFFIX=	${PYTHON_PKGNAMESUFFIX}
diff --git a/devel/editline/Makefile b/devel/editline/Makefile
index dcea3bd9d434..5c8312e2af6e 100644
--- a/devel/editline/Makefile
+++ b/devel/editline/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	editline
-PORTVERSION=	1.15.2
+PORTVERSION=	1.15.3
 CATEGORIES=	devel
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/devel/editline/distinfo b/devel/editline/distinfo
index e7cedca8de89..f02e69b27283 100644
--- a/devel/editline/distinfo
+++ b/devel/editline/distinfo
@@ -1,2 +1,3 @@
-SHA256 (troglobit-editline-1.15.2_GH0.tar.gz) = d2969eabc1bfe3f25d65715a2eb782473ab6fad576ff2106b82cb87803f52b47
-SIZE (troglobit-editline-1.15.2_GH0.tar.gz) = 31623
+TIMESTAMP = 1504799642
+SHA256 (troglobit-editline-1.15.3_GH0.tar.gz) = 21b73baf2a23c9d29c895eeddeaaf715e9ac585d24ceb7f23aba105de1eef035
+SIZE (troglobit-editline-1.15.3_GH0.tar.gz) = 31955
diff --git a/devel/efivar/Makefile b/devel/efivar/Makefile
index ec5a3145a93f..84427584c686 100644
--- a/devel/efivar/Makefile
+++ b/devel/efivar/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	efivar
 PORTVERSION=	0.15
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/devel/efl/Makefile b/devel/efl/Makefile
index dc4cfcf7a2d1..61d5b7fd63a6 100644
--- a/devel/efl/Makefile
+++ b/devel/efl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	efl
 PORTVERSION=	1.18.4
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	devel enlightenment
 MASTER_SITES=	http://download.enlightenment.org/rel/libs/${PORTNAME}/
 DIST_SUBDIR=	enlightenment
diff --git a/devel/elfutils/Makefile b/devel/elfutils/Makefile
index 159bb8ae735b..ff402cac4f87 100644
--- a/devel/elfutils/Makefile
+++ b/devel/elfutils/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	elfutils
 PORTVERSION=	0.168
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://sourceware.org/elfutils/ftp/${PORTVERSION}/
 
diff --git a/devel/elixir-excoveralls/Makefile b/devel/elixir-excoveralls/Makefile
index 0778572f4d65..d8333d760e23 100644
--- a/devel/elixir-excoveralls/Makefile
+++ b/devel/elixir-excoveralls/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	excoveralls
-PORTVERSION=	0.7.2
+PORTVERSION=	0.7.3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 PKGNAMEPREFIX=	elixir-
diff --git a/devel/elixir-excoveralls/distinfo b/devel/elixir-excoveralls/distinfo
index 0e32c707478d..a78ef710be27 100644
--- a/devel/elixir-excoveralls/distinfo
+++ b/devel/elixir-excoveralls/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501640071
-SHA256 (parroty-excoveralls-v0.7.2_GH0.tar.gz) = fc340f3ccb1be33a4ed3e61944112f0cf9d7df67f9ca89cf278dc5dc89368ea4
-SIZE (parroty-excoveralls-v0.7.2_GH0.tar.gz) = 195298
+TIMESTAMP = 1505270274
+SHA256 (parroty-excoveralls-v0.7.3_GH0.tar.gz) = f57c8fde4e85b50d923468050a59a234666afce1f458cce36f9875eac9148cdf
+SIZE (parroty-excoveralls-v0.7.3_GH0.tar.gz) = 195350
diff --git a/devel/elixir-gen_stage/Makefile b/devel/elixir-gen_stage/Makefile
new file mode 100644
index 000000000000..d4c7844da516
--- /dev/null
+++ b/devel/elixir-gen_stage/Makefile
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+PORTNAME=	gen_stage
+PORTVERSION=	0.12.2
+DISTVERSIONPREFIX=	v
+CATEGORIES=	devel
+PKGNAMEPREFIX=	elixir-
+
+MAINTAINER=	olgeni@FreeBSD.org
+COMMENT=	Producer and consumer pipelines with back-pressure for Elixir
+
+LICENSE=	APACHE20
+
+USES=		elixir
+USE_GITHUB=	yes
+GH_ACCOUNT=	elixir-lang
+
+ELIXIR_APP_NAME=gen_stage
+MIX_REWRITE=	yes
+
+.include <bsd.port.mk>
diff --git a/devel/elixir-gen_stage/distinfo b/devel/elixir-gen_stage/distinfo
new file mode 100644
index 000000000000..eb1cfff8e24f
--- /dev/null
+++ b/devel/elixir-gen_stage/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1505119566
+SHA256 (elixir-lang-gen_stage-v0.12.2_GH0.tar.gz) = c9b9523a7e6ca70007721a0039881db998f009d470fb97cd80c00366b78ac933
+SIZE (elixir-lang-gen_stage-v0.12.2_GH0.tar.gz) = 54962
diff --git a/devel/elixir-gen_stage/pkg-descr b/devel/elixir-gen_stage/pkg-descr
new file mode 100644
index 000000000000..9df1e4c0f7a6
--- /dev/null
+++ b/devel/elixir-gen_stage/pkg-descr
@@ -0,0 +1,4 @@
+GenStage is a specification for exchanging events between producers
+and consumers.
+
+WWW: https://github.com/elixir-lang/gen_stage
diff --git a/devel/elixir-gen_stage/pkg-plist b/devel/elixir-gen_stage/pkg-plist
new file mode 100644
index 000000000000..7cea82b91658
--- /dev/null
+++ b/devel/elixir-gen_stage/pkg-plist
@@ -0,0 +1,17 @@
+lib/elixir/lib/gen_stage/ebin/Elixir.ConsumerSupervisor.Default.beam
+lib/elixir/lib/gen_stage/ebin/Elixir.ConsumerSupervisor.beam
+lib/elixir/lib/gen_stage/ebin/Elixir.GenStage.BroadcastDispatcher.beam
+lib/elixir/lib/gen_stage/ebin/Elixir.GenStage.DemandDispatcher.beam
+lib/elixir/lib/gen_stage/ebin/Elixir.GenStage.Dispatcher.beam
+lib/elixir/lib/gen_stage/ebin/Elixir.GenStage.PartitionDispatcher.beam
+lib/elixir/lib/gen_stage/ebin/Elixir.GenStage.Streamer.beam
+lib/elixir/lib/gen_stage/ebin/Elixir.GenStage.beam
+lib/elixir/lib/gen_stage/ebin/gen_stage.app
+lib/elixir/lib/gen_stage/lib/consumer_supervisor.ex
+lib/elixir/lib/gen_stage/lib/gen_stage.ex
+lib/elixir/lib/gen_stage/lib/gen_stage/broadcast_dispatcher.ex
+lib/elixir/lib/gen_stage/lib/gen_stage/demand_dispatcher.ex
+lib/elixir/lib/gen_stage/lib/gen_stage/dispatcher.ex
+lib/elixir/lib/gen_stage/lib/gen_stage/partition_dispatcher.ex
+lib/elixir/lib/gen_stage/lib/gen_stage/streamer.ex
+%%PORTDOCS%%%%DOCSDIR%%/README.md
diff --git a/devel/elixir-gen_state_machine/Makefile b/devel/elixir-gen_state_machine/Makefile
index 89ec41c880b8..b4e6967b7383 100644
--- a/devel/elixir-gen_state_machine/Makefile
+++ b/devel/elixir-gen_state_machine/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gen_state_machine
-PORTVERSION=	2.0.0
+PORTVERSION=	2.0.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 PKGNAMEPREFIX=	elixir-
diff --git a/devel/elixir-gen_state_machine/distinfo b/devel/elixir-gen_state_machine/distinfo
index 73ca3b556933..26fae813778e 100644
--- a/devel/elixir-gen_state_machine/distinfo
+++ b/devel/elixir-gen_state_machine/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1478512914
-SHA256 (antipax-gen_state_machine-v2.0.0_GH0.tar.gz) = 1591b9e6c8fb63e3fc2dc0ca7d833b68117b14a955efd719268ad73f7eaf4b86
-SIZE (antipax-gen_state_machine-v2.0.0_GH0.tar.gz) = 16747
+TIMESTAMP = 1504688050
+SHA256 (antipax-gen_state_machine-v2.0.1_GH0.tar.gz) = 61c55486bf7a64b2feddf0f66e339bec6635626e4e5f56811bf89162dbe84951
+SIZE (antipax-gen_state_machine-v2.0.1_GH0.tar.gz) = 17214
diff --git a/devel/elixir-paratize/Makefile b/devel/elixir-paratize/Makefile
index d1fe450acaf7..7944a9ef7de1 100644
--- a/devel/elixir-paratize/Makefile
+++ b/devel/elixir-paratize/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	elixir-paratize
-PORTVERSION=	2.1.4
+PORTVERSION=	2.1.5
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
diff --git a/devel/elixir-paratize/distinfo b/devel/elixir-paratize/distinfo
index 715951386cf3..ad2dc7898fd4 100644
--- a/devel/elixir-paratize/distinfo
+++ b/devel/elixir-paratize/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1483977502
-SHA256 (seantanly-elixir-paratize-v2.1.4_GH0.tar.gz) = a21533b55bc1c8b73ce56ac5db6f1a1aeee290e5b5e30d3be0bd70cd5ade6d04
-SIZE (seantanly-elixir-paratize-v2.1.4_GH0.tar.gz) = 80036
+TIMESTAMP = 1505049278
+SHA256 (seantanly-elixir-paratize-v2.1.5_GH0.tar.gz) = c74552987c7522b1745f560bfe0ea2913a3a86d4db1c29dc2f88b2968ab95a87
+SIZE (seantanly-elixir-paratize-v2.1.5_GH0.tar.gz) = 7523
diff --git a/devel/elixir-quantum/Makefile b/devel/elixir-quantum/Makefile
index fd39a290009a..03653b166314 100644
--- a/devel/elixir-quantum/Makefile
+++ b/devel/elixir-quantum/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	quantum
-PORTVERSION=	2.0.4
+PORTVERSION=	2.1.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 PKGNAMEPREFIX=	elixir-
@@ -19,6 +19,7 @@ GH_PROJECT=	quantum-elixir
 ELIXIR_APP_NAME=quantum
 MIX_BUILD_DEPS=	devel/elixir-calendar \
 		devel/elixir-crontab \
+		devel/elixir-gen_stage \
 		devel/elixir-timex
 MIX_RUN_DEPS:=	${MIX_BUILD_DEPS}
 MIX_REWRITE=	yes
diff --git a/devel/elixir-quantum/distinfo b/devel/elixir-quantum/distinfo
index 0cd26ef64d5a..876d39b6d823 100644
--- a/devel/elixir-quantum/distinfo
+++ b/devel/elixir-quantum/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504622271
-SHA256 (c-rack-quantum-elixir-v2.0.4_GH0.tar.gz) = e81605c998a6f9149085a24600038c283cee5bf796e42ee4095bbf797f6709c5
-SIZE (c-rack-quantum-elixir-v2.0.4_GH0.tar.gz) = 26880
+TIMESTAMP = 1505119204
+SHA256 (c-rack-quantum-elixir-v2.1.0_GH0.tar.gz) = b53e1df07f8fd2087bcb619ec60338c1b8cc6e9981ed88a3a9b481f2382ef46d
+SIZE (c-rack-quantum-elixir-v2.1.0_GH0.tar.gz) = 29894
diff --git a/devel/elixir-quantum/pkg-plist b/devel/elixir-quantum/pkg-plist
index ee16bc07baa4..bcaf96a75bec 100644
--- a/devel/elixir-quantum/pkg-plist
+++ b/devel/elixir-quantum/pkg-plist
@@ -2,8 +2,11 @@ lib/elixir/lib/quantum/ebin/Elixir.Quantum.Application.beam
 lib/elixir/lib/quantum/ebin/Elixir.Quantum.DateLibrary.Calendar.beam
 lib/elixir/lib/quantum/ebin/Elixir.Quantum.DateLibrary.Timex.beam
 lib/elixir/lib/quantum/ebin/Elixir.Quantum.DateLibrary.beam
+lib/elixir/lib/quantum/ebin/Elixir.Quantum.ExecutionBroadcaster.beam
 lib/elixir/lib/quantum/ebin/Elixir.Quantum.Executor.beam
+lib/elixir/lib/quantum/ebin/Elixir.Quantum.ExecutorSupervisor.beam
 lib/elixir/lib/quantum/ebin/Elixir.Quantum.Job.beam
+lib/elixir/lib/quantum/ebin/Elixir.Quantum.JobBroadcaster.beam
 lib/elixir/lib/quantum/ebin/Elixir.Quantum.Normalizer.beam
 lib/elixir/lib/quantum/ebin/Elixir.Quantum.RunStrategy.All.beam
 lib/elixir/lib/quantum/ebin/Elixir.Quantum.RunStrategy.NodeList.Quantum.RunStrategy.All.beam
@@ -11,10 +14,10 @@ lib/elixir/lib/quantum/ebin/Elixir.Quantum.RunStrategy.NodeList.Quantum.RunStrat
 lib/elixir/lib/quantum/ebin/Elixir.Quantum.RunStrategy.NodeList.beam
 lib/elixir/lib/quantum/ebin/Elixir.Quantum.RunStrategy.Random.beam
 lib/elixir/lib/quantum/ebin/Elixir.Quantum.RunStrategy.beam
-lib/elixir/lib/quantum/ebin/Elixir.Quantum.Runner.beam
 lib/elixir/lib/quantum/ebin/Elixir.Quantum.Scheduler.beam
 lib/elixir/lib/quantum/ebin/Elixir.Quantum.Supervisor.beam
-lib/elixir/lib/quantum/ebin/Elixir.Quantum.Timer.beam
+lib/elixir/lib/quantum/ebin/Elixir.Quantum.TaskRegistry.beam
+lib/elixir/lib/quantum/ebin/Elixir.Quantum.Util.beam
 lib/elixir/lib/quantum/ebin/Elixir.Quantum.beam
 lib/elixir/lib/quantum/ebin/quantum.app
 lib/elixir/lib/quantum/lib/quantum.ex
@@ -22,14 +25,17 @@ lib/elixir/lib/quantum/lib/quantum/application.ex
 lib/elixir/lib/quantum/lib/quantum/date_library.ex
 lib/elixir/lib/quantum/lib/quantum/date_library/calendar.ex
 lib/elixir/lib/quantum/lib/quantum/date_library/timex.ex
+lib/elixir/lib/quantum/lib/quantum/execution_broadcaster.ex
 lib/elixir/lib/quantum/lib/quantum/executor.ex
+lib/elixir/lib/quantum/lib/quantum/executor_supervisor.ex
 lib/elixir/lib/quantum/lib/quantum/job.ex
+lib/elixir/lib/quantum/lib/quantum/job_bradcaster.ex
 lib/elixir/lib/quantum/lib/quantum/normalizer.ex
 lib/elixir/lib/quantum/lib/quantum/run_strategy.ex
 lib/elixir/lib/quantum/lib/quantum/run_strategy/all.ex
 lib/elixir/lib/quantum/lib/quantum/run_strategy/random.ex
-lib/elixir/lib/quantum/lib/quantum/runner.ex
 lib/elixir/lib/quantum/lib/quantum/scheduler.ex
 lib/elixir/lib/quantum/lib/quantum/supervisor.ex
-lib/elixir/lib/quantum/lib/quantum/timer.ex
+lib/elixir/lib/quantum/lib/quantum/task_registry.ex
+lib/elixir/lib/quantum/lib/quantum/util.ex
 %%PORTDOCS%%%%DOCSDIR%%/README.md
diff --git a/devel/elixir-smppex/Makefile b/devel/elixir-smppex/Makefile
index 341a66062c91..e5e547eca0ce 100644
--- a/devel/elixir-smppex/Makefile
+++ b/devel/elixir-smppex/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	smppex
-PORTVERSION=	2.0.1
+PORTVERSION=	2.2.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 PKGNAMEPREFIX=	elixir-
diff --git a/devel/elixir-smppex/distinfo b/devel/elixir-smppex/distinfo
index cd4cdf23f74c..112b46cae90c 100644
--- a/devel/elixir-smppex/distinfo
+++ b/devel/elixir-smppex/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504372112
-SHA256 (savonarola-smppex-v2.0.1_GH0.tar.gz) = 902d8fca8cecb2f5ad7abadbbf0f2e2f9a80fc5a183936f2b5399864a44c4a4f
-SIZE (savonarola-smppex-v2.0.1_GH0.tar.gz) = 47209
+TIMESTAMP = 1505245910
+SHA256 (savonarola-smppex-v2.2.1_GH0.tar.gz) = d78637a12e3e33c29439b64a4b59a9edf5e892c0d6678f35956644be0899c056
+SIZE (savonarola-smppex-v2.2.1_GH0.tar.gz) = 48865
diff --git a/devel/elixir-smppex/pkg-plist b/devel/elixir-smppex/pkg-plist
index f2d701bbb1a1..ced15b10f838 100644
--- a/devel/elixir-smppex/pkg-plist
+++ b/devel/elixir-smppex/pkg-plist
@@ -24,6 +24,7 @@ lib/elixir/lib/smppex/ebin/Elixir.SMPPEX.Protocol.Unpack.beam
 lib/elixir/lib/smppex/ebin/Elixir.SMPPEX.Protocol.beam
 lib/elixir/lib/smppex/ebin/Elixir.SMPPEX.RawPdu.beam
 lib/elixir/lib/smppex/ebin/Elixir.SMPPEX.SMPPTimers.beam
+lib/elixir/lib/smppex/ebin/Elixir.SMPPEX.Session.AutoPduHandler.beam
 lib/elixir/lib/smppex/ebin/Elixir.SMPPEX.Session.Defaults.beam
 lib/elixir/lib/smppex/ebin/Elixir.SMPPEX.Session.beam
 lib/elixir/lib/smppex/ebin/Elixir.SMPPEX.TransportSession.beam
@@ -56,6 +57,7 @@ lib/elixir/lib/smppex/lib/smppex/protocol/unpack.ex
 lib/elixir/lib/smppex/lib/smppex/protocol/unpack/helpers.ex
 lib/elixir/lib/smppex/lib/smppex/raw_pdu.ex
 lib/elixir/lib/smppex/lib/smppex/session.ex
+lib/elixir/lib/smppex/lib/smppex/session/auto_pdu_handler.ex
 lib/elixir/lib/smppex/lib/smppex/session/defaults.ex
 lib/elixir/lib/smppex/lib/smppex/smpp_timers.ex
 lib/elixir/lib/smppex/lib/smppex/transport_session.ex
diff --git a/devel/embb/Makefile b/devel/embb/Makefile
index 71c548b950f7..4c4bfb5e7655 100644
--- a/devel/embb/Makefile
+++ b/devel/embb/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	embb
 PORTVERSION=	1.0.0
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
diff --git a/devel/epl.el/Makefile b/devel/epl.el/Makefile
index 42b191dd9240..9670dca7c6b4 100644
--- a/devel/epl.el/Makefile
+++ b/devel/epl.el/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	epl.el
 PORTVERSION=	0.8
+PORTREVISION=	1
 CATEGORIES=	devel elisp
 
 MAINTAINER=	hrs@FreeBSD.org
diff --git a/devel/eris/Makefile b/devel/eris/Makefile
index 0a1ff9b81ddd..3f293a3318e8 100644
--- a/devel/eris/Makefile
+++ b/devel/eris/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	eris
 PORTVERSION=	1.3.23
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	devel
 MASTER_SITES=	SF/worldforge/Eris%201.4%20%28client%20lib%29/${PORTVERSION}/
 
diff --git a/devel/fb-adb/Makefile b/devel/fb-adb/Makefile
index c916dec7c6d3..09c57b8f75ab 100644
--- a/devel/fb-adb/Makefile
+++ b/devel/fb-adb/Makefile
@@ -3,13 +3,16 @@
 PORTNAME=	fb-adb
 DISTVERSION=	1.4.4-126
 DISTVERSIONSUFFIX=	-g6fd78ae
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel comms
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES=	1b5524282981.patch:-p1 \
 		8f532a9ee3a3.patch:-p1 \
 		a25602788c1b.patch:-p1 \
+		3a3a52355a39.patch:-p1 \
+		281df4766b82.patch:-p1 \
+		723148059ce2.patch:-p1 \
 		${NULL}
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/devel/fb-adb/distinfo b/devel/fb-adb/distinfo
index e59630f7b4e0..35f20c27be25 100644
--- a/devel/fb-adb/distinfo
+++ b/devel/fb-adb/distinfo
@@ -11,3 +11,9 @@ SHA256 (8f532a9ee3a3.patch) = 517d8c8f23ae5e3bdb63445c42ab5a7b7100b30d9fd60e047b
 SIZE (8f532a9ee3a3.patch) = 1235
 SHA256 (a25602788c1b.patch) = 0548d555636cbee711a5d7f3d2e8d119e8016ad5f71dd74a5a898450d127fc3d
 SIZE (a25602788c1b.patch) = 9741
+SHA256 (3a3a52355a39.patch) = 99f6646b0d1821497189c8348d1e29663ab69a99991b6140bf0355ecb8c6f219
+SIZE (3a3a52355a39.patch) = 2591
+SHA256 (281df4766b82.patch) = 37d723cacc36ab3b097a2c1fdf959d50a4f16831dd834bdfd98902744b9506ec
+SIZE (281df4766b82.patch) = 746
+SHA256 (723148059ce2.patch) = 92788bb32dd45b6e989fe58ee2786cad32861b9729c9a8e2b5ab7ffefc41221f
+SIZE (723148059ce2.patch) = 536
diff --git a/devel/flang-clang/Makefile b/devel/flang-clang/Makefile
index 51cb551b20a5..662a48fbba1a 100644
--- a/devel/flang-clang/Makefile
+++ b/devel/flang-clang/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	flang-clang
 DISTVERSION=	4.0-20170812
+PORTREVISION=	1
 CATEGORIES=	devel lang
 
 MAINTAINER=	jmd@FreeBSD.org
diff --git a/devel/flang/Makefile b/devel/flang/Makefile
index 7609d28bdd7b..294e833fd908 100644
--- a/devel/flang/Makefile
+++ b/devel/flang/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	flang
 DISTVERSION=	4.0-20170812
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	jmd@FreeBSD.org
diff --git a/devel/flatbuffers/Makefile b/devel/flatbuffers/Makefile
index bdfaea650215..3211182d8fb7 100644
--- a/devel/flatbuffers/Makefile
+++ b/devel/flatbuffers/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	flatbuffers
 PORTVERSION=	1.7.1
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
diff --git a/devel/gconfmm26/Makefile b/devel/gconfmm26/Makefile
index 7816560d93b5..909bb496606b 100644
--- a/devel/gconfmm26/Makefile
+++ b/devel/gconfmm26/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	gconfmm
 PORTVERSION=	2.28.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/devel/gdb/Makefile b/devel/gdb/Makefile
index b72d6ce0c3b1..3074568c4a5b 100644
--- a/devel/gdb/Makefile
+++ b/devel/gdb/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gdb
 PORTVERSION=	8.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	GNU
 
@@ -48,7 +48,8 @@ EXTRA_PATCHES=	${FILESDIR}/commit-45eba0ab7d \
 		${FILESDIR}/commit-4b654465bf \
 		${FILESDIR}/commit-b30ff123fb \
 		${FILESDIR}/commit-48aeef91c2 \
-		${FILESDIR}/commit-0aa37b654c
+		${FILESDIR}/commit-0aa37b654c \
+		${FILESDIR}/commit-0335ac6d12
 LIB_DEPENDS+=	libexpat.so:textproc/expat2
 
 VER=		${PORTVERSION:S/.//g}
diff --git a/devel/gdb/files/commit-0335ac6d12 b/devel/gdb/files/commit-0335ac6d12
new file mode 100644
index 000000000000..b34450bc1c3c
--- /dev/null
+++ b/devel/gdb/files/commit-0335ac6d12
@@ -0,0 +1,24 @@
+commit 0335ac6d12906bfb4b48410d8a7229c21c727cf2
+Author: John Baldwin <jhb@FreeBSD.org>
+Date:   Tue Aug 15 08:04:23 2017 -0700
+
+    Fix compile on big-endian platforms in siginfo_t converter.
+    
+    gdb/ChangeLog:
+    
+            * fbsd-nat.c (fbsd_convert_siginfo): Fix compile on big-endian
+            platforms.
+
+diff --git gdb/fbsd-nat.c gdb/fbsd-nat.c
+index c89343a24f..6ba6a01a70 100644
+--- gdb/fbsd-nat.c
++++ gdb/fbsd-nat.c
+@@ -314,7 +314,7 @@ fbsd_convert_siginfo (siginfo_t *si)
+      32-bits of the pointer value.  */
+ #if _BYTE_ORDER == _BIG_ENDIAN
+   if (si->si_value.sival_int == 0)
+-    si32->si_value.sival_ptr = (uintptr_t) si->si_value.sival_ptr;
++    si32.si_value.sival_ptr = (uintptr_t) si->si_value.sival_ptr;
+   else
+     si32.si_value.sival_int = si->si_value.sival_int;
+ #else
diff --git a/devel/gdb/files/kgdb/ppcfbsd-kern.c b/devel/gdb/files/kgdb/ppcfbsd-kern.c
index b562e87d1e4e..f9328c68c63f 100644
--- a/devel/gdb/files/kgdb/ppcfbsd-kern.c
+++ b/devel/gdb/files/kgdb/ppcfbsd-kern.c
@@ -58,7 +58,7 @@ ppcfbsd_supply_pcb(struct regcache *regcache, CORE_ADDR pcb_addr)
 
 	tdep = gdbarch_tdep (target_gdbarch());
 
-	if (target_read_memory(pcb_addr, &pcb, sizeof(pcb)) != 0)
+	if (target_read_memory(pcb_addr, (gdb_byte *)&pcb, sizeof(pcb)) != 0)
 		memset(&pcb, 0, sizeof(pcb));
 
 	/*
diff --git a/devel/git-cinnabar/Makefile b/devel/git-cinnabar/Makefile
index 71ef09057a07..0601afa8a30f 100644
--- a/devel/git-cinnabar/Makefile
+++ b/devel/git-cinnabar/Makefile
@@ -10,6 +10,8 @@ COMMENT=	Git remote helper to interact with Mercurial repositories
 
 LICENSE=	GPLv2
 
+BROKEN=		fails to build against git-2.14.*
+
 BUILD_DEPENDS=	${NONEXISTENT}:devel/git:configure
 RUN_DEPENDS=	git:devel/git \
 		hg:devel/mercurial
diff --git a/devel/git-modes/Makefile b/devel/git-modes/Makefile
index ecf5945e4bdc..f25b625cf6f7 100644
--- a/devel/git-modes/Makefile
+++ b/devel/git-modes/Makefile
@@ -2,7 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	git-modes
-PORTVERSION=	1.2.4
+PORTVERSION=	1.2.6
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/devel/git-modes/distinfo b/devel/git-modes/distinfo
index e192c6381e66..35ae8d50c03e 100644
--- a/devel/git-modes/distinfo
+++ b/devel/git-modes/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1497344364
-SHA256 (magit-git-modes-1.2.4_GH0.tar.gz) = 149d91b52ca222e360a9d22bdb6898243e8a3650580846e9ee927a2b81abb977
-SIZE (magit-git-modes-1.2.4_GH0.tar.gz) = 18087
+TIMESTAMP = 1504978180
+SHA256 (magit-git-modes-1.2.6_GH0.tar.gz) = fc02cbf6a152ba51a7c2492e31d038b27d3fc13ea91b6b20a0a9e5582c27e0a3
+SIZE (magit-git-modes-1.2.6_GH0.tar.gz) = 18086
diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
index 12a4a00f2c4e..ec0749cc4183 100644
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	gitaly
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.11.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://gitlab.com/gitlab-org/${PORTNAME}/repository/archive.tar.gz?ref=${DISTVERSIONPREFIX}${PORTVERSION}&dummy=/
 
@@ -17,12 +18,19 @@ BUILD_DEPENDS=	go>=1.8:lang/go
 USES=	gmake
 USE_RUBY=	yes
 
-PLIST_FILES=	bin/gitaly
-
 post-extract:
-	@${MV} ${WRKDIR}/${DISTNAME}-* ${WRKDIR}/${DISTNAME}
+	${MV} ${WRKDIR}/${DISTNAME}-* ${WRKDIR}/${DISTNAME}
+
+post-patch:
+	${MV} ${WRKDIR}/${DISTNAME}/config.toml.example ${WRKDIR}/${DISTNAME}/config.toml.sample
+
+do-install:
+	${MKDIR} ${STAGEDIR}${DATADIR}
+	${MKDIR} ${STAGEDIR}${DATADIR}/bin
+	(cd ${WRKSRC}/_build/bin/ && ${COPYTREE_SHARE} .  ${STAGEDIR}${DATADIR}/bin && \
+	cd ${WRKSRC} && ${COPYTREE_SHARE} config.toml.sample  ${STAGEDIR}${DATADIR})
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/gitaly
+	${STRIP_CMD} ${STAGEDIR}${DATADIR}/bin/gitaly
 
 .include <bsd.port.mk>
diff --git a/devel/gitaly/files/patch-config.toml.example b/devel/gitaly/files/patch-config.toml.example
new file mode 100644
index 000000000000..2298bf521249
--- /dev/null
+++ b/devel/gitaly/files/patch-config.toml.example
@@ -0,0 +1,10 @@
+--- config.toml.example.orig	2017-09-01 10:24:38 UTC
++++ config.toml.example
+@@ -1,6 +1,6 @@
+ # Example Gitaly configuration file
+ 
+-socket_path = "/home/git/gitlab/tmp/sockets/private/gitaly.socket"
++socket_path = "/usr/local/www/gitlab/tmp/sockets/private/gitaly.socket"
+ 
+ # # Optional: listen on a TCP socket. This is insecure (no authentication)
+ # listen_addr = "localhost:9999"
diff --git a/devel/gitaly/pkg-plist b/devel/gitaly/pkg-plist
new file mode 100644
index 000000000000..7050d83c9cad
--- /dev/null
+++ b/devel/gitaly/pkg-plist
@@ -0,0 +1,2 @@
+@(,,555) %%DATADIR%%/bin/gitaly
+@sample %%DATADIR%%/config.toml.sample
diff --git a/devel/gitflow/Makefile b/devel/gitflow/Makefile
index c67e3947cee9..0f53c03d2c8c 100644
--- a/devel/gitflow/Makefile
+++ b/devel/gitflow/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	gitflow
 PORTVERSION=	1.8.0
 CATEGORIES=	devel
 
-MAINTAINER=	nbari@dalmp.com
+MAINTAINER=	nbari@tequila.io
 COMMENT=	Git extensions to provide high-level repository operations
 
 LICENSE=	BSD2CLAUSE
diff --git a/devel/gitg/Makefile b/devel/gitg/Makefile
index a7367ee44881..f13bccba7634 100644
--- a/devel/gitg/Makefile
+++ b/devel/gitg/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gitg
 PORTVERSION=	3.24.0
+PORTREVISION=	1
 CATEGORIES=	devel deskutils gnome
 MASTER_SITES=	GNOME
 
diff --git a/devel/gitlab-shell/Makefile b/devel/gitlab-shell/Makefile
index 0b94a6f7937a..4f58b9adea84 100644
--- a/devel/gitlab-shell/Makefile
+++ b/devel/gitlab-shell/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gitlab-shell
-PORTVERSION=	5.0.4
+PORTVERSION=	5.1.1
 CATEGORIES=	devel
 MASTER_SITES=	https://gitlab.com/gitlab-org/${PORTNAME}/repository/archive.tar.gz?ref=v${PORTVERSION}&dummy=/
 DISTNAME=	${PORTNAME}-v${PORTVERSION}
@@ -10,7 +10,8 @@ DISTNAME=	${PORTNAME}-v${PORTVERSION}
 MAINTAINER=	tz@FreeBSD.org
 COMMENT=	GitLab Shell handles git commands for GitLab
 
-BUILD_DEPENDS=	gem:devel/ruby-gems
+BUILD_DEPENDS=	gem:devel/ruby-gems \
+		go>=1.5.3:lang/go
 
 USERS=		git
 GROUPS=		git
@@ -24,9 +25,18 @@ post-extract:
 post-patch:
 	${MV} ${WRKSRC}/config.yml.example ${WRKSRC}/config.yml.sample
 
+pre-install:
+	${WRKSRC}/bin/compile
+	${RM} -rf ${WRKSRC}/go
+	${RM} -rf ${WRKSRC}/go_build
+
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
 	@${MKDIR} ${STAGEDIR}/var/log/gitlab-shell
 
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${DATADIR}/bin/gitaly-upload-pack
+	${STRIP_CMD} ${STAGEDIR}${DATADIR}/bin/gitaly-receive-pack
+
 .include <bsd.port.mk>
diff --git a/devel/gitlab-shell/distinfo b/devel/gitlab-shell/distinfo
index 0029db5c4795..80b1578ae079 100644
--- a/devel/gitlab-shell/distinfo
+++ b/devel/gitlab-shell/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499074793
-SHA256 (gitlab-shell-v5.0.4.tar.gz) = 9947c9cf7e7f2e1c2af696cf4610c6e2ad256dcae42e95cc0c8dc387ad5d07e3
-SIZE (gitlab-shell-v5.0.4.tar.gz) = 626142
+TIMESTAMP = 1502873044
+SHA256 (gitlab-shell-v5.1.1.tar.gz) = 33a4b79b0b06ad935a4bcf1ad41ab88882eb31b349cca007f1e60f3eb5826a06
+SIZE (gitlab-shell-v5.1.1.tar.gz) = 688960
diff --git a/devel/gitlab-shell/pkg-plist b/devel/gitlab-shell/pkg-plist
index 2db863804342..fc84fdbad175 100644
--- a/devel/gitlab-shell/pkg-plist
+++ b/devel/gitlab-shell/pkg-plist
@@ -1,8 +1,10 @@
+%%DATADIR%%/.codeclimate.yml
 %%DATADIR%%/.gitignore
 %%DATADIR%%/.gitlab-ci.yml
 %%DATADIR%%/.rspec
 %%DATADIR%%/.rubocop.yml
 %%DATADIR%%/CHANGELOG
+%%DATADIR%%/CONTRIBUTING.md
 %%DATADIR%%/Gemfile
 %%DATADIR%%/Gemfile.lock
 %%DATADIR%%/Guardfile
@@ -12,7 +14,10 @@
 %%DATADIR%%/VERSION
 @(,,555) %%DATADIR%%/bin/authorized_keys
 @(,,555) %%DATADIR%%/bin/check
+@(,,555) %%DATADIR%%/bin/compile
 @(,,555) %%DATADIR%%/bin/create-hooks
+@(,,555) %%DATADIR%%/bin/gitaly-upload-pack
+@(,,555) %%DATADIR%%/bin/gitaly-receive-pack
 @(,,555) %%DATADIR%%/bin/gitlab-keys
 @(,,555) %%DATADIR%%/bin/gitlab-projects
 @(,,555) %%DATADIR%%/bin/gitlab-shell
@@ -23,7 +28,6 @@
 @(,,555) %%DATADIR%%/hooks/update
 %%DATADIR%%/lib/gitlab_access.rb
 %%DATADIR%%/lib/gitlab_access_status.rb
-%%DATADIR%%/lib/gitlab_authorized_keys.rb
 %%DATADIR%%/lib/gitlab_config.rb
 %%DATADIR%%/lib/gitlab_custom_hook.rb
 %%DATADIR%%/lib/gitlab_init.rb
@@ -77,19 +81,24 @@
 %%DATADIR%%/spec/vcr_cassettes/broadcast_message-none.yml
 %%DATADIR%%/spec/vcr_cassettes/broadcast_message-ok.yml
 %%DATADIR%%/spec/vcr_cassettes/check-ok.yml
-%%DATADIR%%/spec/vcr_cassettes/denied-pull.yml
-%%DATADIR%%/spec/vcr_cassettes/denied-push-with-user.yml
-%%DATADIR%%/spec/vcr_cassettes/denied-push.yml
 %%DATADIR%%/spec/vcr_cassettes/discover-ok.yml
-%%DATADIR%%/spec/vcr_cassettes/http-access-disabled.yml
+%%DATADIR%%/spec/vcr_cassettes/http-pull-disabled.yml
+%%DATADIR%%/spec/vcr_cassettes/http-push-disabled.yml
 %%DATADIR%%/spec/vcr_cassettes/lfs-authenticate-ok.yml
 %%DATADIR%%/spec/vcr_cassettes/notify-post-receive.yml
-%%DATADIR%%/spec/vcr_cassettes/ssh-access-disabled.yml
 %%DATADIR%%/spec/vcr_cassettes/ssh-key-not-found.yml
 %%DATADIR%%/spec/vcr_cassettes/ssh-key-not-implemented.yml
 %%DATADIR%%/spec/vcr_cassettes/ssh-key-ok.yml
+%%DATADIR%%/spec/vcr_cassettes/ssh-pull-disabled.yml
+%%DATADIR%%/spec/vcr_cassettes/ssh-pull-project-denied.yml
+%%DATADIR%%/spec/vcr_cassettes/ssh-push-disabled.yml
+%%DATADIR%%/spec/vcr_cassettes/ssh-push-project-denied-with-user.yml
+%%DATADIR%%/spec/vcr_cassettes/ssh-push-project-denied.yml
 %%DATADIR%%/spec/vcr_cassettes/two-factor-recovery-codes-fail.yml
 %%DATADIR%%/spec/vcr_cassettes/two-factor-recovery-codes.yml
+%%DATADIR%%/support/go-format
+%%DATADIR%%/support/go-test
+%%DATADIR%%/support/go_build.rb
 %%DATADIR%%/support/rewrite-hooks.sh
 %%DATADIR%%/support/truncate_repositories.sh
 @dir(git,,755) /var/log/gitlab-shell
diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile
index ab0027b8d680..4a3f239fb066 100644
--- a/devel/glibmm/Makefile
+++ b/devel/glibmm/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	glibmm
 PORTVERSION=	2.50.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
diff --git a/devel/gnatpython/Makefile b/devel/gnatpython/Makefile
index 808fbacf934e..570161ce4e92 100644
--- a/devel/gnatpython/Makefile
+++ b/devel/gnatpython/Makefile
@@ -9,12 +9,11 @@ MASTER_SITES=	http://downloads.dragonlace.net/src/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python package used in Ada testsuites
 
-LICENSE=	GPLv3
+LICENSE=	GPLv3+
+LICENSE_FILE=	${WRKSRC}/COPYING3
 
 SNAPSHOT=	20140224
 USES=		python tar:bzip2
 USE_PYTHON=	distutils autoplist
 
-NO_LICENSES_INSTALL=	yes
-
 .include <bsd.port.mk>
diff --git a/devel/gnatpython/files/patch-setup__helpers.py b/devel/gnatpython/files/patch-setup__helpers.py
index 51aa80ddbac9..f2f2d841b2fa 100644
--- a/devel/gnatpython/files/patch-setup__helpers.py
+++ b/devel/gnatpython/files/patch-setup__helpers.py
@@ -1,4 +1,4 @@
---- setup_helpers.py.orig	2014-02-14 10:41:26.000000000 +0000
+--- setup_helpers.py.orig	2015-06-21 09:00:45 UTC
 +++ setup_helpers.py
 @@ -28,7 +28,7 @@ def build_scripts_gnatpython(root_dir=''
                  os.system('gcc -o %sscripts/rlimit %ssrc/rlimit/rlimit-NT.c' %
diff --git a/devel/gnatpython/pkg-descr b/devel/gnatpython/pkg-descr
index 16ac9976d5a6..6be9b6b2d190 100644
--- a/devel/gnatpython/pkg-descr
+++ b/devel/gnatpython/pkg-descr
@@ -2,4 +2,4 @@ GNATPython is a python package to ease development of testsuites and/or
 build scripts in a portable way.  It is an extension to Ada which exports
 GNAT.Expect.TTY and requires the GNAT AUX compiler.
 
-WWW: http://forge.open-do.org/projects/gnatpython
+WWW: https://forge.open-do.org/projects/gnatpython
diff --git a/devel/gnu-efi/Makefile b/devel/gnu-efi/Makefile
index 3ac608f30296..962049870c9f 100644
--- a/devel/gnu-efi/Makefile
+++ b/devel/gnu-efi/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gnu-efi
 PORTVERSION=	3.0.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	SF/gnu-efi
 
diff --git a/devel/godot/Makefile b/devel/godot/Makefile
index cf49780cf8da..1b879d1a2142 100644
--- a/devel/godot/Makefile
+++ b/devel/godot/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	godot
 PORTVERSION=	2.1.2
-PORTREVISION=	2
+PORTREVISION=	3
 DISTVERSIONSUFFIX=	-stable
 CATEGORIES=	devel games
 
diff --git a/devel/gogland-eap/Makefile b/devel/gogland-eap/Makefile
index 89cd5564e4cd..c045ea79d1e1 100644
--- a/devel/gogland-eap/Makefile
+++ b/devel/gogland-eap/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gogland-eap
-PORTVERSION=	172.3757.46
+PORTVERSION=	172.3968.45
 CATEGORIES=	devel java
 MASTER_SITES=	https://download.jetbrains.com/go/ \
 		http://download.jetbrains.com/go/
diff --git a/devel/gogland-eap/distinfo b/devel/gogland-eap/distinfo
index de81606d1909..99b4099a0a0c 100644
--- a/devel/gogland-eap/distinfo
+++ b/devel/gogland-eap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503488186
-SHA256 (gogland-172.3757.46.tar.gz) = 0d6b710edc434ed5d5ea5c4734b9026e2caeba7e74a027c1eb6fd837c5d4f4fd
-SIZE (gogland-172.3757.46.tar.gz) = 184981483
+TIMESTAMP = 1504872676
+SHA256 (gogland-172.3968.45.tar.gz) = dccf09e21aced1ed13afdc7537fb0d3add8bd1a03e74df68b99e04429178695a
+SIZE (gogland-172.3968.45.tar.gz) = 195601265
diff --git a/devel/google-perftools/Makefile b/devel/google-perftools/Makefile
index 12a66dd73198..d38646686fad 100644
--- a/devel/google-perftools/Makefile
+++ b/devel/google-perftools/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	google-perftools
 PORTVERSION=	2.6.1
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/gperftools/gperftools/releases/download/gperftools-${PORTVERSION}/
 DISTNAME=	gperftools-${PORTVERSION}
diff --git a/devel/grantlee5/Makefile b/devel/grantlee5/Makefile
index 62f845e6fc00..38bca3da48e9 100644
--- a/devel/grantlee5/Makefile
+++ b/devel/grantlee5/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	grantlee
 PORTVERSION=	${GRANTLEE_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://downloads.${PORTNAME}.org/
 PKGNAMESUFFIX=	5
diff --git a/devel/hhdate/Makefile b/devel/hhdate/Makefile
index bd7bfb2d68a4..b7e4996aadf8 100644
--- a/devel/hhdate/Makefile
+++ b/devel/hhdate/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	hhdate
 PORTVERSION=	2.2
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
diff --git a/devel/hyperscan/Makefile b/devel/hyperscan/Makefile
index f68f34528011..3bd359900adf 100644
--- a/devel/hyperscan/Makefile
+++ b/devel/hyperscan/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	hyperscan
 PORTVERSION=	4.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel textproc
 MASTER_SITES=	SF/boost/boost/1.61.0:boost
diff --git a/devel/ice/Makefile b/devel/ice/Makefile
index af6c7c07d793..ab2de3e2c7e5 100644
--- a/devel/ice/Makefile
+++ b/devel/ice/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=		Ice
 PORTVERSION=		3.6.3
-PORTREVISION=		2
+PORTREVISION=		3
 DISTVERSIONPREFIX=	v
 CATEGORIES=		devel
 
diff --git a/devel/ice/files/patch-cpp-src-IceGrid-ServerI.cpp b/devel/ice/files/patch-cpp-src-IceGrid-ServerI.cpp
index 83a3eade43b4..128820ca8e00 100644
--- a/devel/ice/files/patch-cpp-src-IceGrid-ServerI.cpp
+++ b/devel/ice/files/patch-cpp-src-IceGrid-ServerI.cpp
@@ -1,5 +1,5 @@
 --- cpp/src/IceGrid/ServerI.cpp.orig	2016-11-15 12:22:54.201742997 +0100
-+++ cpp/src/IceGrid/ServerI.cpp	2016-11-15 12:48:01.409625996 +0100
++++ cpp/src/IceGrid/ServerI.cpp	2017-09-07 12:48:01.409625996 +0100
 @@ -341,7 +341,22 @@
          {
              assert(_p->first.find("config_") == 0);
@@ -24,3 +24,12 @@
              if(_traceLevels->server > 1)
              {
                  const string id = _server->getId();
+@@ -1232,7 +1232,7 @@ ServerI::load(const AMD_Node_loadServerPtr& amdCB, const InternalServerDescripto
+             updateRevision(desc->uuid, desc->revision);
+         }
+ 
+-        if(!_desc)
++        if(!_desc || (_load && descriptorUpdated(_load->getInternalServerDescriptor(), _desc)))
+         {
+             _load->addCallback(amdCB);
+             return 0;
diff --git a/devel/icu-le-hb/Makefile b/devel/icu-le-hb/Makefile
index d0d172fd2a11..aedb154ec41f 100644
--- a/devel/icu-le-hb/Makefile
+++ b/devel/icu-le-hb/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	icu-le-hb
 DISTVERSION=	1.0.3-3
 DISTVERSIONSUFFIX=	-gb8a3163
+PORTREVISION=	2
 CATEGORIES=	devel print
 
 MAINTAINER=	office@FreeBSD.org
diff --git a/devel/icu/Makefile b/devel/icu/Makefile
index 448c937befce..01dc3f09539e 100644
--- a/devel/icu/Makefile
+++ b/devel/icu/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	icu
 DISTVERSION=	58_2
-PORTREVISION?=	2 # keep for icu-lx
+PORTREVISION?=	3 # keep for icu-lx
 PORTEPOCH?=	1
 CATEGORIES?=	devel
 MASTER_SITES=	http://download.icu-project.org/files/icu4c/${PORTVERSION}/
diff --git a/devel/injeqt/Makefile b/devel/injeqt/Makefile
index c60b27ffefc4..ab035f2dd191 100644
--- a/devel/injeqt/Makefile
+++ b/devel/injeqt/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	injeqt
 PORTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	pawel@FreeBSD.org
diff --git a/devel/ipython/Makefile b/devel/ipython/Makefile
index e964187c543c..26d506d1e226 100644
--- a/devel/ipython/Makefile
+++ b/devel/ipython/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ipython
 PORTVERSION=	5.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/jenkins/Makefile b/devel/jenkins/Makefile
index b7db176a2191..c84067c0dbc5 100644
--- a/devel/jenkins/Makefile
+++ b/devel/jenkins/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	jenkins
-PORTVERSION=	2.77
+PORTVERSION=	2.78
 CATEGORIES=	devel java
 MASTER_SITES=	http://mirrors.jenkins-ci.org/war/${PORTVERSION}/
 DISTNAME=	jenkins
diff --git a/devel/jenkins/distinfo b/devel/jenkins/distinfo
index dfbb952010a7..51bf083a10ad 100644
--- a/devel/jenkins/distinfo
+++ b/devel/jenkins/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504583898
-SHA256 (jenkins/2.77/jenkins.war) = 007cf8ef7d0878d7a78a8aa5b5748b629b21496b550a8c0240055f4c822bb2c2
-SIZE (jenkins/2.77/jenkins.war) = 73240129
+TIMESTAMP = 1505106872
+SHA256 (jenkins/2.78/jenkins.war) = 9d8ce9653d7a1ada2071ad9688ba7938e1e0672586e893e578dbfecdff725df6
+SIZE (jenkins/2.78/jenkins.war) = 73240530
diff --git a/devel/jsoncpp/Makefile b/devel/jsoncpp/Makefile
index b212dff4437b..51a1a600501e 100644
--- a/devel/jsoncpp/Makefile
+++ b/devel/jsoncpp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	jsoncpp
 PORTVERSION=	1.8.1
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@rawbw.com
diff --git a/devel/jsonnet/Makefile b/devel/jsonnet/Makefile
index 9697d8b4b3da..393508bfdc04 100644
--- a/devel/jsonnet/Makefile
+++ b/devel/jsonnet/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	jsonnet
 PORTVERSION=	0.9.3
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
diff --git a/devel/kBuild/Makefile b/devel/kBuild/Makefile
index 87c0e4db498e..fd9748602863 100644
--- a/devel/kBuild/Makefile
+++ b/devel/kBuild/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kBuild
 DISTVERSION=	${KBUILD_VERSION}
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	devel
 MASTER_SITES=	LOCAL/jkim
 DISTNAME=	${PORTNAME}-${DISTVERSION}r3050-src
diff --git a/devel/kdevelop-kde4/Makefile b/devel/kdevelop-kde4/Makefile
index 1a1bfc63dbf7..cb2fbe4dbadd 100644
--- a/devel/kdevelop-kde4/Makefile
+++ b/devel/kdevelop-kde4/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kdevelop
 DISTVERSION=	${KDEVELOP_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel kde
 MASTER_SITES=	KDE/${KDEVELOP_BRANCH}/kdevelop/${DISTVERSION}
 DIST_SUBDIR=	KDE/kdevelop/${KDEVELOP_VERSION}
diff --git a/devel/kdevelop-pg-qt/Makefile b/devel/kdevelop-pg-qt/Makefile
index c306c8cfa1b0..2c3206603e24 100644
--- a/devel/kdevelop-pg-qt/Makefile
+++ b/devel/kdevelop-pg-qt/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kdevelop-pg-qt
 PORTVERSION=	1.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE
diff --git a/devel/kdevelop-php-docs/Makefile b/devel/kdevelop-php-docs/Makefile
index ed46be3fe429..bedbbb84cad8 100644
--- a/devel/kdevelop-php-docs/Makefile
+++ b/devel/kdevelop-php-docs/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kdevelop-php-docs
 PORTVERSION=	${KDEVELOP_VERSION:S/4./1./}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel kde
 MASTER_SITES=	KDE/${KDEVELOP_BRANCH}/kdevelop/${KDEVELOP_VERSION}
 DIST_SUBDIR=	KDE/kdevelop/${KDEVELOP_VERSION}
diff --git a/devel/kdevelop-php/Makefile b/devel/kdevelop-php/Makefile
index ef4fe53b89b5..89c2dd2b0fae 100644
--- a/devel/kdevelop-php/Makefile
+++ b/devel/kdevelop-php/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kdevelop-php
 PORTVERSION=	${KDEVELOP_VERSION:S/4./1./}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel kde
 MASTER_SITES=	KDE/${KDEVELOP_BRANCH}/kdevelop/${KDEVELOP_VERSION}
 DIST_SUBDIR=	KDE/kdevelop/${KDEVELOP_VERSION}
diff --git a/devel/kdevplatform/Makefile b/devel/kdevplatform/Makefile
index 40249c27623e..62e871f0a938 100644
--- a/devel/kdevplatform/Makefile
+++ b/devel/kdevplatform/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kdevplatform
 PORTVERSION=	${KDEVELOP_VERSION:S/4./1./}
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel kde
 MASTER_SITES=	KDE/${KDEVELOP_BRANCH}/kdevelop/${KDEVELOP_VERSION}
 DIST_SUBDIR=	KDE/kdevelop/${KDEVELOP_VERSION}
diff --git a/devel/kf5-kauth/Makefile b/devel/kf5-kauth/Makefile
index 50cf82f15201..0e19f51fac48 100644
--- a/devel/kf5-kauth/Makefile
+++ b/devel/kf5-kauth/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	kauth
 PORTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/kf5-kbookmarks/Makefile b/devel/kf5-kbookmarks/Makefile
index 2444ec5f146e..a125d77a9273 100644
--- a/devel/kf5-kbookmarks/Makefile
+++ b/devel/kf5-kbookmarks/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	kbookmarks
 PORTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/kf5-kcmutils/Makefile b/devel/kf5-kcmutils/Makefile
index 58d7b90f1703..86a4fa3fbb91 100644
--- a/devel/kf5-kcmutils/Makefile
+++ b/devel/kf5-kcmutils/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	kcmutils
 PORTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/kf5-kconfig/Makefile b/devel/kf5-kconfig/Makefile
index 8510ccf82f25..92ed0a3fcefd 100644
--- a/devel/kf5-kconfig/Makefile
+++ b/devel/kf5-kconfig/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	kconfig
 PORTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/kf5-kcoreaddons/Makefile b/devel/kf5-kcoreaddons/Makefile
index 5b41f2a670e0..d37ff363bdbe 100644
--- a/devel/kf5-kcoreaddons/Makefile
+++ b/devel/kf5-kcoreaddons/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	kcoreaddons
 PORTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/kf5-kcrash/Makefile b/devel/kf5-kcrash/Makefile
index 8150b90f38fe..0c502bf28968 100644
--- a/devel/kf5-kcrash/Makefile
+++ b/devel/kf5-kcrash/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	kcrash
 PORTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/kf5-kdbusaddons/Makefile b/devel/kf5-kdbusaddons/Makefile
index 8eaa60334ff7..fb73fd4da350 100644
--- a/devel/kf5-kdbusaddons/Makefile
+++ b/devel/kf5-kdbusaddons/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	kdbusaddons
 PORTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/kf5-kdeclarative/Makefile b/devel/kf5-kdeclarative/Makefile
index 46b73cae2604..ba638027e026 100644
--- a/devel/kf5-kdeclarative/Makefile
+++ b/devel/kf5-kdeclarative/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	kdeclarative
 PORTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/kf5-kdoctools/Makefile b/devel/kf5-kdoctools/Makefile
index b66c48ccc48e..96a94f88435b 100644
--- a/devel/kf5-kdoctools/Makefile
+++ b/devel/kf5-kdoctools/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	kdoctools
 PORTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/kf5-kfilemetadata/Makefile b/devel/kf5-kfilemetadata/Makefile
index 6dfccef9a8c9..7089230a5810 100644
--- a/devel/kf5-kfilemetadata/Makefile
+++ b/devel/kf5-kfilemetadata/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kfilemetadata
 PORTVERSION=	${KDE_FRAMEWORKS_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/kf5-ki18n/Makefile b/devel/kf5-ki18n/Makefile
index 72110d704e6f..33b694b4ef72 100644
--- a/devel/kf5-ki18n/Makefile
+++ b/devel/kf5-ki18n/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ki18n
 PORTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/kf5-kidletime/Makefile b/devel/kf5-kidletime/Makefile
index 7fa371cd1106..d9443044a6b2 100644
--- a/devel/kf5-kidletime/Makefile
+++ b/devel/kf5-kidletime/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	kidletime
 PORTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/kf5-kio/Makefile b/devel/kf5-kio/Makefile
index fe4383568c2a..b89feb9c3a90 100644
--- a/devel/kf5-kio/Makefile
+++ b/devel/kf5-kio/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	kio
 PORTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/kf5-kitemmodels/Makefile b/devel/kf5-kitemmodels/Makefile
index 81a96d4deb28..48508d12aea9 100644
--- a/devel/kf5-kitemmodels/Makefile
+++ b/devel/kf5-kitemmodels/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	kitemmodels
 PORTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/kf5-knewstuff/Makefile b/devel/kf5-knewstuff/Makefile
index d0b22952c636..a38caf414e05 100644
--- a/devel/kf5-knewstuff/Makefile
+++ b/devel/kf5-knewstuff/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	knewstuff
 PORTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/kf5-knotifications/Makefile b/devel/kf5-knotifications/Makefile
index a956c0def66b..78b7a03af178 100644
--- a/devel/kf5-knotifications/Makefile
+++ b/devel/kf5-knotifications/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	knotifications
 PORTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/kf5-knotifyconfig/Makefile b/devel/kf5-knotifyconfig/Makefile
index 56bca66ed9fa..901fd2cc9c7a 100644
--- a/devel/kf5-knotifyconfig/Makefile
+++ b/devel/kf5-knotifyconfig/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	knotifyconfig
 PORTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/kf5-kpackage/Makefile b/devel/kf5-kpackage/Makefile
index 08d0bee676bb..340f28f42c8e 100644
--- a/devel/kf5-kpackage/Makefile
+++ b/devel/kf5-kpackage/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	kpackage
 PORTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/kf5-kparts/Makefile b/devel/kf5-kparts/Makefile
index cc8ba8f6e57a..8d378631502d 100644
--- a/devel/kf5-kparts/Makefile
+++ b/devel/kf5-kparts/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	kparts
 PORTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/kf5-kpeople/Makefile b/devel/kf5-kpeople/Makefile
index 9afba7af1366..521699d9c913 100644
--- a/devel/kf5-kpeople/Makefile
+++ b/devel/kf5-kpeople/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	kpeople
 PORTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/kf5-kpty/Makefile b/devel/kf5-kpty/Makefile
index 4e03f8e7a57b..c90d4d0b0f09 100644
--- a/devel/kf5-kpty/Makefile
+++ b/devel/kf5-kpty/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	kpty
 PORTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/kf5-kservice/Makefile b/devel/kf5-kservice/Makefile
index 4f2629b4b462..b8056119b180 100644
--- a/devel/kf5-kservice/Makefile
+++ b/devel/kf5-kservice/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	kservice
 PORTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/kf5-ktexteditor/Makefile b/devel/kf5-ktexteditor/Makefile
index 10b8a5eef829..4dc01715cc09 100644
--- a/devel/kf5-ktexteditor/Makefile
+++ b/devel/kf5-ktexteditor/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ktexteditor
 PORTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/kf5-kunitconversion/Makefile b/devel/kf5-kunitconversion/Makefile
index 681723f60946..ecd08b1576db 100644
--- a/devel/kf5-kunitconversion/Makefile
+++ b/devel/kf5-kunitconversion/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	kunitconversion
 PORTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/kf5-solid/Makefile b/devel/kf5-solid/Makefile
index 60eb477f07c4..28f0102913e8 100644
--- a/devel/kf5-solid/Makefile
+++ b/devel/kf5-solid/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	solid
 PORTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/kf5-threadweaver/Makefile b/devel/kf5-threadweaver/Makefile
index 12ad2043cccc..521ca964f3d6 100644
--- a/devel/kf5-threadweaver/Makefile
+++ b/devel/kf5-threadweaver/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	threadweaver
 PORTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/leatherman/Makefile b/devel/leatherman/Makefile
index 8f24cdabccfd..8fbd2bf821ff 100644
--- a/devel/leatherman/Makefile
+++ b/devel/leatherman/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	leatherman
-PORTVERSION=	1.1.2
+PORTVERSION=	1.2.1
 CATEGORIES=	devel
 
 MAINTAINER=	puppet@FreeBSD.org
diff --git a/devel/leatherman/distinfo b/devel/leatherman/distinfo
index 97d70cf122ae..9e808b49e6c9 100644
--- a/devel/leatherman/distinfo
+++ b/devel/leatherman/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503861160
-SHA256 (puppetlabs-leatherman-1.1.2_GH0.tar.gz) = 1feca2ba8472252132ad90c6bcc3fba6dbb85ee912b1cbcde9853d812d54729f
-SIZE (puppetlabs-leatherman-1.1.2_GH0.tar.gz) = 430545
+TIMESTAMP = 1504858518
+SHA256 (puppetlabs-leatherman-1.2.1_GH0.tar.gz) = 747a12948167634d2c3db8c7be741ceb1eb486f54ed6b5b96fecfd68827e4efb
+SIZE (puppetlabs-leatherman-1.2.1_GH0.tar.gz) = 431781
diff --git a/devel/leatherman/pkg-plist b/devel/leatherman/pkg-plist
index 496dc402afce..c097597fd217 100644
--- a/devel/leatherman/pkg-plist
+++ b/devel/leatherman/pkg-plist
@@ -34,6 +34,7 @@ include/leatherman/util/scoped_resource.hpp
 include/leatherman/util/strings.hpp
 include/leatherman/util/time.hpp
 include/leatherman/util/timer.hpp
+include/leatherman/util/uri.hpp
 include/leatherman/util/windows/scoped_handle.hpp
 include/leatherman/vendor/catch.hpp
 include/leatherman/vendor/rapidjson/allocators.h
diff --git a/devel/leiningen/Makefile b/devel/leiningen/Makefile
index 801ad660849b..44c5ec0983b2 100644
--- a/devel/leiningen/Makefile
+++ b/devel/leiningen/Makefile
@@ -33,7 +33,7 @@ SHEBANG_FILES=	bin/lein-pkg
 bash_CMD=	/bin/sh
 
 post-patch:
-	@${REINPLACE_CMD} -E -e 's|function (.*) {|\1() {|' \
+	@${REINPLACE_CMD} -E -e 's|function (.*) \{|\1() {|' \
 		-e 's|(local )-i |\1|' \
 		-e 's|^if \[\[ (.*) \]\];|if [ \1 ];|' \
 		-e 's|(BOOTCLASSPATH)\[@\]|\1|' \
diff --git a/devel/libbobcat/Makefile b/devel/libbobcat/Makefile
index fefcad9b2ce8..cedeba24a3f8 100644
--- a/devel/libbobcat/Makefile
+++ b/devel/libbobcat/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	libbobcat
 PORTVERSION=	3.25.01
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	SF/bobcat/bobcat/${PORTVERSION}
 DISTNAME=	bobcat_${PORTVERSION}
diff --git a/devel/libconcurrent/Makefile b/devel/libconcurrent/Makefile
index a2a25201e725..f7be97e45d18 100644
--- a/devel/libconcurrent/Makefile
+++ b/devel/libconcurrent/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libconcurrent
 PORTVERSION=	0.0.20160303
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 
 MAINTAINER=	tobik@FreeBSD.org
diff --git a/devel/libcrossguid/Makefile b/devel/libcrossguid/Makefile
index 0aaee9c5ca46..0897fb9bbab5 100644
--- a/devel/libcrossguid/Makefile
+++ b/devel/libcrossguid/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	libcrossguid
 PORTVERSION=	20150803
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 
 MAINTAINER=	mickael.maillot@gmail.com
diff --git a/devel/libcutl/Makefile b/devel/libcutl/Makefile
index a81817c4d75e..2ae4b1855507 100644
--- a/devel/libcutl/Makefile
+++ b/devel/libcutl/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	libcutl
 PORTVERSION=	1.10.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel
 MASTER_SITES=	http://www.codesynthesis.com/download/${PORTNAME}/${PORTVERSION:R}/
 
diff --git a/devel/libcwd/Makefile b/devel/libcwd/Makefile
index 08d7c12342ae..b406c1725652 100644
--- a/devel/libcwd/Makefile
+++ b/devel/libcwd/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libcwd
 PORTVERSION=	1.0.6
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	SF
 
diff --git a/devel/libdbusmenu-qt/Makefile b/devel/libdbusmenu-qt/Makefile
index 3fa9ba4e7afa..43cffed8634e 100644
--- a/devel/libdbusmenu-qt/Makefile
+++ b/devel/libdbusmenu-qt/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libdbusmenu-qt
 PORTVERSION=	${MAJOR_VER}.${SNAPSHOT_VER:S/.//g}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://archive.ubuntu.com/ubuntu/pool/main/libd/${PORTNAME}/
 DISTNAME=	${PORTNAME}_${MAJOR_VER}+${SNAPSHOT_VER}.orig
diff --git a/devel/libflatarray/Makefile b/devel/libflatarray/Makefile
index c86c087e540c..2571712e6f3f 100644
--- a/devel/libflatarray/Makefile
+++ b/devel/libflatarray/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libflatarray
 PORTVERSION=	0.3.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel science
 MASTER_SITES=	http://www.libgeodecomp.org/archive/
 
diff --git a/devel/libfmt/Makefile b/devel/libfmt/Makefile
index 667e01c58af2..52e4556bb8bf 100644
--- a/devel/libfmt/Makefile
+++ b/devel/libfmt/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libfmt
 PORTVERSION=	3.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 
 MAINTAINER=	SlavaMikerov@gmail.com
diff --git a/devel/libgit2-glib/Makefile b/devel/libgit2-glib/Makefile
index 300c2db7fec4..d91665cd2729 100644
--- a/devel/libgit2-glib/Makefile
+++ b/devel/libgit2-glib/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libgit2-glib
 PORTVERSION=	0.25.0
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
diff --git a/devel/libglademm24/Makefile b/devel/libglademm24/Makefile
index ccffad706050..e2ebac4fc35e 100644
--- a/devel/libglademm24/Makefile
+++ b/devel/libglademm24/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	libglademm
 PORTVERSION=	2.6.7
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/devel/libgrading/Makefile b/devel/libgrading/Makefile
index 0e5ab688b4f6..620c2c822fe9 100644
--- a/devel/libgrading/Makefile
+++ b/devel/libgrading/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	libgrading
 PORTVERSION=	0.1.2
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
diff --git a/devel/libhyve-remote/Makefile b/devel/libhyve-remote/Makefile
index d28c4caf5475..63009a6593d5 100644
--- a/devel/libhyve-remote/Makefile
+++ b/devel/libhyve-remote/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	libhyve-remote
-PORTVERSION=	0.1.1
+PORTVERSION=	0.1.2
 CATEGORIES=	devel
 
 MAINTAINER=	araujo@FreeBSD.org
@@ -12,6 +12,9 @@ LICENSE_COMB=	dual
 
 LIB_DEPENDS=	libvncserver.so:net/libvncserver
 
+OPTIONS_DEFINE=	BHYVE
+BHYVE_DESC=	FreeBSD bhyve libhyve-remote integration
+
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
@@ -34,6 +37,8 @@ GH_ACCOUNT=	araujobsd
 
 USE_LDCONFIG=	yes
 
+.include <bsd.port.options.mk>
+
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/libhyverem
 .for headers in ${HEADER_FILES}
@@ -45,4 +50,13 @@ do-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.1
 	${LN} -fs libhyverem.so.1 ${STAGEDIR}${PREFIX}/lib/libhyverem.so
 
+post-install:
+.if ${PORT_OPTIONS:MBHYVE}
+.if !exists(${SRC_BASE}/usr.sbin/bhyve/pci_fbuf.c)
+IGNORE=	requires kernel source files in ${SRC_BASE}
+.else
+	(cd ${WRKSRC} && ${MAKE_CMD} bhyve-patch)
+.endif
+.endif
+
 .include <bsd.port.mk>
diff --git a/devel/libhyve-remote/distinfo b/devel/libhyve-remote/distinfo
index c1f2cd8ff2f4..8753fa3287f1 100644
--- a/devel/libhyve-remote/distinfo
+++ b/devel/libhyve-remote/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501212977
-SHA256 (araujobsd-libhyve-remote-0.1.1_GH0.tar.gz) = e24e71c1dadfe76d52b30bd9b2d064b7cee52b9642c5e5fd5a0a9315ff337fe4
-SIZE (araujobsd-libhyve-remote-0.1.1_GH0.tar.gz) = 6255
+TIMESTAMP = 1505313487
+SHA256 (araujobsd-libhyve-remote-0.1.2_GH0.tar.gz) = 1c45bbefc7b1087dad9330e486499e50d9e2a0f4184032e4ace16c8a86aeb1e2
+SIZE (araujobsd-libhyve-remote-0.1.2_GH0.tar.gz) = 11645
diff --git a/devel/libical-glib/Makefile b/devel/libical-glib/Makefile
index 504920b92a59..678bde407e62 100644
--- a/devel/libical-glib/Makefile
+++ b/devel/libical-glib/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libical-glib
 PORTVERSION=	1.0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
 
diff --git a/devel/liblas/Makefile b/devel/liblas/Makefile
index 218af0cd11d6..6f2ccbc071eb 100644
--- a/devel/liblas/Makefile
+++ b/devel/liblas/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	liblas
 PORTVERSION=	1.8.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel
 
 MAINTAINER=	wen@FreeBSD.org
diff --git a/devel/liblxqt/Makefile b/devel/liblxqt/Makefile
index d7ec47d22269..22420247458a 100644
--- a/devel/liblxqt/Makefile
+++ b/devel/liblxqt/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	liblxqt
 PORTVERSION=	0.11.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	LXQT
 
diff --git a/devel/libopkele/Makefile b/devel/libopkele/Makefile
index 7e3730397324..25e77c1ca0e4 100644
--- a/devel/libopkele/Makefile
+++ b/devel/libopkele/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libopkele
 PORTVERSION=	2.0.4
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	devel
 MASTER_SITES=	http://kin.klever.net/dist/
 
diff --git a/devel/liborcus/Makefile b/devel/liborcus/Makefile
index 745fbf9a11a9..367c4f51cd29 100644
--- a/devel/liborcus/Makefile
+++ b/devel/liborcus/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	liborcus
 PORTVERSION=	0.12.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel misc
 MASTER_SITES=	http://kohei.us/files/orcus/src/
 
diff --git a/devel/libqtxdg/Makefile b/devel/libqtxdg/Makefile
index 3114fa34af22..a3bb394af02b 100644
--- a/devel/libqtxdg/Makefile
+++ b/devel/libqtxdg/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libqtxdg
 PORTVERSION=	2.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	LXQT/${PORTNAME}
 
diff --git a/devel/libsigc++20/Makefile b/devel/libsigc++20/Makefile
index 1a9f397b2bbb..2c7ac089d1b7 100644
--- a/devel/libsigc++20/Makefile
+++ b/devel/libsigc++20/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libsigc++
 PORTVERSION=	2.10.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
 
diff --git a/devel/libtuntap/Makefile b/devel/libtuntap/Makefile
index 14b44ea09881..7fbd1f084088 100644
--- a/devel/libtuntap/Makefile
+++ b/devel/libtuntap/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libtuntap
 DISTVERSION=	0.3-23
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONSUFFIX=	-ga8bcade
 CATEGORIES=	devel net
 
diff --git a/devel/libuv/Makefile b/devel/libuv/Makefile
index 085d05f2a59a..254d4d342c84 100644
--- a/devel/libuv/Makefile
+++ b/devel/libuv/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libuv
-PORTVERSION=	1.14.0
+PORTVERSION=	1.14.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 #MASTER_SITES=	http://dist.libuv.org/dist/v${PORTVERSION}/
diff --git a/devel/libuv/distinfo b/devel/libuv/distinfo
index db1926967219..b18e0a1b7ee1 100644
--- a/devel/libuv/distinfo
+++ b/devel/libuv/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502986522
-SHA256 (libuv-libuv-v1.14.0_GH0.tar.gz) = 96088804334a70f84d64f45e4db926fc1dfa42d4a9d22b1812cf47bc0d9b6947
-SIZE (libuv-libuv-v1.14.0_GH0.tar.gz) = 1156650
+TIMESTAMP = 1504726896
+SHA256 (libuv-libuv-v1.14.1_GH0.tar.gz) = 82fbbb0eaab4adcf8ed513d3b777c8e02ed2e77aae265baf6bd2d68cb84bc9e3
+SIZE (libuv-libuv-v1.14.1_GH0.tar.gz) = 1157777
diff --git a/devel/libvirt/Makefile b/devel/libvirt/Makefile
index 6ad0ab3de577..63d8af55a772 100644
--- a/devel/libvirt/Makefile
+++ b/devel/libvirt/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libvirt
-PORTVERSION=	3.6.0
+PORTVERSION=	3.7.0
 CATEGORIES=	devel
 MASTER_SITES=	http://libvirt.org/sources/ \
 		ftp://libvirt.org/libvirt/
diff --git a/devel/libvirt/distinfo b/devel/libvirt/distinfo
index c6a5f2e4047a..300b0dbf39e6 100644
--- a/devel/libvirt/distinfo
+++ b/devel/libvirt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501681119
-SHA256 (libvirt-3.6.0.tar.xz) = 3a2c97f6950796f300f6a2e0404f4de8e51c3b9430cdb82738439adb0ac59e3d
-SIZE (libvirt-3.6.0.tar.xz) = 14797704
+TIMESTAMP = 1504619135
+SHA256 (libvirt-3.7.0.tar.xz) = 4e7bcb209eeef99f026484293abc733e30ed06dabcdde62c4c3e95f71b2b67ba
+SIZE (libvirt-3.7.0.tar.xz) = 14803752
diff --git a/devel/libvirt/pkg-plist b/devel/libvirt/pkg-plist
index 748db0a105b0..4d07270b4b5f 100644
--- a/devel/libvirt/pkg-plist
+++ b/devel/libvirt/pkg-plist
@@ -35,6 +35,7 @@ man/man8/virtlogd.8.gz
 %%XEN%%@sample %%ETCDIR%%/libxl.conf.sample
 %%QEMU%%%%ETCDIR%%/qemu-lockd.conf
 %%XEN%%%%ETCDIR%%/libxl-lockd.conf
+%%SASL%%etc/sasl2/libvirt.conf
 etc/logrotate.d/libvirtd
 etc/logrotate.d/libvirtd.lxc
 etc/logrotate.d/libvirtd.qemu
@@ -220,6 +221,7 @@ share/augeas/lenses/tests/test_virtlogd.aug
 %%DOCSDIR%%%%PORTVERSION%%/html/migration-tunnel.png
 %%DOCSDIR%%%%PORTVERSION%%/html/migration-unmanaged-direct.png
 %%DOCSDIR%%%%PORTVERSION%%/html/migration.html
+%%DOCSDIR%%%%PORTVERSION%%/html/mobile.css                                   
 %%DOCSDIR%%%%PORTVERSION%%/html/news-2005.html
 %%DOCSDIR%%%%PORTVERSION%%/html/news-2006.html
 %%DOCSDIR%%%%PORTVERSION%%/html/news-2007.html
@@ -235,6 +237,7 @@ share/augeas/lenses/tests/test_virtlogd.aug
 %%DOCSDIR%%%%PORTVERSION%%/html/news.html
 %%DOCSDIR%%%%PORTVERSION%%/html/node.gif
 %%DOCSDIR%%%%PORTVERSION%%/html/nss.html
+%%DOCSDIR%%%%PORTVERSION%%/html/pci-hotplug.html   
 %%DOCSDIR%%%%PORTVERSION%%/html/php.html
 %%DOCSDIR%%%%PORTVERSION%%/html/python.html
 %%DOCSDIR%%%%PORTVERSION%%/html/remote.html
diff --git a/devel/libvshadow/Makefile b/devel/libvshadow/Makefile
index 119167ea0635..585832e3f73b 100644
--- a/devel/libvshadow/Makefile
+++ b/devel/libvshadow/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libvshadow
-PORTVERSION=	20170715
+PORTVERSION=	20170902
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/libyal/libvshadow/releases/download/${PORTVERSION}/ \
 		LOCAL/antoine
@@ -14,13 +14,23 @@ COMMENT=	Library to support the Volume Service Snapshot (VSS) format
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		fuse libtool pathfix pkgconfig python
+BUILD_DEPENDS=	python${PYTHON2_DEFAULT}:lang/python${PYTHON2_DEFAULT:S/.//} \
+		python${PYTHON3_DEFAULT}:lang/python${PYTHON3_DEFAULT:S/.//}
+RUN_DEPENDS=	python${PYTHON2_DEFAULT}:lang/python${PYTHON2_DEFAULT:S/.//} \
+		python${PYTHON3_DEFAULT}:lang/python${PYTHON3_DEFAULT:S/.//}
+
+USES=		fuse libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-python
+CONFIGURE_ARGS=	--enable-python2 --enable-python3
+CONFIGURE_ENV=	PYTHON2_CONFIG=${LOCALBASE}/bin/python${PYTHON2_DEFAULT}-config \
+		PYTHON3=${LOCALBASE}/bin/python${PYTHON3_DEFAULT} \
+		PYTHON3_CONFIG=${LOCALBASE}/bin/python${PYTHON3_DEFAULT}-config
 INSTALL_TARGET=	install-strip
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+PLIST_SUB=	PYTHON2_SITELIBDIR=lib/python${PYTHON2_DEFAULT}/site-packages \
+		PYTHON3_SITELIBDIR=lib/python${PYTHON3_DEFAULT}/site-packages
 
 OPTIONS_DEFINE=	NLS
 
diff --git a/devel/libvshadow/distinfo b/devel/libvshadow/distinfo
index cd8fe734750f..7045aefb9bcc 100644
--- a/devel/libvshadow/distinfo
+++ b/devel/libvshadow/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501704383
-SHA256 (libvshadow-alpha-20170715.tar.gz) = b29dd22b6b12bcf84317e27eed0117ef3efa0549bfd7d3d67f4f44c9dd64ade2
-SIZE (libvshadow-alpha-20170715.tar.gz) = 1391482
+TIMESTAMP = 1504590012
+SHA256 (libvshadow-alpha-20170902.tar.gz) = 9e23a14ee08ad4cc218c63ec8ca350b4951e347ccf3040c365860a399730f261
+SIZE (libvshadow-alpha-20170902.tar.gz) = 1395385
diff --git a/devel/libvshadow/pkg-plist b/devel/libvshadow/pkg-plist
index 5bf8fa16667f..6bcc50a42fe6 100644
--- a/devel/libvshadow/pkg-plist
+++ b/devel/libvshadow/pkg-plist
@@ -12,8 +12,10 @@ lib/libvshadow.a
 lib/libvshadow.so
 lib/libvshadow.so.1
 lib/libvshadow.so.1.0.0
-%%PYTHON_SITELIBDIR%%/pyvshadow.a
-%%PYTHON_SITELIBDIR%%/pyvshadow.so
+%%PYTHON2_SITELIBDIR%%/pyvshadow.a
+%%PYTHON2_SITELIBDIR%%/pyvshadow.so
+%%PYTHON3_SITELIBDIR%%/pyvshadow.a
+%%PYTHON3_SITELIBDIR%%/pyvshadow.so
 libdata/pkgconfig/libvshadow.pc
 man/man1/vshadowinfo.1.gz
 man/man1/vshadowmount.1.gz
diff --git a/devel/libwfut/Makefile b/devel/libwfut/Makefile
index 0c91116fcf72..a68d73294be5 100644
--- a/devel/libwfut/Makefile
+++ b/devel/libwfut/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libwfut
 PORTVERSION=	0.2.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel
 MASTER_SITES=	SF/worldforge/libwfut%20%28updates%20library%29/${PORTVERSION}
 
diff --git a/devel/libzim/Makefile b/devel/libzim/Makefile
new file mode 100644
index 000000000000..b5f917ac4db5
--- /dev/null
+++ b/devel/libzim/Makefile
@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+PORTNAME=	libzim
+PORTVERSION=	2.0.0
+CATEGORIES=	devel
+
+MAINTAINER=	swills@FreeBSD.org
+COMMENT=	Reference implementation of the ZIM specification
+
+LIB_DEPENDS=	libicui18n.so:devel/icu \
+		libxapian.so:databases/xapian-core
+
+USES=		meson pkgconfig
+USE_LDCONFIG=	yes
+USE_GITHUB=	yes
+GH_ACCOUNT=	openzim
+
+.include <bsd.port.mk>
diff --git a/devel/libzim/distinfo b/devel/libzim/distinfo
new file mode 100644
index 000000000000..4ba6ac421f03
--- /dev/null
+++ b/devel/libzim/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1505422546
+SHA256 (openzim-libzim-2.0.0_GH0.tar.gz) = c148aa62a346628447093b0b1eb0b2f1a7236c7555ed2bdd74515b0cc75b167c
+SIZE (openzim-libzim-2.0.0_GH0.tar.gz) = 86835
diff --git a/devel/libzim/pkg-descr b/devel/libzim/pkg-descr
new file mode 100644
index 000000000000..1053dbac173a
--- /dev/null
+++ b/devel/libzim/pkg-descr
@@ -0,0 +1,4 @@
+The openZIM project proposes offline storage solutions for content coming from
+the Web.
+
+WWW: http://www.openzim.org/wiki/OpenZIM
diff --git a/devel/libzim/pkg-plist b/devel/libzim/pkg-plist
new file mode 100644
index 000000000000..d2f4ecdecfd4
--- /dev/null
+++ b/devel/libzim/pkg-plist
@@ -0,0 +1,28 @@
+bin/zimdump
+bin/zimsearch
+include/zim/article.h
+include/zim/blob.h
+include/zim/cache.h
+include/zim/cluster.h
+include/zim/dirent.h
+include/zim/error.h
+include/zim/file.h
+include/zim/fileheader.h
+include/zim/fileimpl.h
+include/zim/fileiterator.h
+include/zim/fstream.h
+include/zim/noncopyable.h
+include/zim/refcounted.h
+include/zim/search.h
+include/zim/search_iterator.h
+include/zim/smartptr.h
+include/zim/template.h
+include/zim/uuid.h
+include/zim/writer/articlesource.h
+include/zim/writer/dirent.h
+include/zim/writer/zimcreator.h
+include/zim/zim.h
+lib/libzim.so
+lib/libzim.so.2
+lib/libzim.so.2.0.0
+libdata/pkgconfig/libzim.pc
diff --git a/devel/linux-kernel/Makefile b/devel/linux-kernel/Makefile
index db6aba1611ac..8ed2fda9e416 100644
--- a/devel/linux-kernel/Makefile
+++ b/devel/linux-kernel/Makefile
@@ -30,6 +30,7 @@
 
 PORTNAME=	linux-kernel
 PORTVERSION=	4.9.5
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	KERNEL_ORG/linux/kernel/v4.x
 DISTNAME=	linux-${DISTVERSION}
diff --git a/devel/lldb38/Makefile b/devel/lldb38/Makefile
index 9fad3a867bed..67b8521d8e8d 100644
--- a/devel/lldb38/Makefile
+++ b/devel/lldb38/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	lldb
 PORTVERSION=	3.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 PKGNAMESUFFIX=	${LLVM_SUFFIX}
 
diff --git a/devel/llvm-cheri/Makefile b/devel/llvm-cheri/Makefile
index b4764a88998c..2cceff7a2f54 100644
--- a/devel/llvm-cheri/Makefile
+++ b/devel/llvm-cheri/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	llvm
 PORTVERSION=	${LLVM_MAJOR}.d${SNAPDATE}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel lang
 PKGNAMESUFFIX=	${LLVM_SUFFIX}
 
diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index 047dc9045edc..5264b34f6791 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	llvm
 PORTVERSION=	${LLVM_MAJOR}.d${SNAPDATE}
+PORTREVISION=	1
 CATEGORIES=	devel lang
 PKGNAMESUFFIX=	-devel
 
diff --git a/devel/llvm34/Makefile b/devel/llvm34/Makefile
index e61b2e0b032c..5af01808e3dd 100644
--- a/devel/llvm34/Makefile
+++ b/devel/llvm34/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	llvm
 PORTVERSION=	3.4.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	devel lang
 MASTER_SITES=	http://llvm.org/releases/${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
diff --git a/devel/llvm35/Makefile b/devel/llvm35/Makefile
index c07ead8c3906..432ae76b6e2f 100644
--- a/devel/llvm35/Makefile
+++ b/devel/llvm35/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	llvm
 DISTVERSION=	3.5.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel lang
 MASTER_SITES=	http://llvm.org/releases/3.5.2/
 DISTNAME=	${PORTNAME}-${DISTVERSION}.src
diff --git a/devel/llvm38/Makefile b/devel/llvm38/Makefile
index b68de3d1649b..8e4b297dfea0 100644
--- a/devel/llvm38/Makefile
+++ b/devel/llvm38/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	llvm
 DISTVERSION=	3.8.1
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	devel lang
 MASTER_SITES=	http://llvm.org/${PRE_}releases/${LLVM_RELEASE}/${RCDIR}
 DISTNAME=	${PORTNAME}-${DISTVERSION}.src
diff --git a/devel/llvm39/Makefile b/devel/llvm39/Makefile
index a4a07ecd8de1..a1e8a7bd12c4 100644
--- a/devel/llvm39/Makefile
+++ b/devel/llvm39/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	llvm
 DISTVERSION=	3.9.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	devel lang
 MASTER_SITES=	http://llvm.org/${PRE_}releases/${LLVM_RELEASE}/${RCDIR}
 PKGNAMESUFFIX=	${LLVM_SUFFIX}
diff --git a/devel/llvm40/Makefile b/devel/llvm40/Makefile
index 3ff0e3182152..ceafe1093c9f 100644
--- a/devel/llvm40/Makefile
+++ b/devel/llvm40/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	llvm
 DISTVERSION=	4.0.1
+PORTREVISION=	1
 CATEGORIES=	devel lang
 MASTER_SITES=	http://llvm.org/${PRE_}releases/${LLVM_RELEASE}/${RCDIR}
 PKGNAMESUFFIX=	${LLVM_SUFFIX}
diff --git a/devel/llvm50/Makefile b/devel/llvm50/Makefile
new file mode 100644
index 000000000000..d42f7887b63e
--- /dev/null
+++ b/devel/llvm50/Makefile
@@ -0,0 +1,540 @@
+# $FreeBSD$
+
+PORTNAME=	llvm
+DISTVERSION=	5.0.0
+CATEGORIES=	devel lang
+MASTER_SITES=	http://llvm.org/${PRE_}releases/${LLVM_RELEASE}/${RCDIR}
+PKGNAMESUFFIX=	${LLVM_SUFFIX}
+DISTNAME=	${PORTNAME}-${DISTVERSION}.src
+DISTFILES=	${PORTNAME}-${DISTVERSION}.src${EXTRACT_SUFX}
+
+MAINTAINER=	brooks@FreeBSD.org
+COMMENT=	LLVM and Clang
+
+LICENSE=	LLVM
+LICENSE_NAME=	LLVM Release License
+LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+
+LLVM_RELEASE=	${DISTVERSION:C/rc.*//}
+LLVM_MAJOR=	${LLVM_RELEASE:C/\.[0-9]$//}
+LLVM_LIB_VER=	${LLVM_MAJOR:C/\.//}
+RCDIR=		${DISTVERSION:S/${LLVM_RELEASE}//:C|(rc.*)|\1/|}
+PRE_=		${DISTVERSION:C/.*rc.*/pre-/:N*[0-9]*}
+LLVM_SUFFIX=	${LLVM_LIB_VER}
+
+LLVM_PREFIX=	${PREFIX}/llvm${LLVM_SUFFIX}
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX}
+DATADIR=	${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX}
+
+USES=		cmake:outsource compiler:c++11-lib libedit perl5 tar:xz \
+		shebangfix
+_USES_PYTHON?=	python:build
+USES+=		${_USES_PYTHON}
+USE_LDCONFIG=	${LLVM_PREFIX}/lib
+SHEBANG_FILES=	utils/lit/lit.py utils/llvm-lit/llvm-lit.in
+
+SUB_FILES=	llvm-wrapper.sh
+SUB_LIST=	LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${LLVM_SUFFIX}"
+
+CMAKE_INSTALL_PREFIX=	${LLVM_PREFIX}
+CMAKE_ARGS=	-DLLVM_BUILD_LLVM_DYLIB=ON
+# Following commit https://github.com/kitware/cmake/commit/956054
+# we need to either change the whole man-shuffle below, or simply
+# redefine CMAKE_INSTALL_MANDIR
+CMAKE_ARGS+=	-DCMAKE_INSTALL_MANDIR:PATH="share/man"
+
+OPTIONS_DEFINE=	CLANG DOCS EXTRAS LIT LLD LLDB
+OPTIONS_DEFINE_amd64=	COMPILER_RT GOLD OPENMP
+OPTIONS_DEFINE_i386=	COMPILER_RT
+OPTIONS_DEFAULT=	CLANG EXTRAS LIT LLD LLDB
+OPTIONS_DEFAULT_amd64=	COMPILER_RT GOLD OPENMP
+OPTIONS_DEFAULT_i386=	COMPILER_RT
+OPTIONS_SUB=	yes
+
+CLANG_DESC=	Build clang
+CLANG_EXTRA_PATCHES= \
+	${PATCHDIR}/clang-patch-fformat_extensions.diff \
+	${PATCHDIR}/clang-patch-fopenmp.diff \
+	${PATCHDIR}/clang-patch-tools_clang_lib_Headers_CMakeLists.txt \
+	${PATCHDIR}/clang-patch-tools_clang_tools_clang-format_clang-format.py \
+	${PATCHDIR}/clang-patch-tools_clang_tools_scan-build_libexec_ccc-analyzer
+CLANG_CONFLICTS_INSTALL=	clang-devel-3.[1234567]*
+CLANG_DISTFILES=	cfe-${DISTVERSION}.src${EXTRACT_SUFX}
+CLANG_CMAKE_ON=		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
+CLANG_PORTDOCS=		clang
+CLANG_USE=		GNOME=libxml2
+COMPILER_RT_DESC=	Sanitizer libraries
+COMPILER_RT_DISTFILES=	compiler-rt-${DISTVERSION}.src${EXTRACT_SUFX}
+COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|}
+DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
+DOCS_PORTDOCS=		llvm
+DOCS_CMAKE_ON=		-DLLVM_ENABLE_SPHINX=ON \
+			-DSPHINX_WARNINGS_AS_ERRORS=OFF \
+			-DLLVM_BUILD_DOCS=ON
+DOCS_PLIST_FILES=	${MAN1SRCS:S|^|man/man1/|:S|.1$|${LLVM_SUFFIX}.1.gz|}
+EXTRAS_DESC=		Extra clang tools
+EXTRAS_IMPLIES=		CLANG
+EXTRAS_DISTFILES=	clang-tools-extra-${DISTVERSION}.src${EXTRACT_SUFX}
+GOLD_DESC=		Build the LLVM Gold plugin for LTO
+GOLD_CMAKE_ON=		-DLLVM_BINUTILS_INCDIR=${LOCALBASE}/include
+GOLD_BUILD_DEPENDS=	${LOCALBASE}/bin/ld.gold:devel/binutils
+LIT_DESC=		Install lit and FileCheck test tools
+LIT_VARS=		_USES_PYTHON=python
+LLD_DESC=		Install lld, the LLVM linker
+LLD_DISTFILES=		lld-${DISTVERSION}.src${EXTRACT_SUFX}
+LLDB_BUILD_DEPENDS=	swig3.0:devel/swig30
+LLDB_DESC=		Install lldb, the LLVM debugger
+LLDB_DISTFILES=		lldb-${DISTVERSION}.src${EXTRACT_SUFX}
+LLDB_IMPLIES=		CLANG
+LLDB_USES=		execinfo
+LLDB_VARS=		_USES_PYTHON=python
+OPENMP_DESC=		Install libomp, the LLVM OpenMP runtime library
+OPENMP_DISTFILES=	openmp-${DISTVERSION}.src${EXTRACT_SUFX}
+OPENMP_EXTRA_PATCHES=	${PATCHDIR}/openmp-patch-bug32279
+
+.if defined(WITH_DEBUG)
+CMAKE_BUILD_TYPE=	RelWithDebInfo
+STRIP=
+.endif
+
+_CRTLIBDIR=	${LLVM_PREFIX:S|${PREFIX}/||}/lib/clang/${LLVM_RELEASE}/lib/freebsd
+
+# Emulate USE_GITHUB's ${WRKSRC_tag} to reduce diffs to ../llvm-devel
+.for option in CLANG COMPILER_RT EXTRAS LLD LLDB OPENMP
+WRKSRC_${option:tl}=		${WRKDIR}/${${option}_DISTFILES:S/${EXTRACT_SUFX}//}
+.endfor
+
+OPTIONS_SUB=	yes
+
+PLIST_SUB+=	LLVM_LIB_VER=${LLVM_LIB_VER} \
+		LLVM_MAJOR=${LLVM_MAJOR} \
+		LLVM_RELEASE=${LLVM_RELEASE} \
+		LLVM_SUFFIX=${LLVM_SUFFIX}
+
+COMMANDS=	bugpoint \
+		llc \
+		lli \
+		llvm-ar \
+		llvm-as \
+		llvm-bcanalyzer \
+		llvm-cat \
+		llvm-config \
+		llvm-cov \
+		llvm-cvtres \
+		llvm-diff \
+		llvm-dis \
+		llvm-dlltool \
+		llvm-dwarfdump \
+		llvm-dwp \
+		llvm-extract \
+		llvm-link \
+		llvm-mc \
+		llvm-mcmarkup \
+		llvm-modextract \
+		llvm-mt \
+		llvm-nm \
+		llvm-objdump \
+		llvm-opt-report \
+		llvm-pdbutil \
+		llvm-profdata \
+		llvm-ranlib \
+		llvm-readelf \
+		llvm-readobj \
+		llvm-rtdyld \
+		llvm-size \
+		llvm-split \
+		llvm-stress \
+		llvm-strings \
+		llvm-symbolizer \
+		llvm-tblgen \
+		macho-dump \
+		opt \
+		sancov
+FIRST_COMMAND=	${COMMANDS:C/^/XXXX/1:MXXXX*:C/^XXXX//}
+
+STRIP_LIBS=	BugpointPasses.so \
+		LLVMHello.so \
+		${LIBNAME}.0 \
+		libLTO.so
+
+EXTRAS_COMMANDS+= \
+		clang-apply-replacements \
+		clang-change-namespace \
+		clang-include-fixer \
+		clang-modernize \
+		clang-query \
+		clang-rename \
+		clang-reorder-fields \
+		clang-tidy \
+		find-all-symbols \
+		modularize
+EXTRAS_LIBS=	libclangApplyReplacements \
+		libclangChangeNamespace \
+		libclangIncludeFixer \
+		libclangMove \
+		libclangQuery \
+		libclangRename \
+		libclangReorderFields \
+		libclangTidy \
+		libclangTidyGoogleModule \
+		libclangTidyLLVMModule \
+		libclangTidyMiscModule \
+		libclangTidyReadabilityModule \
+		libclangTidyUtils \
+		libfindAllSymbols \
+		libmodernizeCore
+EXTRAS_PATTERN=	${EXTRAS_COMMANDS:tW:C/  */|/g}|${EXTRAS_LIBS:tW:C/  */|/g}
+
+.include <bsd.port.options.mk>
+
+# keep in sync with /usr/src/lib/clang/clang.build.mk
+CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/:C/armv6hf/armv6/}-portbld-${OPSYS:tl}${OSREL}
+
+.if ${PORT_OPTIONS:MCLANG}
+COMMANDS+=	c-index-test \
+		clang \
+		clangd \
+		clang++ \
+		clang-check \
+		clang-cpp \
+		clang-format \
+		clang-import-test \
+		clang-offload-bundler \
+		scan-build \
+		scan-view
+MAN1SRCS+=	clang.1 \
+		scan-build.1
+CLANG_PATTERN=	(c-index-test|clang|scan-|Reporter.py|ScanView.py|scanview.css|sorttable.js|startfile.py|-analyzer)
+SHEBANG_FILES+=	tools/clang/tools/scan-view/bin/scan-view \
+		tools/clang/tools/clang-format/git-clang-format \
+		tools/clang/tools/clang-format/clang-format-diff.py
+.endif
+
+.if ${PORT_OPTIONS:MCOMPILER_RT}
+COMPILER_RT_PATTERN=	(asan_blacklist.txt|sanitizer|xray_interface.h)
+.endif
+
+.if ${PORT_OPTIONS:MLIT}
+MAN1SRCS+=	lit.1 FileCheck.1
+LIT_COMMANDS=	lit llvm-lit FileCheck
+.endif
+
+.if ${PORT_OPTIONS:MLLDB}
+COMMANDS+=	lldb \
+		lldb-argdumper \
+		lldb-mi \
+		lldb-server
+.endif
+
+.if ! ${OPTIONS_DEFINE:MCOMPILER_RT}
+# Hack to disable COMPILER_RT in plist of unsupported architectures
+PLIST_SUB+=	COMPILER_RT="@comment "
+.else
+.endif
+
+.if ! ${OPTIONS_DEFINE:MGOLD}
+# Hack to disable GOLD in plist of unsupported architectures
+PLIST_SUB+=	GOLD="@comment "
+.else
+.endif
+
+.if ! ${OPTIONS_DEFINE:MOPENMP}
+# Hack to disable OPENMP in plist of unsupported architectures
+PLIST_SUB+=	OPENMP="@comment "
+.else
+.endif
+
+MAN1SRCS+=	bugpoint.1 llc.1 lli.1 llvm-ar.1 llvm-as.1 \
+		llvm-bcanalyzer.1 llvm-build.1 llvm-config.1 llvm-cov.1 \
+		llvm-diff.1 llvm-dis.1 llvm-dwarfdump.1 \
+		llvm-extract.1 llvm-lib.1 llvm-link.1 llvm-nm.1 \
+		llvm-profdata.1 llvm-readobj.1 llvm-stress.1 llvm-symbolizer.1 \
+		opt.1 tblgen.1
+
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "amd64"
+_COMPILER_RT_LIBS= \
+	libclang_rt.asan-preinit-x86_64.a \
+	libclang_rt.asan-x86_64.a \
+	libclang_rt.asan-x86_64.a.syms \
+	libclang_rt.asan-x86_64.so \
+	libclang_rt.asan_cxx-x86_64.a \
+	libclang_rt.asan_cxx-x86_64.a.syms \
+	libclang_rt.builtins-x86_64.a \
+	libclang_rt.dd-x86_64.a \
+	libclang_rt.dyndd-x86_64.so \
+	libclang_rt.lsan-x86_64.a \
+	libclang_rt.profile-x86_64.a \
+	libclang_rt.safestack-x86_64.a \
+	libclang_rt.stats-x86_64.a \
+	libclang_rt.stats_client-x86_64.a \
+	libclang_rt.tsan-x86_64.a \
+	libclang_rt.tsan-x86_64.a.syms \
+	libclang_rt.tsan_cxx-x86_64.a \
+	libclang_rt.tsan_cxx-x86_64.a.syms \
+	libclang_rt.ubsan_standalone-x86_64.a \
+	libclang_rt.ubsan_standalone-x86_64.a.syms \
+	libclang_rt.ubsan_standalone-x86_64.so \
+	libclang_rt.ubsan_standalone_cxx-x86_64.a \
+	libclang_rt.ubsan_standalone_cxx-x86_64.a.syms \
+	libclang_rt.ubsan_standalone_cxx-x86_64.so
+.endif
+.if ${ARCH} == "i386"
+_COMPILER_RT_LIBS+= \
+	libclang_rt.asan-i386.a \
+	libclang_rt.asan-i386.so \
+	libclang_rt.asan-preinit-i386.a \
+	libclang_rt.asan_cxx-i386.a \
+	libclang_rt.builtins-i386.a \
+	libclang_rt.lsan-i386.a \
+	libclang_rt.profile-i386.a \
+	libclang_rt.safestack-i386.a \
+	libclang_rt.stats-i386.a \
+	libclang_rt.stats_client-i386.a \
+	libclang_rt.ubsan_standalone-i386.a \
+	libclang_rt.ubsan_standalone-i386.so \
+	libclang_rt.ubsan_standalone_cxx-i386.a \
+	libclang_rt.ubsan_standalone_cxx-i386.so
+.endif
+
+.if ${PORT_OPTIONS:MEXTRAS}
+COMMANDS+=	${EXTRAS_COMMANDS}
+MAN1SRCS+=	extraclangtools.1
+PORTDOCS+=	clang-tools
+SHEBANG_FILES+=	tools/clang/tools/extra/clang-tidy/tool/clang-tidy-diff.py \
+		tools/clang/tools/extra/clang-tidy/tool/run-clang-tidy.py \
+		tools/clang/tools/extra/include-fixer/find-all-symbols/tool/run-find-all-symbols.py
+.endif
+
+.if ${PORT_OPTIONS:MLLD}
+COMMANDS+=	lld \
+		lld-link
+PORTDOCS+=	lld
+.endif
+
+.if ${OPSYS} == "FreeBSD" && ${COMPILER_TYPE} != clang
+CXXFLAGS+=	-D_GLIBCXX_USE_C99
+.endif
+
+.if ${ARCH} == "armv6"
+BUILD_DEPENDS+=	${LOCALBASE}/bin/ld:devel/binutils
+CONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
+MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
+.endif
+
+.if ${PYTHON_REL} < 3400
+LLDB_BUILD_DEPENDS+= \
+	${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34
+.endif
+
+post-extract-CLANG-on:
+	${MV} ${WRKSRC_clang} ${PATCH_WRKSRC}/tools/clang
+
+post-extract-EXTRAS-on:
+	${MV} ${WRKSRC_extras} ${PATCH_WRKSRC}/tools/clang/tools/extra
+
+post-extract-LLD-on:
+	${MV} ${WRKSRC_lld} ${PATCH_WRKSRC}/tools/lld
+
+post-extract-LLDB-on:
+	${MV} ${WRKSRC_lldb} ${PATCH_WRKSRC}/tools/lldb
+
+post-extract-OPENMP-on:
+	${MV} ${WRKSRC_openmp} ${PATCH_WRKSRC}/tools/openmp
+
+post-patch:
+	${REINPLACE_CMD} -e 's|import lit|import lit${LLVM_SUFFIX}|' \
+	    -e 's|from lit|from lit${LLVM_SUFFIX}|' \
+	    -e 's|lit\.|lit${LLVM_SUFFIX}.|' \
+	    ${WRKSRC}/utils/lit/lit.py ${WRKSRC}/utils/lit/lit/*.py \
+	    ${WRKSRC}/utils/lit/lit/formats/*.py
+	${REINPLACE_CMD} -e 's,/usr/local/,${LOCALBASE}/,' \
+	    ${WRKSRC}/CMakeLists.txt
+
+post-patch-CLANG-on:
+	${REINPLACE_CMD} -e 's|%%LLVM_PREFIX%%|${LLVM_PREFIX}|' \
+	    ${PATCH_WRKSRC}/tools/clang/lib/Driver/ToolChains/CommonArgs.cpp
+
+post-build-COMPILER_RT-on:
+	${MKDIR} ${WRKDIR}/compiler-rt-build
+	cd ${WRKDIR}/compiler-rt-build && \
+	${CMAKE_BIN} ${CMAKE_ARGS} \
+	    -DLLVM_CONFIG_PATH=${CONFIGURE_WRKSRC}/bin/llvm-config \
+	    ${WRKSRC_compiler_rt} && \
+	${MAKE_ENV} ${MAKE_CMD}
+
+post-install:
+	${RM} -r ${STAGEDIR}${LLVM_PREFIX}/include/llvm/MC/MCAnalysis
+	${INSTALL_SCRIPT} ${WRKDIR}/llvm-wrapper.sh \
+	    ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX}
+.for command in ${COMMANDS:C/^/XXXX/1:NXXXX*}
+	${LN} -f ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX} \
+	    ${STAGEDIR}${PREFIX}/bin/${command}${LLVM_SUFFIX}
+.endfor
+
+post-install-DOCS-on:
+	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/doc ${STAGEDIR}${DOCSDIR}
+.for _man in ${MAN1SRCS}
+	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/${_man} \
+	    ${STAGEDIR}${MANPREFIX}/man/man1/${_man:R}${LLVM_SUFFIX}.1
+.endfor
+.if ! ${PORT_OPTIONS:MLIT}
+	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/lit.1
+	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/FileCheck.1
+.endif
+	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/
+	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/
+
+.if ${PORT_OPTIONS:MCLANG}
+post-install-DOCS-off:
+	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/scan-build.1
+	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/
+	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/
+.endif
+
+post-install-LLDB-on:
+	${RM} ${STAGEDIR}${LLVM_PREFIX}/lib/python*/site-packages/lib
+	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/lldb/Host/windows/getopt
+	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/lldb/Host/mingw
+	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/lldb/Host/msvc
+
+post-install-CLANG-on:
+	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/clang \
+	   ${STAGEDIR}${LLVM_PREFIX}/bin/clang-cpp
+	${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/clang-tblgen \
+	    ${STAGEDIR}${LLVM_PREFIX}/bin/
+
+post-install-COMPILER_RT-on:
+	cd ${WRKDIR}/compiler-rt-build && \
+	    ${MAKE_ENV} ${MAKE_CMD} ${INSTALL_TARGET}
+.if ${ARCH} == "amd64"
+	${RM} ${STAGEDIR}${LLVM_PREFIX}/lib/freebsd/libclang_rt*i386*
+.endif
+	${MKDIR} ${STAGEDIR}${PREFIX}/${_CRTLIBDIR}
+	${MV} ${STAGEDIR}${LLVM_PREFIX}/lib/freebsd/* \
+	    ${STAGEDIR}${PREFIX}/${_CRTLIBDIR}
+	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/lib/freebsd
+
+post-install-LIT-on:
+	${INSTALL_SCRIPT} ${PATCH_WRKSRC}/utils/lit/lit.py \
+	    ${STAGEDIR}${LLVM_PREFIX}/bin/lit
+	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \
+	    ${STAGEDIR}${LLVM_PREFIX}/bin/llvm-lit
+	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \
+	    ${STAGEDIR}${PREFIX}/bin/lit${LLVM_SUFFIX}
+	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \
+	    ${STAGEDIR}${PREFIX}/bin/llvm-lit${LLVM_SUFFIX}
+	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}
+	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/formats
+	${INSTALL_DATA} ${WRKSRC}/utils/lit/lit/*.py \
+	    ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}
+	${INSTALL_DATA} ${WRKSRC}/utils/lit/lit/formats/*.py \
+			${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/formats
+	${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/FileCheck \
+	    ${STAGEDIR}${LLVM_PREFIX}/bin/
+	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/FileCheck \
+	    ${STAGEDIR}${PREFIX}/bin/FileCheck${LLVM_SUFFIX}
+
+TEST_CMD=	'(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ${MAKE_CMD} check-local-lit)'
+regression-test: ${BUILD_COOKIE}
+	if [ `${ID} -u` = 0 ]; then \
+		${CHOWN} -R nobody ${WRKSRC}/test; \
+		su -m nobody -c ${TEST_CMD}; \
+	else \
+		${SH} -c ${TEST_CMD}; \
+	fi
+
+build-plist:
+	${RM} ${PLIST} ${PLIST}.tmp
+	${ECHO_CMD} "@comment >>>>> GENERATED FILE, DO NOT EDIT <<<<<" >> ${PLIST}.tmp
+	${ECHO_CMD} "@comment Alter build-plist target and regenerate as required" >> ${PLIST}.tmp
+.for command in ${COMMANDS}
+	${ECHO_CMD} bin/${command}%%LLVM_SUFFIX%% >> ${PLIST}.tmp
+.endfor
+.for command in ${LIT_COMMANDS}
+	${ECHO_CMD} %%LIT%%bin/${command}%%LLVM_SUFFIX%% >> ${PLIST}.tmp
+	${ECHO_CMD} %%LIT%%${LLVM_PREFIX:S|${PREFIX}/||:C|${LLVM_SUFFIX}|%%LLVM_SUFFIX%%|}/bin/${command} >> ${PLIST}.tmp
+.endfor
+
+	${FIND} ${STAGEDIR}${LLVM_PREFIX} -type f -o -type l | \
+	    ${GREP} -v '[/-]lit$$' | ${GREP} -v 'FileCheck$$' | \
+	    ${GREP} -v man/man1 | ${SED} -e 's|${STAGEDIR}${PREFIX}/||' \
+	    -e 's|${LLVM_RELEASE}|%%LLVM_RELEASE%%|' \
+	    -e 's|release.cmake|%%CMAKE_BUILD_TYPE%%.cmake|' \
+	    -e 's|${LLVM_RELEASE:C/\./\\./g}|%%LLVM_RELEASE%%|' \
+	    -e 's|${LLVM_MAJOR:C/\./\\./}|%%LLVM_MAJOR%%|' \
+	    -e 's|${LLVM_MAJOR:C/\.//}|%%LLVM_LIB_VER%%|' \
+	    -e 's|${PYTHON_SITELIBDIR:C|${PREFIX}/||}|%%PYTHON_SITELIBDIR%%|' | \
+	    ${SORT} >> ${PLIST}.tmp
+	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/lit${LLVM_SUFFIX} -type f | \
+	    ${SED} -e 's|${STAGEDIR}${PYTHON_SITELIBDIR}|%%LIT%%%%PYTHON_SITELIBDIR%%|' \
+	    -e 's|${LLVM_RELEASE:C/\./\\./g}|%%LLVM_RELEASE%%|' \
+	    -e 's|${LLVM_MAJOR:C/\./\\./}|%%LLVM_MAJOR%%|' \
+	    -e 's|lit${LLVM_SUFFIX}|lit%%LLVM_SUFFIX%%|' | \
+	    ${SORT} >> ${PLIST}.tmp
+	${AWK} '{ \
+	    if ($$0 ~ /${CLANG_PATTERN}/ && $$0 !~ /(omp.h|${EXTRAS_PATTERN}|libclang_rt)/) {printf "%%%%CLANG%%%%"} \
+	    if ($$0 ~ /${COMPILER_RT_PATTERN}/) \
+		{printf "%%%%COMPILER_RT%%%%"} \
+	    if ($$0 ~ /(${EXTRAS_PATTERN})/) {printf "%%%%EXTRAS%%%%"} \
+	    if ($$0 ~ /lld/ && $$0 !~ /lldb/) {printf "%%%%LLD%%%%"} \
+	    if ($$0 ~ /(argdumper|lldb|six.py)/) {printf "%%%%LLDB%%%%"} \
+	    if ($$0 ~ /lib.*omp/) {printf "%%%%OPENMP%%%%"} \
+	    if ($$0 ~ /LLVMgold/) {printf "%%%%GOLD%%%%"} \
+	    if ($$0 !~ /libclang_rt/) {print}}' ${PLIST}.tmp >> ${PLIST}
+	${RM} ${PLIST}.tmp
+
+check-commands:
+.for command in ${COMMANDS}
+	test -e ${STAGEDIR}${LLVM_PREFIX}/bin/${command}
+.endfor
+
+.if make(svn-patch-llvm)
+.if !defined(PATCH_REV)
+.error svn-patch-llvm requires that PATCH_REV be set
+.endif
+_PATCH_FILE=${FILESDIR}/patch-svn-${PATCH_REV}
+_LLVM_BASE=http://llvm.org/svn/llvm-project/llvm/trunk
+svn-patch-llvm:
+	svn log -c ${PATCH_REV} ${_LLVM_BASE} >> ${_PATCH_FILE}
+	svn diff -c ${PATCH_REV} ${_LLVM_BASE} >> ${_PATCH_FILE}
+.endif
+
+.if make(svn-patch-clang)
+.if !defined(PATCH_REV)
+.error svn-patch-clang requires that PATCH_REV be set
+.endif
+_PATCH_FILE=${FILESDIR}/clang-patch-svn-${PATCH_REV}
+_LLVM_BASE=http://llvm.org/svn/llvm-project/cfe/trunk
+svn-patch-clang:
+	svn log -c ${PATCH_REV} ${_LLVM_BASE} >> ${_PATCH_FILE}
+	svn diff -c ${PATCH_REV} ${_LLVM_BASE} | \
+	    ${SED} -E -e 's;^(---|\+\+\+) ;\1 tools/clang/;' >> ${_PATCH_FILE}
+.endif
+
+.if make(svn-patch-compiler-rt)
+.if !defined(PATCH_REV)
+.error svn-patch-compiler-rt requires that PATCH_REV be set
+.endif
+_PATCH_FILE=${FILESDIR}/compiler-rt-patch-svn-${PATCH_REV}
+_LLVM_BASE=http://llvm.org/svn/llvm-project/compiler-rt/trunk
+svn-patch-compiler-rt:
+	svn log -c ${PATCH_REV} ${_LLVM_BASE} >> ${_PATCH_FILE}
+	svn diff -c ${PATCH_REV} ${_LLVM_BASE} | \
+	    ${SED} -E -e 's;^(---|\+\+\+) ;\1 tools/compiler-rt/;' >> ${_PATCH_FILE}
+.endif
+
+.if make(svn-patch-lldb)
+.if !defined(PATCH_REV)
+.error svn-patch-lldb requires that PATCH_REV be set
+.endif
+_PATCH_FILE=${FILESDIR}/lldb-patch-svn-${PATCH_REV}
+_LLVM_BASE=http://llvm.org/svn/llvm-project/lldb/trunk
+svn-patch-lldb:
+	svn log -c ${PATCH_REV} ${_LLVM_BASE} >> ${_PATCH_FILE}
+	svn diff -c ${PATCH_REV} ${_LLVM_BASE} | >> ${_PATCH_FILE}
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/llvm50/distinfo b/devel/llvm50/distinfo
new file mode 100644
index 000000000000..581882119fd1
--- /dev/null
+++ b/devel/llvm50/distinfo
@@ -0,0 +1,15 @@
+TIMESTAMP = 1505153164
+SHA256 (llvm-5.0.0.src.tar.xz) = e35dcbae6084adcf4abb32514127c5eabd7d63b733852ccdb31e06f1373136da
+SIZE (llvm-5.0.0.src.tar.xz) = 23411980
+SHA256 (cfe-5.0.0.src.tar.xz) = 019f23c2192df793ac746595e94a403908749f8e0c484b403476d2611dd20970
+SIZE (cfe-5.0.0.src.tar.xz) = 11437024
+SHA256 (compiler-rt-5.0.0.src.tar.xz) = d5ad5266462134a482b381f1f8115b6cad3473741b3bb7d1acc7f69fd0f0c0b3
+SIZE (compiler-rt-5.0.0.src.tar.xz) = 1507996
+SHA256 (clang-tools-extra-5.0.0.src.tar.xz) = 87d078b959c4a6e5ff9fd137c2f477cadb1245f93812512996f73986a6d973c6
+SIZE (clang-tools-extra-5.0.0.src.tar.xz) = 646416
+SHA256 (lld-5.0.0.src.tar.xz) = 399a7920a5278d42c46a7bf7e4191820ec2301457a7d0d4fcc9a4ac05dd53897
+SIZE (lld-5.0.0.src.tar.xz) = 668344
+SHA256 (lldb-5.0.0.src.tar.xz) = c0a0ca32105e9881d86b7ca886220147e686edc97fdb9f3657c6659dc6568b7d
+SIZE (lldb-5.0.0.src.tar.xz) = 19203772
+SHA256 (openmp-5.0.0.src.tar.xz) = c0ef081b05e0725a04e8711d9ecea2e90d6c3fbb1622845336d3d095d0a3f7c5
+SIZE (openmp-5.0.0.src.tar.xz) = 2074004
diff --git a/devel/llvm50/files/clang-patch-fformat_extensions.diff b/devel/llvm50/files/clang-patch-fformat_extensions.diff
new file mode 100644
index 000000000000..69093d923b6f
--- /dev/null
+++ b/devel/llvm50/files/clang-patch-fformat_extensions.diff
@@ -0,0 +1,44 @@
+diff -ruN tools/clang/include/clang/Basic/LangOptions.def tools/clang/include/clang/Basic/LangOptions.def
+--- tools/clang/include/clang/Basic/LangOptions.def	2015-07-30 22:47:41 UTC
++++ tools/clang/include/clang/Basic/LangOptions.def
+@@ -114,6 +114,7 @@
+ LANGOPT(RTTIData          , 1, 1, "emit run-time type information data")
+ LANGOPT(MSBitfields       , 1, 0, "Microsoft-compatible structure layout")
+ LANGOPT(Freestanding, 1, 0, "freestanding implementation")
++LANGOPT(FormatExtensions  , 1, 0, "FreeBSD format extensions")
+ LANGOPT(NoBuiltin         , 1, 0, "disable builtin functions")
+ LANGOPT(NoMathBuiltin     , 1, 0, "disable math builtin functions")
+ LANGOPT(GNUAsm            , 1, 1, "GNU-style inline assembly")
+diff -ruN tools/clang/include/clang/Driver/Options.td tools/clang/include/clang/Driver/Options.td
+--- tools/clang/include/clang/Driver/Options.td	2015-07-30 22:47:41 UTC
++++ tools/clang/include/clang/Driver/Options.td
+@@ -644,6 +644,8 @@
+ 
+ def ffreestanding : Flag<["-"], "ffreestanding">, Group<f_Group>, Flags<[CC1Option]>,
+   HelpText<"Assert that the compilation takes place in a freestanding environment">;
++def fformat_extensions: Flag<["-"], "fformat-extensions">, Group<f_Group>, Flags<[CC1Option]>,
++  HelpText<"Enable FreeBSD kernel specific format string extensions">;
+ def fgnu_keywords : Flag<["-"], "fgnu-keywords">, Group<f_Group>, Flags<[CC1Option]>,
+   HelpText<"Allow GNU-extension keywords regardless of language standard">;
+ def fgnu89_inline : Flag<["-"], "fgnu89-inline">, Group<f_Group>, Flags<[CC1Option]>,
+--- tools/clang/lib/Driver/ToolChains/Clang.cpp.orig	2017-09-14 19:36:28.212240000 +0100
++++ tools/clang/lib/Driver/ToolChains/Clang.cpp	2017-09-14 19:35:59.296165000 +0100
+@@ -3202,6 +3202,7 @@
+ 
+   // Forward -f (flag) options which we can pass directly.
+   Args.AddLastArg(CmdArgs, options::OPT_femit_all_decls);
++  Args.AddLastArg(CmdArgs, options::OPT_fformat_extensions);
+   Args.AddLastArg(CmdArgs, options::OPT_fheinous_gnu_extensions);
+   Args.AddLastArg(CmdArgs, options::OPT_fno_operator_names);
+   // Emulated TLS is enabled by default on Android and OpenBSD, and can be enabled
+diff -ruN tools/clang/lib/Frontend/CompilerInvocation.cpp tools/clang/lib/Frontend/CompilerInvocation.cpp
+--- tools/clang/lib/Frontend/CompilerInvocation.cpp	2015-07-30 22:47:41 UTC
++++ tools/clang/lib/Frontend/CompilerInvocation.cpp
+@@ -1543,6 +1543,7 @@
+   Opts.ShortWChar = Args.hasFlag(OPT_fshort_wchar, OPT_fno_short_wchar, false);
+   Opts.ShortEnums = Args.hasArg(OPT_fshort_enums);
+   Opts.Freestanding = Args.hasArg(OPT_ffreestanding);
++  Opts.FormatExtensions = Args.hasArg(OPT_fformat_extensions);
+   Opts.NoBuiltin = Args.hasArg(OPT_fno_builtin) || Opts.Freestanding;
+   Opts.NoMathBuiltin = Args.hasArg(OPT_fno_math_builtin);
+   Opts.AssumeSaneOperatorNew = !Args.hasArg(OPT_fno_assume_sane_operator_new);
diff --git a/devel/llvm50/files/clang-patch-fopenmp.diff b/devel/llvm50/files/clang-patch-fopenmp.diff
new file mode 100644
index 000000000000..18932bd0d19c
--- /dev/null
+++ b/devel/llvm50/files/clang-patch-fopenmp.diff
@@ -0,0 +1,14 @@
+--- tools/clang/lib/Driver/ToolChains/CommonArgs.cpp.orig	2017-05-10 17:18:56.000000000 +0000
++++ tools/clang/lib/Driver/ToolChains/CommonArgs.cpp	2017-05-10 23:01:17.087686000 +0000
+@@ -441,7 +441,10 @@
+ 
+   switch (TC.getDriver().getOpenMPRuntime(Args)) {
+   case Driver::OMPRT_OMP:
+-    CmdArgs.push_back("-lomp");
++    if (TC.getTriple().getOS() != llvm::Triple::FreeBSD || TC.isCrossCompiling() || !llvm::sys::fs::exists("%%LLVM_PREFIX%%/lib/libomp.so"))
++      CmdArgs.push_back("-lomp");
++    else
++      CmdArgs.push_back("%%LLVM_PREFIX%%/lib/libomp.so");
+     break;
+   case Driver::OMPRT_GOMP:
+     CmdArgs.push_back("-lgomp");
diff --git a/devel/llvm50/files/clang-patch-svn-r280672 b/devel/llvm50/files/clang-patch-svn-r280672
new file mode 100644
index 000000000000..0c6df7b175f0
--- /dev/null
+++ b/devel/llvm50/files/clang-patch-svn-r280672
@@ -0,0 +1,39 @@
+------------------------------------------------------------------------
+r280672 | ed | 2016-09-05 18:38:34 +0000 (Mon, 05 Sep 2016) | 6 lines
+
+Add support for targeting armv6-unknown-cloudabi-eabihf.
+
+I'm in the progress of adding ARMv6 support to CloudABI. On the compiler
+side, everything seems to work properly with this tiny change applied.
+
+
+------------------------------------------------------------------------
+Index: test/Preprocessor/init.c
+===================================================================
+--- tools/clang/test/Preprocessor/init.c	(revision 280671)
++++ tools/clang/test/Preprocessor/init.c	(revision 280672)
+@@ -1975,6 +1975,11 @@
+ // ARMEABIHARDFP:#define __arm 1
+ // ARMEABIHARDFP:#define __arm__ 1
+ 
++// RUN: %clang_cc1 -E -dM -ffreestanding -triple=armv6-unknown-cloudabi-eabihf < /dev/null | FileCheck -match-full-lines -check-prefix ARMV6-CLOUDABI %s
++//
++// ARMV6-CLOUDABI:#define __CloudABI__ 1
++// ARMV6-CLOUDABI:#define __arm__ 1
++
+ // RUN: %clang_cc1 -E -dM -ffreestanding -triple=arm-netbsd-eabi < /dev/null | FileCheck -match-full-lines -check-prefix ARM-NETBSD %s
+ //
+ // ARM-NETBSD-NOT:#define _LP64
+Index: lib/Basic/Targets.cpp
+===================================================================
+--- tools/clang/lib/Basic/Targets.cpp	(revision 280671)
++++ tools/clang/lib/Basic/Targets.cpp	(revision 280672)
+@@ -8261,6 +8261,8 @@
+       return new DarwinARMTargetInfo(Triple, Opts);
+ 
+     switch (os) {
++    case llvm::Triple::CloudABI:
++      return new CloudABITargetInfo<ARMleTargetInfo>(Triple, Opts);
+     case llvm::Triple::Linux:
+       return new LinuxTargetInfo<ARMleTargetInfo>(Triple, Opts);
+     case llvm::Triple::FreeBSD:
diff --git a/devel/llvm50/files/clang-patch-tools_clang_lib_Headers_CMakeLists.txt b/devel/llvm50/files/clang-patch-tools_clang_lib_Headers_CMakeLists.txt
new file mode 100644
index 000000000000..354bf18f34a2
--- /dev/null
+++ b/devel/llvm50/files/clang-patch-tools_clang_lib_Headers_CMakeLists.txt
@@ -0,0 +1,31 @@
+--- tools/clang/lib/Headers/CMakeLists.txt.orig	2017-05-25 14:44:11.000000000 +0100
++++ tools/clang/lib/Headers/CMakeLists.txt	2017-09-11 19:19:54.532997000 +0100
+@@ -45,7 +45,6 @@
+   intrin.h
+   inttypes.h
+   iso646.h
+-  limits.h
+   lwpintrin.h
+   lzcntintrin.h
+   mm3dnow.h
+@@ -65,20 +64,12 @@
+   s390intrin.h
+   shaintrin.h
+   smmintrin.h
+-  stdalign.h
+-  stdarg.h
+-  stdatomic.h
+-  stdbool.h
+-  stddef.h
+   __stddef_max_align_t.h
+-  stdint.h
+-  stdnoreturn.h
+   tbmintrin.h
+   tgmath.h
+   tmmintrin.h
+   unwind.h
+   vadefs.h
+-  varargs.h
+   vecintrin.h
+   wmmintrin.h
+   __wmmintrin_aes.h
diff --git a/devel/llvm50/files/clang-patch-tools_clang_tools_clang-format_clang-format.py b/devel/llvm50/files/clang-patch-tools_clang_tools_clang-format_clang-format.py
new file mode 100644
index 000000000000..9cf506dd1480
--- /dev/null
+++ b/devel/llvm50/files/clang-patch-tools_clang_tools_clang-format_clang-format.py
@@ -0,0 +1,11 @@
+--- tools/clang/tools/clang-format/clang-format.py.orig	2015-09-08 20:44:00 UTC
++++ tools/clang/tools/clang-format/clang-format.py
+@@ -34,7 +34,7 @@ import vim
+ 
+ # set g:clang_format_path to the path to clang-format if it is not on the path
+ # Change this to the full path if clang-format is not on the path.
+-binary = 'clang-format'
++binary = 'clang-format39'
+ if vim.eval('exists("g:clang_format_path")') == "1":
+   binary = vim.eval('g:clang_format_path')
+ 
diff --git a/devel/llvm50/files/clang-patch-tools_clang_tools_scan-build_libexec_ccc-analyzer b/devel/llvm50/files/clang-patch-tools_clang_tools_scan-build_libexec_ccc-analyzer
new file mode 100644
index 000000000000..e1c65480ce2f
--- /dev/null
+++ b/devel/llvm50/files/clang-patch-tools_clang_tools_scan-build_libexec_ccc-analyzer
@@ -0,0 +1,12 @@
+--- tools/clang/tools/scan-build/libexec/ccc-analyzer.orig
++++ tools/clang/tools/scan-build/libexec/ccc-analyzer
+@@ -81,6 +81,9 @@
+   if (-x "/usr/bin/xcrun") {
+     $UseXCRUN = 1;
+   }
++} elsif (`uname -s` eq "FreeBSD\n") {
++  $DefaultCCompiler = 'cc';
++  $DefaultCXXCompiler = 'c++';
+ } else {
+   $DefaultCCompiler = 'gcc';
+   $DefaultCXXCompiler = 'g++';
diff --git a/devel/llvm50/files/llvm-wrapper.sh.in b/devel/llvm50/files/llvm-wrapper.sh.in
new file mode 100644
index 000000000000..0a460f3156e5
--- /dev/null
+++ b/devel/llvm50/files/llvm-wrapper.sh.in
@@ -0,0 +1,10 @@
+#!/bin/sh
+# $FreeBSD$
+
+LLVM_PREFIX="%%LLVM_PREFIX%%"
+LLVM_SUFFIX="%%LLVM_SUFFIX%%"
+
+tool=$(basename $0)
+tool="${LLVM_PREFIX}/bin/${tool%${LLVM_SUFFIX}}"
+LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${LLVM_PREFIX}/lib" \
+    "${tool}" "${@}"
diff --git a/devel/llvm50/files/openmp-patch-bug32279 b/devel/llvm50/files/openmp-patch-bug32279
new file mode 100644
index 000000000000..0eddd83f523a
--- /dev/null
+++ b/devel/llvm50/files/openmp-patch-bug32279
@@ -0,0 +1,29 @@
+--- tools/openmp/runtime/cmake/LibompHandleFlags.cmake.orig	2017-03-16 15:50:48 UTC
++++ tools/openmp/runtime/cmake/LibompHandleFlags.cmake
+@@ -156,6 +156,11 @@ function(libomp_get_libflags libflags)
+   if(${IA32})
+     libomp_append(libflags_local -lirc_pic LIBOMP_HAVE_IRC_PIC_LIBRARY)
+   endif()
++  IF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
++    libomp_append(libflags_local "-Wl,--no-as-needed" LIBOMP_HAVE_AS_NEEDED_FLAG)
++    libomp_append(libflags_local "-lm")
++    libomp_append(libflags_local "-Wl,--as-needed" LIBOMP_HAVE_AS_NEEDED_FLAG)
++  ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+   IF(${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
+     libomp_append(libflags_local -lm)
+   ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
+ runtime/cmake/LibompHandleFlags.cmake | 5 +++++
+ runtime/cmake/LibompMicroTests.cmake  | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+--- tools/openmp/runtime/cmake/LibompMicroTests.cmake.orig	2017-03-16 15:50:48 UTC
++++ tools/openmp/runtime/cmake/LibompMicroTests.cmake
+@@ -171,7 +171,7 @@ add_custom_command(
+ add_custom_target(libomp-test-deps DEPENDS test-deps/.success)
+ set(libomp_expected_library_deps)
+ if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+-  set(libomp_expected_library_deps libc.so.7 libthr.so.3)
++  set(libomp_expected_library_deps libc.so.7 libthr.so.3 libm.so.5)
+   libomp_append(libomp_expected_library_deps libhwloc.so.5 LIBOMP_USE_HWLOC)
+ elseif(CMAKE_SYSTEM_NAME MATCHES "NetBSD")
+   set(libomp_expected_library_deps libc.so.12 libpthread.so.1 libm.so.0)
diff --git a/devel/llvm50/pkg-descr b/devel/llvm50/pkg-descr
new file mode 100644
index 000000000000..d252f07c6790
--- /dev/null
+++ b/devel/llvm50/pkg-descr
@@ -0,0 +1,8 @@
+The LLVM Project is a collection of modular and reusable compiler and
+toolchain technologies.
+
+This port includes Clang (a C/C++/Objective-C compiler), LLD (a linker),
+LLDB (a debugger), an OpenMP runtime library, and the LLVM infrastructure
+these are built on.
+
+WWW: http://llvm.org/
diff --git a/devel/llvm50/pkg-plist b/devel/llvm50/pkg-plist
new file mode 100644
index 000000000000..f5ea08262e9c
--- /dev/null
+++ b/devel/llvm50/pkg-plist
@@ -0,0 +1,2759 @@
+@comment >>>>> GENERATED FILE, DO NOT EDIT <<<<<
+@comment Alter build-plist target and regenerate as required
+bin/bugpoint%%LLVM_SUFFIX%%
+bin/llc%%LLVM_SUFFIX%%
+bin/lli%%LLVM_SUFFIX%%
+bin/llvm-ar%%LLVM_SUFFIX%%
+bin/llvm-as%%LLVM_SUFFIX%%
+bin/llvm-bcanalyzer%%LLVM_SUFFIX%%
+bin/llvm-cat%%LLVM_SUFFIX%%
+bin/llvm-config%%LLVM_SUFFIX%%
+bin/llvm-cov%%LLVM_SUFFIX%%
+bin/llvm-cvtres%%LLVM_SUFFIX%%
+bin/llvm-diff%%LLVM_SUFFIX%%
+bin/llvm-dis%%LLVM_SUFFIX%%
+bin/llvm-dlltool%%LLVM_SUFFIX%%
+bin/llvm-dwarfdump%%LLVM_SUFFIX%%
+bin/llvm-dwp%%LLVM_SUFFIX%%
+bin/llvm-extract%%LLVM_SUFFIX%%
+bin/llvm-link%%LLVM_SUFFIX%%
+bin/llvm-mc%%LLVM_SUFFIX%%
+bin/llvm-mcmarkup%%LLVM_SUFFIX%%
+bin/llvm-modextract%%LLVM_SUFFIX%%
+bin/llvm-mt%%LLVM_SUFFIX%%
+bin/llvm-nm%%LLVM_SUFFIX%%
+bin/llvm-objdump%%LLVM_SUFFIX%%
+bin/llvm-opt-report%%LLVM_SUFFIX%%
+bin/llvm-pdbutil%%LLVM_SUFFIX%%
+bin/llvm-profdata%%LLVM_SUFFIX%%
+bin/llvm-ranlib%%LLVM_SUFFIX%%
+bin/llvm-readelf%%LLVM_SUFFIX%%
+bin/llvm-readobj%%LLVM_SUFFIX%%
+bin/llvm-rtdyld%%LLVM_SUFFIX%%
+bin/llvm-size%%LLVM_SUFFIX%%
+bin/llvm-split%%LLVM_SUFFIX%%
+bin/llvm-stress%%LLVM_SUFFIX%%
+bin/llvm-strings%%LLVM_SUFFIX%%
+bin/llvm-symbolizer%%LLVM_SUFFIX%%
+bin/llvm-tblgen%%LLVM_SUFFIX%%
+bin/macho-dump%%LLVM_SUFFIX%%
+bin/opt%%LLVM_SUFFIX%%
+bin/sancov%%LLVM_SUFFIX%%
+%%CLANG%%bin/c-index-test%%LLVM_SUFFIX%%
+%%CLANG%%bin/clang%%LLVM_SUFFIX%%
+%%CLANG%%bin/clangd%%LLVM_SUFFIX%%
+%%CLANG%%bin/clang++%%LLVM_SUFFIX%%
+%%CLANG%%bin/clang-check%%LLVM_SUFFIX%%
+%%CLANG%%bin/clang-cpp%%LLVM_SUFFIX%%
+%%CLANG%%bin/clang-format%%LLVM_SUFFIX%%
+%%CLANG%%bin/clang-import-test%%LLVM_SUFFIX%%
+%%CLANG%%bin/clang-offload-bundler%%LLVM_SUFFIX%%
+%%CLANG%%bin/scan-build%%LLVM_SUFFIX%%
+%%CLANG%%bin/scan-view%%LLVM_SUFFIX%%
+%%LLDB%%bin/lldb%%LLVM_SUFFIX%%
+%%LLDB%%bin/lldb-argdumper%%LLVM_SUFFIX%%
+%%LLDB%%bin/lldb-mi%%LLVM_SUFFIX%%
+%%LLDB%%bin/lldb-server%%LLVM_SUFFIX%%
+%%EXTRAS%%bin/clang-apply-replacements%%LLVM_SUFFIX%%
+%%EXTRAS%%bin/clang-change-namespace%%LLVM_SUFFIX%%
+%%EXTRAS%%bin/clang-include-fixer%%LLVM_SUFFIX%%
+%%EXTRAS%%bin/clang-modernize%%LLVM_SUFFIX%%
+%%EXTRAS%%bin/clang-query%%LLVM_SUFFIX%%
+%%EXTRAS%%bin/clang-rename%%LLVM_SUFFIX%%
+%%EXTRAS%%bin/clang-reorder-fields%%LLVM_SUFFIX%%
+%%EXTRAS%%bin/clang-tidy%%LLVM_SUFFIX%%
+%%EXTRAS%%bin/find-all-symbols%%LLVM_SUFFIX%%
+%%EXTRAS%%bin/modularize%%LLVM_SUFFIX%%
+%%LLD%%bin/lld%%LLVM_SUFFIX%%
+%%LLD%%bin/lld-link%%LLVM_SUFFIX%%
+%%LIT%%bin/lit%%LLVM_SUFFIX%%
+%%LIT%%llvm%%LLVM_SUFFIX%%/bin/lit
+%%LIT%%bin/llvm-lit%%LLVM_SUFFIX%%
+%%LIT%%llvm%%LLVM_SUFFIX%%/bin/llvm-lit
+%%LIT%%bin/FileCheck%%LLVM_SUFFIX%%
+%%LIT%%llvm%%LLVM_SUFFIX%%/bin/FileCheck
+%%LLDB%%llvm%%LLVM_LIB_VER%%/%%PYTHON_SITELIBDIR%%/lldb/__init__.py
+%%LLDB%%llvm%%LLVM_LIB_VER%%/%%PYTHON_SITELIBDIR%%/lldb/_lldb.so
+%%LLDB%%llvm%%LLVM_LIB_VER%%/%%PYTHON_SITELIBDIR%%/lldb/embedded_interpreter.py
+%%LLDB%%llvm%%LLVM_LIB_VER%%/%%PYTHON_SITELIBDIR%%/lldb/formatters/Logger.py
+%%LLDB%%llvm%%LLVM_LIB_VER%%/%%PYTHON_SITELIBDIR%%/lldb/formatters/__init__.py
+%%LLDB%%llvm%%LLVM_LIB_VER%%/%%PYTHON_SITELIBDIR%%/lldb/formatters/attrib_fromdict.py
+%%LLDB%%llvm%%LLVM_LIB_VER%%/%%PYTHON_SITELIBDIR%%/lldb/formatters/cache.py
+%%LLDB%%llvm%%LLVM_LIB_VER%%/%%PYTHON_SITELIBDIR%%/lldb/formatters/cpp/__init__.py
+%%LLDB%%llvm%%LLVM_LIB_VER%%/%%PYTHON_SITELIBDIR%%/lldb/formatters/cpp/gnu_libstdcpp.py
+%%LLDB%%llvm%%LLVM_LIB_VER%%/%%PYTHON_SITELIBDIR%%/lldb/formatters/cpp/libcxx.py
+%%LLDB%%llvm%%LLVM_LIB_VER%%/%%PYTHON_SITELIBDIR%%/lldb/formatters/metrics.py
+%%LLDB%%llvm%%LLVM_LIB_VER%%/%%PYTHON_SITELIBDIR%%/lldb/formatters/synth.py
+%%LLDB%%llvm%%LLVM_LIB_VER%%/%%PYTHON_SITELIBDIR%%/lldb/lldb-argdumper
+%%LLDB%%llvm%%LLVM_LIB_VER%%/%%PYTHON_SITELIBDIR%%/lldb/runtime/__init__.py
+%%LLDB%%llvm%%LLVM_LIB_VER%%/%%PYTHON_SITELIBDIR%%/lldb/utils/__init__.py
+%%LLDB%%llvm%%LLVM_LIB_VER%%/%%PYTHON_SITELIBDIR%%/lldb/utils/symbolication.py
+%%LLDB%%llvm%%LLVM_LIB_VER%%/%%PYTHON_SITELIBDIR%%/six.py
+%%COMPILER_RT%%llvm%%LLVM_LIB_VER%%/asan_blacklist.txt
+llvm%%LLVM_LIB_VER%%/bin/bugpoint
+%%CLANG%%llvm%%LLVM_LIB_VER%%/bin/c-index-test
+%%CLANG%%llvm%%LLVM_LIB_VER%%/bin/clang
+%%CLANG%%llvm%%LLVM_LIB_VER%%/bin/clang++
+%%CLANG%%llvm%%LLVM_LIB_VER%%/bin/clang-%%LLVM_MAJOR%%
+%%EXTRAS%%llvm%%LLVM_LIB_VER%%/bin/clang-apply-replacements
+%%EXTRAS%%llvm%%LLVM_LIB_VER%%/bin/clang-change-namespace
+%%CLANG%%llvm%%LLVM_LIB_VER%%/bin/clang-check
+%%CLANG%%llvm%%LLVM_LIB_VER%%/bin/clang-cl
+%%CLANG%%llvm%%LLVM_LIB_VER%%/bin/clang-cpp
+%%CLANG%%llvm%%LLVM_LIB_VER%%/bin/clang-format
+%%CLANG%%llvm%%LLVM_LIB_VER%%/bin/clang-import-test
+%%EXTRAS%%llvm%%LLVM_LIB_VER%%/bin/clang-include-fixer
+%%CLANG%%llvm%%LLVM_LIB_VER%%/bin/clang-offload-bundler
+%%EXTRAS%%llvm%%LLVM_LIB_VER%%/bin/clang-query
+%%EXTRAS%%llvm%%LLVM_LIB_VER%%/bin/clang-rename
+%%EXTRAS%%llvm%%LLVM_LIB_VER%%/bin/clang-reorder-fields
+%%CLANG%%llvm%%LLVM_LIB_VER%%/bin/clang-tblgen
+%%EXTRAS%%llvm%%LLVM_LIB_VER%%/bin/clang-tidy
+%%CLANG%%llvm%%LLVM_LIB_VER%%/bin/clangd
+%%EXTRAS%%llvm%%LLVM_LIB_VER%%/bin/find-all-symbols
+%%CLANG%%llvm%%LLVM_LIB_VER%%/bin/git-clang-format
+%%LLD%%llvm%%LLVM_LIB_VER%%/bin/ld.lld
+llvm%%LLVM_LIB_VER%%/bin/llc
+%%LLD%%llvm%%LLVM_LIB_VER%%/bin/lld
+%%LLD%%llvm%%LLVM_LIB_VER%%/bin/lld-link
+%%LLDB%%llvm%%LLVM_LIB_VER%%/bin/lldb
+%%LLDB%%llvm%%LLVM_LIB_VER%%/bin/lldb-argdumper
+%%LLDB%%llvm%%LLVM_LIB_VER%%/bin/lldb-mi
+%%LLDB%%llvm%%LLVM_LIB_VER%%/bin/lldb-server
+llvm%%LLVM_LIB_VER%%/bin/lli
+llvm%%LLVM_LIB_VER%%/bin/llvm-ar
+llvm%%LLVM_LIB_VER%%/bin/llvm-as
+llvm%%LLVM_LIB_VER%%/bin/llvm-bcanalyzer
+llvm%%LLVM_LIB_VER%%/bin/llvm-c-test
+llvm%%LLVM_LIB_VER%%/bin/llvm-cat
+llvm%%LLVM_LIB_VER%%/bin/llvm-config
+llvm%%LLVM_LIB_VER%%/bin/llvm-cov
+llvm%%LLVM_LIB_VER%%/bin/llvm-cvtres
+llvm%%LLVM_LIB_VER%%/bin/llvm-cxxdump
+llvm%%LLVM_LIB_VER%%/bin/llvm-cxxfilt
+llvm%%LLVM_LIB_VER%%/bin/llvm-diff
+llvm%%LLVM_LIB_VER%%/bin/llvm-dis
+llvm%%LLVM_LIB_VER%%/bin/llvm-dlltool
+llvm%%LLVM_LIB_VER%%/bin/llvm-dsymutil
+llvm%%LLVM_LIB_VER%%/bin/llvm-dwarfdump
+llvm%%LLVM_LIB_VER%%/bin/llvm-dwp
+llvm%%LLVM_LIB_VER%%/bin/llvm-extract
+llvm%%LLVM_LIB_VER%%/bin/llvm-lib
+llvm%%LLVM_LIB_VER%%/bin/llvm-link
+llvm%%LLVM_LIB_VER%%/bin/llvm-lto
+llvm%%LLVM_LIB_VER%%/bin/llvm-lto2
+llvm%%LLVM_LIB_VER%%/bin/llvm-mc
+llvm%%LLVM_LIB_VER%%/bin/llvm-mcmarkup
+llvm%%LLVM_LIB_VER%%/bin/llvm-modextract
+llvm%%LLVM_LIB_VER%%/bin/llvm-mt
+llvm%%LLVM_LIB_VER%%/bin/llvm-nm
+llvm%%LLVM_LIB_VER%%/bin/llvm-objdump
+llvm%%LLVM_LIB_VER%%/bin/llvm-opt-report
+llvm%%LLVM_LIB_VER%%/bin/llvm-pdbutil
+llvm%%LLVM_LIB_VER%%/bin/llvm-profdata
+llvm%%LLVM_LIB_VER%%/bin/llvm-ranlib
+llvm%%LLVM_LIB_VER%%/bin/llvm-readelf
+llvm%%LLVM_LIB_VER%%/bin/llvm-readobj
+llvm%%LLVM_LIB_VER%%/bin/llvm-rtdyld
+llvm%%LLVM_LIB_VER%%/bin/llvm-size
+llvm%%LLVM_LIB_VER%%/bin/llvm-split
+llvm%%LLVM_LIB_VER%%/bin/llvm-stress
+llvm%%LLVM_LIB_VER%%/bin/llvm-strings
+llvm%%LLVM_LIB_VER%%/bin/llvm-symbolizer
+llvm%%LLVM_LIB_VER%%/bin/llvm-tblgen
+llvm%%LLVM_LIB_VER%%/bin/llvm-xray
+%%EXTRAS%%llvm%%LLVM_LIB_VER%%/bin/modularize
+llvm%%LLVM_LIB_VER%%/bin/obj2yaml
+llvm%%LLVM_LIB_VER%%/bin/opt
+llvm%%LLVM_LIB_VER%%/bin/sancov
+llvm%%LLVM_LIB_VER%%/bin/sanstats
+%%CLANG%%llvm%%LLVM_LIB_VER%%/bin/scan-build
+%%CLANG%%llvm%%LLVM_LIB_VER%%/bin/scan-view
+llvm%%LLVM_LIB_VER%%/bin/verify-uselistorder
+llvm%%LLVM_LIB_VER%%/bin/yaml2obj
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang-c/BuildSystem.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang-c/CXCompilationDatabase.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang-c/CXErrorCode.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang-c/CXString.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang-c/Documentation.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang-c/Index.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang-c/Platform.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/ARCMigrate/ARCMT.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/ARCMigrate/ARCMTActions.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/ARCMigrate/FileRemapper.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/APValue.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/AST.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/ASTConsumer.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/ASTContext.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/ASTDiagnostic.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/ASTFwd.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/ASTImporter.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/ASTLambda.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/ASTMutationListener.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/ASTStructuralEquivalence.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/ASTTypeTraits.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/ASTUnresolvedSet.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/ASTVector.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/Attr.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/AttrDump.inc
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/AttrImpl.inc
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/AttrIterator.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/AttrVisitor.inc
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/Attrs.inc
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/Availability.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/BaseSubobject.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/BuiltinTypes.def
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/CXXInheritance.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/CanonicalType.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/CharUnits.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/Comment.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/CommentBriefParser.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/CommentCommandInfo.inc
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/CommentCommandList.inc
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/CommentCommandTraits.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/CommentDiagnostic.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/CommentHTMLNamedCharacterReferences.inc
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/CommentHTMLTags.inc
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/CommentHTMLTagsProperties.inc
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/CommentLexer.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/CommentNodes.inc
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/CommentParser.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/CommentSema.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/CommentVisitor.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/Decl.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/DeclAccessPair.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/DeclBase.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/DeclCXX.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/DeclContextInternals.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/DeclFriend.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/DeclGroup.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/DeclLookups.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/DeclNodes.inc
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/DeclObjC.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/DeclOpenMP.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/DeclTemplate.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/DeclVisitor.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/DeclarationName.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/DependentDiagnostic.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/EvaluatedExprVisitor.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/Expr.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/ExprCXX.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/ExprObjC.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/ExprOpenMP.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/ExternalASTMerger.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/ExternalASTSource.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/GlobalDecl.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/LambdaCapture.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/LocInfoType.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/Mangle.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/MangleNumberingContext.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/NSAPI.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/NestedNameSpecifier.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/ODRHash.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/OpenMPClause.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/OperationKinds.def
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/OperationKinds.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/ParentMap.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/PrettyPrinter.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/RawCommentList.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/RecordLayout.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/RecursiveASTVisitor.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/Redeclarable.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/SelectorLocationsKind.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/Stmt.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/StmtCXX.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/StmtGraphTraits.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/StmtIterator.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/StmtNodes.inc
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/StmtObjC.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/StmtOpenMP.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/StmtVisitor.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/TemplateBase.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/TemplateName.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/Type.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/TypeLoc.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/TypeLocNodes.def
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/TypeLocVisitor.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/TypeNodes.def
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/TypeOrdering.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/TypeVisitor.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/UnresolvedSet.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/VTTBuilder.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/VTableBuilder.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/ASTMatchers/ASTMatchFinder.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/ASTMatchers/ASTMatchers.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/ASTMatchers/ASTMatchersInternal.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/ASTMatchers/ASTMatchersMacros.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/ASTMatchers/Dynamic/Diagnostics.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/ASTMatchers/Dynamic/Parser.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/ASTMatchers/Dynamic/Registry.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/ASTMatchers/Dynamic/VariantValue.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Analysis/Analyses/CFGReachabilityAnalysis.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Analysis/Analyses/Consumed.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Analysis/Analyses/Dominators.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Analysis/Analyses/FormatString.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Analysis/Analyses/LiveVariables.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Analysis/Analyses/OSLog.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Analysis/Analyses/PostOrderCFGView.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Analysis/Analyses/PseudoConstantAnalysis.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Analysis/Analyses/ReachableCode.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Analysis/Analyses/ThreadSafety.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Analysis/Analyses/ThreadSafetyCommon.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Analysis/Analyses/ThreadSafetyLogical.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Analysis/Analyses/ThreadSafetyOps.def
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Analysis/Analyses/ThreadSafetyTIL.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Analysis/Analyses/ThreadSafetyTraverse.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Analysis/Analyses/ThreadSafetyUtil.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Analysis/Analyses/UninitializedValues.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Analysis/AnalysisContext.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Analysis/AnalysisDiagnostic.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Analysis/CFG.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Analysis/CFGStmtMap.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Analysis/CallGraph.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Analysis/CloneDetection.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Analysis/CodeInjector.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Analysis/DomainSpecific/CocoaConventions.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Analysis/DomainSpecific/ObjCNoReturn.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Analysis/FlowSensitive/DataflowValues.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Analysis/ProgramPoint.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Analysis/Support/BumpVector.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/ABI.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/AddressSpaces.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/AllDiagnostics.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/AttrHasAttributeImpl.inc
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/AttrKinds.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/AttrList.inc
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/AttrSubMatchRulesList.inc
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/AttrSubjectMatchRules.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/Attributes.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/Builtins.def
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/Builtins.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/BuiltinsAArch64.def
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/BuiltinsAMDGPU.def
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/BuiltinsARM.def
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/BuiltinsHexagon.def
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/BuiltinsLe64.def
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/BuiltinsMips.def
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/BuiltinsNEON.def
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/BuiltinsNVPTX.def
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/BuiltinsNios2.def
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/BuiltinsPPC.def
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/BuiltinsSystemZ.def
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/BuiltinsWebAssembly.def
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/BuiltinsX86.def
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/BuiltinsX86_64.def
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/BuiltinsXCore.def
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/CapturedStmt.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/CharInfo.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/CommentOptions.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/Cuda.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/DebugInfoOptions.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/Diagnostic.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/DiagnosticASTKinds.inc
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/DiagnosticAnalysisKinds.inc
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/DiagnosticCategories.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/DiagnosticCommentKinds.inc
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/DiagnosticCommonKinds.inc
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/DiagnosticDriverKinds.inc
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/DiagnosticFrontendKinds.inc
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/DiagnosticGroups.inc
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/DiagnosticIDs.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/DiagnosticIndexName.inc
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/DiagnosticLexKinds.inc
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/DiagnosticOptions.def
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/DiagnosticOptions.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/DiagnosticParseKinds.inc
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/DiagnosticSemaKinds.inc
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/DiagnosticSerializationKinds.inc
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/ExceptionSpecificationType.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/ExpressionTraits.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/FileManager.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/FileSystemOptions.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/FileSystemStatCache.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/IdentifierTable.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/LLVM.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/Lambda.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/LangOptions.def
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/LangOptions.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/Linkage.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/MacroBuilder.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/MemoryBufferCache.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/Module.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/ObjCRuntime.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/OpenCLExtensions.def
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/OpenCLImageTypes.def
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/OpenCLOptions.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/OpenMPKinds.def
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/OpenMPKinds.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/OperatorKinds.def
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/OperatorKinds.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/OperatorPrecedence.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/PartialDiagnostic.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/PlistSupport.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/PragmaKinds.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/PrettyStackTrace.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/SanitizerBlacklist.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/Sanitizers.def
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/Sanitizers.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/SourceLocation.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/SourceManager.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/SourceManagerInternals.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/Specifiers.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/TargetBuiltins.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/TargetCXXABI.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/TargetInfo.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/TargetOptions.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/TemplateKinds.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/TokenKinds.def
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/TokenKinds.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/TypeTraits.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/Version.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/Version.inc
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/VersionTuple.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/VirtualFileSystem.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/Visibility.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/XRayLists.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/arm_neon.inc
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/CodeGen/BackendUtil.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/CodeGen/CGFunctionInfo.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/CodeGen/CodeGenABITypes.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/CodeGen/CodeGenAction.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/CodeGen/ConstantInitBuilder.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/CodeGen/ConstantInitFuture.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/CodeGen/ModuleBuilder.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/CodeGen/ObjectFilePCHContainerOperations.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/CodeGen/SwiftCallingConv.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Config/config.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Driver/Action.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Driver/Compilation.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Driver/Distro.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Driver/Driver.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Driver/DriverDiagnostic.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Driver/Job.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Driver/Multilib.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Driver/Options.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Driver/Options.inc
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Driver/Phases.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Driver/SanitizerArgs.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Driver/Tool.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Driver/ToolChain.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Driver/Types.def
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Driver/Types.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Driver/Util.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Driver/XRayArgs.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Edit/Commit.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Edit/EditedSource.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Edit/EditsReceiver.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Edit/FileOffset.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Edit/Rewriters.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Format/Format.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Frontend/ASTConsumers.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Frontend/ASTUnit.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Frontend/ChainedDiagnosticConsumer.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Frontend/CodeGenOptions.def
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Frontend/CodeGenOptions.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Frontend/CommandLineSourceLoc.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Frontend/CompilerInstance.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Frontend/CompilerInvocation.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Frontend/DependencyOutputOptions.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Frontend/DiagnosticRenderer.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Frontend/FrontendAction.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Frontend/FrontendActions.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Frontend/FrontendDiagnostic.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Frontend/FrontendOptions.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Frontend/FrontendPluginRegistry.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Frontend/LangStandard.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Frontend/LangStandards.def
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Frontend/LayoutOverrideSource.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Frontend/LogDiagnosticPrinter.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Frontend/MigratorOptions.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Frontend/MultiplexConsumer.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Frontend/PCHContainerOperations.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Frontend/PrecompiledPreamble.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Frontend/PreprocessorOutputOptions.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Frontend/SerializedDiagnosticPrinter.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Frontend/SerializedDiagnosticReader.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Frontend/SerializedDiagnostics.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Frontend/TextDiagnostic.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Frontend/TextDiagnosticBuffer.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Frontend/TextDiagnosticPrinter.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Frontend/Utils.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Frontend/VerifyDiagnosticConsumer.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/FrontendTool/Utils.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Index/CodegenNameGenerator.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Index/CommentToXML.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Index/IndexDataConsumer.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Index/IndexSymbol.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Index/IndexingAction.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Index/USRGeneration.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Lex/CodeCompletionHandler.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Lex/DirectoryLookup.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Lex/ExternalPreprocessorSource.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Lex/HeaderMap.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Lex/HeaderMapTypes.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Lex/HeaderSearch.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Lex/HeaderSearchOptions.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Lex/LexDiagnostic.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Lex/Lexer.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Lex/LiteralSupport.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Lex/MacroArgs.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Lex/MacroInfo.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Lex/ModuleLoader.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Lex/ModuleMap.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Lex/MultipleIncludeOpt.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Lex/PPCallbacks.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Lex/PPConditionalDirectiveRecord.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Lex/PTHLexer.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Lex/PTHManager.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Lex/Pragma.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Lex/PreprocessingRecord.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Lex/Preprocessor.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Lex/PreprocessorLexer.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Lex/PreprocessorOptions.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Lex/ScratchBuffer.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Lex/Token.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Lex/TokenConcatenation.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Lex/TokenLexer.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Parse/AttrParserStringSwitches.inc
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Parse/AttrSubMatchRulesParserStringSwitches.inc
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Parse/ParseAST.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Parse/ParseDiagnostic.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Parse/Parser.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Parse/RAIIObjectsForParser.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Rewrite/Core/DeltaTree.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Rewrite/Core/HTMLRewrite.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Rewrite/Core/RewriteBuffer.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Rewrite/Core/RewriteRope.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Rewrite/Core/Rewriter.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Rewrite/Core/TokenRewriter.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Rewrite/Frontend/ASTConsumers.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Rewrite/Frontend/FixItRewriter.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Rewrite/Frontend/FrontendActions.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Rewrite/Frontend/Rewriters.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Sema/AnalysisBasedWarnings.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Sema/AttrParsedAttrImpl.inc
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Sema/AttrParsedAttrKinds.inc
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Sema/AttrParsedAttrList.inc
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Sema/AttrSpellingListIndex.inc
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Sema/AttrTemplateInstantiate.inc
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Sema/AttributeList.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Sema/CXXFieldCollector.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Sema/CleanupInfo.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Sema/CodeCompleteConsumer.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Sema/CodeCompleteOptions.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Sema/DeclSpec.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Sema/DelayedDiagnostic.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Sema/Designator.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Sema/ExternalSemaSource.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Sema/IdentifierResolver.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Sema/Initialization.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Sema/Lookup.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Sema/LoopHint.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Sema/MultiplexExternalSemaSource.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Sema/ObjCMethodList.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Sema/Overload.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Sema/Ownership.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Sema/ParsedTemplate.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Sema/PrettyDeclStackTrace.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Sema/Scope.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Sema/ScopeInfo.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Sema/Sema.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Sema/SemaConsumer.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Sema/SemaDiagnostic.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Sema/SemaFixItUtils.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Sema/SemaInternal.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Sema/SemaLambda.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Sema/Template.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Sema/TemplateDeduction.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Sema/TypoCorrection.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Sema/Weak.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Serialization/ASTBitCodes.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Serialization/ASTDeserializationListener.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Serialization/ASTReader.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Serialization/ASTWriter.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Serialization/AttrPCHRead.inc
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Serialization/AttrPCHWrite.inc
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Serialization/ContinuousRangeMap.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Serialization/GlobalModuleIndex.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Serialization/Module.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Serialization/ModuleFileExtension.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Serialization/ModuleManager.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Serialization/SerializationDiagnostic.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Checkers/Checkers.inc
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Checkers/ClangCheckers.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Checkers/LocalCheckers.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Checkers/MPIFunctionClassifier.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Checkers/ObjCRetainCount.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Checkers/SValExplainer.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/Analyses.def
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/AnalyzerOptions.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/BugReporter/BugReporter.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/BugReporter/BugReporterVisitor.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/BugReporter/BugType.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/BugReporter/CommonBugCategories.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/BugReporter/PathDiagnostic.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/Checker.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/CheckerManager.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/CheckerOptInfo.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/CheckerRegistry.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/IssueHash.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/PathDiagnosticConsumers.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/PathSensitive/APSIntType.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/PathSensitive/AnalysisManager.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/PathSensitive/BasicValueFactory.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/PathSensitive/BlockCounter.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/PathSensitive/CallEvent.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/PathSensitive/CheckerContext.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/PathSensitive/CheckerHelpers.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/PathSensitive/ConstraintManager.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/PathSensitive/CoreEngine.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/PathSensitive/DynamicTypeInfo.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/PathSensitive/DynamicTypeMap.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/PathSensitive/Environment.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/PathSensitive/ExplodedGraph.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/PathSensitive/ExprEngine.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/PathSensitive/FunctionSummary.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/PathSensitive/LoopWidening.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/PathSensitive/MemRegion.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramStateTrait.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState_Fwd.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/PathSensitive/Regions.def
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/PathSensitive/SValBuilder.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/PathSensitive/SValVisitor.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/PathSensitive/SVals.def
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/PathSensitive/SVals.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/PathSensitive/SimpleConstraintManager.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/PathSensitive/Store.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/PathSensitive/StoreRef.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/PathSensitive/SubEngine.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/PathSensitive/SummaryManager.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/PathSensitive/SymExpr.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/PathSensitive/SymbolManager.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/PathSensitive/Symbols.def
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/PathSensitive/TaintManager.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/PathSensitive/TaintTag.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/PathSensitive/WorkList.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Frontend/AnalysisConsumer.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Frontend/CheckerRegistration.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Frontend/FrontendActions.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Frontend/ModelConsumer.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/ArgumentsAdjusters.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/CommonOptionsParser.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/CompilationDatabase.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/CompilationDatabasePluginRegistry.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/Core/Diagnostic.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/Core/Lookup.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/Core/QualTypeNames.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/Core/Replacement.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/DiagnosticsYaml.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/FileMatchTrie.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/FixIt.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/JSONCompilationDatabase.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/Refactoring.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/Refactoring/AtomicChange.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/Refactoring/RecursiveSymbolVisitor.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/Refactoring/Rename/RenamingAction.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/Refactoring/Rename/USRFinder.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/Refactoring/Rename/USRFindingAction.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/Refactoring/Rename/USRLocFinder.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/RefactoringCallbacks.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/ReplacementsYaml.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/Tooling.h
+%%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Config/Version.h
+%%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Core/AbsoluteAtom.h
+%%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Core/ArchiveLibraryFile.h
+%%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Core/Atom.h
+%%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Core/DefinedAtom.h
+%%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Core/Error.h
+%%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Core/File.h
+%%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Core/Instrumentation.h
+%%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Core/LLVM.h
+%%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Core/LinkingContext.h
+%%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Core/Node.h
+%%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Core/Pass.h
+%%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Core/PassManager.h
+%%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Core/Reader.h
+%%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Core/Reference.h
+%%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Core/Reproduce.h
+%%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Core/Resolver.h
+%%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Core/SharedLibraryAtom.h
+%%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Core/SharedLibraryFile.h
+%%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Core/Simple.h
+%%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Core/SymbolTable.h
+%%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Core/TargetOptionsCommandFlags.h
+%%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Core/UndefinedAtom.h
+%%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Core/Writer.h
+%%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Driver/Driver.h
+%%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/ReaderWriter/MachOLinkingContext.h
+%%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/ReaderWriter/YamlContext.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/LLDB.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBAddress.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBAttachInfo.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBBlock.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBBreakpoint.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBBreakpointLocation.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBBroadcaster.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBCommandInterpreter.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBCommandReturnObject.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBCommunication.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBCompileUnit.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBData.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBDebugger.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBDeclaration.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBDefines.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBError.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBEvent.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBExecutionContext.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBExpressionOptions.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBFileSpec.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBFileSpecList.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBFrame.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBFunction.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBHostOS.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBInstruction.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBInstructionList.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBLanguageRuntime.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBLaunchInfo.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBLineEntry.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBListener.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBMemoryRegionInfo.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBMemoryRegionInfoList.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBModule.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBModuleSpec.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBPlatform.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBProcess.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBQueue.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBQueueItem.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBSection.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBSourceManager.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBStream.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBStringList.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBStructuredData.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBSymbol.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBSymbolContext.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBSymbolContextList.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBTarget.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBThread.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBThreadCollection.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBThreadPlan.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBTrace.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBTraceOptions.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBType.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBTypeCategory.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBTypeEnumMember.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBTypeFilter.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBTypeFormat.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBTypeNameSpecifier.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBTypeSummary.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBTypeSynthetic.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBUnixSignals.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBValue.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBValueList.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBVariablesOptions.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBWatchpoint.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SystemInitializerFull.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Breakpoint/Breakpoint.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Breakpoint/BreakpointID.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Breakpoint/BreakpointIDList.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Breakpoint/BreakpointList.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Breakpoint/BreakpointLocation.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Breakpoint/BreakpointLocationCollection.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Breakpoint/BreakpointLocationList.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Breakpoint/BreakpointOptions.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Breakpoint/BreakpointResolver.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Breakpoint/BreakpointResolverAddress.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Breakpoint/BreakpointResolverFileLine.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Breakpoint/BreakpointResolverFileRegex.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Breakpoint/BreakpointResolverName.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Breakpoint/BreakpointSite.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Breakpoint/BreakpointSiteList.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Breakpoint/Stoppoint.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Breakpoint/StoppointCallbackContext.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Breakpoint/StoppointLocation.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Breakpoint/Watchpoint.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Breakpoint/WatchpointList.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Breakpoint/WatchpointOptions.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/Address.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/AddressRange.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/AddressResolver.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/AddressResolverFileLine.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/AddressResolverName.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/ArchSpec.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/Broadcaster.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/ClangForward.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/Communication.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/Debugger.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/Disassembler.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/DumpDataExtractor.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/EmulateInstruction.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/Event.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/FileLineResolver.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/FileSpecList.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/FormatEntity.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/IOHandler.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/IOStreamMacros.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/Listener.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/LoadedModuleInfoList.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/Mangled.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/MappedHash.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/Module.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/ModuleChild.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/ModuleList.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/ModuleSpec.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/Opcode.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/PluginInterface.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/PluginManager.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/RangeMap.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/RegisterValue.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/STLUtils.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/Scalar.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/SearchFilter.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/Section.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/SourceManager.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/State.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/StreamAsynchronousIO.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/StreamBuffer.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/StreamFile.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/StructuredDataImpl.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/ThreadSafeDenseMap.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/ThreadSafeDenseSet.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/ThreadSafeSTLMap.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/ThreadSafeSTLVector.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/ThreadSafeValue.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/UniqueCStringMap.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/UserSettingsController.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/Value.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/ValueObject.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/ValueObjectCast.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/ValueObjectChild.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/ValueObjectConstResult.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/ValueObjectConstResultCast.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/ValueObjectConstResultChild.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/ValueObjectConstResultImpl.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/ValueObjectDynamicValue.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/ValueObjectList.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/ValueObjectMemory.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/ValueObjectRegister.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/ValueObjectSyntheticFilter.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/ValueObjectVariable.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/dwarf.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/DataFormatters/CXXFunctionPointer.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/DataFormatters/DataVisualization.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/DataFormatters/DumpValueObjectOptions.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/DataFormatters/FormatCache.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/DataFormatters/FormatClasses.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/DataFormatters/FormatManager.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/DataFormatters/FormattersContainer.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/DataFormatters/FormattersHelpers.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/DataFormatters/LanguageCategory.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/DataFormatters/StringPrinter.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/DataFormatters/TypeCategory.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/DataFormatters/TypeCategoryMap.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/DataFormatters/TypeFormat.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/DataFormatters/TypeSummary.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/DataFormatters/TypeSynthetic.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/DataFormatters/TypeValidator.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/DataFormatters/ValueObjectPrinter.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/DataFormatters/VectorIterator.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/DataFormatters/VectorType.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Expression/DWARFExpression.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Expression/DiagnosticManager.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Expression/Expression.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Expression/ExpressionParser.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Expression/ExpressionSourceCode.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Expression/ExpressionTypeSystemHelper.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Expression/ExpressionVariable.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Expression/FunctionCaller.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Expression/IRDynamicChecks.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Expression/IRExecutionUnit.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Expression/IRInterpreter.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Expression/IRMemoryMap.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Expression/LLVMUserExpression.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Expression/Materializer.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Expression/REPL.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Expression/UserExpression.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Expression/UtilityFunction.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/Config.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/ConnectionFileDescriptor.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/Debug.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/Editline.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/File.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/FileCache.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/FileSystem.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/Host.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/HostGetOpt.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/HostInfo.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/HostInfoBase.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/HostNativeProcess.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/HostNativeProcessBase.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/HostNativeThread.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/HostNativeThreadBase.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/HostNativeThreadForward.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/HostProcess.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/HostThread.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/LockFile.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/LockFileBase.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/MainLoop.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/MainLoopBase.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/MonitoringProcessLauncher.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/OptionParser.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/Pipe.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/PipeBase.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/PosixApi.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/Predicate.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/ProcessLauncher.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/ProcessRunLock.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/PseudoTerminal.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/Socket.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/SocketAddress.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/StringConvert.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/Symbols.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/Terminal.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/ThreadLauncher.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/Time.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/XML.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/android/HostInfoAndroid.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/common/GetOptInc.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/common/NativeBreakpoint.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/common/NativeBreakpointList.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/common/NativeProcessProtocol.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/common/NativeRegisterContext.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/common/NativeThreadProtocol.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/common/NativeWatchpointList.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/common/SoftwareBreakpoint.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/common/TCPSocket.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/common/UDPSocket.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/freebsd/HostInfoFreeBSD.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/linux/AbstractSocket.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/linux/HostInfoLinux.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/linux/Ptrace.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/linux/Support.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/linux/Uio.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/macosx/HostInfoMacOSX.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/macosx/HostThreadMacOSX.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/netbsd/HostInfoNetBSD.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/openbsd/HostInfoOpenBSD.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/posix/ConnectionFileDescriptorPosix.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/posix/DomainSocket.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/posix/Fcntl.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/posix/HostInfoPosix.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/posix/HostProcessPosix.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/posix/HostThreadPosix.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/posix/LockFilePosix.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/posix/PipePosix.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/posix/ProcessLauncherPosixFork.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/windows/AutoHandle.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/windows/ConnectionGenericFileWindows.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/windows/HostInfoWindows.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/windows/HostProcessWindows.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/windows/HostThreadWindows.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/windows/LockFileWindows.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/windows/PipeWindows.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/windows/PosixApi.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/windows/ProcessLauncherWindows.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/windows/editlinewin.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/windows/windows.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Initialization/SystemInitializer.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Initialization/SystemInitializerCommon.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Initialization/SystemLifetimeManager.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Interpreter/Args.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Interpreter/CommandAlias.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Interpreter/CommandCompletions.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Interpreter/CommandHistory.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Interpreter/CommandInterpreter.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Interpreter/CommandObject.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Interpreter/CommandObjectMultiword.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Interpreter/CommandObjectRegexCommand.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Interpreter/CommandOptionValidators.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Interpreter/CommandReturnObject.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Interpreter/OptionGroupArchitecture.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Interpreter/OptionGroupBoolean.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Interpreter/OptionGroupFile.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Interpreter/OptionGroupFormat.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Interpreter/OptionGroupOutputFile.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Interpreter/OptionGroupPlatform.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Interpreter/OptionGroupString.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Interpreter/OptionGroupUInt64.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Interpreter/OptionGroupUUID.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Interpreter/OptionGroupValueObjectDisplay.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Interpreter/OptionGroupVariable.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Interpreter/OptionGroupWatchpoint.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Interpreter/OptionValue.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Interpreter/OptionValueArch.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Interpreter/OptionValueArgs.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Interpreter/OptionValueArray.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Interpreter/OptionValueBoolean.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Interpreter/OptionValueChar.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Interpreter/OptionValueDictionary.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Interpreter/OptionValueEnumeration.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Interpreter/OptionValueFileSpec.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Interpreter/OptionValueFileSpecList.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Interpreter/OptionValueFormat.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Interpreter/OptionValueFormatEntity.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Interpreter/OptionValueLanguage.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Interpreter/OptionValuePathMappings.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Interpreter/OptionValueProperties.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Interpreter/OptionValueRegex.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Interpreter/OptionValueSInt64.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Interpreter/OptionValueString.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Interpreter/OptionValueUInt64.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Interpreter/OptionValueUUID.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Interpreter/OptionValues.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Interpreter/Options.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Interpreter/Property.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Interpreter/ScriptInterpreter.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Symbol/ArmUnwindInfo.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Symbol/Block.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Symbol/ClangASTContext.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Symbol/ClangASTImporter.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Symbol/ClangExternalASTSourceCallbacks.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Symbol/ClangExternalASTSourceCommon.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Symbol/ClangUtil.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Symbol/CompactUnwindInfo.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Symbol/CompileUnit.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Symbol/CompilerDecl.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Symbol/CompilerDeclContext.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Symbol/CompilerType.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Symbol/DWARFCallFrameInfo.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Symbol/DebugMacros.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Symbol/DeclVendor.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Symbol/Declaration.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Symbol/FuncUnwinders.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Symbol/Function.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Symbol/GoASTContext.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Symbol/JavaASTContext.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Symbol/LineEntry.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Symbol/LineTable.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Symbol/OCamlASTContext.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Symbol/ObjectContainer.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Symbol/ObjectFile.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Symbol/Symbol.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Symbol/SymbolContext.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Symbol/SymbolContextScope.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Symbol/SymbolFile.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Symbol/SymbolVendor.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Symbol/Symtab.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Symbol/TaggedASTType.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Symbol/Type.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Symbol/TypeList.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Symbol/TypeMap.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Symbol/TypeSystem.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Symbol/UnwindPlan.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Symbol/UnwindTable.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Symbol/Variable.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Symbol/VariableList.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Symbol/VerifyDecl.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/ABI.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/CPPLanguageRuntime.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/DynamicLoader.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/ExecutionContext.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/ExecutionContextScope.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/FileAction.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/InstrumentationRuntime.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/InstrumentationRuntimeStopInfo.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/JITLoader.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/JITLoaderList.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/Language.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/LanguageRuntime.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/Memory.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/MemoryHistory.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/MemoryRegionInfo.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/ModuleCache.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/ObjCLanguageRuntime.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/OperatingSystem.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/PathMappingList.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/Platform.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/Process.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/ProcessInfo.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/ProcessLaunchInfo.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/ProcessStructReader.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/Queue.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/QueueItem.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/QueueList.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/RegisterCheckpoint.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/RegisterContext.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/RegisterNumber.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/SectionLoadHistory.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/SectionLoadList.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/StackFrame.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/StackFrameList.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/StackID.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/StopInfo.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/StructuredDataPlugin.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/SystemRuntime.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/Target.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/TargetList.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/Thread.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/ThreadCollection.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/ThreadList.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/ThreadPlan.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/ThreadPlanBase.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/ThreadPlanCallFunction.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/ThreadPlanCallFunctionUsingABI.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/ThreadPlanCallOnFunctionExit.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/ThreadPlanCallUserExpression.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/ThreadPlanPython.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/ThreadPlanRunToAddress.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/ThreadPlanShouldStopHere.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/ThreadPlanStepInRange.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/ThreadPlanStepInstruction.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/ThreadPlanStepOut.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/ThreadPlanStepOverBreakpoint.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/ThreadPlanStepOverRange.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/ThreadPlanStepRange.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/ThreadPlanStepThrough.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/ThreadPlanStepUntil.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/ThreadPlanTracer.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/ThreadSpec.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/UnixSignals.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/Unwind.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/UnwindAssembly.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/AnsiTerminal.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/Baton.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/CleanUp.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/Connection.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/ConstString.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/DataBuffer.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/DataBufferHeap.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/DataBufferLLVM.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/DataEncoder.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/DataExtractor.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/Either.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/Endian.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/FastDemangle.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/FileSpec.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/Flags.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/History.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/IOObject.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/Iterable.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/JSON.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/LLDBAssert.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/Log.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/Logging.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/NameMatches.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/Range.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/RegularExpression.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/SafeMachO.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/SelectHelper.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/SharedCluster.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/SharingPtr.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/Status.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/Stream.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/StreamCallback.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/StreamGDBRemote.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/StreamString.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/StreamTee.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/StringExtractor.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/StringLexer.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/StringList.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/StructuredData.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/TaskPool.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/TildeExpressionResolver.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/Timeout.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/Timer.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/TraceOptions.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/UUID.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/UriParser.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/UserID.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/VASPrintf.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/VMRange.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/lldb-defines.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/lldb-enumerations.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/lldb-forward.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/lldb-private-defines.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/lldb-private-enumerations.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/lldb-private-forward.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/lldb-private-interfaces.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/lldb-private-types.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/lldb-private.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/lldb-public.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/lldb-types.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/lldb-versioning.h
+llvm%%LLVM_LIB_VER%%/include/llvm-c/Analysis.h
+llvm%%LLVM_LIB_VER%%/include/llvm-c/BitReader.h
+llvm%%LLVM_LIB_VER%%/include/llvm-c/BitWriter.h
+llvm%%LLVM_LIB_VER%%/include/llvm-c/Core.h
+llvm%%LLVM_LIB_VER%%/include/llvm-c/Disassembler.h
+llvm%%LLVM_LIB_VER%%/include/llvm-c/ErrorHandling.h
+llvm%%LLVM_LIB_VER%%/include/llvm-c/ExecutionEngine.h
+llvm%%LLVM_LIB_VER%%/include/llvm-c/IRReader.h
+llvm%%LLVM_LIB_VER%%/include/llvm-c/Initialization.h
+llvm%%LLVM_LIB_VER%%/include/llvm-c/LinkTimeOptimizer.h
+llvm%%LLVM_LIB_VER%%/include/llvm-c/Linker.h
+llvm%%LLVM_LIB_VER%%/include/llvm-c/Object.h
+llvm%%LLVM_LIB_VER%%/include/llvm-c/OrcBindings.h
+llvm%%LLVM_LIB_VER%%/include/llvm-c/Support.h
+llvm%%LLVM_LIB_VER%%/include/llvm-c/Target.h
+llvm%%LLVM_LIB_VER%%/include/llvm-c/TargetMachine.h
+llvm%%LLVM_LIB_VER%%/include/llvm-c/Transforms/IPO.h
+llvm%%LLVM_LIB_VER%%/include/llvm-c/Transforms/PassManagerBuilder.h
+llvm%%LLVM_LIB_VER%%/include/llvm-c/Transforms/Scalar.h
+llvm%%LLVM_LIB_VER%%/include/llvm-c/Transforms/Vectorize.h
+llvm%%LLVM_LIB_VER%%/include/llvm-c/Types.h
+llvm%%LLVM_LIB_VER%%/include/llvm-c/lto.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/APFloat.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/APInt.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/APSInt.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/AllocatorList.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/ArrayRef.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/BitVector.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/BitmaskEnum.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/BreadthFirstIterator.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/CachedHashString.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/DAGDeltaAlgorithm.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/DeltaAlgorithm.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/DenseMap.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/DenseMapInfo.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/DenseSet.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/DepthFirstIterator.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/EpochTracker.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/EquivalenceClasses.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/FoldingSet.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/GraphTraits.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/Hashing.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/ImmutableList.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/ImmutableMap.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/ImmutableSet.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/IndexedMap.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/IntEqClasses.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/IntervalMap.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/IntrusiveRefCntPtr.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/MapVector.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/None.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/Optional.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/PackedVector.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/PointerEmbeddedInt.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/PointerIntPair.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/PointerSumType.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/PointerUnion.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/PostOrderIterator.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/PriorityQueue.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/PriorityWorklist.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/SCCIterator.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/STLExtras.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/ScopeExit.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/ScopedHashTable.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/Sequence.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/SetOperations.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/SetVector.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/SmallBitVector.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/SmallPtrSet.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/SmallSet.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/SmallString.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/SmallVector.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/SparseBitVector.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/SparseMultiSet.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/SparseSet.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/Statistic.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/StringExtras.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/StringMap.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/StringRef.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/StringSet.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/StringSwitch.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/TinyPtrVector.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/Triple.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/Twine.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/UniqueVector.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/VariadicFunction.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/edit_distance.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/ilist.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/ilist_base.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/ilist_iterator.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/ilist_node.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/ilist_node_base.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/ilist_node_options.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/iterator.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/iterator_range.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ADT/simple_ilist.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/AliasAnalysis.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/AliasAnalysisEvaluator.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/AliasSetTracker.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/AssumptionCache.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/BasicAliasAnalysis.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/BlockFrequencyInfo.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/BlockFrequencyInfoImpl.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/BranchProbabilityInfo.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/CFG.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/CFGPrinter.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/CFLAliasAnalysisUtils.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/CFLAndersAliasAnalysis.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/CFLSteensAliasAnalysis.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/CGSCCPassManager.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/CallGraph.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/CallGraphSCCPass.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/CallPrinter.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/CaptureTracking.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/CodeMetrics.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/ConstantFolding.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/DOTGraphTraitsPass.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/DemandedBits.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/DependenceAnalysis.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/DivergenceAnalysis.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/DomPrinter.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/DominanceFrontier.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/DominanceFrontierImpl.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/EHPersonalities.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/GlobalsModRef.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/IVUsers.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/IndirectCallPromotionAnalysis.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/IndirectCallSiteVisitor.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/InlineCost.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/InstructionSimplify.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/Interval.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/IntervalIterator.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/IntervalPartition.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/IteratedDominanceFrontier.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/LazyBlockFrequencyInfo.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/LazyBranchProbabilityInfo.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/LazyCallGraph.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/LazyValueInfo.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/Lint.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/Loads.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/LoopAccessAnalysis.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/LoopAnalysisManager.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/LoopInfo.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/LoopInfoImpl.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/LoopIterator.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/LoopPass.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/LoopUnrollAnalyzer.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/MemoryBuiltins.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/MemoryDependenceAnalysis.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/MemoryLocation.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/MemorySSA.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/MemorySSAUpdater.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/ModuleSummaryAnalysis.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/ObjCARCAliasAnalysis.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/ObjCARCAnalysisUtils.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/ObjCARCInstKind.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/ObjectUtils.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/OptimizationDiagnosticInfo.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/OrderedBasicBlock.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/PHITransAddr.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/Passes.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/PostDominators.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/ProfileSummaryInfo.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/PtrUseVisitor.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/RegionInfo.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/RegionInfoImpl.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/RegionIterator.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/RegionPass.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/RegionPrinter.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/ScalarEvolution.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/ScalarEvolutionAliasAnalysis.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/ScalarEvolutionExpander.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/ScalarEvolutionExpressions.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/ScalarEvolutionNormalization.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/ScopedNoAliasAA.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/SparsePropagation.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/TargetFolder.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/TargetLibraryInfo.def
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/TargetLibraryInfo.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/TargetTransformInfo.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/TargetTransformInfoImpl.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/Trace.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/TypeBasedAliasAnalysis.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/TypeMetadataUtils.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/ValueTracking.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/VectorUtils.h
+llvm%%LLVM_LIB_VER%%/include/llvm/AsmParser/Parser.h
+llvm%%LLVM_LIB_VER%%/include/llvm/AsmParser/SlotMapping.h
+llvm%%LLVM_LIB_VER%%/include/llvm/BinaryFormat/COFF.h
+llvm%%LLVM_LIB_VER%%/include/llvm/BinaryFormat/Dwarf.def
+llvm%%LLVM_LIB_VER%%/include/llvm/BinaryFormat/Dwarf.h
+llvm%%LLVM_LIB_VER%%/include/llvm/BinaryFormat/ELF.h
+llvm%%LLVM_LIB_VER%%/include/llvm/BinaryFormat/ELFRelocs/AArch64.def
+llvm%%LLVM_LIB_VER%%/include/llvm/BinaryFormat/ELFRelocs/AMDGPU.def
+llvm%%LLVM_LIB_VER%%/include/llvm/BinaryFormat/ELFRelocs/ARM.def
+llvm%%LLVM_LIB_VER%%/include/llvm/BinaryFormat/ELFRelocs/AVR.def
+llvm%%LLVM_LIB_VER%%/include/llvm/BinaryFormat/ELFRelocs/BPF.def
+llvm%%LLVM_LIB_VER%%/include/llvm/BinaryFormat/ELFRelocs/Hexagon.def
+llvm%%LLVM_LIB_VER%%/include/llvm/BinaryFormat/ELFRelocs/Lanai.def
+llvm%%LLVM_LIB_VER%%/include/llvm/BinaryFormat/ELFRelocs/Mips.def
+llvm%%LLVM_LIB_VER%%/include/llvm/BinaryFormat/ELFRelocs/PowerPC.def
+llvm%%LLVM_LIB_VER%%/include/llvm/BinaryFormat/ELFRelocs/PowerPC64.def
+llvm%%LLVM_LIB_VER%%/include/llvm/BinaryFormat/ELFRelocs/RISCV.def
+llvm%%LLVM_LIB_VER%%/include/llvm/BinaryFormat/ELFRelocs/Sparc.def
+llvm%%LLVM_LIB_VER%%/include/llvm/BinaryFormat/ELFRelocs/SystemZ.def
+llvm%%LLVM_LIB_VER%%/include/llvm/BinaryFormat/ELFRelocs/WebAssembly.def
+llvm%%LLVM_LIB_VER%%/include/llvm/BinaryFormat/ELFRelocs/i386.def
+llvm%%LLVM_LIB_VER%%/include/llvm/BinaryFormat/ELFRelocs/x86_64.def
+llvm%%LLVM_LIB_VER%%/include/llvm/BinaryFormat/MachO.def
+llvm%%LLVM_LIB_VER%%/include/llvm/BinaryFormat/MachO.h
+llvm%%LLVM_LIB_VER%%/include/llvm/BinaryFormat/Magic.h
+llvm%%LLVM_LIB_VER%%/include/llvm/BinaryFormat/Wasm.h
+llvm%%LLVM_LIB_VER%%/include/llvm/BinaryFormat/WasmRelocs/WebAssembly.def
+llvm%%LLVM_LIB_VER%%/include/llvm/Bitcode/BitCodes.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Bitcode/BitcodeReader.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Bitcode/BitcodeWriter.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Bitcode/BitcodeWriterPass.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Bitcode/BitstreamReader.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Bitcode/BitstreamWriter.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Bitcode/LLVMBitCodes.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/Analysis.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/AsmPrinter.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/AtomicExpandUtils.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/BasicTTIImpl.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/CalcSpillWeights.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/CallingConvLower.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/CommandFlags.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/DAGCombine.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/DFAPacketizer.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/DIE.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/DIEValue.def
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/DwarfStringPoolEntry.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/EdgeBundles.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/ExecutionDepsFix.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/ExpandReductions.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/FastISel.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/FaultMaps.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/FunctionLoweringInfo.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/GCMetadata.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/GCMetadataPrinter.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/GCStrategy.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/GCs.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/GlobalISel/CallLowering.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/GlobalISel/GISelAccessor.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/GlobalISel/IRTranslator.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/GlobalISel/InstructionSelect.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/GlobalISel/InstructionSelector.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/GlobalISel/InstructionSelectorImpl.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/GlobalISel/Legalizer.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/GlobalISel/LegalizerHelper.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/GlobalISel/LegalizerInfo.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/GlobalISel/Localizer.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/GlobalISel/MachineIRBuilder.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/GlobalISel/RegBankSelect.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/GlobalISel/RegisterBank.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/GlobalISel/RegisterBankInfo.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/GlobalISel/Types.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/GlobalISel/Utils.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/ISDOpcodes.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/IntrinsicLowering.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/LatencyPriorityQueue.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/LazyMachineBlockFrequencyInfo.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/LexicalScopes.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/LinkAllAsmWriterComponents.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/LinkAllCodegenComponents.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/LiveInterval.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/LiveIntervalAnalysis.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/LiveIntervalUnion.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/LivePhysRegs.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/LiveRangeEdit.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/LiveRegMatrix.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/LiveRegUnits.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/LiveStackAnalysis.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/LiveVariables.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/LowLevelType.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/MIRParser/MIRParser.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/MIRPrinter.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/MIRYamlMapping.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/MachORelocation.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/MachineBasicBlock.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/MachineBlockFrequencyInfo.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/MachineBranchProbabilityInfo.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/MachineCombinerPattern.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/MachineConstantPool.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/MachineDominanceFrontier.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/MachineDominators.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/MachineFrameInfo.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/MachineFunction.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/MachineFunctionPass.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/MachineInstr.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/MachineInstrBuilder.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/MachineInstrBundle.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/MachineInstrBundleIterator.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/MachineJumpTableInfo.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/MachineLoopInfo.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/MachineMemOperand.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/MachineModuleInfo.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/MachineModuleInfoImpls.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/MachineOperand.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/MachineOptimizationRemarkEmitter.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/MachinePassRegistry.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/MachinePostDominators.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/MachineRegionInfo.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/MachineRegisterInfo.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/MachineSSAUpdater.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/MachineScheduler.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/MachineTraceMetrics.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/MachineValueType.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/MacroFusion.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/PBQP/CostAllocator.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/PBQP/Graph.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/PBQP/Math.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/PBQP/ReductionRules.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/PBQP/Solution.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/PBQPRAConstraint.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/ParallelCG.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/Passes.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/PreISelIntrinsicLowering.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/PseudoSourceValue.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/RegAllocPBQP.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/RegAllocRegistry.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/RegisterClassInfo.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/RegisterPressure.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/RegisterScavenging.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/RegisterUsageInfo.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/ResourcePriorityQueue.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/RuntimeLibcalls.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/ScheduleDAG.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/ScheduleDAGInstrs.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/ScheduleDAGMutation.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/ScheduleDFS.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/ScheduleHazardRecognizer.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/SchedulerRegistry.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/ScoreboardHazardRecognizer.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/SelectionDAG.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/SelectionDAGAddressAnalysis.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/SelectionDAGISel.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/SelectionDAGNodes.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/SelectionDAGTargetInfo.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/SlotIndexes.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/StackMaps.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/StackProtector.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/TailDuplicator.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/TargetPassConfig.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/TargetSchedule.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/UnreachableBlockElim.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/ValueTypes.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/ValueTypes.td
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/VirtRegMap.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/WinEHFuncInfo.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Config/AsmParsers.def
+llvm%%LLVM_LIB_VER%%/include/llvm/Config/AsmPrinters.def
+llvm%%LLVM_LIB_VER%%/include/llvm/Config/Disassemblers.def
+llvm%%LLVM_LIB_VER%%/include/llvm/Config/Targets.def
+llvm%%LLVM_LIB_VER%%/include/llvm/Config/abi-breaking.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Config/llvm-config.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/CVDebugRecord.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/CVRecord.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/CVSymbolVisitor.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/CVTypeVisitor.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/CodeView.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/CodeViewError.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/CodeViewRecordIO.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/CodeViewSymbols.def
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/CodeViewTypes.def
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/DebugChecksumsSubsection.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/DebugCrossExSubsection.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/DebugCrossImpSubsection.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/DebugFrameDataSubsection.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/DebugInlineeLinesSubsection.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/DebugLinesSubsection.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/DebugStringTableSubsection.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/DebugSubsection.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/DebugSubsectionRecord.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/DebugSubsectionVisitor.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/DebugSymbolRVASubsection.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/DebugSymbolsSubsection.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/DebugUnknownSubsection.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/EnumTables.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/Formatters.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/FunctionId.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/GUID.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/LazyRandomTypeCollection.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/Line.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/RecordSerialization.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/StringsAndChecksums.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/SymbolDeserializer.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/SymbolDumpDelegate.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/SymbolDumper.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/SymbolRecord.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/SymbolRecordMapping.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/SymbolSerializer.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/SymbolVisitorCallbackPipeline.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/SymbolVisitorCallbacks.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/SymbolVisitorDelegate.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/TypeCollection.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/TypeDeserializer.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/TypeDumpVisitor.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/TypeIndex.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/TypeIndexDiscovery.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/TypeName.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/TypeRecord.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/TypeRecordBuilder.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/TypeRecordMapping.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/TypeSerializer.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/TypeStreamMerger.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/TypeSymbolEmitter.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/TypeTableBuilder.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/TypeTableCollection.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/TypeVisitorCallbackPipeline.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/CodeView/TypeVisitorCallbacks.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/DIContext.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/DWARF/DWARFAbbreviationDeclaration.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/DWARF/DWARFAttribute.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/DWARF/DWARFCompileUnit.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/DWARF/DWARFContext.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/DWARF/DWARFDataExtractor.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/DWARF/DWARFDebugAbbrev.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/DWARF/DWARFDebugArangeSet.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/DWARF/DWARFDebugAranges.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/DWARF/DWARFDebugFrame.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/DWARF/DWARFDebugInfoEntry.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/DWARF/DWARFDebugLine.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/DWARF/DWARFDebugLoc.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/DWARF/DWARFDebugMacro.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/DWARF/DWARFDebugPubTable.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/DWARF/DWARFDebugRangeList.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/DWARF/DWARFDie.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/DWARF/DWARFFormValue.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/DWARF/DWARFGdbIndex.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/DWARF/DWARFRelocMap.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/DWARF/DWARFSection.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/DWARF/DWARFTypeUnit.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/DWARF/DWARFUnit.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/DWARF/DWARFUnitIndex.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/DWARF/DWARFVerifier.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/MSF/IMSFFile.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/MSF/MSFBuilder.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/MSF/MSFCommon.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/MSF/MSFError.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/MSF/MSFStreamLayout.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/MSF/MappedBlockStream.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/ConcreteSymbolEnumerator.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/DIA/DIADataStream.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/DIA/DIAEnumDebugStreams.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/DIA/DIAEnumLineNumbers.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/DIA/DIAEnumSourceFiles.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/DIA/DIAEnumSymbols.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/DIA/DIAError.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/DIA/DIALineNumber.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/DIA/DIARawSymbol.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/DIA/DIASession.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/DIA/DIASourceFile.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/DIA/DIASupport.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/GenericError.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/IPDBDataStream.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/IPDBEnumChildren.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/IPDBLineNumber.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/IPDBRawSymbol.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/IPDBSession.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/IPDBSourceFile.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/Native/DbiModuleDescriptor.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/Native/DbiModuleDescriptorBuilder.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/Native/DbiModuleList.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/Native/DbiStream.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/Native/DbiStreamBuilder.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/Native/EnumTables.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/Native/Formatters.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/Native/GlobalsStream.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/Native/Hash.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/Native/HashTable.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/Native/ISectionContribVisitor.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/Native/InfoStream.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/Native/InfoStreamBuilder.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/Native/ModuleDebugStream.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/Native/NamedStreamMap.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/Native/NativeBuiltinSymbol.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/Native/NativeCompilandSymbol.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/Native/NativeEnumModules.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/Native/NativeExeSymbol.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/Native/NativeRawSymbol.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/Native/NativeSession.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/Native/PDBFile.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/Native/PDBFileBuilder.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/Native/PDBStringTable.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/Native/PDBStringTableBuilder.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/Native/PublicsStream.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/Native/PublicsStreamBuilder.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/Native/RawConstants.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/Native/RawError.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/Native/RawTypes.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/Native/SymbolStream.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/Native/TpiHashing.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/Native/TpiStream.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/Native/TpiStreamBuilder.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/PDB.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/PDBContext.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/PDBExtras.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/PDBSymDumper.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/PDBSymbol.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/PDBSymbolAnnotation.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/PDBSymbolBlock.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/PDBSymbolCompiland.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/PDBSymbolCompilandDetails.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/PDBSymbolCompilandEnv.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/PDBSymbolCustom.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/PDBSymbolData.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/PDBSymbolExe.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/PDBSymbolFunc.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/PDBSymbolFuncDebugEnd.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/PDBSymbolFuncDebugStart.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/PDBSymbolLabel.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/PDBSymbolPublicSymbol.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/PDBSymbolThunk.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/PDBSymbolTypeArray.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/PDBSymbolTypeBaseClass.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/PDBSymbolTypeBuiltin.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/PDBSymbolTypeCustom.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/PDBSymbolTypeDimension.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/PDBSymbolTypeEnum.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/PDBSymbolTypeFriend.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/PDBSymbolTypeFunctionArg.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/PDBSymbolTypeFunctionSig.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/PDBSymbolTypeManaged.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/PDBSymbolTypePointer.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/PDBSymbolTypeTypedef.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/PDBSymbolTypeUDT.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/PDBSymbolTypeVTable.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/PDBSymbolTypeVTableShape.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/PDBSymbolUnknown.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/PDBSymbolUsingNamespace.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/PDBTypes.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/PDB/UDTLayout.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/Symbolize/DIPrinter.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/Symbolize/SymbolizableModule.h
+llvm%%LLVM_LIB_VER%%/include/llvm/DebugInfo/Symbolize/Symbolize.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Demangle/Demangle.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ExecutionEngine/ExecutionEngine.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ExecutionEngine/GenericValue.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ExecutionEngine/Interpreter.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ExecutionEngine/JITEventListener.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ExecutionEngine/JITSymbol.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ExecutionEngine/MCJIT.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ExecutionEngine/OProfileWrapper.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ExecutionEngine/ObjectCache.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ExecutionEngine/ObjectMemoryBuffer.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ExecutionEngine/Orc/CompileOnDemandLayer.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ExecutionEngine/Orc/CompileUtils.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ExecutionEngine/Orc/ExecutionUtils.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ExecutionEngine/Orc/GlobalMappingLayer.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ExecutionEngine/Orc/IRCompileLayer.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ExecutionEngine/Orc/IRTransformLayer.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ExecutionEngine/Orc/IndirectionUtils.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ExecutionEngine/Orc/LambdaResolver.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ExecutionEngine/Orc/LazyEmittingLayer.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ExecutionEngine/Orc/NullResolver.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ExecutionEngine/Orc/ObjectTransformLayer.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ExecutionEngine/Orc/OrcABISupport.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ExecutionEngine/Orc/OrcError.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetRPCAPI.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetServer.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ExecutionEngine/Orc/RPCSerialization.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ExecutionEngine/Orc/RPCUtils.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ExecutionEngine/Orc/RawByteChannel.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ExecutionEngine/OrcMCJITReplacement.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ExecutionEngine/RTDyldMemoryManager.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ExecutionEngine/RuntimeDyld.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ExecutionEngine/RuntimeDyldChecker.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ExecutionEngine/SectionMemoryManager.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/Argument.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/AssemblyAnnotationWriter.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/Attributes.gen
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/Attributes.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/Attributes.td
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/AutoUpgrade.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/BasicBlock.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/CFG.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/CallSite.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/CallingConv.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/Comdat.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/Constant.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/ConstantFolder.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/ConstantRange.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/Constants.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/DIBuilder.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/DataLayout.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/DebugInfo.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/DebugInfoFlags.def
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/DebugInfoMetadata.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/DebugLoc.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/DerivedTypes.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/DerivedUser.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/DiagnosticInfo.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/DiagnosticPrinter.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/Dominators.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/Function.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/GVMaterializer.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/GetElementPtrTypeIterator.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/GlobalAlias.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/GlobalIFunc.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/GlobalIndirectSymbol.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/GlobalObject.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/GlobalValue.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/GlobalVariable.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/IRBuilder.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/IRPrintingPasses.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/InlineAsm.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/InstIterator.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/InstVisitor.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/InstrTypes.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/Instruction.def
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/Instruction.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/Instructions.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/IntrinsicInst.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/Intrinsics.gen
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/Intrinsics.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/Intrinsics.td
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/IntrinsicsAArch64.td
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/IntrinsicsAMDGPU.td
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/IntrinsicsARM.td
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/IntrinsicsBPF.td
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/IntrinsicsHexagon.td
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/IntrinsicsMips.td
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/IntrinsicsNVVM.td
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/IntrinsicsPowerPC.td
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/IntrinsicsSystemZ.td
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/IntrinsicsWebAssembly.td
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/IntrinsicsX86.td
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/IntrinsicsXCore.td
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/LLVMContext.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/LegacyPassManager.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/LegacyPassManagers.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/LegacyPassNameParser.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/MDBuilder.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/Mangler.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/Metadata.def
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/Metadata.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/Module.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/ModuleSlotTracker.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/ModuleSummaryIndex.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/ModuleSummaryIndexYAML.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/NoFolder.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/OperandTraits.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/Operator.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/OptBisect.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/PassManager.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/PassManagerInternal.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/PatternMatch.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/PredIteratorCache.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/ProfileSummary.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/SafepointIRVerifier.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/Statepoint.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/SymbolTableListTraits.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/TrackingMDRef.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/Type.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/TypeBuilder.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/TypeFinder.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/Use.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/UseListOrder.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/User.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/Value.def
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/Value.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/ValueHandle.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/ValueMap.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/ValueSymbolTable.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IR/Verifier.h
+llvm%%LLVM_LIB_VER%%/include/llvm/IRReader/IRReader.h
+llvm%%LLVM_LIB_VER%%/include/llvm/InitializePasses.h
+llvm%%LLVM_LIB_VER%%/include/llvm/LTO/Caching.h
+llvm%%LLVM_LIB_VER%%/include/llvm/LTO/Config.h
+llvm%%LLVM_LIB_VER%%/include/llvm/LTO/LTO.h
+llvm%%LLVM_LIB_VER%%/include/llvm/LTO/LTOBackend.h
+llvm%%LLVM_LIB_VER%%/include/llvm/LTO/legacy/LTOCodeGenerator.h
+llvm%%LLVM_LIB_VER%%/include/llvm/LTO/legacy/LTOModule.h
+llvm%%LLVM_LIB_VER%%/include/llvm/LTO/legacy/ThinLTOCodeGenerator.h
+llvm%%LLVM_LIB_VER%%/include/llvm/LTO/legacy/UpdateCompilerUsed.h
+llvm%%LLVM_LIB_VER%%/include/llvm/LineEditor/LineEditor.h
+llvm%%LLVM_LIB_VER%%/include/llvm/LinkAllIR.h
+llvm%%LLVM_LIB_VER%%/include/llvm/LinkAllPasses.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Linker/IRMover.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Linker/Linker.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/ConstantPools.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/LaneBitmask.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCAsmBackend.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCAsmInfo.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCAsmInfoCOFF.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCAsmInfoDarwin.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCAsmInfoELF.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCAsmInfoWasm.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCAsmLayout.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCAssembler.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCCodeEmitter.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCCodeView.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCContext.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCDirectives.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCDisassembler/MCDisassembler.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCDisassembler/MCExternalSymbolizer.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCDisassembler/MCRelocationInfo.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCDisassembler/MCSymbolizer.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCDwarf.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCELFObjectWriter.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCELFStreamer.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCExpr.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCFixedLenDisassembler.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCFixup.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCFixupKindInfo.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCFragment.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCInst.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCInstBuilder.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCInstPrinter.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCInstrAnalysis.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCInstrDesc.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCInstrInfo.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCInstrItineraries.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCLabel.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCLinkerOptimizationHint.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCMachObjectWriter.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCObjectFileInfo.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCObjectStreamer.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCObjectWriter.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCParser/AsmCond.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCParser/AsmLexer.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCParser/MCAsmLexer.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCParser/MCAsmParser.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCParser/MCAsmParserExtension.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCParser/MCAsmParserUtils.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCParser/MCParsedAsmOperand.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCParser/MCTargetAsmParser.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCRegisterInfo.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCSchedule.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCSection.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCSectionCOFF.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCSectionELF.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCSectionMachO.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCSectionWasm.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCStreamer.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCSubtargetInfo.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCSymbol.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCSymbolCOFF.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCSymbolELF.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCSymbolMachO.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCSymbolWasm.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCTargetOptions.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCTargetOptionsCommandFlags.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCValue.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCWasmObjectWriter.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCWasmStreamer.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCWin64EH.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCWinCOFFObjectWriter.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCWinCOFFStreamer.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MCWinEH.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/MachineLocation.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/SectionKind.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/StringTableBuilder.h
+llvm%%LLVM_LIB_VER%%/include/llvm/MC/SubtargetFeature.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Object/Archive.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Object/ArchiveWriter.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Object/Binary.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Object/COFF.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Object/COFFImportFile.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Object/COFFModuleDefinition.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Object/Decompressor.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Object/ELF.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Object/ELFObjectFile.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Object/ELFTypes.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Object/Error.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Object/IRObjectFile.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Object/IRSymtab.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Object/MachO.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Object/MachOUniversal.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Object/ModuleSymbolTable.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Object/ObjectFile.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Object/RelocVisitor.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Object/StackMapParser.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Object/SymbolSize.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Object/SymbolicFile.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Object/Wasm.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Object/WindowsResource.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ObjectYAML/COFFYAML.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ObjectYAML/CodeViewYAMLDebugSections.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ObjectYAML/CodeViewYAMLSymbols.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ObjectYAML/CodeViewYAMLTypes.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ObjectYAML/DWARFEmitter.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ObjectYAML/DWARFYAML.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ObjectYAML/ELFYAML.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ObjectYAML/MachOYAML.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ObjectYAML/ObjectYAML.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ObjectYAML/WasmYAML.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ObjectYAML/YAML.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Option/Arg.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Option/ArgList.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Option/OptParser.td
+llvm%%LLVM_LIB_VER%%/include/llvm/Option/OptSpecifier.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Option/OptTable.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Option/Option.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Pass.h
+llvm%%LLVM_LIB_VER%%/include/llvm/PassAnalysisSupport.h
+llvm%%LLVM_LIB_VER%%/include/llvm/PassInfo.h
+llvm%%LLVM_LIB_VER%%/include/llvm/PassRegistry.h
+llvm%%LLVM_LIB_VER%%/include/llvm/PassSupport.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Passes/PassBuilder.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ProfileData/Coverage/CoverageMapping.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ProfileData/Coverage/CoverageMappingReader.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ProfileData/Coverage/CoverageMappingWriter.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ProfileData/InstrProf.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ProfileData/InstrProfData.inc
+llvm%%LLVM_LIB_VER%%/include/llvm/ProfileData/InstrProfReader.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ProfileData/InstrProfWriter.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ProfileData/ProfileCommon.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ProfileData/SampleProf.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ProfileData/SampleProfReader.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ProfileData/SampleProfWriter.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/AArch64TargetParser.def
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/AMDGPUCodeObjectMetadata.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/ARMAttributeParser.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/ARMBuildAttributes.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/ARMEHABI.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/ARMTargetParser.def
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/ARMWinEH.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/AlignOf.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/Allocator.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/ArrayRecycler.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/Atomic.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/AtomicOrdering.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/BinaryByteStream.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/BinaryItemStream.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/BinaryStream.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/BinaryStreamArray.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/BinaryStreamError.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/BinaryStreamReader.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/BinaryStreamRef.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/BinaryStreamWriter.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/BlockFrequency.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/BranchProbability.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/CBindingWrapping.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/COM.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/CachePruning.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/Capacity.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/Casting.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/Chrono.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/CodeGen.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/CodeGenCWrappers.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/CommandLine.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/Compiler.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/Compression.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/ConvertUTF.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/CrashRecoveryContext.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/DOTGraphTraits.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/DataExtractor.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/DataTypes.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/Debug.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/DebugCounter.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/DynamicLibrary.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/Endian.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/EndianStream.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/Errc.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/Errno.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/Error.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/ErrorHandling.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/ErrorOr.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/FileOutputBuffer.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/FileSystem.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/FileUtilities.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/Format.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/FormatAdapters.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/FormatCommon.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/FormatProviders.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/FormatVariadic.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/FormatVariadicDetails.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/FormattedStream.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/GCOV.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/GenericDomTree.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/GenericDomTreeConstruction.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/GlobPattern.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/GraphWriter.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/Host.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/JamCRC.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/KnownBits.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/LEB128.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/LICENSE.TXT
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/LineIterator.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/Locale.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/LockFileManager.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/LowLevelTypeImpl.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/MD5.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/ManagedStatic.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/MathExtras.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/Memory.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/MemoryBuffer.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/MipsABIFlags.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/Mutex.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/MutexGuard.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/NativeFormatting.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/OnDiskHashTable.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/Options.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/Parallel.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/Path.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/PluginLoader.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/PointerLikeTypeTraits.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/PrettyStackTrace.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/Printable.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/Process.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/Program.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/RWMutex.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/RandomNumberGenerator.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/Recycler.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/RecyclingAllocator.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/Regex.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/Registry.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/ReverseIteration.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/SHA1.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/SMLoc.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/SaveAndRestore.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/ScaledNumber.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/ScopedPrinter.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/Signals.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/Solaris/sys/regset.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/SourceMgr.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/SpecialCaseList.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/StringPool.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/StringSaver.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/SwapByteOrder.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/SystemUtils.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/TarWriter.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/TargetParser.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/TargetRegistry.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/TargetSelect.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/ThreadLocal.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/ThreadPool.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/Threading.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/Timer.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/ToolOutputFile.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/TrailingObjects.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/TrigramIndex.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/TypeName.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/Unicode.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/UnicodeCharRanges.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/UniqueLock.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/VCSRevision.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/Valgrind.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/Watchdog.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/Win64EH.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/WindowsError.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/YAMLParser.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/YAMLTraits.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/circular_raw_ostream.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/raw_os_ostream.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/raw_ostream.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/raw_sha1_ostream.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/thread.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/type_traits.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Support/xxhash.h
+llvm%%LLVM_LIB_VER%%/include/llvm/TableGen/Error.h
+llvm%%LLVM_LIB_VER%%/include/llvm/TableGen/Main.h
+llvm%%LLVM_LIB_VER%%/include/llvm/TableGen/Record.h
+llvm%%LLVM_LIB_VER%%/include/llvm/TableGen/SearchableTable.td
+llvm%%LLVM_LIB_VER%%/include/llvm/TableGen/SetTheory.h
+llvm%%LLVM_LIB_VER%%/include/llvm/TableGen/StringMatcher.h
+llvm%%LLVM_LIB_VER%%/include/llvm/TableGen/StringToOffsetTable.h
+llvm%%LLVM_LIB_VER%%/include/llvm/TableGen/TableGenBackend.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Target/CostTable.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Target/GenericOpcodes.td
+llvm%%LLVM_LIB_VER%%/include/llvm/Target/GlobalISel/RegisterBank.td
+llvm%%LLVM_LIB_VER%%/include/llvm/Target/GlobalISel/SelectionDAGCompat.td
+llvm%%LLVM_LIB_VER%%/include/llvm/Target/GlobalISel/Target.td
+llvm%%LLVM_LIB_VER%%/include/llvm/Target/Target.td
+llvm%%LLVM_LIB_VER%%/include/llvm/Target/TargetCallingConv.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Target/TargetCallingConv.td
+llvm%%LLVM_LIB_VER%%/include/llvm/Target/TargetFrameLowering.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Target/TargetInstrInfo.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Target/TargetIntrinsicInfo.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Target/TargetItinerary.td
+llvm%%LLVM_LIB_VER%%/include/llvm/Target/TargetLowering.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Target/TargetLoweringObjectFile.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Target/TargetMachine.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Target/TargetOpcodes.def
+llvm%%LLVM_LIB_VER%%/include/llvm/Target/TargetOpcodes.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Target/TargetOptions.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Target/TargetRegisterInfo.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Target/TargetSchedule.td
+llvm%%LLVM_LIB_VER%%/include/llvm/Target/TargetSelectionDAG.td
+llvm%%LLVM_LIB_VER%%/include/llvm/Target/TargetSubtargetInfo.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Testing/Support/Error.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Testing/Support/SupportHelpers.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ToolDrivers/llvm-dlltool/DlltoolDriver.h
+llvm%%LLVM_LIB_VER%%/include/llvm/ToolDrivers/llvm-lib/LibDriver.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Coroutines.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/GCOVProfiler.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/IPO.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/IPO/AlwaysInliner.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/IPO/ArgumentPromotion.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/IPO/ConstantMerge.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/IPO/CrossDSOCFI.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/IPO/DeadArgumentElimination.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/IPO/ElimAvailExtern.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/IPO/ForceFunctionAttrs.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/IPO/FunctionAttrs.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/IPO/FunctionImport.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/IPO/GlobalDCE.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/IPO/GlobalOpt.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/IPO/GlobalSplit.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/IPO/InferFunctionAttrs.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/IPO/Inliner.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/IPO/Internalize.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/IPO/LowerTypeTests.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/IPO/PartialInlining.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/IPO/PassManagerBuilder.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/IPO/SCCP.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/IPO/StripDeadPrototypes.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/IPO/ThinLTOBitcodeWriter.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/IPO/WholeProgramDevirt.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/InstCombine/InstCombine.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/InstCombine/InstCombineWorklist.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/InstrProfiling.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Instrumentation.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/ObjCARC.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/PGOInstrumentation.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/SampleProfile.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Scalar.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Scalar/ADCE.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Scalar/AlignmentFromAssumptions.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Scalar/BDCE.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Scalar/ConstantHoisting.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Scalar/CorrelatedValuePropagation.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Scalar/DCE.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Scalar/DeadStoreElimination.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Scalar/EarlyCSE.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Scalar/Float2Int.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Scalar/GVN.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Scalar/GVNExpression.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Scalar/GuardWidening.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Scalar/IVUsersPrinter.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Scalar/IndVarSimplify.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Scalar/JumpThreading.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Scalar/LICM.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Scalar/LoopAccessAnalysisPrinter.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Scalar/LoopDataPrefetch.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Scalar/LoopDeletion.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Scalar/LoopDistribute.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Scalar/LoopIdiomRecognize.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Scalar/LoopInstSimplify.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Scalar/LoopLoadElimination.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Scalar/LoopPassManager.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Scalar/LoopPredication.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Scalar/LoopRotation.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Scalar/LoopSimplifyCFG.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Scalar/LoopSink.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Scalar/LoopStrengthReduce.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Scalar/LoopUnrollPass.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Scalar/LowerAtomic.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Scalar/LowerExpectIntrinsic.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Scalar/LowerGuardIntrinsic.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Scalar/MemCpyOptimizer.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Scalar/MergedLoadStoreMotion.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Scalar/NaryReassociate.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Scalar/NewGVN.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Scalar/PartiallyInlineLibCalls.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Scalar/Reassociate.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Scalar/SCCP.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Scalar/SROA.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Scalar/SimpleLoopUnswitch.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Scalar/SimplifyCFG.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Scalar/Sink.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Scalar/SpeculativeExecution.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Scalar/TailRecursionElimination.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Utils/ASanStackFrameLayout.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Utils/AddDiscriminators.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Utils/BasicBlockUtils.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Utils/BreakCriticalEdges.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Utils/BuildLibCalls.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Utils/BypassSlowDivision.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Utils/Cloning.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Utils/CmpInstAnalysis.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Utils/CodeExtractor.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Utils/CtorUtils.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Utils/EscapeEnumerator.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Utils/Evaluator.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Utils/FunctionComparator.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Utils/FunctionImportUtils.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Utils/GlobalStatus.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Utils/ImportedFunctionsInliningStatistics.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Utils/IntegerDivision.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Utils/LCSSA.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Utils/LibCallsShrinkWrap.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Utils/Local.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Utils/LoopSimplify.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Utils/LoopUtils.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Utils/LoopVersioning.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Utils/LowerInvoke.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Utils/LowerMemIntrinsics.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Utils/Mem2Reg.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Utils/ModuleUtils.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Utils/NameAnonGlobals.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Utils/OrderedInstructions.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Utils/PredicateInfo.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Utils/PromoteMemToReg.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Utils/SSAUpdater.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Utils/SSAUpdaterImpl.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Utils/SanitizerStats.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Utils/SimplifyIndVar.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Utils/SimplifyInstructions.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Utils/SimplifyLibCalls.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Utils/SplitModule.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Utils/SymbolRewriter.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Utils/UnrollLoop.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Utils/VNCoercion.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Utils/ValueMapper.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Vectorize.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Vectorize/LoopVectorize.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Transforms/Vectorize/SLPVectorizer.h
+llvm%%LLVM_LIB_VER%%/include/llvm/XRay/Graph.h
+llvm%%LLVM_LIB_VER%%/include/llvm/XRay/InstrumentationMap.h
+llvm%%LLVM_LIB_VER%%/include/llvm/XRay/Trace.h
+llvm%%LLVM_LIB_VER%%/include/llvm/XRay/XRayRecord.h
+llvm%%LLVM_LIB_VER%%/include/llvm/XRay/YAMLXRayRecord.h
+%%COMPILER_RT%%llvm%%LLVM_LIB_VER%%/include/sanitizer/allocator_interface.h
+%%COMPILER_RT%%llvm%%LLVM_LIB_VER%%/include/sanitizer/asan_interface.h
+%%COMPILER_RT%%llvm%%LLVM_LIB_VER%%/include/sanitizer/common_interface_defs.h
+%%COMPILER_RT%%llvm%%LLVM_LIB_VER%%/include/sanitizer/coverage_interface.h
+%%COMPILER_RT%%llvm%%LLVM_LIB_VER%%/include/sanitizer/dfsan_interface.h
+%%COMPILER_RT%%llvm%%LLVM_LIB_VER%%/include/sanitizer/esan_interface.h
+%%COMPILER_RT%%llvm%%LLVM_LIB_VER%%/include/sanitizer/linux_syscall_hooks.h
+%%COMPILER_RT%%llvm%%LLVM_LIB_VER%%/include/sanitizer/lsan_interface.h
+%%COMPILER_RT%%llvm%%LLVM_LIB_VER%%/include/sanitizer/msan_interface.h
+%%COMPILER_RT%%llvm%%LLVM_LIB_VER%%/include/sanitizer/tsan_interface.h
+%%COMPILER_RT%%llvm%%LLVM_LIB_VER%%/include/sanitizer/tsan_interface_atomic.h
+%%COMPILER_RT%%llvm%%LLVM_LIB_VER%%/include/xray/xray_interface.h
+llvm%%LLVM_LIB_VER%%/include/xray/xray_log_interface.h
+llvm%%LLVM_LIB_VER%%/lib/BugpointPasses.so
+llvm%%LLVM_LIB_VER%%/lib/LLVMHello.so
+%%GOLD%%llvm%%LLVM_LIB_VER%%/lib/LLVMgold.so
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_builtin_vars.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_cmath.h
+%%CLANG%%%%OPENMP%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_complex_builtins.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_intrinsics.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_math_forward_declares.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_runtime_wrapper.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/__stddef_max_align_t.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/__wmmintrin_aes.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/__wmmintrin_pclmul.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/adxintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/altivec.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/ammintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/arm_acle.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/arm_neon.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/armintr.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/avx2intrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/avx512bwintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/avx512cdintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/avx512dqintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/avx512erintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/avx512fintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/avx512ifmaintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/avx512ifmavlintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/avx512pfintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/avx512vbmiintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/avx512vbmivlintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/avx512vlbwintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/avx512vlcdintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/avx512vldqintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/avx512vlintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/avx512vpopcntdqintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/avxintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/bmi2intrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/bmiintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/clflushoptintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/clzerointrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/cpuid.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/cuda_wrappers/algorithm
+%%CLANG%%%%OPENMP%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/cuda_wrappers/complex
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/cuda_wrappers/new
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/emmintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/f16cintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/float.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/fma4intrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/fmaintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/fxsrintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/htmintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/htmxlintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/ia32intrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/immintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/intrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/inttypes.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/iso646.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/lwpintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/lzcntintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/mm3dnow.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/mm_malloc.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/mmintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/module.modulemap
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/msa.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/mwaitxintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/nmmintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/opencl-c.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/pkuintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/pmmintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/popcntintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/prfchwintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/rdseedintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/rtmintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/s390intrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/shaintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/smmintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/tbmintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/tgmath.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/tmmintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/unwind.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/vadefs.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/vecintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/wmmintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/x86intrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/xmmintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/xopintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/xsavecintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/xsaveintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/xsaveoptintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/xsavesintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/clang/%%LLVM_RELEASE%%/include/xtestintrin.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/cmake/clang/ClangConfig.cmake
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/cmake/clang/ClangTargets-%%CMAKE_BUILD_TYPE%%.cmake
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/cmake/clang/ClangTargets.cmake
+llvm%%LLVM_LIB_VER%%/lib/cmake/llvm/AddLLVM.cmake
+llvm%%LLVM_LIB_VER%%/lib/cmake/llvm/AddLLVMDefinitions.cmake
+llvm%%LLVM_LIB_VER%%/lib/cmake/llvm/AddOCaml.cmake
+llvm%%LLVM_LIB_VER%%/lib/cmake/llvm/AddSphinxTarget.cmake
+llvm%%LLVM_LIB_VER%%/lib/cmake/llvm/CheckAtomic.cmake
+%%OPENMP%%llvm%%LLVM_LIB_VER%%/lib/cmake/llvm/CheckCompilerVersion.cmake
+llvm%%LLVM_LIB_VER%%/lib/cmake/llvm/CheckLinkerFlag.cmake
+llvm%%LLVM_LIB_VER%%/lib/cmake/llvm/ChooseMSVCCRT.cmake
+%%OPENMP%%llvm%%LLVM_LIB_VER%%/lib/cmake/llvm/CrossCompile.cmake
+%%OPENMP%%llvm%%LLVM_LIB_VER%%/lib/cmake/llvm/DetermineGCCCompatible.cmake
+llvm%%LLVM_LIB_VER%%/lib/cmake/llvm/FindOCaml.cmake
+llvm%%LLVM_LIB_VER%%/lib/cmake/llvm/FindSphinx.cmake
+llvm%%LLVM_LIB_VER%%/lib/cmake/llvm/GenerateVersionFromCVS.cmake
+llvm%%LLVM_LIB_VER%%/lib/cmake/llvm/GetSVN.cmake
+llvm%%LLVM_LIB_VER%%/lib/cmake/llvm/HandleLLVMOptions.cmake
+llvm%%LLVM_LIB_VER%%/lib/cmake/llvm/HandleLLVMStdlib.cmake
+llvm%%LLVM_LIB_VER%%/lib/cmake/llvm/LLVM-Config.cmake
+llvm%%LLVM_LIB_VER%%/lib/cmake/llvm/LLVMConfig.cmake
+llvm%%LLVM_LIB_VER%%/lib/cmake/llvm/LLVMConfigVersion.cmake
+llvm%%LLVM_LIB_VER%%/lib/cmake/llvm/LLVMExports-%%CMAKE_BUILD_TYPE%%.cmake
+llvm%%LLVM_LIB_VER%%/lib/cmake/llvm/LLVMExports.cmake
+llvm%%LLVM_LIB_VER%%/lib/cmake/llvm/LLVMExternalProjectUtils.cmake
+llvm%%LLVM_LIB_VER%%/lib/cmake/llvm/LLVMInstallSymlink.cmake
+llvm%%LLVM_LIB_VER%%/lib/cmake/llvm/LLVMProcessSources.cmake
+llvm%%LLVM_LIB_VER%%/lib/cmake/llvm/TableGen.cmake
+llvm%%LLVM_LIB_VER%%/lib/cmake/llvm/VersionFromVCS.cmake
+llvm%%LLVM_LIB_VER%%/lib/libLLVM-%%LLVM_MAJOR%%.so
+llvm%%LLVM_LIB_VER%%/lib/libLLVM-%%LLVM_RELEASE%%.so
+llvm%%LLVM_LIB_VER%%/lib/libLLVM.so
+llvm%%LLVM_LIB_VER%%/lib/libLLVMAArch64AsmParser.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMAArch64AsmPrinter.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMAArch64CodeGen.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMAArch64Desc.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMAArch64Disassembler.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMAArch64Info.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMAArch64Utils.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMAMDGPUAsmParser.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMAMDGPUAsmPrinter.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMAMDGPUCodeGen.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMAMDGPUDesc.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMAMDGPUDisassembler.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMAMDGPUInfo.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMAMDGPUUtils.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMARMAsmParser.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMARMAsmPrinter.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMARMCodeGen.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMARMDesc.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMARMDisassembler.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMARMInfo.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMAnalysis.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMAsmParser.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMAsmPrinter.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMBPFAsmPrinter.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMBPFCodeGen.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMBPFDesc.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMBPFDisassembler.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMBPFInfo.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMBinaryFormat.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMBitReader.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMBitWriter.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMCodeGen.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMCore.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMCoroutines.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMCoverage.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMDebugInfoCodeView.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMDebugInfoDWARF.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMDebugInfoMSF.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMDebugInfoPDB.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMDemangle.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMDlltoolDriver.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMExecutionEngine.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMGlobalISel.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMHexagonAsmParser.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMHexagonCodeGen.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMHexagonDesc.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMHexagonDisassembler.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMHexagonInfo.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMIRReader.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMInstCombine.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMInstrumentation.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMInterpreter.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMLTO.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMLanaiAsmParser.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMLanaiAsmPrinter.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMLanaiCodeGen.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMLanaiDesc.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMLanaiDisassembler.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMLanaiInfo.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMLibDriver.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMLineEditor.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMLinker.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMMC.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMMCDisassembler.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMMCJIT.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMMCParser.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMMIRParser.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMMSP430AsmPrinter.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMMSP430CodeGen.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMMSP430Desc.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMMSP430Info.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMMipsAsmParser.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMMipsAsmPrinter.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMMipsCodeGen.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMMipsDesc.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMMipsDisassembler.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMMipsInfo.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMNVPTXAsmPrinter.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMNVPTXCodeGen.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMNVPTXDesc.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMNVPTXInfo.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMObjCARCOpts.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMObject.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMObjectYAML.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMOption.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMOrcJIT.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMPasses.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMPowerPCAsmParser.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMPowerPCAsmPrinter.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMPowerPCCodeGen.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMPowerPCDesc.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMPowerPCDisassembler.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMPowerPCInfo.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMProfileData.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMRuntimeDyld.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMScalarOpts.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMSelectionDAG.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMSparcAsmParser.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMSparcAsmPrinter.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMSparcCodeGen.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMSparcDesc.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMSparcDisassembler.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMSparcInfo.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMSupport.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMSymbolize.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMSystemZAsmParser.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMSystemZAsmPrinter.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMSystemZCodeGen.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMSystemZDesc.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMSystemZDisassembler.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMSystemZInfo.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMTableGen.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMTarget.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMTransformUtils.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMVectorize.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMX86AsmParser.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMX86AsmPrinter.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMX86CodeGen.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMX86Desc.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMX86Disassembler.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMX86Info.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMX86Utils.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMXCoreAsmPrinter.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMXCoreCodeGen.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMXCoreDesc.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMXCoreDisassembler.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMXCoreInfo.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMXRay.a
+llvm%%LLVM_LIB_VER%%/lib/libLLVMipo.a
+llvm%%LLVM_LIB_VER%%/lib/libLTO.so
+llvm%%LLVM_LIB_VER%%/lib/libLTO.so.%%LLVM_RELEASE%%
+llvm%%LLVM_LIB_VER%%/lib/libLTO.so.5
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/libclang.so
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/libclang.so.%%LLVM_MAJOR%%
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/libclang.so.5
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/libclangARCMigrate.a
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/libclangAST.a
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/libclangASTMatchers.a
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/libclangAnalysis.a
+%%EXTRAS%%llvm%%LLVM_LIB_VER%%/lib/libclangApplyReplacements.a
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/libclangBasic.a
+%%EXTRAS%%llvm%%LLVM_LIB_VER%%/lib/libclangChangeNamespace.a
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/libclangCodeGen.a
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/libclangDaemon.a
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/libclangDriver.a
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/libclangDynamicASTMatchers.a
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/libclangEdit.a
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/libclangFormat.a
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/libclangFrontend.a
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/libclangFrontendTool.a
+%%EXTRAS%%llvm%%LLVM_LIB_VER%%/lib/libclangIncludeFixer.a
+%%EXTRAS%%llvm%%LLVM_LIB_VER%%/lib/libclangIncludeFixerPlugin.a
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/libclangIndex.a
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/libclangLex.a
+%%EXTRAS%%llvm%%LLVM_LIB_VER%%/lib/libclangMove.a
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/libclangParse.a
+%%EXTRAS%%llvm%%LLVM_LIB_VER%%/lib/libclangQuery.a
+%%EXTRAS%%llvm%%LLVM_LIB_VER%%/lib/libclangReorderFields.a
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/libclangRewrite.a
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/libclangRewriteFrontend.a
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/libclangSema.a
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/libclangSerialization.a
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/libclangStaticAnalyzerCheckers.a
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/libclangStaticAnalyzerCore.a
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/libclangStaticAnalyzerFrontend.a
+%%EXTRAS%%llvm%%LLVM_LIB_VER%%/lib/libclangTidy.a
+%%EXTRAS%%llvm%%LLVM_LIB_VER%%/lib/libclangTidyAndroidModule.a
+%%EXTRAS%%llvm%%LLVM_LIB_VER%%/lib/libclangTidyBoostModule.a
+%%EXTRAS%%llvm%%LLVM_LIB_VER%%/lib/libclangTidyBugproneModule.a
+%%EXTRAS%%llvm%%LLVM_LIB_VER%%/lib/libclangTidyCERTModule.a
+%%EXTRAS%%llvm%%LLVM_LIB_VER%%/lib/libclangTidyCppCoreGuidelinesModule.a
+%%EXTRAS%%llvm%%LLVM_LIB_VER%%/lib/libclangTidyGoogleModule.a
+%%EXTRAS%%llvm%%LLVM_LIB_VER%%/lib/libclangTidyHICPPModule.a
+%%EXTRAS%%llvm%%LLVM_LIB_VER%%/lib/libclangTidyLLVMModule.a
+%%EXTRAS%%llvm%%LLVM_LIB_VER%%/lib/libclangTidyMPIModule.a
+%%EXTRAS%%llvm%%LLVM_LIB_VER%%/lib/libclangTidyMiscModule.a
+%%EXTRAS%%llvm%%LLVM_LIB_VER%%/lib/libclangTidyModernizeModule.a
+%%EXTRAS%%llvm%%LLVM_LIB_VER%%/lib/libclangTidyPerformanceModule.a
+%%EXTRAS%%llvm%%LLVM_LIB_VER%%/lib/libclangTidyPlugin.a
+%%EXTRAS%%llvm%%LLVM_LIB_VER%%/lib/libclangTidyReadabilityModule.a
+%%EXTRAS%%llvm%%LLVM_LIB_VER%%/lib/libclangTidyUtils.a
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/libclangTooling.a
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/libclangToolingCore.a
+%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/libclangToolingRefactor.a
+%%EXTRAS%%llvm%%LLVM_LIB_VER%%/lib/libfindAllSymbols.a
+%%LLD%%llvm%%LLVM_LIB_VER%%/lib/liblldCOFF.a
+%%LLD%%llvm%%LLVM_LIB_VER%%/lib/liblldConfig.a
+%%LLD%%llvm%%LLVM_LIB_VER%%/lib/liblldCore.a
+%%LLD%%llvm%%LLVM_LIB_VER%%/lib/liblldDriver.a
+%%LLD%%llvm%%LLVM_LIB_VER%%/lib/liblldELF.a
+%%LLD%%llvm%%LLVM_LIB_VER%%/lib/liblldMachO.a
+%%LLD%%llvm%%LLVM_LIB_VER%%/lib/liblldReaderWriter.a
+%%LLD%%llvm%%LLVM_LIB_VER%%/lib/liblldYAML.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldb.so
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldb.so.%%LLVM_RELEASE%%
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldb.so.5
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbBase.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbBreakpoint.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbCommands.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbCore.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbDataFormatters.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbExpression.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbHost.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbInitialization.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbInterpreter.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginABIMacOSX_arm.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginABIMacOSX_arm64.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginABIMacOSX_i386.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginABISysV_arm.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginABISysV_arm64.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginABISysV_hexagon.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginABISysV_i386.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginABISysV_mips.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginABISysV_mips64.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginABISysV_ppc.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginABISysV_ppc64.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginABISysV_s390x.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginABISysV_x86_64.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginAppleObjCRuntime.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginCPlusPlusLanguage.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginCXXItaniumABI.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginDisassemblerLLVM.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginDynamicLoaderHexagonDYLD.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginDynamicLoaderMacOSXDYLD.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginDynamicLoaderPosixDYLD.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginDynamicLoaderStatic.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginDynamicLoaderWindowsDYLD.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginExpressionParserClang.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginExpressionParserGo.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginGoLanguage.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginInstructionARM.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginInstructionARM64.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginInstructionMIPS.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginInstructionMIPS64.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginInstrumentationRuntimeASan.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginInstrumentationRuntimeMainThreadChecker.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginInstrumentationRuntimeTSan.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginInstrumentationRuntimeUBSan.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginJITLoaderGDB.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginJavaLanguage.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginLanguageRuntimeGo.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginLanguageRuntimeJava.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginMemoryHistoryASan.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginOCamlLanguage.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginOSGo.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginOSPython.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginObjCLanguage.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginObjCPlusPlusLanguage.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginObjectContainerBSDArchive.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginObjectContainerMachOArchive.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginObjectFileELF.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginObjectFileJIT.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginObjectFileMachO.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginObjectFilePECOFF.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginPlatformAndroid.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginPlatformFreeBSD.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginPlatformGDB.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginPlatformKalimba.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginPlatformLinux.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginPlatformMacOSX.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginPlatformNetBSD.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginPlatformOpenBSD.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginPlatformPOSIX.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginPlatformWindows.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginProcessElfCore.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginProcessFreeBSD.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginProcessGDBRemote.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginProcessMinidump.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginProcessPOSIX.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginProcessUtility.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginRenderScriptRuntime.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginScriptInterpreterNone.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginScriptInterpreterPython.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginStructuredDataDarwinLog.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginSymbolFileDWARF.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginSymbolFilePDB.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginSymbolFileSymtab.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginSymbolVendorELF.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginSystemRuntimeMacOSX.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginUnwindAssemblyInstEmulation.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbPluginUnwindAssemblyX86.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbSymbol.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbTarget.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbUtility.a
+%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbUtilityHelpers.a
+%%CLANG%%llvm%%LLVM_LIB_VER%%/libexec/c++-analyzer
+%%CLANG%%llvm%%LLVM_LIB_VER%%/libexec/ccc-analyzer
+%%CLANG%%llvm%%LLVM_LIB_VER%%/share/clang/bash-autocomplete.sh
+%%CLANG%%llvm%%LLVM_LIB_VER%%/share/clang/clang-format-bbedit.applescript
+%%CLANG%%llvm%%LLVM_LIB_VER%%/share/clang/clang-format-diff.py
+%%CLANG%%llvm%%LLVM_LIB_VER%%/share/clang/clang-format-sublime.py
+%%CLANG%%llvm%%LLVM_LIB_VER%%/share/clang/clang-format.el
+%%CLANG%%llvm%%LLVM_LIB_VER%%/share/clang/clang-format.py
+%%EXTRAS%%llvm%%LLVM_LIB_VER%%/share/clang/clang-include-fixer.el
+%%EXTRAS%%llvm%%LLVM_LIB_VER%%/share/clang/clang-include-fixer.py
+%%EXTRAS%%llvm%%LLVM_LIB_VER%%/share/clang/clang-rename.el
+%%EXTRAS%%llvm%%LLVM_LIB_VER%%/share/clang/clang-rename.py
+%%EXTRAS%%llvm%%LLVM_LIB_VER%%/share/clang/clang-tidy-diff.py
+%%EXTRAS%%llvm%%LLVM_LIB_VER%%/share/clang/run-clang-tidy.py
+%%EXTRAS%%llvm%%LLVM_LIB_VER%%/share/clang/run-find-all-symbols.py
+llvm%%LLVM_LIB_VER%%/share/opt-viewer/opt-diff.py
+llvm%%LLVM_LIB_VER%%/share/opt-viewer/opt-stats.py
+llvm%%LLVM_LIB_VER%%/share/opt-viewer/opt-viewer.py
+llvm%%LLVM_LIB_VER%%/share/opt-viewer/optpmap.py
+llvm%%LLVM_LIB_VER%%/share/opt-viewer/optrecord.py
+llvm%%LLVM_LIB_VER%%/share/opt-viewer/style.css
+%%CLANG%%llvm%%LLVM_LIB_VER%%/share/scan-build/scanview.css
+%%CLANG%%llvm%%LLVM_LIB_VER%%/share/scan-build/sorttable.js
+%%CLANG%%llvm%%LLVM_LIB_VER%%/share/scan-view/FileRadar.scpt
+%%CLANG%%llvm%%LLVM_LIB_VER%%/share/scan-view/GetRadarVersion.scpt
+%%CLANG%%llvm%%LLVM_LIB_VER%%/share/scan-view/Reporter.py
+%%CLANG%%llvm%%LLVM_LIB_VER%%/share/scan-view/ScanView.py
+%%CLANG%%llvm%%LLVM_LIB_VER%%/share/scan-view/bugcatcher.ico
+%%CLANG%%llvm%%LLVM_LIB_VER%%/share/scan-view/startfile.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/BooleanExpression.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/LitConfig.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/LitTestCase.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/ProgressBar.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/ShCommands.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/ShUtil.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/Test.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/TestRunner.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/TestingConfig.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/__init__.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/discovery.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/formats/__init__.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/formats/base.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/formats/googletest.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/formats/shtest.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/main.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/run.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/util.py
diff --git a/devel/lockfree-malloc/Makefile b/devel/lockfree-malloc/Makefile
index c9b92d9f1aff..091aae490d26 100644
--- a/devel/lockfree-malloc/Makefile
+++ b/devel/lockfree-malloc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	lockfree-malloc
 PORTVERSION=	0.0.${DATE}
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel
 MASTER_SITES=	LOCAL/vg
 
diff --git a/devel/love/Makefile b/devel/love/Makefile
index 4a577db62c80..da8a472d58fb 100644
--- a/devel/love/Makefile
+++ b/devel/love/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	love
 PORTVERSION=	0.10.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel games
 MASTER_SITES=	https://bitbucket.org/rude/love/downloads/ \
 		http://mirror.amdmi3.ru/distfiles/
diff --git a/devel/magit/Makefile b/devel/magit/Makefile
index 645a951033a4..918bb3f8f2c1 100644
--- a/devel/magit/Makefile
+++ b/devel/magit/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	magit
 PORTVERSION=	2.10.3
+PORTREVISION=	1
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
diff --git a/devel/mercator/Makefile b/devel/mercator/Makefile
index 3395cb8102d8..17f95cc05a16 100644
--- a/devel/mercator/Makefile
+++ b/devel/mercator/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mercator
 PORTVERSION=	0.3.3
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	devel
 MASTER_SITES=	SF/worldforge/Mercator%20%28terrain%20lib%29/${PORTVERSION}
 
diff --git a/devel/msgpack/Makefile b/devel/msgpack/Makefile
index 49b28ae2a38c..71941cead203 100644
--- a/devel/msgpack/Makefile
+++ b/devel/msgpack/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	msgpack
 PORTVERSION=	1.4.2
 DISTVERSIONPREFIX=	cpp-
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 
 MAINTAINER=	kuriyama@FreeBSD.org
diff --git a/devel/msp430-debug-stack/Makefile b/devel/msp430-debug-stack/Makefile
index 61706b19a9a0..3fe86fda62d7 100644
--- a/devel/msp430-debug-stack/Makefile
+++ b/devel/msp430-debug-stack/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	msp430-debug-stack
 PORTVERSION=	3.9.1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://www.ti.com/lit/sw/slac460s/ \
 		http://www.ti.com/lit/ug/slau320x/:doc1 \
diff --git a/devel/nlohmann-json/Makefile b/devel/nlohmann-json/Makefile
index 261005f46290..414ebd03f3ef 100644
--- a/devel/nlohmann-json/Makefile
+++ b/devel/nlohmann-json/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	json
 PORTVERSION=	2.1.1
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 PKGNAMEPREFIX=	nlohmann-
diff --git a/devel/obby/Makefile b/devel/obby/Makefile
index 661866e33139..0530b68d3483 100644
--- a/devel/obby/Makefile
+++ b/devel/obby/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	obby
 PORTVERSION=	0.4.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://releases.0x539.de/obby/
 
diff --git a/devel/ocaml-lacaml/Makefile b/devel/ocaml-lacaml/Makefile
index b54656c3f084..39a916cdad87 100644
--- a/devel/ocaml-lacaml/Makefile
+++ b/devel/ocaml-lacaml/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	lacaml
 PORTVERSION=	8.0.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/mmottl/lacaml/releases/download/v${PORTVERSION}/
 PKGNAMEPREFIX=	ocaml-
diff --git a/devel/opendht/Makefile b/devel/opendht/Makefile
index f86ba315d344..85b7c210b99c 100644
--- a/devel/opendht/Makefile
+++ b/devel/opendht/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	opendht
 PORTVERSION=	0.5.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel net
 
 MAINTAINER=	yuri@rawbw.com
diff --git a/devel/openmp/Makefile b/devel/openmp/Makefile
index 92f0226a2b1f..a43719ec3e3d 100644
--- a/devel/openmp/Makefile
+++ b/devel/openmp/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	openmp
-DISTVERSION=	4.0.1
+DISTVERSION=	5.0.0
 DISTVERSIONSUFFIX=	.src
 CATEGORIES=	devel
 MASTER_SITES=	http://llvm.org/releases/${DISTVERSION}/
diff --git a/devel/openmp/distinfo b/devel/openmp/distinfo
index ef587e5c752b..ce187f9a36cb 100644
--- a/devel/openmp/distinfo
+++ b/devel/openmp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501781996
-SHA256 (openmp-4.0.1.src.tar.xz) = ec693b170e0600daa7b372240a06e66341ace790d89eaf4a843e8d56d5f4ada4
-SIZE (openmp-4.0.1.src.tar.xz) = 2275240
+TIMESTAMP = 1504637833
+SHA256 (openmp-5.0.0.src.tar.xz) = c0ef081b05e0725a04e8711d9ecea2e90d6c3fbb1622845336d3d095d0a3f7c5
+SIZE (openmp-5.0.0.src.tar.xz) = 2074004
diff --git a/devel/openmp/files/patch-runtime_src_kmp__runtime.cpp b/devel/openmp/files/patch-runtime_src_kmp__runtime.cpp
index f7776cf27a02..99ae204e56ef 100644
--- a/devel/openmp/files/patch-runtime_src_kmp__runtime.cpp
+++ b/devel/openmp/files/patch-runtime_src_kmp__runtime.cpp
@@ -1,11 +1,11 @@
---- runtime/src/kmp_runtime.cpp.orig	2017-01-20 23:31:21 UTC
+--- runtime/src/kmp_runtime.cpp.orig	2017-07-17 09:03:14 UTC
 +++ runtime/src/kmp_runtime.cpp
-@@ -7597,7 +7597,7 @@ __kmp_determine_reduction_method( ident_t *loc, kmp_in
+@@ -7535,7 +7535,7 @@ __kmp_determine_reduction_method(
  
-         #elif KMP_ARCH_X86 || KMP_ARCH_ARM || KMP_ARCH_AARCH || KMP_ARCH_MIPS
+ #elif KMP_ARCH_X86 || KMP_ARCH_ARM || KMP_ARCH_AARCH || KMP_ARCH_MIPS
  
--            #if KMP_OS_LINUX || KMP_OS_WINDOWS
-+            #if KMP_OS_LINUX || KMP_OS_FREEBSD || KMP_OS_WINDOWS
+-#if KMP_OS_LINUX || KMP_OS_WINDOWS
++#if KMP_OS_LINUX || KMP_OS_FREEBSD || KMP_OS_WINDOWS
  
-                 // basic tuning
+     // basic tuning
  
diff --git a/devel/p5-CPAN-Perl-Releases/Makefile b/devel/p5-CPAN-Perl-Releases/Makefile
index 7fe1b3e8808d..f90fa40d1589 100644
--- a/devel/p5-CPAN-Perl-Releases/Makefile
+++ b/devel/p5-CPAN-Perl-Releases/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	CPAN-Perl-Releases
-PORTVERSION=	3.32
+PORTVERSION=	3.34
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-CPAN-Perl-Releases/distinfo b/devel/p5-CPAN-Perl-Releases/distinfo
index c0708212e81d..d2ef7fdf92a1 100644
--- a/devel/p5-CPAN-Perl-Releases/distinfo
+++ b/devel/p5-CPAN-Perl-Releases/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503415927
-SHA256 (CPAN-Perl-Releases-3.32.tar.gz) = 29915e0e611e3ff49cbb2308249f95179ba6f81b0bf2a0d81917bae6e275e887
-SIZE (CPAN-Perl-Releases-3.32.tar.gz) = 24932
+TIMESTAMP = 1505127713
+SHA256 (CPAN-Perl-Releases-3.34.tar.gz) = 17179549807a2a7338b124dddf464a24a3eba649caf3d90b29f18f281a7d8f5b
+SIZE (CPAN-Perl-Releases-3.34.tar.gz) = 25003
diff --git a/devel/p5-CPANPLUS/Makefile b/devel/p5-CPANPLUS/Makefile
index 2d682ca6940d..1049ed5dae39 100644
--- a/devel/p5-CPANPLUS/Makefile
+++ b/devel/p5-CPANPLUS/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	CPANPLUS
-PORTVERSION=	0.9168
+PORTVERSION=	0.9170
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BINGOS
diff --git a/devel/p5-CPANPLUS/distinfo b/devel/p5-CPANPLUS/distinfo
index 7e8a94180bc2..f627fb1cc7f8 100644
--- a/devel/p5-CPANPLUS/distinfo
+++ b/devel/p5-CPANPLUS/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1494936624
-SHA256 (CPANPLUS-0.9168.tar.gz) = ea7b3278a688721729244de4d8efc57536be833458d93172c412bdc7c3c1ed02
-SIZE (CPANPLUS-0.9168.tar.gz) = 583994
+TIMESTAMP = 1505424283
+SHA256 (CPANPLUS-0.9170.tar.gz) = 8b2eceac8e329e3ed22f7c8b1db622f67cc3c2e19789f22506f0350794a8ba58
+SIZE (CPANPLUS-0.9170.tar.gz) = 588092
diff --git a/devel/p5-IPC-Shareable/pkg-descr b/devel/p5-IPC-Shareable/pkg-descr
index 0c42b2c2285e..0f3a990cf0cf 100644
--- a/devel/p5-IPC-Shareable/pkg-descr
+++ b/devel/p5-IPC-Shareable/pkg-descr
@@ -1,9 +1,7 @@
 IPC::Shareable allows you to tie a variable to shared memory making it
 easy to share the contents of that variable with other Perl processes.
-Currently either scalars or hashes can be tied; tying of arrays remains
-a work in progress. However, the variable being tied may contain
-arbitrarily complex data structures - including references to arrays,
-hashes of hashes, etc. See the "REFERENCES" entry in this man page below
-for more information.
+Scalars, arrays, and hashes can be tied. The variable being tied may
+contain arbitrarily complex data structures - including references to
+arrays, hashes of hashes, etc.
 
 WWW: http://search.cpan.org/dist/IPC-Shareable/
diff --git a/devel/p5-Log-Dispatch-FileRotate/Makefile b/devel/p5-Log-Dispatch-FileRotate/Makefile
index 5fe256eb60e3..c857b101f39e 100644
--- a/devel/p5-Log-Dispatch-FileRotate/Makefile
+++ b/devel/p5-Log-Dispatch-FileRotate/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Log-Dispatch-FileRotate
-PORTVERSION=	1.30
+PORTVERSION=	1.34
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -15,8 +15,7 @@ LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	p5-Date-Manip>=0:devel/p5-Date-Manip \
-		p5-Log-Dispatch>=0:devel/p5-Log-Dispatch \
-		p5-Params-Validate>=0:devel/p5-Params-Validate
+		p5-Log-Dispatch>=0:devel/p5-Log-Dispatch
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Path-Tiny>=0.018:devel/p5-Path-Tiny \
 		p5-Test-Warn>=0:devel/p5-Test-Warn
diff --git a/devel/p5-Log-Dispatch-FileRotate/distinfo b/devel/p5-Log-Dispatch-FileRotate/distinfo
index 226029218e96..5958a6505a09 100644
--- a/devel/p5-Log-Dispatch-FileRotate/distinfo
+++ b/devel/p5-Log-Dispatch-FileRotate/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501862741
-SHA256 (Log-Dispatch-FileRotate-1.30.tar.gz) = 4e04883b504c3dd9482bcdbdf63ad8d5a9c6989620514db474f2bd12afefe323
-SIZE (Log-Dispatch-FileRotate-1.30.tar.gz) = 25420
+TIMESTAMP = 1505424294
+SHA256 (Log-Dispatch-FileRotate-1.34.tar.gz) = 028a4c5293172b2f4ae7acbf0923f4467af1600c573fdc5067eea7707657095c
+SIZE (Log-Dispatch-FileRotate-1.34.tar.gz) = 28202
diff --git a/devel/p5-Log-Dispatch-FileRotate/pkg-plist b/devel/p5-Log-Dispatch-FileRotate/pkg-plist
index 3ab05455c2e6..3ec2485ce7d4 100644
--- a/devel/p5-Log-Dispatch-FileRotate/pkg-plist
+++ b/devel/p5-Log-Dispatch-FileRotate/pkg-plist
@@ -1,2 +1,6 @@
 %%SITE_PERL%%/Log/Dispatch/FileRotate.pm
+%%SITE_PERL%%/Log/Dispatch/FileRotate/Flock.pm
+%%SITE_PERL%%/Log/Dispatch/FileRotate/Mutex.pm
 %%PERL5_MAN3%%/Log::Dispatch::FileRotate.3.gz
+%%PERL5_MAN3%%/Log::Dispatch::FileRotate::Flock.3.gz
+%%PERL5_MAN3%%/Log::Dispatch::FileRotate::Mutex.3.gz
diff --git a/devel/p5-MCE/Makefile b/devel/p5-MCE/Makefile
index 57b1a7467d25..e1d068c04cf7 100644
--- a/devel/p5-MCE/Makefile
+++ b/devel/p5-MCE/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	MCE
-PORTVERSION=	1.829
+PORTVERSION=	1.830
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MARIOROY
diff --git a/devel/p5-MCE/distinfo b/devel/p5-MCE/distinfo
index cddd14449c9b..a349e5e3d7a8 100644
--- a/devel/p5-MCE/distinfo
+++ b/devel/p5-MCE/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1493837856
-SHA256 (MCE-1.829.tar.gz) = cdf2420108b2a3b0b4ed6ddd53f9c5c283c1eaab04a9445d7accd67c4abe3489
-SIZE (MCE-1.829.tar.gz) = 181474
+TIMESTAMP = 1505424303
+SHA256 (MCE-1.830.tar.gz) = ab6b779b2a47e26d03d3f0a9ce6fcfb48b900001ccdd0b98bed99ae20db65ca8
+SIZE (MCE-1.830.tar.gz) = 181656
diff --git a/devel/p5-Return-MultiLevel/Makefile b/devel/p5-Return-MultiLevel/Makefile
index e6ec2727fbb9..aa521babb518 100644
--- a/devel/p5-Return-MultiLevel/Makefile
+++ b/devel/p5-Return-MultiLevel/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Return-MultiLevel
-PORTVERSION=	0.04
-PORTREVISION=	2
+PORTVERSION=	0.05
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MAUKE
@@ -15,9 +14,12 @@ COMMENT=	Return across multiple call levels
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Data-Munge>=0.07:devel/p5-Data-Munge
+BUILD_DEPENDS=	p5-Data-Munge>=0.07:devel/p5-Data-Munge \
+		p5-Scope-Upper>=0.29:devel/p5-Scope-Upper
 RUN_DEPENDS:=	${BUILD_DEPENDS}
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
+NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure
 
diff --git a/devel/p5-Return-MultiLevel/distinfo b/devel/p5-Return-MultiLevel/distinfo
index 0f50a81ba0d5..ed3226c75d04 100644
--- a/devel/p5-Return-MultiLevel/distinfo
+++ b/devel/p5-Return-MultiLevel/distinfo
@@ -1,2 +1,3 @@
-SHA256 (Return-MultiLevel-0.04.tar.gz) = 4c807ca670cfb8db05ccc4b2848ba28618eecfc8147fdadc97f79fb74403a547
-SIZE (Return-MultiLevel-0.04.tar.gz) = 5129
+TIMESTAMP = 1505104208
+SHA256 (Return-MultiLevel-0.05.tar.gz) = ff076fbaba653c09953ac53959fe6c64fb52a33db3b5d223a015ab75ac3ed91d
+SIZE (Return-MultiLevel-0.05.tar.gz) = 7054
diff --git a/devel/p5-Sepia/Makefile b/devel/p5-Sepia/Makefile
index d10d9e0bf3a2..b665c47c974c 100644
--- a/devel/p5-Sepia/Makefile
+++ b/devel/p5-Sepia/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Sepia
 PORTVERSION=	0.992
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Simple/Makefile b/devel/p5-Test-Simple/Makefile
index 1325c879cc5a..c2349c0a02d6 100644
--- a/devel/p5-Test-Simple/Makefile
+++ b/devel/p5-Test-Simple/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Test-Simple
-PORTVERSION=	1.302086
+PORTVERSION=	1.302096
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -14,8 +14,6 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-CONFLICTS_INSTALL=	p5-Test2-[0-9]* p5-Test-Tester-[0-9]* p5-Test-use-ok-[0-9]*
-
 NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Test-Simple/distinfo b/devel/p5-Test-Simple/distinfo
index 108f7b30afe6..90849f697196 100644
--- a/devel/p5-Test-Simple/distinfo
+++ b/devel/p5-Test-Simple/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1498142163
-SHA256 (Test-Simple-1.302086.tar.gz) = 21e4c93c52529a10ef970afcf2cdb5719bcfef5f71af09cad3675fcf021995b1
-SIZE (Test-Simple-1.302086.tar.gz) = 257046
+TIMESTAMP = 1505229634
+SHA256 (Test-Simple-1.302096.tar.gz) = 314b38cb33fb608c352bd895431cf504b14642ff8714831c410f30877019dc11
+SIZE (Test-Simple-1.302096.tar.gz) = 282450
diff --git a/devel/p5-Test-Simple/pkg-plist b/devel/p5-Test-Simple/pkg-plist
index 5fc49c0e133a..73476b1e5a8d 100644
--- a/devel/p5-Test-Simple/pkg-plist
+++ b/devel/p5-Test-Simple/pkg-plist
@@ -24,14 +24,27 @@
 %%SITE_PERL%%/Test2/Event/Diag.pm
 %%SITE_PERL%%/Test2/Event/Encoding.pm
 %%SITE_PERL%%/Test2/Event/Exception.pm
+%%SITE_PERL%%/Test2/Event/Fail.pm
 %%SITE_PERL%%/Test2/Event/Generic.pm
 %%SITE_PERL%%/Test2/Event/Note.pm
 %%SITE_PERL%%/Test2/Event/Ok.pm
+%%SITE_PERL%%/Test2/Event/Pass.pm
 %%SITE_PERL%%/Test2/Event/Plan.pm
 %%SITE_PERL%%/Test2/Event/Skip.pm
 %%SITE_PERL%%/Test2/Event/Subtest.pm
 %%SITE_PERL%%/Test2/Event/TAP/Version.pm
 %%SITE_PERL%%/Test2/Event/Waiting.pm
+%%SITE_PERL%%/Test2/EventFacet.pm
+%%SITE_PERL%%/Test2/EventFacet/About.pm
+%%SITE_PERL%%/Test2/EventFacet/Amnesty.pm
+%%SITE_PERL%%/Test2/EventFacet/Assert.pm
+%%SITE_PERL%%/Test2/EventFacet/Control.pm
+%%SITE_PERL%%/Test2/EventFacet/Error.pm
+%%SITE_PERL%%/Test2/EventFacet/Info.pm
+%%SITE_PERL%%/Test2/EventFacet/Meta.pm
+%%SITE_PERL%%/Test2/EventFacet/Parent.pm
+%%SITE_PERL%%/Test2/EventFacet/Plan.pm
+%%SITE_PERL%%/Test2/EventFacet/Trace.pm
 %%SITE_PERL%%/Test2/Formatter.pm
 %%SITE_PERL%%/Test2/Formatter/TAP.pm
 %%SITE_PERL%%/Test2/Hub.pm
@@ -45,6 +58,7 @@
 %%SITE_PERL%%/Test2/Transition.pod
 %%SITE_PERL%%/Test2/Util.pm
 %%SITE_PERL%%/Test2/Util/ExternalMeta.pm
+%%SITE_PERL%%/Test2/Util/Facets2Legacy.pm
 %%SITE_PERL%%/Test2/Util/HashBase.pm
 %%SITE_PERL%%/Test2/Util/Trace.pm
 %%SITE_PERL%%/ok.pm
@@ -59,14 +73,27 @@
 %%PERL5_MAN3%%/Test2::Event::Diag.3.gz
 %%PERL5_MAN3%%/Test2::Event::Encoding.3.gz
 %%PERL5_MAN3%%/Test2::Event::Exception.3.gz
+%%PERL5_MAN3%%/Test2::Event::Fail.3.gz
 %%PERL5_MAN3%%/Test2::Event::Generic.3.gz
 %%PERL5_MAN3%%/Test2::Event::Note.3.gz
 %%PERL5_MAN3%%/Test2::Event::Ok.3.gz
+%%PERL5_MAN3%%/Test2::Event::Pass.3.gz
 %%PERL5_MAN3%%/Test2::Event::Plan.3.gz
 %%PERL5_MAN3%%/Test2::Event::Skip.3.gz
 %%PERL5_MAN3%%/Test2::Event::Subtest.3.gz
 %%PERL5_MAN3%%/Test2::Event::TAP::Version.3.gz
 %%PERL5_MAN3%%/Test2::Event::Waiting.3.gz
+%%PERL5_MAN3%%/Test2::EventFacet.3.gz
+%%PERL5_MAN3%%/Test2::EventFacet::About.3.gz
+%%PERL5_MAN3%%/Test2::EventFacet::Amnesty.3.gz
+%%PERL5_MAN3%%/Test2::EventFacet::Assert.3.gz
+%%PERL5_MAN3%%/Test2::EventFacet::Control.3.gz
+%%PERL5_MAN3%%/Test2::EventFacet::Error.3.gz
+%%PERL5_MAN3%%/Test2::EventFacet::Info.3.gz
+%%PERL5_MAN3%%/Test2::EventFacet::Meta.3.gz
+%%PERL5_MAN3%%/Test2::EventFacet::Parent.3.gz
+%%PERL5_MAN3%%/Test2::EventFacet::Plan.3.gz
+%%PERL5_MAN3%%/Test2::EventFacet::Trace.3.gz
 %%PERL5_MAN3%%/Test2::Formatter.3.gz
 %%PERL5_MAN3%%/Test2::Formatter::TAP.3.gz
 %%PERL5_MAN3%%/Test2::Hub.3.gz
diff --git a/devel/p5-Test2-Suite/Makefile b/devel/p5-Test2-Suite/Makefile
index 77508de70609..3406ef2a7a29 100644
--- a/devel/p5-Test2-Suite/Makefile
+++ b/devel/p5-Test2-Suite/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Test2-Suite
-PORTVERSION=	0.000072
+PORTVERSION=	0.000077
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:EXODIST
@@ -17,18 +17,12 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	p5-Importer>=0.024:devel/p5-Importer \
 		p5-Sub-Info>=0.001:devel/p5-Sub-Info \
-		p5-Term-Table>=0.002:devel/p5-Term-Table
+		p5-Term-Table>=0.002:devel/p5-Term-Table \
+		p5-Test-Simple>=1.302096:devel/p5-Test-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
 USE_PERL5=	configure
 USES=		perl5
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 502508
-BUILD_DEPENDS+=	p5-Test-Simple>=1.302073:devel/p5-Test-Simple
-RUN_DEPENDS+=	p5-Test-Simple>=1.302073:devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Test2-Suite/distinfo b/devel/p5-Test2-Suite/distinfo
index 42a4ac960403..23e180c43ad0 100644
--- a/devel/p5-Test2-Suite/distinfo
+++ b/devel/p5-Test2-Suite/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1497778484
-SHA256 (Test2-Suite-0.000072.tar.gz) = ee6254725b71ef29b28612e31e2bd4d88b82d61495beb531bf014a9c8435ed41
-SIZE (Test2-Suite-0.000072.tar.gz) = 141276
+TIMESTAMP = 1505293179
+SHA256 (Test2-Suite-0.000077.tar.gz) = 8102f9724f863dcd05efe783e4415f91d1cf2d6a118b75e97856a566b83f1305
+SIZE (Test2-Suite-0.000077.tar.gz) = 144835
diff --git a/devel/p5-Test2-Suite/pkg-plist b/devel/p5-Test2-Suite/pkg-plist
index 0382d3a57424..714bab33cf5d 100644
--- a/devel/p5-Test2-Suite/pkg-plist
+++ b/devel/p5-Test2-Suite/pkg-plist
@@ -26,12 +26,14 @@
 %%SITE_PERL%%/Test2/Compare/String.pm
 %%SITE_PERL%%/Test2/Compare/Undef.pm
 %%SITE_PERL%%/Test2/Compare/Wildcard.pm
+%%SITE_PERL%%/Test2/Event/Times.pm
 %%SITE_PERL%%/Test2/Mock.pm
 %%SITE_PERL%%/Test2/Plugin.pm
 %%SITE_PERL%%/Test2/Plugin/BailOnFail.pm
 %%SITE_PERL%%/Test2/Plugin/DieOnFail.pm
 %%SITE_PERL%%/Test2/Plugin/ExitSummary.pm
 %%SITE_PERL%%/Test2/Plugin/SRand.pm
+%%SITE_PERL%%/Test2/Plugin/Times.pm
 %%SITE_PERL%%/Test2/Plugin/UTF8.pm
 %%SITE_PERL%%/Test2/Require.pm
 %%SITE_PERL%%/Test2/Require/AuthorTesting.pm
@@ -53,6 +55,7 @@
 %%SITE_PERL%%/Test2/Tools/Event.pm
 %%SITE_PERL%%/Test2/Tools/Exception.pm
 %%SITE_PERL%%/Test2/Tools/Exports.pm
+%%SITE_PERL%%/Test2/Tools/GenTemp.pm
 %%SITE_PERL%%/Test2/Tools/Grab.pm
 %%SITE_PERL%%/Test2/Tools/Mock.pm
 %%SITE_PERL%%/Test2/Tools/Ref.pm
@@ -67,6 +70,7 @@
 %%SITE_PERL%%/Test2/Util/Table/Cell.pm
 %%SITE_PERL%%/Test2/Util/Table/LineBreak.pm
 %%SITE_PERL%%/Test2/Util/Term.pm
+%%SITE_PERL%%/Test2/Util/Times.pm
 %%SITE_PERL%%/Test2/V0.pm
 %%PERL5_MAN3%%/Test2::Bundle.3.gz
 %%PERL5_MAN3%%/Test2::Bundle::Extended.3.gz
@@ -102,6 +106,7 @@
 %%PERL5_MAN3%%/Test2::Plugin::DieOnFail.3.gz
 %%PERL5_MAN3%%/Test2::Plugin::ExitSummary.3.gz
 %%PERL5_MAN3%%/Test2::Plugin::SRand.3.gz
+%%PERL5_MAN3%%/Test2::Plugin::Times.3.gz
 %%PERL5_MAN3%%/Test2::Plugin::UTF8.3.gz
 %%PERL5_MAN3%%/Test2::Require.3.gz
 %%PERL5_MAN3%%/Test2::Require::AuthorTesting.3.gz
@@ -123,6 +128,7 @@
 %%PERL5_MAN3%%/Test2::Tools::Event.3.gz
 %%PERL5_MAN3%%/Test2::Tools::Exception.3.gz
 %%PERL5_MAN3%%/Test2::Tools::Exports.3.gz
+%%PERL5_MAN3%%/Test2::Tools::GenTemp.3.gz
 %%PERL5_MAN3%%/Test2::Tools::Grab.3.gz
 %%PERL5_MAN3%%/Test2::Tools::Mock.3.gz
 %%PERL5_MAN3%%/Test2::Tools::Ref.3.gz
@@ -135,4 +141,5 @@
 %%PERL5_MAN3%%/Test2::Util::Sub.3.gz
 %%PERL5_MAN3%%/Test2::Util::Table.3.gz
 %%PERL5_MAN3%%/Test2::Util::Table::LineBreak.3.gz
+%%PERL5_MAN3%%/Test2::Util::Times.3.gz
 %%PERL5_MAN3%%/Test2::V0.3.gz
diff --git a/devel/p5-perlkde/Makefile b/devel/p5-perlkde/Makefile
index 66c493c45f8e..662077258aa0 100644
--- a/devel/p5-perlkde/Makefile
+++ b/devel/p5-perlkde/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	perlkde
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel kde kde-kde4 perl5
 PKGNAMEPREFIX=	p5-
 
diff --git a/devel/papi/Makefile b/devel/papi/Makefile
index 7704b40f9b4f..df3d1be0976d 100644
--- a/devel/papi/Makefile
+++ b/devel/papi/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	papi
 PORTVERSION=	5.4.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	http://icl.cs.utk.edu/projects/papi/downloads/
 
diff --git a/devel/pear-File_Iterator/Makefile b/devel/pear-File_Iterator/Makefile
index 0b259d2c8436..6f1413ae27bc 100644
--- a/devel/pear-File_Iterator/Makefile
+++ b/devel/pear-File_Iterator/Makefile
@@ -2,20 +2,32 @@
 # $FreeBSD$
 
 PORTNAME=	File_Iterator
-PORTVERSION=	1.3.3
+PORTVERSION=	1.4.2
 CATEGORIES=	devel www pear
-MASTER_SITES=	http://pear.phpunit.de/get/
 PKGNAMEPREFIX=	pear-
 
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PEAR FileIterator implementation
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
-RUN_DEPENDS=	${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BROKEN=		unfetchable, redirects to https://phpunit.de/
+BUILD_DEPENDS=	pear-channel-phpunit>=20110327:devel/pear-channel-phpunit
+RUN_DEPENDS=	pear-channel-phpunit>=20110327:devel/pear-channel-phpunit
 
-USES=	pear
-PEAR_CHANNEL=	phpunit
+USE_GITHUB=	yes
+GH_ACCOUNT=	sebastianbergmann
+GH_PROJECT=	php-file-iterator
+
+NO_BUILD=	yes
+
+PHP_DIR=	share/PHP
+
+PLIST_FILES=	${PHP_DIR}/${PORTNAME}/Iterator.php
+
+do-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/${PHP_DIR}/${PORTNAME}
+	${INSTALL_SCRIPT} ${WRKSRC}/src/Iterator.php \
+		${STAGEDIR}${PREFIX}/${PHP_DIR}/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/devel/pear-File_Iterator/distinfo b/devel/pear-File_Iterator/distinfo
index 553cd387cdc7..e438709f24c0 100644
--- a/devel/pear-File_Iterator/distinfo
+++ b/devel/pear-File_Iterator/distinfo
@@ -1,2 +1,3 @@
-SHA256 (PEAR/File_Iterator-1.3.3.tgz) = 10a3f840cab6ae49cd10590026ffc43930dddd2a33b57fb16c6c14eaa5ef7211
-SIZE (PEAR/File_Iterator-1.3.3.tgz) = 5152
+TIMESTAMP = 1504024394
+SHA256 (sebastianbergmann-php-file-iterator-1.4.2_GH0.tar.gz) = 138c7ba11c72e7aff3cded47b6011fc152405e7b907d28578b95d5b4b7e062a2
+SIZE (sebastianbergmann-php-file-iterator-1.4.2_GH0.tar.gz) = 4141
diff --git a/devel/pear-SebastianBergmann_Git/Makefile b/devel/pear-SebastianBergmann_Git/Makefile
index 5e5404f7cf16..a767c333508d 100644
--- a/devel/pear-SebastianBergmann_Git/Makefile
+++ b/devel/pear-SebastianBergmann_Git/Makefile
@@ -3,23 +3,32 @@
 
 PORTNAME=	Git
 PORTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	devel pear
-MASTER_SITES=	http://pear.phpunit.de/get/
 PKGNAMEPREFIX=	pear-SebastianBergmann_
 
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Simple wrapper for Git
 
 LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	pear>=1.9.4:devel/pear \
-		${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
-RUN_DEPENDS=	pear>=1.9.4:devel/pear \
-		${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
+BUILD_DEPENDS=	pear>=1.9.4:devel/pear
+RUN_DEPENDS=	pear>=1.9.4:devel/pear
 
-BROKEN=		unfetchable, redirects to https://phpunit.de/
+USE_GITHUB=	yes
+GH_ACCOUNT=	sebastianbergmann
+GH_PROJECT=	git
 
-USES=	pear
-PEAR_CHANNEL=	phpunit
+NO_BUILD=	yes
+
+PHP_DIR=	share/PHP
+
+PLIST_FILES=	${PHP_DIR}/${PORTNAME}/Git.php
+
+do-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/${PHP_DIR}/${PORTNAME}
+	${INSTALL_SCRIPT} ${WRKSRC}/src/Git.php \
+		${STAGEDIR}${PREFIX}/${PHP_DIR}/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/devel/pear-SebastianBergmann_Git/distinfo b/devel/pear-SebastianBergmann_Git/distinfo
index eeb23304db53..ed23bc2bd4ca 100644
--- a/devel/pear-SebastianBergmann_Git/distinfo
+++ b/devel/pear-SebastianBergmann_Git/distinfo
@@ -1,2 +1,3 @@
-SHA256 (PEAR/Git-1.2.0.tgz) = b51bd62acc23df45bc49fc97e636317ad92054dd4b8e81e7062233ecb3ce6a62
-SIZE (PEAR/Git-1.2.0.tgz) = 3418
+TIMESTAMP = 1503836008
+SHA256 (sebastianbergmann-git-1.2.0_GH0.tar.gz) = f0413815174c5797dc619dd038dbce3200ce6a64c11c6d820a1303b7bd7d7d12
+SIZE (sebastianbergmann-git-1.2.0_GH0.tar.gz) = 4479
diff --git a/devel/pear-TheSeer_fDOMDocument/Makefile b/devel/pear-TheSeer_fDOMDocument/Makefile
index 0b1509db28e8..0a4514ffd95b 100644
--- a/devel/pear-TheSeer_fDOMDocument/Makefile
+++ b/devel/pear-TheSeer_fDOMDocument/Makefile
@@ -2,21 +2,35 @@
 # $FreeBSD$
 
 PORTNAME=	fDOMDocument
-PORTVERSION=	1.4.3
+PORTVERSION=	1.6.6
 CATEGORIES=	devel www pear
-MASTER_SITES=	http://pear.netpirates.net/get/
 PKGNAMEPREFIX=	pear-TheSeer_
 
 MAINTAINER=	joneum@FreeBSD.org
-COMMENT=	Extension to PHP's standard DOM
+COMMENT=	Extension to PHP standard DOM
 
 LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/pear.netpirates.net.reg:devel/pear-channel-theseer
-RUN_DEPENDS=	${PEARDIR}/.channels/pear.netpirates.net.reg:devel/pear-channel-theseer
+BUILD_DEPENDS=	pear-channel-theseer>=20120501:devel/pear-channel-theseer
+RUN_DEPENDS=	pear-channel-theseer>=20120501:devel/pear-channel-theseer
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	theseer
+GH_PROJECT=	fDOMDocument
 
 USE_PHP=	dom xml
 PEAR_CHANNEL=	theseer
-USES=	pear
+
+NO_BUILD=	yes
+
+PHP_DIR=	share/PHP
+
+PLIST_FILES=	${PHP_DIR}/${PORTNAME}/fDOMDocument.php
+
+do-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/${PHP_DIR}/${PORTNAME}
+	${INSTALL_SCRIPT} ${WRKSRC}/src/fDOMDocument.php \
+		${STAGEDIR}${PREFIX}/${PHP_DIR}/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/devel/pear-TheSeer_fDOMDocument/distinfo b/devel/pear-TheSeer_fDOMDocument/distinfo
index ea821b2135ff..9a86f6f5352b 100644
--- a/devel/pear-TheSeer_fDOMDocument/distinfo
+++ b/devel/pear-TheSeer_fDOMDocument/distinfo
@@ -1,2 +1,3 @@
-SHA256 (PEAR/fDOMDocument-1.4.3.tgz) = 9c8c14bd39c406d0fba4c7c9a8c6382c8c06ba870f9982e8f42bf824e8b814bd
-SIZE (PEAR/fDOMDocument-1.4.3.tgz) = 15310
+TIMESTAMP = 1504199780
+SHA256 (theseer-fDOMDocument-1.6.6_GH0.tar.gz) = 7e5bfe993a622ca814ecc19d13484bf4ee08f8a6d3b01de9a1e9c057a0518e19
+SIZE (theseer-fDOMDocument-1.6.6_GH0.tar.gz) = 21233
diff --git a/devel/pecl-intl/Makefile b/devel/pecl-intl/Makefile
index 30327cc0961e..a59129ae1569 100644
--- a/devel/pecl-intl/Makefile
+++ b/devel/pecl-intl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	intl
 PORTVERSION=	3.0.0
-PORTREVISION=	7
+PORTREVISION=	9
 CATEGORIES=	devel pear
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/devel/php70-intl/Makefile b/devel/php70-intl/Makefile
index 7fbefd3675e5..f8a572ceb788 100644
--- a/devel/php70-intl/Makefile
+++ b/devel/php70-intl/Makefile
@@ -1,6 +1,7 @@
 # Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
 
+PORTREVISION=	2
 CATEGORIES=	devel
 
 MASTERDIR=	${.CURDIR}/../../lang/php70
diff --git a/devel/php71-intl/Makefile b/devel/php71-intl/Makefile
index 3544627cd377..af7bea5b33a0 100644
--- a/devel/php71-intl/Makefile
+++ b/devel/php71-intl/Makefile
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PORTREVISION=	2
 CATEGORIES=	devel
 
 MASTERDIR=	${.CURDIR}/../../lang/php71
diff --git a/devel/pkg-info.el/Makefile b/devel/pkg-info.el/Makefile
index ee8bb61b28ce..f3a95f1ccb3f 100644
--- a/devel/pkg-info.el/Makefile
+++ b/devel/pkg-info.el/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	pkg-info.el
 PORTVERSION=	0.6
+PORTREVISION=	1
 CATEGORIES=	devel elisp
 
 MAINTAINER=	hrs@FreeBSD.org
diff --git a/devel/ponscripter-sekai/Makefile b/devel/ponscripter-sekai/Makefile
index 4f010e426f89..213d2e075440 100644
--- a/devel/ponscripter-sekai/Makefile
+++ b/devel/ponscripter-sekai/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	ponscripter-sekai
 PORTVERSION=	0.0.6
 DISTVERSIONPREFIX=	v
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel games
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/devel/protobuf/Makefile b/devel/protobuf/Makefile
index 7a88854c86c3..6a344cc35d3f 100644
--- a/devel/protobuf/Makefile
+++ b/devel/protobuf/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	protobuf
 PORTVERSION=	3.4.0
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
diff --git a/devel/psvn/Makefile b/devel/psvn/Makefile
index 40e128c3a99a..da494cd5e4d7 100644
--- a/devel/psvn/Makefile
+++ b/devel/psvn/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	psvn
 PORTVERSION=	20120326.212349
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel elisp
 MASTER_SITES=	http://www.xsteve.at/prg/emacs/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
@@ -13,7 +13,7 @@ EXTRACT_SUFX=	# empty
 MAINTAINER=	yasu@utahime.org
 COMMENT=	Subversion interface for Emacs
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
 
 RUN_DEPENDS=	svn:devel/subversion
 
diff --git a/devel/psvn/pkg-descr b/devel/psvn/pkg-descr
index 9d7633a67495..76fe8b0b9813 100644
--- a/devel/psvn/pkg-descr
+++ b/devel/psvn/pkg-descr
@@ -2,4 +2,4 @@ psvn.el is an interface for the revision control tool subversion.
 psvn.el provides a similar interface for subversion as pcl-cvs for
 cvs.
 
-WWW: http://xsteve.nit.at/prg/emacs/
+WWW: http://www.xsteve.at/prg/emacs/
diff --git a/devel/pure-stllib/Makefile b/devel/pure-stllib/Makefile
index 9299f4b8497a..6ac5b46a05f1 100644
--- a/devel/pure-stllib/Makefile
+++ b/devel/pure-stllib/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pure-stllib
 PORTVERSION=	0.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	https://bitbucket.org/purelang/pure-lang/downloads/
 DIST_SUBDIR=	pure
diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile
index d292630f3649..fc725ce69cb2 100644
--- a/devel/pwlib/Makefile
+++ b/devel/pwlib/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pwlib
 PORTVERSION=	1.12.0
-PORTREVISION=	12
+PORTREVISION=	13
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	SF/openh323/${PORTNAME}/${PORTVERSION}
diff --git a/devel/py-bsd/Makefile b/devel/py-bsd/Makefile
index 6a496a825984..22996ff25044 100644
--- a/devel/py-bsd/Makefile
+++ b/devel/py-bsd/Makefile
@@ -10,20 +10,18 @@ COMMENT=	Python wrappers for various BSD libc and system calls
 
 LICENSE=	BSD3CLAUSE
 
-BROKEN=		fails to build
-
 BUILD_DEPENDS=	cython>0:lang/cython \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
 
+USES=		python
+USE_PYTHON=	autoplist distutils
+
 USE_GITHUB=     yes
 GH_ACCOUNT=	freenas
 GH_PROJECT=	py-bsd
 GH_TAGNAME=	6d148fa
 
-USES=		python
-USE_PYTHON=	autoplist distutils
-
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 3400
diff --git a/devel/py-bsd/files/patch-bsd__extattr.pyx b/devel/py-bsd/files/patch-bsd__extattr.pyx
new file mode 100644
index 000000000000..baa907aaf1a1
--- /dev/null
+++ b/devel/py-bsd/files/patch-bsd__extattr.pyx
@@ -0,0 +1,11 @@
+--- bsd/extattr.pyx.orig	2017-03-30 01:24:59 UTC
++++ bsd/extattr.pyx
+@@ -335,7 +335,7 @@ def _list(fobj, namespace = Namespaces.U
+             if isinstance(fobj, file_types):
+                 kr = defs.extattr_list_file(fobj.fileno(), namespace, data_buffer, nbytes)
+             elif type(fobj) is int:
+-                kr = defs.exattr_list_file(fobj, namespace, data_buffer, nbytes)
++                kr = defs.extattr_list_file(fobj, namespace, data_buffer, nbytes)
+             elif type(fobj) is str:
+                 if follow:
+                     kr = defs.extattr_list_file(pname, namespace, data_buffer, nbytes)
diff --git a/devel/py-bsd/files/patch-defs.pxd b/devel/py-bsd/files/patch-defs.pxd
new file mode 100644
index 000000000000..b9dd1f424d2e
--- /dev/null
+++ b/devel/py-bsd/files/patch-defs.pxd
@@ -0,0 +1,11 @@
+--- defs.pxd.orig	2017-03-30 01:24:59 UTC
++++ defs.pxd
+@@ -490,7 +490,7 @@ cdef extern from "sys/extattr.h" nogil:
+     char *EXTATTR_NAMESPACE_SYSTEM_STRING
+     
+     ssize_t extattr_get_fd(int fd, int attrnamespace, const char *attrname, void *data, size_t nbytes)
+-    ssize_t exattr_set_fd(int fd, int attrnamespace, const char *attrname, const void *data, size_t nbytes)
++    ssize_t extattr_set_fd(int fd, int attrnamespace, const char *attrname, const void *data, size_t nbytes)
+     int extattr_delete_fd(int fd, int attrnamespace, const char *attrname)
+     ssize_t extattr_list_fd(int fd, int attrnamespace, void *data, size_t nbytes)
+ 
diff --git a/devel/py-libvirt/Makefile b/devel/py-libvirt/Makefile
index f22cca629d89..21a91d28009f 100644
--- a/devel/py-libvirt/Makefile
+++ b/devel/py-libvirt/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libvirt
-PORTVERSION=	3.6.0
+PORTVERSION=	3.7.0
 CATEGORIES=	devel
 MASTER_SITES=	http://libvirt.org/sources/python/ \
 		ftp://libvirt.org/libvirt/python/
diff --git a/devel/py-libvirt/distinfo b/devel/py-libvirt/distinfo
index c3c552ce7b85..4f57a40fe709 100644
--- a/devel/py-libvirt/distinfo
+++ b/devel/py-libvirt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501681470
-SHA256 (libvirt-python-3.6.0.tar.gz) = ecb9cbc8b1f33b245b04e3a937d8483584ab7a18258b217be96661343a4b1ad0
-SIZE (libvirt-python-3.6.0.tar.gz) = 181778
+TIMESTAMP = 1504927640
+SHA256 (libvirt-python-3.7.0.tar.gz) = 1e4a8a8b08ef8f2502088f26ce3aced415d55ef808d8301dfed023f45154c06f
+SIZE (libvirt-python-3.7.0.tar.gz) = 182372
diff --git a/devel/py-llfuse/Makefile b/devel/py-llfuse/Makefile
index 150711dc3f5c..0c4a67b75003 100644
--- a/devel/py-llfuse/Makefile
+++ b/devel/py-llfuse/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	llfuse
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-llvmlite/Makefile b/devel/py-llvmlite/Makefile
index 890b4c751845..cc994b97e53e 100644
--- a/devel/py-llvmlite/Makefile
+++ b/devel/py-llvmlite/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	llvmlite
 PORTVERSION=	0.16.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-mailcap-fix/pkg-descr b/devel/py-mailcap-fix/pkg-descr
index b973b32415fc..9101fce1189f 100644
--- a/devel/py-mailcap-fix/pkg-descr
+++ b/devel/py-mailcap-fix/pkg-descr
@@ -1,5 +1,5 @@
 This package patches the python standard library's mailcap module in order to 
-correctly handle windcard entries.
+correctly handle wildcard entries.
 
 The bug is documented on the bug tracker here: issue 14977
 
diff --git a/devel/py-numba/Makefile b/devel/py-numba/Makefile
index 87221aadbfeb..f40ebeeac9c1 100644
--- a/devel/py-numba/Makefile
+++ b/devel/py-numba/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	numba
 PORTVERSION=	0.29.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-pefile/Makefile b/devel/py-pefile/Makefile
index 0f226569729f..65e71c487b85 100644
--- a/devel/py-pefile/Makefile
+++ b/devel/py-pefile/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pefile
-PORTVERSION=	2017.8.1
+PORTVERSION=	2017.9.3
 CATEGORIES=	devel python
 MASTER_SITES=	https://github.com/erocarrera/pefile/releases/download/v${PORTVERSION}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-pefile/distinfo b/devel/py-pefile/distinfo
index 71a875dbfc5e..4ac687cba59e 100644
--- a/devel/py-pefile/distinfo
+++ b/devel/py-pefile/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502010353
-SHA256 (pefile-2017.8.1.tar.gz) = 363f7d1f4d58b7bf8a46dd8b1d48805d270d1ea4dab2526ce183d71ed89075b1
-SIZE (pefile-2017.8.1.tar.gz) = 60809
+TIMESTAMP = 1504533185
+SHA256 (pefile-2017.9.3.tar.gz) = 99d45ef48c290fb74e30507e259b77e2a3ce3a4f4eea35e8089cb24e2c514e4d
+SIZE (pefile-2017.9.3.tar.gz) = 61722
diff --git a/devel/py-pyicu/Makefile b/devel/py-pyicu/Makefile
index 6db074739352..c2ba04c48c04 100644
--- a/devel/py-pyicu/Makefile
+++ b/devel/py-pyicu/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pyicu
 PORTVERSION=	1.9.4
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-pytest-asyncio/Makefile b/devel/py-pytest-asyncio/Makefile
index 2330a2f719cd..187ef0aa5b57 100644
--- a/devel/py-pytest-asyncio/Makefile
+++ b/devel/py-pytest-asyncio/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	pytest-asyncio
-PORTVERSION=	0.6.0
+PORTVERSION=	0.7.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,10 +11,10 @@ COMMENT=	Py.test plugin providing fixtures and markers for asyncio
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=3.0.2:devel/py3-pytest
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=3.0.6:devel/py3-pytest
 
 NO_ARCH=	yes
-USES=		python:3.3+
+USES=		python:3.5+
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.pre.mk>
diff --git a/devel/py-pytest-asyncio/distinfo b/devel/py-pytest-asyncio/distinfo
index b3d0524e1abb..7c02832304b5 100644
--- a/devel/py-pytest-asyncio/distinfo
+++ b/devel/py-pytest-asyncio/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1496009958
-SHA256 (pytest-asyncio-0.6.0.tar.gz) = e5c6786ece4b3bbb0cca1bf68bf089756a62760e3764dc84eaee39bfab70289b
-SIZE (pytest-asyncio-0.6.0.tar.gz) = 10912
+TIMESTAMP = 1504901770
+SHA256 (pytest-asyncio-0.7.0.tar.gz) = ef384946ebca4a3b02f6bb210eba24c502d80cc6556936a5eb5617e7ae22a3a0
+SIZE (pytest-asyncio-0.7.0.tar.gz) = 11172
diff --git a/devel/py-pytest/Makefile b/devel/py-pytest/Makefile
index a65cf810afc9..8c54ee274e5a 100644
--- a/devel/py-pytest/Makefile
+++ b/devel/py-pytest/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	pytest
-PORTVERSION=	3.2.1
+PORTVERSION=	3.2.2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-pytest/distinfo b/devel/py-pytest/distinfo
index 0b1491e6b4e7..115895f5721e 100644
--- a/devel/py-pytest/distinfo
+++ b/devel/py-pytest/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502473958
-SHA256 (pytest-3.2.1.tar.gz) = 4c2159d2be2b4e13fa293e7a72bdf2f06848a017150d5c6d35112ce51cfd74ce
-SIZE (pytest-3.2.1.tar.gz) = 784076
+TIMESTAMP = 1504891824
+SHA256 (pytest-3.2.2.tar.gz) = f46e49e0340a532764991c498244a60e3a37d7424a532b3ff1a6a7653f1a403a
+SIZE (pytest-3.2.2.tar.gz) = 786396
diff --git a/devel/py-python-engineio/pkg-descr b/devel/py-python-engineio/pkg-descr
index d37642a02a8e..196539439c68 100644
--- a/devel/py-python-engineio/pkg-descr
+++ b/devel/py-python-engineio/pkg-descr
@@ -1,7 +1,7 @@
 Python implementation of the Engine.IO realtime server.
 
 Features
-    Fully compatible with the Javascript engine.io-client library,
+    Fully compatible with the JavaScript engine.io-client library,
         versions 1.5.0 and up.
     Compatible with Python 2.7 and Python 3.3+.
     Supports large number of clients even on modest hardware when
diff --git a/devel/py-robotframework-pabot/Makefile b/devel/py-robotframework-pabot/Makefile
index 772f9fd5469d..4c2905f010e5 100644
--- a/devel/py-robotframework-pabot/Makefile
+++ b/devel/py-robotframework-pabot/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	robotframework-pabot
-PORTVERSION=	0.37
+PORTVERSION=	0.38
 CATEGORIES=	devel www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-robotframework-pabot/distinfo b/devel/py-robotframework-pabot/distinfo
index db33b3c73ce1..6b9d23b4cf9d 100644
--- a/devel/py-robotframework-pabot/distinfo
+++ b/devel/py-robotframework-pabot/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502406789
-SHA256 (robotframework-pabot-0.37.tar.gz) = 3665055fc59a4df64d7044ebb390191269117033b19133ee0ba36527c1aa4034
-SIZE (robotframework-pabot-0.37.tar.gz) = 11282
+TIMESTAMP = 1504958830
+SHA256 (robotframework-pabot-0.38.tar.gz) = 77bdb7f9794513b50728069f149e1b70697f69fc3836d6ac93af812a7110ca32
+SIZE (robotframework-pabot-0.38.tar.gz) = 11560
diff --git a/devel/py-tables/Makefile b/devel/py-tables/Makefile
index cef5e66dfd11..13260bd7a1fa 100644
--- a/devel/py-tables/Makefile
+++ b/devel/py-tables/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	tables
 PORTVERSION=	3.4.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-twilio/Makefile b/devel/py-twilio/Makefile
index 63d727837ddc..4dcfc05cc05e 100644
--- a/devel/py-twilio/Makefile
+++ b/devel/py-twilio/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	twilio
-PORTVERSION=	6.6.1
+PORTVERSION=	6.6.2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-twilio/distinfo b/devel/py-twilio/distinfo
index bce04aa2e40b..3125446aead0 100644
--- a/devel/py-twilio/distinfo
+++ b/devel/py-twilio/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504343233
-SHA256 (twilio-6.6.1.tar.gz) = 78e54ed9736a1a1c5b72018246cafd70d6d08aea6727f904404bec080c981e03
-SIZE (twilio-6.6.1.tar.gz) = 223886
+TIMESTAMP = 1504942535
+SHA256 (twilio-6.6.2.tar.gz) = f5bf2a2dbed16cfc3a67567d4cf28d74a7b3634789c1e5f13fcdb1d18f5eea34
+SIZE (twilio-6.6.2.tar.gz) = 225614
diff --git a/devel/py-vcrpy/pkg-descr b/devel/py-vcrpy/pkg-descr
index 1d01e0dbcf38..8b7c58a74b87 100644
--- a/devel/py-vcrpy/pkg-descr
+++ b/devel/py-vcrpy/pkg-descr
@@ -4,7 +4,7 @@ function, VCR.py records all HTTP interactions that take place through
 the libraries it supports and serializes and writes them to a flat file
 (in yaml format by default). This flat file is called a cassette.
 
-When the relevant peice of code is executed again, VCR.py will read the
+When the relevant piece of code is executed again, VCR.py will read the
 serialized requests and responses from the aforementioned cassette file,
 and intercept any HTTP requests that it recognizes from the original test
 run and return the responses that corresponded to those requests. This
diff --git a/devel/py-wheel/Makefile b/devel/py-wheel/Makefile
index 4bbf7929b762..d4a05f07b5be 100644
--- a/devel/py-wheel/Makefile
+++ b/devel/py-wheel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	wheel
-PORTVERSION=	0.29.0
+PORTVERSION=	0.30.0
 PORTREVISION=	0
 CATEGORIES=	devel
 MASTER_SITES=	CHEESESHOP
diff --git a/devel/py-wheel/distinfo b/devel/py-wheel/distinfo
index ae639a452b2f..d9483f05542f 100644
--- a/devel/py-wheel/distinfo
+++ b/devel/py-wheel/distinfo
@@ -1,2 +1,3 @@
-SHA256 (wheel-0.29.0.tar.gz) = 1ebb8ad7e26b448e9caa4773d2357849bf80ff9e313964bcaf79cbf0201a1648
-SIZE (wheel-0.29.0.tar.gz) = 54143
+TIMESTAMP = 1505203839
+SHA256 (wheel-0.30.0.tar.gz) = 9515fe0a94e823fd90b08d22de45d7bde57c90edce705b22f5e1ecf7e1b653c8
+SIZE (wheel-0.30.0.tar.gz) = 43087
diff --git a/devel/py3-toposort/Makefile b/devel/py3-toposort/Makefile
new file mode 100644
index 000000000000..1b91add10479
--- /dev/null
+++ b/devel/py3-toposort/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+MASTERDIR=	${.CURDIR}/../py-toposort
+
+USES=		python:3.3+
+
+.include "${MASTERDIR}/Makefile"
diff --git a/devel/pycharm-ce/Makefile b/devel/pycharm-ce/Makefile
index bebd3ce1ac1f..3061279a6f25 100644
--- a/devel/pycharm-ce/Makefile
+++ b/devel/pycharm-ce/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pycharm-ce
-PORTVERSION=	2017.2.2
+PORTVERSION=	2017.2.3
 CATEGORIES=	devel java python
 MASTER_SITES=	https://download.jetbrains.com/python/ \
 		http://download.jetbrains.com/python/
diff --git a/devel/pycharm-ce/distinfo b/devel/pycharm-ce/distinfo
index 89768b7ae9d0..d5d4adbcdbc1 100644
--- a/devel/pycharm-ce/distinfo
+++ b/devel/pycharm-ce/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503651598
-SHA256 (pycharm-community-2017.2.2.tar.gz) = 4eacc9bf512406bebf71546ccb4b6c14ea8e06748fd76be6ca409ea1955e1f53
-SIZE (pycharm-community-2017.2.2.tar.gz) = 200453221
+TIMESTAMP = 1504872451
+SHA256 (pycharm-community-2017.2.3.tar.gz) = e8562938c2ede32a1c1036391942190144cd9f0927bd49b6b3ddf5f7a01c33aa
+SIZE (pycharm-community-2017.2.3.tar.gz) = 200478376
diff --git a/devel/pymacs/Makefile b/devel/pymacs/Makefile
index ff475ceead78..979dc001376c 100644
--- a/devel/pymacs/Makefile
+++ b/devel/pymacs/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	Pymacs
 PORTVERSION=	0.25
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel editors python elisp
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/devel/qbs/Makefile b/devel/qbs/Makefile
index b23181304bac..9a424e51e9ca 100644
--- a/devel/qbs/Makefile
+++ b/devel/qbs/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	qbs
 PORTVERSION=	1.8.1
+PORTREVISION=	1
 DISTVERSIONPREFIX=	src-
 CATEGORIES=	devel
 MASTER_SITES=	QT/official_releases/${PORTNAME}/${PORTVERSION}
diff --git a/devel/qgit/Makefile b/devel/qgit/Makefile
index 400abc6061a8..ea161f0389ae 100644
--- a/devel/qgit/Makefile
+++ b/devel/qgit/Makefile
@@ -2,24 +2,20 @@
 # $FreeBSD$
 
 PORTNAME=	qgit
-PORTVERSION=	2.3
-PORTREVISION=	2
+DISTVERSIONPREFIX=	${PORTNAME}-
+DISTVERSION=	2.7
 CATEGORIES=	devel
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}4/${PORTVERSION}
-PKGNAMESUFFIX=	-qt4
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	adridg@FreeBSD.org
 COMMENT=	Graphical interface to git repositories
 
-USES=		qmake tar:bzip2
-USE_QT4=	corelib gui moc_build rcc_build uic_build
-MAKE_JOBS_UNSAFE=	yes
+LICENSE=	GPLv2
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
+USES=		cmake:outsource
+USE_QT5=	core gui widgets \
+		buildtools_build qmake_build
 
-PLIST_FILES=	bin/${PORTNAME}
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+USE_GITHUB=	yes
+GH_ACCOUNT=	tibirna
 
 .include <bsd.port.mk>
diff --git a/devel/qgit/distinfo b/devel/qgit/distinfo
index 13b4c3d38edb..9682289bf9b8 100644
--- a/devel/qgit/distinfo
+++ b/devel/qgit/distinfo
@@ -1,2 +1,3 @@
-SHA256 (qgit-2.3.tar.bz2) = a5fdd7e27fea376790eed787e22f4863eb9d2fe0217fd98b9fdbcf47a45bdc64
-SIZE (qgit-2.3.tar.bz2) = 206812
+TIMESTAMP = 1505308761
+SHA256 (tibirna-qgit-qgit-2.7_GH0.tar.gz) = 183d116b2fb38c6a76c99577f6cc86f0241f8b6bdc74042be4cb8631567f5e9e
+SIZE (tibirna-qgit-qgit-2.7_GH0.tar.gz) = 259624
diff --git a/devel/qgit/files/patch-src_git.cpp b/devel/qgit/files/patch-src_git.cpp
deleted file mode 100644
index 29cd5949b654..000000000000
--- a/devel/qgit/files/patch-src_git.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-repo-config was aliased to config as of git 1.7 (2010)
-and was removed, it seems, in 1.8.5 (2012). None of those
-git versions are still supported upstream; switch to git config.
-
---- src/git.cpp.orig	2009-03-12 17:14:31 UTC
-+++ src/git.cpp
-@@ -425,7 +425,7 @@ void Git::setTextCodec(QTextCodec* tc) {
- 	if (name == "Big5-HKSCS")
- 		name = "Big5";
- 
--	run("git repo-config i18n.commitencoding " + name);
-+	run("git config i18n.commitencoding " + name);
- }
- 
- QTextCodec* Git::getTextCodec(bool* isGitArchive) {
-@@ -435,7 +435,7 @@ QTextCodec* Git::getTextCodec(bool* isGi
- 		return NULL;
- 
- 	QString runOutput;
--	if (!run("git repo-config --get i18n.commitencoding", &runOutput))
-+	if (!run("git config --get i18n.commitencoding", &runOutput))
- 		return NULL;
- 
- 	if (runOutput.isEmpty()) // git docs says default is utf-8
diff --git a/devel/qgit/pkg-descr b/devel/qgit/pkg-descr
index 4407459f3191..2005ae49db46 100644
--- a/devel/qgit/pkg-descr
+++ b/devel/qgit/pkg-descr
@@ -1,4 +1,5 @@
-QGit is a git GUI viewer built on Qt/C++.
+QGit is a git GUI viewer.
+
 With qgit you will be able to browse revisions history, view patch content and
 changed files, graphically following different development branches.
 
@@ -8,10 +9,11 @@ Features :
 - Apply or format patch series from selected commits, drag and drop commits
 between two instances of qgit.
 - Associate commands sequences, scripts and anything else executable to a
-custom action. Actions can be run from menu and corresponding output is grabbed
-by a terminal window. qgit implements a GUI for the most common StGIT commands
-like push/pop and apply/format patches. You can also create new patches or
-refresh current top one using the same semantics of git commit,
-i.e. cherry picking single modified files.
+  custom action. Actions can be run from menu and corresponding output is
+  grabbed by a terminal window.
+- qgit implements a GUI for the most common StGIT commands
+  like push/pop and apply/format patches. You can also create new patches or
+  refresh current top one using the same semantics of git commit,
+  i.e. cherry picking single modified files.
 
-WWW: https://sourceforge.net/projects/qgit/
+WWW: https://github.com/tibirna/qgit
diff --git a/devel/qgit/pkg-plist b/devel/qgit/pkg-plist
new file mode 100644
index 000000000000..ffe58a3ccb24
--- /dev/null
+++ b/devel/qgit/pkg-plist
@@ -0,0 +1,4 @@
+bin/qgit
+share/applications/qgit.desktop
+share/icons/hicolor/48x48/apps/qgit.png
+share/metainfo/qgit.appdata.xml
diff --git a/devel/qt5-qmake/Makefile b/devel/qt5-qmake/Makefile
index fd785c4e9227..113fc10032ab 100644
--- a/devel/qt5-qmake/Makefile
+++ b/devel/qt5-qmake/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	qmake
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-
 
diff --git a/devel/qtcreator/Makefile b/devel/qtcreator/Makefile
index 33831305b93f..1a91ead682ca 100644
--- a/devel/qtcreator/Makefile
+++ b/devel/qtcreator/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	qtcreator
 DISTVERSION=	4.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	QT/official_releases/qtcreator/${DISTVERSION:R}/${DISTVERSION}
 DISTNAME=	qt-creator-opensource-src-${DISTVERSION}
diff --git a/devel/raknet/Makefile b/devel/raknet/Makefile
index a7a66f871797..c4e909a2bf15 100644
--- a/devel/raknet/Makefile
+++ b/devel/raknet/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	raknet
 PORTVERSION=	3.9.2
-PORTREVISION=	5
+PORTREVISION=	6
 PORTEPOCH=	1
 CATEGORIES=	devel net
 MASTER_SITES=	http://www.jenkinssoftware.com/raknet/downloads/ \
diff --git a/devel/rapidjson/Makefile b/devel/rapidjson/Makefile
index a6ddea7b9467..31be765b5c02 100644
--- a/devel/rapidjson/Makefile
+++ b/devel/rapidjson/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	rapidjson
 PORTVERSION=	1.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel textproc
 
diff --git a/devel/re2/Makefile b/devel/re2/Makefile
index 9814e87f8a2d..d46f67797ab0 100644
--- a/devel/re2/Makefile
+++ b/devel/re2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	re2
 PORTVERSION=	20170301
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	jlaffaye@FreeBSD.org
diff --git a/devel/rebar3/Makefile b/devel/rebar3/Makefile
index eb4636f3fa81..82b3cde3ce0f 100644
--- a/devel/rebar3/Makefile
+++ b/devel/rebar3/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	rebar3
-PORTVERSION=	3.4.3
+PORTVERSION=	3.4.4
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES+=	LOCAL/olgeni:deps \
diff --git a/devel/rebar3/distinfo b/devel/rebar3/distinfo
index 3dadc8f6bf24..88a634f87968 100644
--- a/devel/rebar3/distinfo
+++ b/devel/rebar3/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1504279351
+TIMESTAMP = 1505318547
 SHA256 (rebar3-cache-13.tar.gz) = d23b0667b43c3722ee7a212e21c4a91aca1fb1c067272e8ee3953af99145d2c5
 SIZE (rebar3-cache-13.tar.gz) = 2232269
 SHA256 (bbmustache-1.3.0.tar) = e68a9e25358319256c5efa336915e859b7ca18eaf1a1a7b5c14c4fa4f5735710
@@ -21,5 +21,5 @@ SHA256 (relx-3.23.1.tar) = 2d29d0a80c3afb8fa91ef5256a2ce48ffb0f39fcc3f39bf2d8689
 SIZE (relx-3.23.1.tar) = 81920
 SHA256 (ssl_verify_fun-1.1.2.tar) = 322ba12d3d045683c586527a40bc1546e21ea7952dfccfc96ede25b0c1e9be61
 SIZE (ssl_verify_fun-1.1.2.tar) = 20480
-SHA256 (rebar-rebar3-3.4.3_GH0.tar.gz) = 6194b738fb8a4a1bef6619220ca8acf4ed826d2febfe39c62ebd0ed6fb7d05a8
-SIZE (rebar-rebar3-3.4.3_GH0.tar.gz) = 270619
+SHA256 (rebar-rebar3-3.4.4_GH0.tar.gz) = 0f7c860489dc4e4fcdc706a04690f791755870ff0e0582525b8ee9a78e911443
+SIZE (rebar-rebar3-3.4.4_GH0.tar.gz) = 270813
diff --git a/devel/regexxer/Makefile b/devel/regexxer/Makefile
index fca42abe8ffa..de5420c85a6c 100644
--- a/devel/regexxer/Makefile
+++ b/devel/regexxer/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	regexxer
 PORTVERSION=	0.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel textproc gnome
 MASTER_SITES=	GNOME
 
diff --git a/devel/rhtvision/Makefile b/devel/rhtvision/Makefile
index 67c15877d8fe..2e0facb51ed8 100644
--- a/devel/rhtvision/Makefile
+++ b/devel/rhtvision/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	rhtvision
 PORTVERSION=	2.2.1.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel
 MASTER_SITES=	SF/tvision/UNIX/${PORTVERSION:R}%20CVS20100714%20Source%20and%20Debian%205.0
 DISTNAME=	${PORTNAME}_${PORTVERSION:R}-${PORTVERSION:E}
diff --git a/devel/rlvm/Makefile b/devel/rlvm/Makefile
index 5b9d39c588bc..6a7a29112373 100644
--- a/devel/rlvm/Makefile
+++ b/devel/rlvm/Makefile
@@ -4,7 +4,7 @@ PORTNAME=	rlvm
 DISTVERSIONPREFIX=	release-
 DISTVERSION=	0.14-67
 DISTVERSIONSUFFIX=	-g9350209
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	devel games
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/devel/rubygem-actionview5/Makefile b/devel/rubygem-actionview5/Makefile
index 5bbdf853649f..34ba37bee3ff 100644
--- a/devel/rubygem-actionview5/Makefile
+++ b/devel/rubygem-actionview5/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	actionview
-PORTVERSION=	5.1.3
+PORTVERSION=	5.1.4
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	5
diff --git a/devel/rubygem-actionview5/distinfo b/devel/rubygem-actionview5/distinfo
index 6b29dcd7e334..380f8858b2f8 100644
--- a/devel/rubygem-actionview5/distinfo
+++ b/devel/rubygem-actionview5/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501862680
-SHA256 (rubygem/actionview-5.1.3.gem) = b744e9cbb2760754fa4c3c2b57c68916756a5f032fa6307ca362379e02a48857
-SIZE (rubygem/actionview-5.1.3.gem) = 161280
+TIMESTAMP = 1504891652
+SHA256 (rubygem/actionview-5.1.4.gem) = 302f398a86337818e6f4225934b136436cab5fdfe2fcd6dd7509b1f595a417c2
+SIZE (rubygem/actionview-5.1.4.gem) = 161792
diff --git a/devel/rubygem-actionview50/Makefile b/devel/rubygem-actionview50/Makefile
index b3c6dcc5f584..209d56bdabc8 100644
--- a/devel/rubygem-actionview50/Makefile
+++ b/devel/rubygem-actionview50/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	actionview
-PORTVERSION=	5.0.5
+PORTVERSION=	5.0.6
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	50
diff --git a/devel/rubygem-actionview50/distinfo b/devel/rubygem-actionview50/distinfo
index 67b0549218a5..e595e862f755 100644
--- a/devel/rubygem-actionview50/distinfo
+++ b/devel/rubygem-actionview50/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501604022
-SHA256 (rubygem/actionview-5.0.5.gem) = cb4d2928b63f29931a6d05adde78bcf7dac83bf79a05911547068af2da765a6b
-SIZE (rubygem/actionview-5.0.5.gem) = 152576
+TIMESTAMP = 1504891742
+SHA256 (rubygem/actionview-5.0.6.gem) = 6d256fba84733b0dc8a22de7264ceb77ef2ddeae2913632300c76182ecd6d36d
+SIZE (rubygem/actionview-5.0.6.gem) = 152576
diff --git a/devel/rubygem-activejob5/Makefile b/devel/rubygem-activejob5/Makefile
index a8ed16d87975..a7865b35efab 100644
--- a/devel/rubygem-activejob5/Makefile
+++ b/devel/rubygem-activejob5/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	activejob
-PORTVERSION=	5.1.3
+PORTVERSION=	5.1.4
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	5
diff --git a/devel/rubygem-activejob5/distinfo b/devel/rubygem-activejob5/distinfo
index 8500fae005b8..6c8d0d4e243b 100644
--- a/devel/rubygem-activejob5/distinfo
+++ b/devel/rubygem-activejob5/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501862687
-SHA256 (rubygem/activejob-5.1.3.gem) = 15e98c4bf71941ae81f7e4e7c5d9627c09cd9b4d0c1a36bf94b42910eb8874a3
-SIZE (rubygem/activejob-5.1.3.gem) = 25600
+TIMESTAMP = 1504891658
+SHA256 (rubygem/activejob-5.1.4.gem) = f7814fdf4a7592f7f6774f68c5adec53cbcbf825a61bae91219c730ba1cb6bca
+SIZE (rubygem/activejob-5.1.4.gem) = 25600
diff --git a/devel/rubygem-activejob50/Makefile b/devel/rubygem-activejob50/Makefile
index 8dbcbe54a0ed..f4cdc5fbdaaf 100644
--- a/devel/rubygem-activejob50/Makefile
+++ b/devel/rubygem-activejob50/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	activejob
-PORTVERSION=	5.0.5
+PORTVERSION=	5.0.6
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	50
diff --git a/devel/rubygem-activejob50/distinfo b/devel/rubygem-activejob50/distinfo
index db600a2a1853..7896a962dfc8 100644
--- a/devel/rubygem-activejob50/distinfo
+++ b/devel/rubygem-activejob50/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501604028
-SHA256 (rubygem/activejob-5.0.5.gem) = af79fc954e9ddece35ef4975b9a244b2bb48a76e17a19c0dff7233fc75852877
-SIZE (rubygem/activejob-5.0.5.gem) = 25088
+TIMESTAMP = 1504891748
+SHA256 (rubygem/activejob-5.0.6.gem) = 78190e9f3ab0185734a123907cfa1b847e96d4b1303dcb8304e8bb0d26e64bcd
+SIZE (rubygem/activejob-5.0.6.gem) = 25088
diff --git a/devel/rubygem-activesupport5/Makefile b/devel/rubygem-activesupport5/Makefile
index 1dabf6b6cd3d..6b82a99df5d2 100644
--- a/devel/rubygem-activesupport5/Makefile
+++ b/devel/rubygem-activesupport5/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	activesupport
-PORTVERSION=	5.1.3
+PORTVERSION=	5.1.4
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	5
diff --git a/devel/rubygem-activesupport5/distinfo b/devel/rubygem-activesupport5/distinfo
index a8dbb7ee0530..cfe4ef49732f 100644
--- a/devel/rubygem-activesupport5/distinfo
+++ b/devel/rubygem-activesupport5/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501862659
-SHA256 (rubygem/activesupport-5.1.3.gem) = b01fa04345c87526fd22affc4e46dd22bf125c608853d13bf093dab08c45219b
-SIZE (rubygem/activesupport-5.1.3.gem) = 369664
+TIMESTAMP = 1504891630
+SHA256 (rubygem/activesupport-5.1.4.gem) = 9969d4fdc7e1fad82f02f457b03995baa74928e99f73d035564c9eec7426ee69
+SIZE (rubygem/activesupport-5.1.4.gem) = 370176
diff --git a/devel/rubygem-activesupport50/Makefile b/devel/rubygem-activesupport50/Makefile
index 76011c385280..d88ac4772b0d 100644
--- a/devel/rubygem-activesupport50/Makefile
+++ b/devel/rubygem-activesupport50/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	activesupport
-PORTVERSION=	5.0.5
+PORTVERSION=	5.0.6
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	50
diff --git a/devel/rubygem-activesupport50/distinfo b/devel/rubygem-activesupport50/distinfo
index 6d20c30ea10c..0c9c661cbdee 100644
--- a/devel/rubygem-activesupport50/distinfo
+++ b/devel/rubygem-activesupport50/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501603999
-SHA256 (rubygem/activesupport-5.0.5.gem) = 00c714979fffa05846a2d044f24f9569a5ae471b2e20c73fdf3172f1d81edfb1
-SIZE (rubygem/activesupport-5.0.5.gem) = 363520
+TIMESTAMP = 1504891720
+SHA256 (rubygem/activesupport-5.0.6.gem) = e6f98107623edb19cc25ca2aab134b857f291529ab37a1d00b47560d30a6053d
+SIZE (rubygem/activesupport-5.0.6.gem) = 363520
diff --git a/devel/rubygem-aws-sdk-core/Makefile b/devel/rubygem-aws-sdk-core/Makefile
index bdaabdd735f8..9e685c2d8736 100644
--- a/devel/rubygem-aws-sdk-core/Makefile
+++ b/devel/rubygem-aws-sdk-core/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	aws-sdk-core
-PORTVERSION=	2.10.38
+PORTVERSION=	2.10.46
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-aws-sdk-core/distinfo b/devel/rubygem-aws-sdk-core/distinfo
index 35e2cdb6bc71..53c7cf85f600 100644
--- a/devel/rubygem-aws-sdk-core/distinfo
+++ b/devel/rubygem-aws-sdk-core/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504355573
-SHA256 (rubygem/aws-sdk-core-2.10.38.gem) = 6de888d1333c0c0dfc6c1714643a3c1f9a8fec22656327f7086dd78b61a25818
-SIZE (rubygem/aws-sdk-core-2.10.38.gem) = 1065984
+TIMESTAMP = 1505452075
+SHA256 (rubygem/aws-sdk-core-2.10.46.gem) = a197ffb534a2ecb1368f10e7f0288d519dc54a79c958c7f65fce64f782e4957e
+SIZE (rubygem/aws-sdk-core-2.10.46.gem) = 1068032
diff --git a/devel/rubygem-aws-sdk-resources/Makefile b/devel/rubygem-aws-sdk-resources/Makefile
index 6df2be4cbfce..780c0c7d49d0 100644
--- a/devel/rubygem-aws-sdk-resources/Makefile
+++ b/devel/rubygem-aws-sdk-resources/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	aws-sdk-resources
-PORTVERSION=	2.10.38
+PORTVERSION=	2.10.46
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-aws-sdk-resources/distinfo b/devel/rubygem-aws-sdk-resources/distinfo
index 6e864e303071..9894de433b9e 100644
--- a/devel/rubygem-aws-sdk-resources/distinfo
+++ b/devel/rubygem-aws-sdk-resources/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504355580
-SHA256 (rubygem/aws-sdk-resources-2.10.38.gem) = 7c23c717dd5f4efbe64c300e9f76ea51e6d751df01f6020e07126b8b5914d0f7
-SIZE (rubygem/aws-sdk-resources-2.10.38.gem) = 48640
+TIMESTAMP = 1505452082
+SHA256 (rubygem/aws-sdk-resources-2.10.46.gem) = 318118c79eda1dc428e938d9e4d6f0181af1324912ac1d4e7ca35e67b6d04cbd
+SIZE (rubygem/aws-sdk-resources-2.10.46.gem) = 48640
diff --git a/devel/rubygem-aws-sdk/Makefile b/devel/rubygem-aws-sdk/Makefile
index 0b53fd323dd2..f0530fce9fe7 100644
--- a/devel/rubygem-aws-sdk/Makefile
+++ b/devel/rubygem-aws-sdk/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	aws-sdk
-PORTVERSION=	2.10.38
+PORTVERSION=	2.10.46
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-aws-sdk/distinfo b/devel/rubygem-aws-sdk/distinfo
index 7b53cde4d302..028b62caafc1 100644
--- a/devel/rubygem-aws-sdk/distinfo
+++ b/devel/rubygem-aws-sdk/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504355587
-SHA256 (rubygem/aws-sdk-2.10.38.gem) = 105cebeef3c2d4ec2d55465d82181bba7c24cde510f25623f4df1f432676841d
-SIZE (rubygem/aws-sdk-2.10.38.gem) = 4608
+TIMESTAMP = 1505452088
+SHA256 (rubygem/aws-sdk-2.10.46.gem) = e9357c78d637b73fedae2c24a84f74c560413b3ededc48b8fc656a0d96a97096
+SIZE (rubygem/aws-sdk-2.10.46.gem) = 4608
diff --git a/devel/rubygem-bootsnap/Makefile b/devel/rubygem-bootsnap/Makefile
index f27724aabd2d..3d02ffc90a28 100644
--- a/devel/rubygem-bootsnap/Makefile
+++ b/devel/rubygem-bootsnap/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	bootsnap
-PORTVERSION=	1.1.2
+PORTVERSION=	1.1.3
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-bootsnap/distinfo b/devel/rubygem-bootsnap/distinfo
index 46e0544e8e4d..8a03e3d5ef7a 100644
--- a/devel/rubygem-bootsnap/distinfo
+++ b/devel/rubygem-bootsnap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500259916
-SHA256 (rubygem/bootsnap-1.1.2.gem) = 670c8b72226c19c28bfff749b621438904022dcbd45760ac347c4aa70737e8d9
-SIZE (rubygem/bootsnap-1.1.2.gem) = 27648
+TIMESTAMP = 1504799719
+SHA256 (rubygem/bootsnap-1.1.3.gem) = 8aef3e6a89308c55cb640d24d2423092e29670da8e2dbc3fee58d70227c38539
+SIZE (rubygem/bootsnap-1.1.3.gem) = 27648
diff --git a/devel/rubygem-declarative/Makefile b/devel/rubygem-declarative/Makefile
index 125465babac1..6f1197d71cee 100644
--- a/devel/rubygem-declarative/Makefile
+++ b/devel/rubygem-declarative/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	declarative
-PORTVERSION=	0.0.9
+PORTVERSION=	0.0.10
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-declarative/distinfo b/devel/rubygem-declarative/distinfo
index bc28c432a87e..cb751323793e 100644
--- a/devel/rubygem-declarative/distinfo
+++ b/devel/rubygem-declarative/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1490093865
-SHA256 (rubygem/declarative-0.0.9.gem) = 12a1403ef9ef7cd40219c8a9977c2e88b21713bfab60e82aafdb7174a7935bac
-SIZE (rubygem/declarative-0.0.9.gem) = 12288
+TIMESTAMP = 1505293237
+SHA256 (rubygem/declarative-0.0.10.gem) = b26cfbd229fc54256132636a6073c67d3ca22a3f86bc15ee1cf1adfff9ee8218
+SIZE (rubygem/declarative-0.0.10.gem) = 13824
diff --git a/devel/rubygem-dynflow/Makefile b/devel/rubygem-dynflow/Makefile
index 6a6cce30a590..15a566d9f3cd 100644
--- a/devel/rubygem-dynflow/Makefile
+++ b/devel/rubygem-dynflow/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	dynflow
-PORTVERSION=	0.8.28
+PORTVERSION=	0.8.29
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-dynflow/distinfo b/devel/rubygem-dynflow/distinfo
index e5aee339e2c2..6afc777f3b5f 100644
--- a/devel/rubygem-dynflow/distinfo
+++ b/devel/rubygem-dynflow/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503678475
-SHA256 (rubygem/dynflow-0.8.28.gem) = 67c7134d4d5261bf56e19b2b47b959fe37d0a6cc0db8b50ccca2cc4f4fce3893
-SIZE (rubygem/dynflow-0.8.28.gem) = 940544
+TIMESTAMP = 1505229691
+SHA256 (rubygem/dynflow-0.8.29.gem) = 3d9c30c1bb5f7b91462962c5663ed3bf9b9470c09fd6773fc3605d1804899f14
+SIZE (rubygem/dynflow-0.8.29.gem) = 941056
diff --git a/devel/rubygem-excon/Makefile b/devel/rubygem-excon/Makefile
index ee951e3903df..4f0d2dd4f2cc 100644
--- a/devel/rubygem-excon/Makefile
+++ b/devel/rubygem-excon/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	excon
-PORTVERSION=	0.58.0
+PORTVERSION=	0.59.0
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-excon/distinfo b/devel/rubygem-excon/distinfo
index b1c46c859fae..801480fee7b9 100644
--- a/devel/rubygem-excon/distinfo
+++ b/devel/rubygem-excon/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501694462
-SHA256 (rubygem/excon-0.58.0.gem) = 534dd03e81996b5ac3fa511f1e1ed3a73de921890e62f42b1fd4efce3d951a07
-SIZE (rubygem/excon-0.58.0.gem) = 235520
+TIMESTAMP = 1504718754
+SHA256 (rubygem/excon-0.59.0.gem) = 80b016756151fa141fc185d7f15a2da5621d6f8d075270bd2a12f34f314dcc56
+SIZE (rubygem/excon-0.59.0.gem) = 236032
diff --git a/devel/rubygem-google-api-client/Makefile b/devel/rubygem-google-api-client/Makefile
index 92296a9c0896..b2579cb7238f 100644
--- a/devel/rubygem-google-api-client/Makefile
+++ b/devel/rubygem-google-api-client/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	google-api-client
-PORTVERSION=	0.13.5
+PORTVERSION=	0.13.6
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-google-api-client/distinfo b/devel/rubygem-google-api-client/distinfo
index 3029631acbea..df28b6472b3c 100644
--- a/devel/rubygem-google-api-client/distinfo
+++ b/devel/rubygem-google-api-client/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504539990
-SHA256 (rubygem/google-api-client-0.13.5.gem) = 81cf397f3545bf0e4939a0b21b76f40cada52a4be4854788bbdc1b98fd48cb99
-SIZE (rubygem/google-api-client-0.13.5.gem) = 3206656
+TIMESTAMP = 1505127727
+SHA256 (rubygem/google-api-client-0.13.6.gem) = 3e387f97e64d2de97b478f87f6b6adeb314c0f703f71f1f99e395a3e81c28929
+SIZE (rubygem/google-api-client-0.13.6.gem) = 3212288
diff --git a/devel/rubygem-grape/Makefile b/devel/rubygem-grape/Makefile
index 4fce4dd46f52..f5fe89351d27 100644
--- a/devel/rubygem-grape/Makefile
+++ b/devel/rubygem-grape/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	grape
-PORTVERSION=	1.0.0
+PORTVERSION=	1.0.1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-grape/distinfo b/devel/rubygem-grape/distinfo
index 057f6134a10f..a3ce5a177d4e 100644
--- a/devel/rubygem-grape/distinfo
+++ b/devel/rubygem-grape/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500129589
-SHA256 (rubygem/grape-1.0.0.gem) = 1bb6e94fc401d4c7e8866a8f6dfd581d08d078bbf830efa2e91ca66f4aa7e5ef
-SIZE (rubygem/grape-1.0.0.gem) = 201728
+TIMESTAMP = 1504932944
+SHA256 (rubygem/grape-1.0.1.gem) = d66c3a7faf88eed3fed61de068527e75c09060228bbcaaa1e059617493475af4
+SIZE (rubygem/grape-1.0.1.gem) = 395264
diff --git a/devel/rubygem-jruby-jars/Makefile b/devel/rubygem-jruby-jars/Makefile
index 825fde88f928..c43a0d2a343d 100644
--- a/devel/rubygem-jruby-jars/Makefile
+++ b/devel/rubygem-jruby-jars/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	jruby-jars
-PORTVERSION=	9.1.12.0
+PORTVERSION=	9.1.13.0
 CATEGORIES=	devel rubygems java
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-jruby-jars/distinfo b/devel/rubygem-jruby-jars/distinfo
index 43c1a2573c3c..0705a1502e68 100644
--- a/devel/rubygem-jruby-jars/distinfo
+++ b/devel/rubygem-jruby-jars/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1497619409
-SHA256 (rubygem/jruby-jars-9.1.12.0.gem) = c945aa817b9d846c5fb2d87a9e3c71443243eea19dcd0d7fcc5c099beb88c92d
-SIZE (rubygem/jruby-jars-9.1.12.0.gem) = 20456960
+TIMESTAMP = 1504799732
+SHA256 (rubygem/jruby-jars-9.1.13.0.gem) = c725cc612aa59e6d4475dc7ad86ff8239ca73d220cf4e8e61ddf8dbf88faca7c
+SIZE (rubygem/jruby-jars-9.1.13.0.gem) = 20529664
diff --git a/devel/rubygem-jsonapi-renderer/Makefile b/devel/rubygem-jsonapi-renderer/Makefile
index 7ab0f9691261..aadd6e729fe6 100644
--- a/devel/rubygem-jsonapi-renderer/Makefile
+++ b/devel/rubygem-jsonapi-renderer/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	jsonapi-renderer
-PORTVERSION=	0.1.3
+PORTVERSION=	0.2.0
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
@@ -10,9 +10,8 @@ COMMENT=	Render JSONAPI documents
 
 LICENSE=	MIT
 
+NO_ARCH=	yes
 USES=		gem
 USE_RUBY=	yes
 
-NO_ARCH=	yes
-
 .include <bsd.port.mk>
diff --git a/devel/rubygem-jsonapi-renderer/distinfo b/devel/rubygem-jsonapi-renderer/distinfo
index dc839a923a81..32400c52988e 100644
--- a/devel/rubygem-jsonapi-renderer/distinfo
+++ b/devel/rubygem-jsonapi-renderer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501014957
-SHA256 (rubygem/jsonapi-renderer-0.1.3.gem) = eb426b9122ec805168822bee64a42310740c7c90b6d3aed9848851d5db367cb3
-SIZE (rubygem/jsonapi-renderer-0.1.3.gem) = 7680
+TIMESTAMP = 1505127732
+SHA256 (rubygem/jsonapi-renderer-0.2.0.gem) = b24cb7423d6975e272973e0bc64c8ecfd1ae886a918c116bf48c653b36abda03
+SIZE (rubygem/jsonapi-renderer-0.2.0.gem) = 8704
diff --git a/devel/rubygem-multi_json/Makefile b/devel/rubygem-multi_json/Makefile
index 0f8114b95c22..3ba3ad81ebc3 100644
--- a/devel/rubygem-multi_json/Makefile
+++ b/devel/rubygem-multi_json/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	multi_json
-PORTVERSION=	1.12.1
+PORTVERSION=	1.12.2
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-multi_json/distinfo b/devel/rubygem-multi_json/distinfo
index 52b3bf456418..39a0d5c423bd 100644
--- a/devel/rubygem-multi_json/distinfo
+++ b/devel/rubygem-multi_json/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1473686517
-SHA256 (rubygem/multi_json-1.12.1.gem) = b387722b0a31fff619a2682c7011affb5a13fed2cce240c75c5d6ca3e910ecf2
-SIZE (rubygem/multi_json-1.12.1.gem) = 26112
+TIMESTAMP = 1504718760
+SHA256 (rubygem/multi_json-1.12.2.gem) = 5dcc0b569969f3d1658c68b5d597fcdc1fc3a34d4ae92b4615c740d95aaa51e5
+SIZE (rubygem/multi_json-1.12.2.gem) = 25600
diff --git a/devel/rubygem-pygments.rb/Makefile b/devel/rubygem-pygments.rb/Makefile
index 9af3977fc55d..0fe14ec29048 100644
--- a/devel/rubygem-pygments.rb/Makefile
+++ b/devel/rubygem-pygments.rb/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pygments.rb
-PORTVERSION=	1.1.2
+PORTVERSION=	1.2.0
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
@@ -16,8 +16,21 @@ RUN_DEPENDS=	rubygem-multi_json>=1.0.0:devel/rubygem-multi_json
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USES=		gem
+USES=		gem shebangfix
 
-PLIST_FILES=	%%GEM_LIB_DIR%%/vendor/pygments-main/scripts/find_error.py
+SHEBANG_FILES=	vendor/pygments-main/external/autopygmentize
+
+post-patch:
+	@${REINPLACE_CMD} -e '1d' \
+		${WRKSRC}/lib/pygments/mentos.py \
+		${WRKSRC}/vendor/pygments-main/external/lasso-builtins-generator-9.lasso \
+		${WRKSRC}/vendor/pygments-main/pygmentize \
+		${WRKSRC}/vendor/pygments-main/pygments/util.py \
+		${WRKSRC}/vendor/pygments-main/scripts/check_sources.py \
+		${WRKSRC}/vendor/pygments-main/scripts/debug_lexer.py \
+		${WRKSRC}/vendor/pygments-main/scripts/vim2pygments.py \
+		${WRKSRC}/vendor/pygments-main/setup.py \
+		${WRKSRC}/vendor/simplejson/scripts/make_docs.py \
+		${WRKSRC}/vendor/simplejson/setup.py
 
 .include <bsd.port.mk>
diff --git a/devel/rubygem-pygments.rb/distinfo b/devel/rubygem-pygments.rb/distinfo
index 3ddec0fc2739..7fb03716b81a 100644
--- a/devel/rubygem-pygments.rb/distinfo
+++ b/devel/rubygem-pygments.rb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1491215657
-SHA256 (rubygem/pygments.rb-1.1.2.gem) = 55a5deed9ecba6037ac22bf27191e0073bd460f87291b2f384922e4b0d59511c
-SIZE (rubygem/pygments.rb-1.1.2.gem) = 1169920
+TIMESTAMP = 1505424341
+SHA256 (rubygem/pygments.rb-1.2.0.gem) = 8aa9f8c1254e340230413c0d9ed52efa6cd706adfc60e876a15d2e7a1d73080b
+SIZE (rubygem/pygments.rb-1.2.0.gem) = 1174016
diff --git a/devel/rubygem-rake/Makefile b/devel/rubygem-rake/Makefile
index 6fd7c92d8d2d..0e7169be6e2c 100644
--- a/devel/rubygem-rake/Makefile
+++ b/devel/rubygem-rake/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	rake
-PORTVERSION=	12.0.0
-PORTREVISION=	1
+PORTVERSION=	12.1.0
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-rake/distinfo b/devel/rubygem-rake/distinfo
index 4071bedf5f59..4a4772c3d513 100644
--- a/devel/rubygem-rake/distinfo
+++ b/devel/rubygem-rake/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1483215684
-SHA256 (rubygem/rake-12.0.0.gem) = f6b43059e2923ddd30128fbbf4eb2e610c020b888ad97b57d7d94abc12734806
-SIZE (rubygem/rake-12.0.0.gem) = 84480
+TIMESTAMP = 1505293242
+SHA256 (rubygem/rake-12.1.0.gem) = 5cbb774dfd1c31c4ef19e365728b8a9ecb8b0b74349496c32e3a993aee7dd855
+SIZE (rubygem/rake-12.1.0.gem) = 84480
diff --git a/devel/rubygem-recaptcha/Makefile b/devel/rubygem-recaptcha/Makefile
index 9275caa1a414..1580e7fa5cf8 100644
--- a/devel/rubygem-recaptcha/Makefile
+++ b/devel/rubygem-recaptcha/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	recaptcha
-PORTVERSION=	4.4.0
+PORTVERSION=	4.4.1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-recaptcha/distinfo b/devel/rubygem-recaptcha/distinfo
index da8b7bf62f1f..18e2a9ecafa2 100644
--- a/devel/rubygem-recaptcha/distinfo
+++ b/devel/rubygem-recaptcha/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504355593
-SHA256 (rubygem/recaptcha-4.4.0.gem) = c5982fd7c9730a5589d41d0a1ae05a13841e00ce83bb367d4214b4b171552d48
-SIZE (rubygem/recaptcha-4.4.0.gem) = 12288
+TIMESTAMP = 1504891832
+SHA256 (rubygem/recaptcha-4.4.1.gem) = 0023aa7d3bbf94782b107d52c56efdf02cb51cb3154dd6977f80b911035f487c
+SIZE (rubygem/recaptcha-4.4.1.gem) = 12288
diff --git a/devel/rubygem-rubocop/Makefile b/devel/rubygem-rubocop/Makefile
index 66bfaae15831..b68a25ba5b7f 100644
--- a/devel/rubygem-rubocop/Makefile
+++ b/devel/rubygem-rubocop/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	rubocop
-PORTVERSION=	0.49.1
+PORTVERSION=	0.50.0
 CATEGORIES=	devel ruby
 MASTER_SITES=	RG
 
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 RUN_DEPENDS=	rubygem-parallel>=1.10:sysutils/rubygem-parallel \
 		rubygem-parser>=2.3.3.1:devel/rubygem-parser \
 		rubygem-powerpack>=0.1:devel/rubygem-powerpack \
-		rubygem-rainbow>=1.99.1:devel/rubygem-rainbow \
+		rubygem-rainbow>=2.2.2:devel/rubygem-rainbow \
 		rubygem-ruby-progressbar>=1.7:devel/rubygem-ruby-progressbar \
 		rubygem-unicode-display_width>=1.0.1:devel/rubygem-unicode-display_width
 
diff --git a/devel/rubygem-rubocop/distinfo b/devel/rubygem-rubocop/distinfo
index 266302cc637a..f5d96e3dd91b 100644
--- a/devel/rubygem-rubocop/distinfo
+++ b/devel/rubygem-rubocop/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1496154597
-SHA256 (rubygem/rubocop-0.49.1.gem) = bcb37220633a570611b68bf8d4649414624d90fad83a7bf8310940f61df51ed7
-SIZE (rubygem/rubocop-0.49.1.gem) = 321024
+TIMESTAMP = 1505452097
+SHA256 (rubygem/rubocop-0.50.0.gem) = 9f7610b37b6746609c932ec8ac5b1a9b4b56f7526018c941393e79b2d93fedc2
+SIZE (rubygem/rubocop-0.50.0.gem) = 335872
diff --git a/devel/rubygem-simplecov/Makefile b/devel/rubygem-simplecov/Makefile
index badb521b11f7..aad7d8511fd1 100644
--- a/devel/rubygem-simplecov/Makefile
+++ b/devel/rubygem-simplecov/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	simplecov
-PORTVERSION=	0.15.0
+PORTVERSION=	0.15.1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-simplecov/distinfo b/devel/rubygem-simplecov/distinfo
index 4f9d1b57fd68..1a0ae630e50d 100644
--- a/devel/rubygem-simplecov/distinfo
+++ b/devel/rubygem-simplecov/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502810071
-SHA256 (rubygem/simplecov-0.15.0.gem) = b57e7b90b3cb1cb6afb9ad1bc216b26abff245b9600578a60661b820debb8004
-SIZE (rubygem/simplecov-0.15.0.gem) = 63488
+TIMESTAMP = 1505229700
+SHA256 (rubygem/simplecov-0.15.1.gem) = b201d2c89a33b5478b138b7df0f771a395ec3da7cf9b60b3063abf3bfd3cf47f
+SIZE (rubygem/simplecov-0.15.1.gem) = 64000
diff --git a/devel/sbt/Makefile b/devel/sbt/Makefile
index 419228107bf2..5311643ab538 100644
--- a/devel/sbt/Makefile
+++ b/devel/sbt/Makefile
@@ -2,18 +2,19 @@
 # $FreeBSD$
 
 PORTNAME=	sbt
-PORTVERSION=	1.0.0
+PORTVERSION=	1.0.1
 CATEGORIES=	devel java
-MASTER_SITES=	https://github.com/sbt/sbt/releases/download/v${PORTVERSION}/
+MASTER_SITES=	https://cocl.us/
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Build tool for Scala projects
 
 LICENSE=	APACHE20
 
-OPTIONS_DEFINE=	ADVANCED
+OPTIONS_DEFINE=	ADVANCED PRELOADED
 OPTIONS_DEFAULT=ADVANCED
 ADVANCED_DESC=	Install advanced bash shell-script
+PRELOADED_DESC=	Install preloaded jars for offline usage
 
 USES=		tar:tgz
 NO_BUILD=	yes
@@ -21,19 +22,19 @@ NO_ARCH=	yes
 USE_JAVA=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-PLIST_FILES=	bin/sbt \
-		%%DATADIR%%/sbt-launch.jar
+ADVANCED_RUN_DEPENDS+=	bash:shells/bash
+PRELOADED_RUN_DEPENDS+=	rsync:net/rsync
 
-.include <bsd.port.options.mk>
+ADVANCED_SUB_FILES_OFF=	sbt.sh
 
-.if ${PORT_OPTIONS:MADVANCED}
-RUN_DEPENDS=	bash:shells/bash
+PLIST_FILES=	bin/sbt
 
-PLIST_FILES+=	%%DATADIR%%/sbt \
-		%%DATADIR%%/sbt-launch-lib.bash
-.else
-SUB_FILES=	sbt.sh
-.endif
+PORTDATA=	*
+
+.include <bsd.port.options.mk>
+
+post-patch:
+	@${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/bin/sbt
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
@@ -41,8 +42,12 @@ do-install:
 .if ${PORT_OPTIONS:MADVANCED}
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/sbt ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/sbt-launch-lib.bash ${STAGEDIR}${DATADIR}
+.if ${PORT_OPTIONS:MPRELOADED}
+	cd ${WRKSRC}/lib && ${COPYTREE_SHARE} local-preloaded ${STAGEDIR}${DATADIR}
+.endif
 	${LN} -s ../${DATADIR_REL}/sbt ${STAGEDIR}${PREFIX}/bin/
 .else
+	${INSTALL_DATA} ${WRKSRC}/bin/sbt-launch.jar ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/sbt.sh ${STAGEDIR}${PREFIX}/bin/sbt
 .endif
 
diff --git a/devel/sbt/distinfo b/devel/sbt/distinfo
index 960c17b61499..57734171a621 100644
--- a/devel/sbt/distinfo
+++ b/devel/sbt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504078579
-SHA256 (sbt-1.0.0.tgz) = 9ae04f4972145f2ac56c4deb868c9a5bb8b8b85c5151885dff3b997712645c5a
-SIZE (sbt-1.0.0.tgz) = 59735978
+TIMESTAMP = 1504873206
+SHA256 (sbt-1.0.1.tgz) = 5b68996a890b4a91efd9d13b9aca5e2b09f78c254c2907b3d548a9a7a73b0e5a
+SIZE (sbt-1.0.1.tgz) = 59744300
diff --git a/devel/sbt/files/patch-bin_sbt b/devel/sbt/files/patch-bin_sbt
index a89c35c970d9..1f16f06fe62a 100644
--- a/devel/sbt/files/patch-bin_sbt
+++ b/devel/sbt/files/patch-bin_sbt
@@ -1,20 +1,20 @@
---- bin/sbt.orig	2016-10-28 17:46:00 UTC
+--- bin/sbt.orig	2017-08-29 21:39:02 UTC
 +++ bin/sbt
-@@ -62,7 +62,7 @@ cygwinpath() {
+@@ -63,7 +63,7 @@ cygwinpath() {
  
  declare -r noshare_opts="-Dsbt.global.base=project/.sbtboot -Dsbt.boot.directory=project/.boot -Dsbt.ivy.home=project/.ivy"
  declare -r sbt_opts_file=".sbtopts"
--declare -r etc_sbt_opts_file="${sbt_home}/conf/sbtopts"
-+declare -r etc_sbt_opts_file="${sbt_home}/etc/sbtopts"
+-declare -r etc_sbt_opts_file="/etc/sbt/sbtopts"
++declare -r etc_sbt_opts_file="%%PREFIX%%/etc/sbtopts"
+ declare -r dist_sbt_opts_file="${sbt_home}/conf/sbtopts"
  declare -r win_sbt_opts_file="${sbt_home}/conf/sbtconfig.txt"
  
- usage() {
-@@ -99,7 +99,7 @@ Usage: $script_name [options]
+@@ -101,7 +101,7 @@ Usage: $script_name [options]
    SBT_OPTS           environment variable, if unset uses "$default_sbt_opts"
    .sbtopts           if this file exists in the current directory, its contents
                       are prepended to the runner args
 -  /etc/sbt/sbtopts   if this file exists, it is prepended to the runner args
-+  ${sbt_home}/etc/sbtopts   if this file exists, it is prepended to the runner args
++  %%PREFIX%%/etc/sbtopts   if this file exists, it is prepended to the runner args
    -Dkey=val          pass -Dkey=val directly to the java runtime
    -J-X               pass option -X directly to the java runtime 
                       (-J is stripped)
diff --git a/devel/sbt/files/patch-bin_sbt-launch-lib.bash b/devel/sbt/files/patch-bin_sbt-launch-lib.bash
index 0493e7ae53df..b33892183f5e 100644
--- a/devel/sbt/files/patch-bin_sbt-launch-lib.bash
+++ b/devel/sbt/files/patch-bin_sbt-launch-lib.bash
@@ -1,11 +1,38 @@
---- bin/sbt-launch-lib.bash.orig	2016-10-28 17:46:00 UTC
+--- bin/sbt-launch-lib.bash.orig	2017-08-29 21:39:02 UTC
 +++ bin/sbt-launch-lib.bash
-@@ -26,7 +26,7 @@ dlog () {
+@@ -26,7 +26,7 @@ while [ -h "$SCRIPT" ] ; do
+   fi
+ done
+ declare -r sbt_bin_dir="$(dirname "$SCRIPT")"
+-declare -r sbt_home="$(dirname "$sbt_bin_dir")"
++declare -r sbt_home="$sbt_bin_dir"
+ 
+ echoerr () {
+   echo 1>&2 "$@"
+@@ -39,7 +39,7 @@ dlog () {
  }
  
  jar_file () {
 -  echo "$(cygwinpath "${sbt_home}/bin/sbt-launch.jar")"
-+  echo "$(cygwinpath "${sbt_bin_dir}/sbt-launch.jar")"
++  echo "$(cygwinpath "${sbt_home}/sbt-launch.jar")"
  }
  
  acquire_sbt_jar () {
+@@ -172,14 +172,14 @@ process_args () {
+ syncPreloaded() {
+   if [[ "$init_sbt_version" == "" ]]; then
+     # FIXME: better $init_sbt_version detection
+-    init_sbt_version="$(ls -1 "$sbt_home/lib/local-preloaded/org.scala-sbt/sbt/")"
++    init_sbt_version="$(ls -1 "$sbt_home/local-preloaded/org.scala-sbt/sbt/")"
+   fi
+   [[ -f "$HOME/.sbt/preloaded/org.scala-sbt/sbt/$init_sbt_version/jars/sbt.jar" ]] || {
+     # lib/local-preloaded exists (This is optional)
+-    [[ -d "$sbt_home/lib/local-preloaded/" ]] && {
++    [[ -d "$sbt_home/local-preloaded/" ]] && {
+       command -v rsync >/dev/null 2>&1 && {
+         mkdir -p "$HOME/.sbt/preloaded"
+-        rsync -a --ignore-existing "$sbt_home/lib/local-preloaded/" "$HOME/.sbt/preloaded"
++        rsync -a --ignore-existing "$sbt_home/local-preloaded/" "$HOME/.sbt/preloaded"
+       }
+     }
+   }
diff --git a/devel/sdl2pp/Makefile b/devel/sdl2pp/Makefile
index c2e99705e544..dd4332e38d3a 100644
--- a/devel/sdl2pp/Makefile
+++ b/devel/sdl2pp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	sdl2pp
 PORTVERSION=	0.15.0
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	amdmi3@FreeBSD.org
diff --git a/devel/sfml/Makefile b/devel/sfml/Makefile
index 6477fddcd1b1..b186166d0743 100644
--- a/devel/sfml/Makefile
+++ b/devel/sfml/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	sfml
 PORTVERSION=	2.4.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://www.sfml-dev.org/download/sfml/${PORTVERSION}/
 DISTNAME=	SFML-${PORTVERSION}-sources
diff --git a/devel/simgear/Makefile b/devel/simgear/Makefile
index 77c6624a5004..3d65ae9af907 100644
--- a/devel/simgear/Makefile
+++ b/devel/simgear/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	simgear
 PORTVERSION=	2017.1.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel games
 MASTER_SITES=	SF/flightgear/release-${PORTVERSION:R}
 
diff --git a/devel/smv/Makefile b/devel/smv/Makefile
index 8b4d387288a9..7d4eef1617cc 100644
--- a/devel/smv/Makefile
+++ b/devel/smv/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	smv
 PORTVERSION=	2.5.4.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel
 MASTER_SITES=	http://www.cs.cmu.edu/~modelcheck/smv/
 DISTNAME=	${PORTNAME}.r${PORTVERSION}
diff --git a/devel/sourcenav/Makefile b/devel/sourcenav/Makefile
index 7260764e2e23..6ad7fd9a60ea 100644
--- a/devel/sourcenav/Makefile
+++ b/devel/sourcenav/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	sourcenav
 PORTVERSION=	4.5
-PORTREVISION=	5
+PORTREVISION=	6
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/NG${PORTVERSION}
diff --git a/devel/synfig/Makefile b/devel/synfig/Makefile
index 2aac588f2afe..743b126b1275 100644
--- a/devel/synfig/Makefile
+++ b/devel/synfig/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	synfig
 PORTVERSION=	1.0.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	devel graphics multimedia
 MASTER_SITES=	SF/${PORTNAME}/releases/${PORTVERSION}/source
 
diff --git a/devel/thrift-cpp/Makefile b/devel/thrift-cpp/Makefile
index f0b55e7bb7bd..0b6cf302a892 100644
--- a/devel/thrift-cpp/Makefile
+++ b/devel/thrift-cpp/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	thrift
 PORTVERSION=	${THRIFT_PORTVERSION} # to keep in sync with thrift
-PORTREVISION=	8
+PORTREVISION=	9
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	APACHE/thrift/${PORTVERSION}
diff --git a/devel/tigcc/Makefile b/devel/tigcc/Makefile
index 48a2ba904c38..15719125699a 100644
--- a/devel/tigcc/Makefile
+++ b/devel/tigcc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	tigcc
 PORTVERSION=	0.96.b8
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel
 MASTER_SITES=		GCC/snapshots/4.1-20060728:gcc \
 			GNU/binutils:gas \
diff --git a/devel/tortoisehg/Makefile b/devel/tortoisehg/Makefile
index 6a4591975d81..f2dbaa25b30e 100644
--- a/devel/tortoisehg/Makefile
+++ b/devel/tortoisehg/Makefile
@@ -1,13 +1,13 @@
 # $FreeBSD$
 
 PORTNAME=	tortoisehg
-PORTVERSION=	4.2.1
+PORTVERSION=	4.3.1
 CATEGORIES=	devel
 MASTER_SITES=	https://bitbucket.org/tortoisehg/targz/downloads/
 #MASTER_SITES=	http://cdn.bitbucket.org/tortoisehg/targz/downloads/
 
 MAINTAINER=	6yearold@gmail.com
-COMMENT=	THg script from TortoiseHG
+COMMENT=	GUI for Mercurial VCS
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
diff --git a/devel/tortoisehg/distinfo b/devel/tortoisehg/distinfo
index 014f2de7b4b8..afd29dd2f399 100644
--- a/devel/tortoisehg/distinfo
+++ b/devel/tortoisehg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500137755
-SHA256 (tortoisehg-4.2.1.tar.gz) = e821b9c4fc2c8ab8a1d743c56b6f002c4994d737120b388d38b4891dcd57ecca
-SIZE (tortoisehg-4.2.1.tar.gz) = 7921681
+TIMESTAMP = 1502643094
+SHA256 (tortoisehg-4.3.1.tar.gz) = 5698db60320574769c73e4f910909e75a8e32ba84adcea902f9457899bbcb753
+SIZE (tortoisehg-4.3.1.tar.gz) = 7930491
diff --git a/devel/ucommon/Makefile b/devel/ucommon/Makefile
index 310f53f9e6b4..ad6565ba554a 100644
--- a/devel/ucommon/Makefile
+++ b/devel/ucommon/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ucommon
 PORTVERSION=	7.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	GNU/commoncpp
 
diff --git a/devel/upp/Makefile b/devel/upp/Makefile
index 5b39a22cf3cf..a7a2efb671a6 100644
--- a/devel/upp/Makefile
+++ b/devel/upp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	upp
 PORTVERSION=	10804
+PORTREVISION=	1
 CATEGORIES=	devel x11-toolkits
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/2017.1/
 DISTNAME=	${PORTNAME}-x11-src-${PORTVERSION}
diff --git a/devel/varconf/Makefile b/devel/varconf/Makefile
index 8825098f05c1..81646e40da31 100644
--- a/devel/varconf/Makefile
+++ b/devel/varconf/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	varconf
 PORTVERSION=	1.0.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	devel
 MASTER_SITES=	SF/worldforge/${PORTNAME}%20%28config%20lib%29/${PORTVERSION}
 
diff --git a/devel/vtcl/Makefile b/devel/vtcl/Makefile
index e3d96687516e..3b9ce49470ac 100644
--- a/devel/vtcl/Makefile
+++ b/devel/vtcl/Makefile
@@ -10,6 +10,10 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/1.6.1.a1
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Application Development Environment for Tcl/Tk
 
+DEPRECATED=		This port depends on Tcl/Tk 8.4 , which is no longer\
+			maintained. Please port it to 8.5+
+EXPIRATION_DATE=	2017-10-15
+
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
diff --git a/devel/wxformbuilder/Makefile b/devel/wxformbuilder/Makefile
index 7558508147ed..caf6600fe680 100644
--- a/devel/wxformbuilder/Makefile
+++ b/devel/wxformbuilder/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	wxformbuilder
 DISTVERSION=	3.5.0-beta
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-nightly/${DISTVERSION}
 DISTNAME=	wxFormBuilder_v${DISTVERSION}-source
diff --git a/devel/xdg-user-dirs/Makefile b/devel/xdg-user-dirs/Makefile
index 3871d7d4e4b5..fc0b7cb61e86 100644
--- a/devel/xdg-user-dirs/Makefile
+++ b/devel/xdg-user-dirs/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xdg-user-dirs
-PORTVERSION=	0.15
-PORTREVISION=	2
+PORTVERSION=	0.16
 CATEGORIES=	devel
 MASTER_SITES=	http://user-dirs.freedesktop.org/releases/
 
diff --git a/devel/xdg-user-dirs/distinfo b/devel/xdg-user-dirs/distinfo
index aa7bcb552d55..0a631f0666ec 100644
--- a/devel/xdg-user-dirs/distinfo
+++ b/devel/xdg-user-dirs/distinfo
@@ -1,2 +1,3 @@
-SHA256 (xdg-user-dirs-0.15.tar.gz) = 20b4a751f41d0554bce3e0ce5e8d934be98cc62d48f0b90a894c3e1916552786
-SIZE (xdg-user-dirs-0.15.tar.gz) = 243747
+TIMESTAMP = 1505386726
+SHA256 (xdg-user-dirs-0.16.tar.gz) = 770fb42c8809d192c661585a0ee9ed9b65ebaca7532abe7dd68eca0e4962e3e6
+SIZE (xdg-user-dirs-0.16.tar.gz) = 255933
diff --git a/devel/xdg-user-dirs/pkg-plist b/devel/xdg-user-dirs/pkg-plist
index 7ec4ccc72d44..39ff966d056b 100644
--- a/devel/xdg-user-dirs/pkg-plist
+++ b/devel/xdg-user-dirs/pkg-plist
@@ -1,5 +1,6 @@
 bin/xdg-user-dir
 bin/xdg-user-dirs-update
+etc/xdg/autostart/xdg-user-dirs.desktop
 etc/xdg/user-dirs.conf
 etc/xdg/user-dirs.defaults
 man/man1/xdg-user-dir.1.gz
@@ -31,6 +32,7 @@ share/locale/fa/LC_MESSAGES/xdg-user-dirs.mo
 share/locale/fi/LC_MESSAGES/xdg-user-dirs.mo
 share/locale/fr/LC_MESSAGES/xdg-user-dirs.mo
 share/locale/ga/LC_MESSAGES/xdg-user-dirs.mo
+share/locale/gd/LC_MESSAGES/xdg-user-dirs.mo
 share/locale/gl/LC_MESSAGES/xdg-user-dirs.mo
 share/locale/gu/LC_MESSAGES/xdg-user-dirs.mo
 share/locale/he/LC_MESSAGES/xdg-user-dirs.mo
diff --git a/devel/yaml-cpp/Makefile b/devel/yaml-cpp/Makefile
index b56b943ee40f..74e8dc945b51 100644
--- a/devel/yaml-cpp/Makefile
+++ b/devel/yaml-cpp/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	yaml-cpp
 PORTVERSION=	0.5.3
 DISTVERSIONPREFIX=	release-
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 
 MAINTAINER=	madpilot@FreeBSD.org
diff --git a/devel/yaml-cpp/files/patch-include_yaml-cpp_emitter.h b/devel/yaml-cpp/files/patch-include_yaml-cpp_emitter.h
new file mode 100644
index 000000000000..2e7e09a71521
--- /dev/null
+++ b/devel/yaml-cpp/files/patch-include_yaml-cpp_emitter.h
@@ -0,0 +1,11 @@
+--- include/yaml-cpp/emitter.h.orig	2016-01-10 18:11:40 UTC
++++ include/yaml-cpp/emitter.h
+@@ -122,7 +122,7 @@ class YAML_CPP_API Emitter : private non
+   bool CanEmitNewline() const;
+ 
+  private:
+-  std::auto_ptr<EmitterState> m_pState;
++  std::unique_ptr<EmitterState> m_pState;
+   ostream_wrapper m_stream;
+ };
+ 
diff --git a/devel/yaml-cpp/files/patch-include_yaml-cpp_parser.h b/devel/yaml-cpp/files/patch-include_yaml-cpp_parser.h
new file mode 100644
index 000000000000..dd5ebd96e8aa
--- /dev/null
+++ b/devel/yaml-cpp/files/patch-include_yaml-cpp_parser.h
@@ -0,0 +1,13 @@
+--- include/yaml-cpp/parser.h.orig	2016-01-10 18:11:40 UTC
++++ include/yaml-cpp/parser.h
+@@ -40,8 +40,8 @@ class YAML_CPP_API Parser : private nonc
+   void HandleTagDirective(const Token& token);
+ 
+  private:
+-  std::auto_ptr<Scanner> m_pScanner;
+-  std::auto_ptr<Directives> m_pDirectives;
++  std::unique_ptr<Scanner> m_pScanner;
++  std::unique_ptr<Directives> m_pDirectives;
+ };
+ }
+ 
diff --git a/devel/yaml2argdata/Makefile b/devel/yaml2argdata/Makefile
new file mode 100644
index 000000000000..2970245dc7e6
--- /dev/null
+++ b/devel/yaml2argdata/Makefile
@@ -0,0 +1,28 @@
+# Created by: Ed Schouten <ed@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	yaml2argdata
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.3
+CATEGORIES=	devel
+
+MAINTAINER=	ed@FreeBSD.org
+COMMENT=	Helper classes for parsing YAML into Argdata
+
+LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	argdata>=0:devel/argdata \
+		yaml-cpp>=0:devel/yaml-cpp
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	NuxiNL
+
+NO_BUILD=	yes
+
+do-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME}
+	cd ${WRKSRC}/${PORTNAME} && \
+		${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/${PORTNAME}
+
+.include <bsd.port.mk>
diff --git a/devel/yaml2argdata/distinfo b/devel/yaml2argdata/distinfo
new file mode 100644
index 000000000000..2992da9dc29b
--- /dev/null
+++ b/devel/yaml2argdata/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1504099311
+SHA256 (NuxiNL-yaml2argdata-v0.3_GH0.tar.gz) = 8b4d3bba51d0c7944dfe4c7d8c9cc8e49cb99f5b538195cc53ef49fd95519909
+SIZE (NuxiNL-yaml2argdata-v0.3_GH0.tar.gz) = 4116
diff --git a/devel/yaml2argdata/pkg-descr b/devel/yaml2argdata/pkg-descr
new file mode 100644
index 000000000000..de699d9195f7
--- /dev/null
+++ b/devel/yaml2argdata/pkg-descr
@@ -0,0 +1,15 @@
+Argdata is a binary serialisation format similar to FreeBSD's nvlists.
+It differs from nvlists in that it uses data types that are more similar
+to YAML.
+
+Argdata is used by CloudABI as a replacement for string command line
+arguments and environment variables. CloudABI processes can start new
+processes by passing them a YAML-like tree of arguments, having file
+descriptors of resources annotated to the tree.
+
+This package provides a series of helper classes that are used by
+utilities like cloudabi-run to parse and translate YAML to Argdata.
+These classes are useful when building custom utilities for launching
+CloudABI processes, such as CloudABI's Kubernetes daemon.
+
+WWW: https://github.com/NuxiNL/yaml2argdata
diff --git a/devel/yaml2argdata/pkg-plist b/devel/yaml2argdata/pkg-plist
new file mode 100644
index 000000000000..c13cc6c857d9
--- /dev/null
+++ b/devel/yaml2argdata/pkg-plist
@@ -0,0 +1,5 @@
+include/yaml2argdata/yaml_argdata_factory.h
+include/yaml2argdata/yaml_builder.h
+include/yaml2argdata/yaml_canonicalizing_factory.h
+include/yaml2argdata/yaml_error_factory.h
+include/yaml2argdata/yaml_factory.h
diff --git a/devel/zeal/Makefile b/devel/zeal/Makefile
index edfcc7d75c9c..da9c0a99063b 100644
--- a/devel/zeal/Makefile
+++ b/devel/zeal/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	zeal
 PORTVERSION=	0.4.0
+PORTREVISION=	1
 DISTVERSIONPREFIX=v
 CATEGORIES=	devel
 
diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile
index 24571bce39a5..b84eab4fac3e 100644
--- a/dns/bind9-devel/Makefile
+++ b/dns/bind9-devel/Makefile
@@ -31,8 +31,8 @@ LICENSE=	MPL
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION=	9.12.0a.2017.09.05
-HASH=		e8a4edf
+ISCVERSION=	9.12.0a.2017.09.10
+HASH=		8334115
 
 USES=	cpe libedit
 
diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo
index 6553dd695d12..4b9b033acbf2 100644
--- a/dns/bind9-devel/distinfo
+++ b/dns/bind9-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504608701
-SHA256 (bind9-e8a4edf.tar.gz) = a8917c5ba2879ff49a3e8a98853d6641dce7267fcb6111185147f10ea64a4b3d
-SIZE (bind9-e8a4edf.tar.gz) = 11911423
+TIMESTAMP = 1505133022
+SHA256 (bind9-8334115.tar.gz) = d59fc6eec14f15644288e1ae9e93caf57ac4b0c8f61bc3e0c87fbb508b8ac147
+SIZE (bind9-8334115.tar.gz) = 11605180
diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
index 4b3ef4e50b19..f46b035d42b9 100644
--- a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
+++ b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
@@ -1,8 +1,8 @@
---- bin/named/config.c.orig	2017-09-05 01:10:49 UTC
+--- bin/named/config.c.orig	2017-09-10 01:10:23 UTC
 +++ bin/named/config.c
-@@ -176,12 +176,14 @@ options {\n\
- 	max-recursion-depth 7;\n\
+@@ -179,12 +179,14 @@ options {\n\
  	max-recursion-queries 75;\n\
+ 	max-stale-ttl 604800; /* 1 week */\n\
  	message-compression yes;\n\
 +	min-cache-ttl 0; /* no minimal, zero is allowed */\n\
  #	min-roots <obsolete>;\n\
@@ -15,26 +15,26 @@
  	provide-ixfr true;\n\
  	query-source address *;\n\
  	query-source-v6 address *;\n\
---- bin/named/server.c.orig	2017-09-05 01:10:49 UTC
+--- bin/named/server.c.orig	2017-09-10 01:10:23 UTC
 +++ bin/named/server.c
-@@ -3722,6 +3722,16 @@ configure_view(dns_view_t *view, dns_vie
+@@ -3741,6 +3741,16 @@ configure_view(dns_view_t *view, dns_vie
  	}
  
  	obj = NULL;
-+	result = ns_config_get(maps, "override-cache-ttl", &obj);
++	result = named_config_get(maps, "override-cache-ttl", &obj);
 +	INSIST(result == ISC_R_SUCCESS);
 +	view->overridecachettl = cfg_obj_asuint32(obj);
 +
 +	obj = NULL;
-+	result = ns_config_get(maps, "min-cache-ttl", &obj);
++	result = named_config_get(maps, "min-cache-ttl", &obj);
 +	INSIST(result == ISC_R_SUCCESS);
 +	view->mincachettl = cfg_obj_asuint32(obj);
 +
 +	obj = NULL;
- 	result = ns_config_get(maps, "max-cache-ttl", &obj);
+ 	result = named_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	2017-09-05 01:10:49 UTC
+--- lib/dns/include/dns/view.h.orig	2017-09-10 01:10:23 UTC
 +++ lib/dns/include/dns/view.h
 @@ -145,6 +145,8 @@ struct dns_view {
  	isc_boolean_t			requestnsid;
@@ -45,9 +45,9 @@
  	dns_ttl_t			maxncachettl;
  	isc_uint32_t			nta_lifetime;
  	isc_uint32_t			nta_recheck;
---- lib/dns/resolver.c.orig	2017-09-05 01:10:49 UTC
+--- lib/dns/resolver.c.orig	2017-09-10 01:10:23 UTC
 +++ lib/dns/resolver.c
-@@ -5722,6 +5722,18 @@ cache_name(fetchctx_t *fctx, dns_name_t 
+@@ -5726,6 +5726,18 @@ cache_name(fetchctx_t *fctx, dns_name_t 
  		}
  
  		/*
@@ -66,7 +66,7 @@
  		 * Enforce the configure maximum cache TTL.
  		 */
  		if (rdataset->ttl > res->view->maxcachettl)
---- lib/isccfg/namedconf.c.orig	2017-09-05 01:10:49 UTC
+--- lib/isccfg/namedconf.c.orig	2017-09-10 01:10:23 UTC
 +++ lib/isccfg/namedconf.c
 @@ -1894,6 +1894,8 @@ view_clauses[] = {
  	{ "max-acache-size", &cfg_type_sizenodefault,
diff --git a/dns/bind9-devel/files/patch-configure b/dns/bind9-devel/files/patch-configure
index 50ce7753cccf..a047c80ce85e 100644
--- a/dns/bind9-devel/files/patch-configure
+++ b/dns/bind9-devel/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2017-09-05 01:10:49 UTC
+--- configure.orig	2017-09-10 01:10:23 UTC
 +++ configure
-@@ -14434,27 +14434,9 @@ done
+@@ -14403,27 +14403,9 @@ done
  		# problems start to show up.
  		saved_libs="$LIBS"
  		for TRY_LIBS in \
@@ -9,9 +9,9 @@
 -		    "-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -lresolv" \
 -		    "-lgssapi" \
 -		    "-lgssapi -lkrb5 -ldes -lcrypt -lasn1 -lroken -lcom_err" \
--		    "-lgssapi -lkrb5 -lcrypto -lcrypt -lasn1 -lroken -lcom_err" \
--		    "-lgssapi -lkrb5 -lgssapi_krb5 -lcrypto -lcrypt -lasn1 -lroken -lcom_err" \
--		    "-lgssapi -lkrb5 -lhx509 -lcrypto -lcrypt -lasn1 -lroken -lcom_err" \
+-		    "-lgssapi -lkrb5 -lcrypt -lasn1 -lroken -lcom_err" \
+-		    "-lgssapi -lkrb5 -lgssapi_krb5 -lcrypt -lasn1 -lroken -lcom_err" \
+-		    "-lgssapi -lkrb5 -lhx509 -lcrypt -lasn1 -lroken -lcom_err" \
 -		    "-lgss -lkrb5"
 +		    "$($KRB5CONFIG gssapi --libs)"; \
  		do
@@ -22,15 +22,15 @@
 -		    # when you are trying to build with KTH in /usr/lib.
 -		    if test "/usr" = "$use_gssapi"
 -		    then
--			    LIBS="$TRY_LIBS"
+-			    LIBS="$TRY_LIBS $ISC_OPENSSL_LIBS"
 -		    else
--			    LIBS="-L$use_gssapi/lib $TRY_LIBS"
+-			    LIBS="-L$use_gssapi/lib $TRY_LIBS $ISC_OPENSSL_LIBS"
 -		    fi
 +		    LIBS="$TRY_LIBS"
  		    { $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
-@@ -14497,47 +14479,7 @@ $as_echo "no" >&6; } ;;
+@@ -14466,47 +14448,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
-@@ -23023,7 +22965,7 @@ $as_echo "" >&6; }
+@@ -22701,7 +22643,7 @@ $as_echo "" >&6; }
  			# Check other locations for includes.
  			# Order is important (sigh).
  
diff --git a/dns/bind9-devel/pkg-plist b/dns/bind9-devel/pkg-plist
index c8af2f16274f..70bbbafa686e 100644
--- a/dns/bind9-devel/pkg-plist
+++ b/dns/bind9-devel/pkg-plist
@@ -241,21 +241,6 @@ include/isccfg/grammar.h
 include/isccfg/log.h
 include/isccfg/namedconf.h
 include/isccfg/version.h
-include/lwres/context.h
-include/lwres/int.h
-include/lwres/ipv6.h
-include/lwres/lang.h
-include/lwres/list.h
-include/lwres/lwbuffer.h
-include/lwres/lwpacket.h
-include/lwres/lwres.h
-include/lwres/net.h
-include/lwres/netdb.h
-include/lwres/platform.h
-include/lwres/result.h
-include/lwres/stdlib.h
-include/lwres/string.h
-include/lwres/version.h
 include/pk11/constants.h
 include/pk11/internal.h
 include/pk11/pk11.h
@@ -272,7 +257,7 @@ lib/libirs.a
 lib/libisc.a
 lib/libisccc.a
 lib/libisccfg.a
-lib/liblwres.a
+lib/libns.a
 man/man1/arpaname.1.gz
 man/man1/bind9-config.1.gz
 man/man1/delv.1.gz
@@ -284,91 +269,6 @@ man/man1/mdig.1.gz
 man/man1/named-rrchecker.1.gz
 man/man1/nslookup.1.gz
 man/man1/nsupdate.1.gz
-man/man3/lwres.3.gz
-man/man3/lwres_addr_parse.3.gz
-man/man3/lwres_buffer.3.gz
-man/man3/lwres_buffer_add.3.gz
-man/man3/lwres_buffer_back.3.gz
-man/man3/lwres_buffer_clear.3.gz
-man/man3/lwres_buffer_first.3.gz
-man/man3/lwres_buffer_forward.3.gz
-man/man3/lwres_buffer_getmem.3.gz
-man/man3/lwres_buffer_getuint16.3.gz
-man/man3/lwres_buffer_getuint32.3.gz
-man/man3/lwres_buffer_getuint8.3.gz
-man/man3/lwres_buffer_init.3.gz
-man/man3/lwres_buffer_invalidate.3.gz
-man/man3/lwres_buffer_putmem.3.gz
-man/man3/lwres_buffer_putuint16.3.gz
-man/man3/lwres_buffer_putuint32.3.gz
-man/man3/lwres_buffer_putuint8.3.gz
-man/man3/lwres_buffer_subtract.3.gz
-man/man3/lwres_conf_clear.3.gz
-man/man3/lwres_conf_get.3.gz
-man/man3/lwres_conf_init.3.gz
-man/man3/lwres_conf_parse.3.gz
-man/man3/lwres_conf_print.3.gz
-man/man3/lwres_config.3.gz
-man/man3/lwres_context.3.gz
-man/man3/lwres_context_allocmem.3.gz
-man/man3/lwres_context_create.3.gz
-man/man3/lwres_context_destroy.3.gz
-man/man3/lwres_context_freemem.3.gz
-man/man3/lwres_context_initserial.3.gz
-man/man3/lwres_context_nextserial.3.gz
-man/man3/lwres_context_sendrecv.3.gz
-man/man3/lwres_endhostent.3.gz
-man/man3/lwres_endhostent_r.3.gz
-man/man3/lwres_freeaddrinfo.3.gz
-man/man3/lwres_freehostent.3.gz
-man/man3/lwres_gabn.3.gz
-man/man3/lwres_gabnrequest_free.3.gz
-man/man3/lwres_gabnrequest_parse.3.gz
-man/man3/lwres_gabnrequest_render.3.gz
-man/man3/lwres_gabnresponse_free.3.gz
-man/man3/lwres_gabnresponse_parse.3.gz
-man/man3/lwres_gabnresponse_render.3.gz
-man/man3/lwres_gai_strerror.3.gz
-man/man3/lwres_getaddrinfo.3.gz
-man/man3/lwres_getaddrsbyname.3.gz
-man/man3/lwres_gethostbyaddr.3.gz
-man/man3/lwres_gethostbyaddr_r.3.gz
-man/man3/lwres_gethostbyname.3.gz
-man/man3/lwres_gethostbyname2.3.gz
-man/man3/lwres_gethostbyname_r.3.gz
-man/man3/lwres_gethostent.3.gz
-man/man3/lwres_gethostent_r.3.gz
-man/man3/lwres_getipnode.3.gz
-man/man3/lwres_getipnodebyaddr.3.gz
-man/man3/lwres_getipnodebyname.3.gz
-man/man3/lwres_getnamebyaddr.3.gz
-man/man3/lwres_getnameinfo.3.gz
-man/man3/lwres_getrrsetbyname.3.gz
-man/man3/lwres_gnba.3.gz
-man/man3/lwres_gnbarequest_free.3.gz
-man/man3/lwres_gnbarequest_parse.3.gz
-man/man3/lwres_gnbarequest_render.3.gz
-man/man3/lwres_gnbaresponse_free.3.gz
-man/man3/lwres_gnbaresponse_parse.3.gz
-man/man3/lwres_gnbaresponse_render.3.gz
-man/man3/lwres_herror.3.gz
-man/man3/lwres_hstrerror.3.gz
-man/man3/lwres_inetntop.3.gz
-man/man3/lwres_lwpacket_parseheader.3.gz
-man/man3/lwres_lwpacket_renderheader.3.gz
-man/man3/lwres_net_ntop.3.gz
-man/man3/lwres_noop.3.gz
-man/man3/lwres_nooprequest_free.3.gz
-man/man3/lwres_nooprequest_parse.3.gz
-man/man3/lwres_nooprequest_render.3.gz
-man/man3/lwres_noopresponse_free.3.gz
-man/man3/lwres_noopresponse_parse.3.gz
-man/man3/lwres_noopresponse_render.3.gz
-man/man3/lwres_packet.3.gz
-man/man3/lwres_resutil.3.gz
-man/man3/lwres_sethostent.3.gz
-man/man3/lwres_sethostent_r.3.gz
-man/man3/lwres_string_parse.3.gz
 man/man5/named.conf.5.gz
 man/man5/rndc.conf.5.gz
 man/man8/ddns-confgen.8.gz
@@ -385,7 +285,6 @@ man/man8/dnssec-signzone.8.gz
 man/man8/dnssec-verify.8.gz
 man/man8/genrandom.8.gz
 man/man8/isc-hmac-fixup.8.gz
-man/man8/lwresd.8.gz
 man/man8/named-checkconf.8.gz
 man/man8/named-checkzone.8.gz
 man/man8/named-compilezone.8.gz
@@ -414,7 +313,6 @@ sbin/dnssec-signzone
 sbin/dnssec-verify
 sbin/genrandom
 sbin/isc-hmac-fixup
-sbin/lwresd
 sbin/named
 sbin/named-checkconf
 sbin/named-checkzone
diff --git a/dns/bundy/Makefile b/dns/bundy/Makefile
index eab3117f93d2..74de9f50b422 100644
--- a/dns/bundy/Makefile
+++ b/dns/bundy/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	bundy
 PORTVERSION=	0.20160125
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	dns
 MASTER_SITES=	LOCAL/mat/bundy SF/boost/boost/1.55.0:boost
 DISTFILES+=	boost_1_55_0.tar.bz2:boost
diff --git a/dns/c-ares/Makefile b/dns/c-ares/Makefile
index 34577bd927b7..d27716ff5df9 100644
--- a/dns/c-ares/Makefile
+++ b/dns/c-ares/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	c-ares
 PORTVERSION=	1.12.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	dns
 MASTER_SITES=	http://c-ares.haxx.se/download/ \
 		http://obsd.isc.org/pub/OpenBSD/distfiles/ \
diff --git a/dns/kf5-kdnssd/Makefile b/dns/kf5-kdnssd/Makefile
index bd4f662e9525..b29ad96fbb1d 100644
--- a/dns/kf5-kdnssd/Makefile
+++ b/dns/kf5-kdnssd/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	kdnssd
 PORTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	dns kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/dns/knot2/Makefile b/dns/knot2/Makefile
index 415e751d3b97..4773a187d992 100644
--- a/dns/knot2/Makefile
+++ b/dns/knot2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	knot
 PORTVERSION=	2.5.3
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	dns ipv6
 MASTER_SITES=	https://secure.nic.cz/files/knot-dns/ \
 		http://dns-lab.com/downloads/knot-dns/
diff --git a/dns/p5-POE-Component-Client-DNS/Makefile b/dns/p5-POE-Component-Client-DNS/Makefile
index 9c9ba620270f..af1c9c6d1005 100644
--- a/dns/p5-POE-Component-Client-DNS/Makefile
+++ b/dns/p5-POE-Component-Client-DNS/Makefile
@@ -18,7 +18,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BUILD_DEPENDS=	p5-Net-DNS>=0.65:dns/p5-Net-DNS \
 		p5-POE>=1.249:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings
+TEST_DEPENDS=	p5-Test-NoWarnings>=1.02:devel/p5-Test-NoWarnings
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/dns/powerdns-recursor/Makefile b/dns/powerdns-recursor/Makefile
index 050f8bbe0ea8..7609c726d5fd 100644
--- a/dns/powerdns-recursor/Makefile
+++ b/dns/powerdns-recursor/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	recursor
 PORTVERSION=	4.0.6
+PORTREVISION=	1
 CATEGORIES=	dns ipv6
 MASTER_SITES=	http://downloads.powerdns.com/releases/
 PKGNAMEPREFIX=	powerdns-
diff --git a/dns/powerdns/Makefile b/dns/powerdns/Makefile
index 0dd746f980df..3863e5791c7c 100644
--- a/dns/powerdns/Makefile
+++ b/dns/powerdns/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	powerdns
 PORTVERSION=	4.0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	dns ipv6
 MASTER_SITES=	http://downloads.powerdns.com/releases/
 DISTNAME=	pdns-${PORTVERSION}
diff --git a/dns/void-zones-tools/Makefile b/dns/void-zones-tools/Makefile
index ea88fd1cb22c..fb77ee59ac2a 100644
--- a/dns/void-zones-tools/Makefile
+++ b/dns/void-zones-tools/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	void-zones-tools
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	dns
 
 MAINTAINER=	vidar@karlsen.tech
diff --git a/dns/yadifa/Makefile b/dns/yadifa/Makefile
index 8d9d7be3d3f1..2ca9c5b9f173 100644
--- a/dns/yadifa/Makefile
+++ b/dns/yadifa/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	yadifa
 PORTVERSION=	2.2.3
 DISTVERSIONSUFFIX=	-6711
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	dns ipv6
 MASTER_SITES=	http://cdn.yadifa.eu/sites/default/files/releases/
 
diff --git a/editors/apel/Makefile b/editors/apel/Makefile
index 095ba468882f..5f9578332b09 100644
--- a/editors/apel/Makefile
+++ b/editors/apel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	apel
 PORTVERSION=	${APEL_VER}
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	editors elisp
 MASTER_SITES=	http://git.chise.org/elisp/dist/apel/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index 7176899d314f..a9a2819f5683 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -6,7 +6,7 @@
 #
 PORTNAME=	calligra
 PORTVERSION=	3.0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	editors kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}
 DIST_SUBDIR=	KDE/${PORTNAME}
diff --git a/editors/chexedit/pkg-descr b/editors/chexedit/pkg-descr
index 811bda34b159..5f305587f33b 100644
--- a/editors/chexedit/pkg-descr
+++ b/editors/chexedit/pkg-descr
@@ -1,6 +1,6 @@
 Hexedit is a Curses based Hex editor.  Unlike a text editor, which
 is used for editing text documents in the desired language, hexedit
-lets you edit any file as it's byte(1) for byte representation.  It can
+lets you edit any file as its byte for byte representation.  It can
 even let you view and edit your fixed disks on your Linux system.  This
 is not ideal for writing a letter or writing c code, but there are my
 times when this is ideal:
diff --git a/editors/codelite/Makefile b/editors/codelite/Makefile
index 413b9a02cf53..b7605c8d113e 100644
--- a/editors/codelite/Makefile
+++ b/editors/codelite/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	codelite
 PORTVERSION=	10.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors devel
 
 MAINTAINER=	mmokhi@FreeBSD.org
diff --git a/editors/cooledit/Makefile b/editors/cooledit/Makefile
index d85defb8fb4c..16e645fee65a 100644
--- a/editors/cooledit/Makefile
+++ b/editors/cooledit/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cooledit
 PORTVERSION=	3.17.17
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	editors
 MASTER_SITES=	SUNSITE/apps/editors/X/cooledit
 
diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index 6ff5a6d645df..c2bbf9c987e5 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -19,10 +19,10 @@ BROKEN_aarch64=		Segfaults during build
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	emacs-mirror
-GH_TAGNAME=	1b492fa
+GH_TAGNAME=	49a42fb
 
 EMACS_VER=	26.0.50
-EMACS_REV=	20170903
+EMACS_REV=	20170912
 GNU_CONFIGURE=	yes
 USES=		autoreconf:build cpe gmake makeinfo ncurses pkgconfig
 INFO_PATH=	${DATADIR_REL}/info
diff --git a/editors/emacs-devel/distinfo b/editors/emacs-devel/distinfo
index b54c1b41dc3f..d953ca4e3753 100644
--- a/editors/emacs-devel/distinfo
+++ b/editors/emacs-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504453415
-SHA256 (emacs-mirror-emacs-26.0.50.20170903-1b492fa_GH0.tar.gz) = f409d8d0afecbf35999a4af0bb168969cb84a8f21428bbbdc9c28b498e804da7
-SIZE (emacs-mirror-emacs-26.0.50.20170903-1b492fa_GH0.tar.gz) = 39365573
+TIMESTAMP = 1505223890
+SHA256 (emacs-mirror-emacs-26.0.50.20170912-49a42fb_GH0.tar.gz) = a3ef3450a5adae16f4c0f1303492a8c57dae6ecb1f745ab881a90cb836ed1c5b
+SIZE (emacs-mirror-emacs-26.0.50.20170912-49a42fb_GH0.tar.gz) = 39375071
diff --git a/editors/emacs-devel/files/patch-configure.ac b/editors/emacs-devel/files/patch-configure.ac
index 7026a2043480..2dc44ce5cb0a 100644
--- a/editors/emacs-devel/files/patch-configure.ac
+++ b/editors/emacs-devel/files/patch-configure.ac
@@ -10,12 +10,3 @@
      *' (GNU texinfo) '[[5-9]]* | \
      *' (GNU texinfo) '[[1-9][0-9]]* ) ;;
      *) MAKEINFO=no;;
-@@ -3364,7 +3365,7 @@ if test "${HAVE_X11}" = "yes"; then
-       AC_CACHE_CHECK([for XpmReturnAllocPixels preprocessor define],
-       [emacs_cv_cpp_xpm_return_alloc_pixels],
-       [AC_EGREP_CPP(no_return_alloc_pixels,
--      [#include "noX/xpm.h"
-+      [#include "X11/xpm.h"
- #ifndef XpmReturnAllocPixels
- no_return_alloc_pixels
- #endif
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index f25726733ead..970519033c5e 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	emacs
 PORTVERSION=	${EMACS_VER}
-PORTREVISION=	2
 PORTEPOCH=	3
 CATEGORIES=	editors ipv6
 MASTER_SITES=	GNU
@@ -21,7 +20,7 @@ CONFLICTS_INSTALL?=	emacs-devel-[0-9]* emacs-nox11-[0-9]*
 
 BROKEN_aarch64=		Fails to link: missing sbrk
 
-EMACS_VER=	25.2
+EMACS_VER=	25.3
 GNU_CONFIGURE=	yes
 USES=		cpe gmake makeinfo ncurses pkgconfig tar:xz
 # Building with GCC 4.6+ requires it; remove after 9.3 EOL
diff --git a/editors/emacs/distinfo b/editors/emacs/distinfo
index 8452866a0048..4be0987b8d82 100644
--- a/editors/emacs/distinfo
+++ b/editors/emacs/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1492819467
-SHA256 (emacs-25.2.tar.xz) = 59b55194c9979987c5e9f1a1a4ab5406714e80ffcfd415cc6b9222413bc073fa
-SIZE (emacs-25.2.tar.xz) = 46900336
+TIMESTAMP = 1505178274
+SHA256 (emacs-25.3.tar.xz) = 253ac5e7075e594549b83fd9ec116a9dc37294d415e2f21f8ee109829307c00b
+SIZE (emacs-25.3.tar.xz) = 42854740
 SHA256 (emacs25.1canna-20160919.diff.gz) = b0ef90be88e8b947d41805713735a79c6f78e2401b749d5e6d1e3fd1bc7e5f32
 SIZE (emacs25.1canna-20160919.diff.gz) = 31671
diff --git a/editors/flim/Makefile b/editors/flim/Makefile
index 23ab1fc19363..ba3e67effa1d 100644
--- a/editors/flim/Makefile
+++ b/editors/flim/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	flim
 PORTVERSION=	${FLIM_VER}
-PORTREVISION=	15
+PORTREVISION=	16
 PORTEPOCH=	1
 CATEGORIES=	editors elisp
 MASTER_SITES=	http://git.chise.org/elisp/dist/flim/flim-1.14/
diff --git a/editors/focuswriter/Makefile b/editors/focuswriter/Makefile
index e29f483f4adc..6a72b256e582 100644
--- a/editors/focuswriter/Makefile
+++ b/editors/focuswriter/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	focuswriter
 PORTVERSION=	1.6.7
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	editors
 
diff --git a/editors/gobby/Makefile b/editors/gobby/Makefile
index 0472be3e057a..79fe72838c43 100644
--- a/editors/gobby/Makefile
+++ b/editors/gobby/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	gobby
 PORTVERSION=	0.4.13
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	editors
 MASTER_SITES=	http://releases.0x539.de/gobby/ \
 		LOCAL/sbz
diff --git a/editors/hexedit/Makefile b/editors/hexedit/Makefile
index 14c4a730d228..95a1fc5730c2 100644
--- a/editors/hexedit/Makefile
+++ b/editors/hexedit/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	hexedit
-PORTVERSION=	1.3
+PORTVERSION=	1.4.1
 CATEGORIES=	editors
 
 MAINTAINER=	sunpoet@FreeBSD.org
@@ -22,4 +22,8 @@ USE_GITHUB=	yes
 post-build:
 	m4 -DVERSION=${PORTVERSION} ${WRKSRC}/hexedit.1.in > ${WRKSRC}/hexedit.1
 
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1/
+
 .include <bsd.port.mk>
diff --git a/editors/hexedit/distinfo b/editors/hexedit/distinfo
index decd3515c04f..29d2cced95e4 100644
--- a/editors/hexedit/distinfo
+++ b/editors/hexedit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1485555554
-SHA256 (pixel-hexedit-1.3_GH0.tar.gz) = 88d489dfb895e28bb2472613736fc6a147034f4d4b038f3b9d178e6969bffd70
-SIZE (pixel-hexedit-1.3_GH0.tar.gz) = 29620
+TIMESTAMP = 1504891623
+SHA256 (pixel-hexedit-1.4.1_GH0.tar.gz) = 4104905394f1313c47e22d4c81e9df538b90cec9004b3230d68cd055b84f5715
+SIZE (pixel-hexedit-1.4.1_GH0.tar.gz) = 30149
diff --git a/editors/latexila/Makefile b/editors/latexila/Makefile
index bf5aca7d8587..d2f460ae6a99 100644
--- a/editors/latexila/Makefile
+++ b/editors/latexila/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	latexila
 PORTVERSION=	3.22.1
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index 8f0fb2ea8dee..1e08cdb2c92f 100644
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@@ -2,7 +2,7 @@
 
 .include "${.CURDIR}/Makefile.common"
 
-PORTREVISION=	0
+PORTREVISION=	1
 MASTER_SITES=	http://download.documentfoundation.org/libreoffice/src/${PORTVERSION}/ \
 		http://dev-www.libreoffice.org/src/:src \
 		http://dev-www.libreoffice.org/extern/:ext
diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile
index 23ed26c76105..dce9eaa28e3f 100644
--- a/editors/openoffice-4/Makefile
+++ b/editors/openoffice-4/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	apache-openoffice
 PORTVERSION=	${AOOVERSION}
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	editors java
 MASTER_SITES=	APACHE/openoffice/${PORTVERSION}/source \
 		http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index 0acc31f11dba..03cf98ad0dc3 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	apache-openoffice
 PORTVERSION=	${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION}
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	4
 CATEGORIES=	editors java
 MASTER_SITES=	https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-r${SVNREVISION}/source/ \
diff --git a/editors/p5-Padre/Makefile b/editors/p5-Padre/Makefile
index 2bc7bc728138..2f13853aafb9 100644
--- a/editors/p5-Padre/Makefile
+++ b/editors/p5-Padre/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Padre
 PORTVERSION=	1.00
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	editors perl5
 MASTER_SITES=	CPAN/${PORTNAME}/ CPAN/Wx/:wxsc
 PKGNAMEPREFIX=	p5-
diff --git a/editors/paredit-mode.el/Makefile b/editors/paredit-mode.el/Makefile
index c32634263c98..3a3d53437968 100644
--- a/editors/paredit-mode.el/Makefile
+++ b/editors/paredit-mode.el/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	paredit-mode.el
 PORTVERSION=	24
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors elisp
 MASTER_SITES=	http://mumble.net/~campbell/emacs/
 DISTNAME=	paredit-${PORTVERSION}.el
diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile
index e4362400b2a0..51b7d67f33f1 100644
--- a/editors/poedit/Makefile
+++ b/editors/poedit/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	poedit
 PORTVERSION=	1.8.4
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	editors
 MASTER_SITES=	https://github.com/vslavik/${PORTNAME}/releases/download/v${PORTVERSION}-oss/
 
diff --git a/editors/psgml/Makefile b/editors/psgml/Makefile
index f8da1e3808cc..724b3b28eb05 100644
--- a/editors/psgml/Makefile
+++ b/editors/psgml/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	psgml
 PORTVERSION=	1.4.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	editors elisp
 MASTER_SITES=	SF/${PORTNAME}/ALPHA%20${PORTNAME}/${PORTVERSION}
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/editors/scite/Makefile b/editors/scite/Makefile
index 4f80132acbbb..6ce52bd43355 100644
--- a/editors/scite/Makefile
+++ b/editors/scite/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	scite
 PORTVERSION=	3.7.5
+PORTREVISION=	1
 CATEGORIES=	editors gnome
 MASTER_SITES=	SF/scintilla/SciTE/${PORTVERSION}
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
diff --git a/editors/semi/Makefile b/editors/semi/Makefile
index 02597e8ae4ac..66431910544a 100644
--- a/editors/semi/Makefile
+++ b/editors/semi/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	semi
 PORTVERSION=	${SEMI_VER}
-PORTREVISION=	18
+PORTREVISION=	19
 CATEGORIES=	editors elisp
 MASTER_SITES=	http://git.chise.org/elisp/dist/semi/semi-1.14-for-flim-1.14/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/editors/slime/Makefile b/editors/slime/Makefile
index 4e4849ab5db8..8ccfa4974ead 100644
--- a/editors/slime/Makefile
+++ b/editors/slime/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	slime
 PORTVERSION=	2.15
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=v
 CATEGORIES=	editors elisp
 
diff --git a/editors/tamago/Makefile b/editors/tamago/Makefile
index 3e0975f15865..5757cbba3d57 100644
--- a/editors/tamago/Makefile
+++ b/editors/tamago/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	tamago
 PORTVERSION=	4.0.6.0.20041122.19.14
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	editors elisp
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/editors/textroom/Makefile b/editors/textroom/Makefile
index ae084d42bb34..a3e9b85e71e9 100644
--- a/editors/textroom/Makefile
+++ b/editors/textroom/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	textroom
 PORTVERSION=	0.8.2
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	editors
 MASTER_SITES=	SF
 
diff --git a/editors/tpad/Makefile b/editors/tpad/Makefile
index 94238227d62d..18c0cd5e2d24 100644
--- a/editors/tpad/Makefile
+++ b/editors/tpad/Makefile
@@ -13,6 +13,10 @@ MASTER_SITES=	SF/tclpad/tclpad/${PORTVERSION} \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Windows XP (TM) enhanced Notepad clone written in Tcl/Tk
 
+DEPRECATED=		This port depends on Tcl/Tk 8.4 , which is no longer\
+			maintained. Please port it to 8.5+
+EXPIRATION_DATE=	2017-10-15
+
 LICENSE=	GPLv2+
 
 NO_BUILD=	yes
diff --git a/editors/tree-widget/Makefile b/editors/tree-widget/Makefile
index de08dedd7179..c48148800472 100644
--- a/editors/tree-widget/Makefile
+++ b/editors/tree-widget/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	tree-widget
 PORTVERSION=	2.0
-PORTREVISION=	17
+PORTREVISION=	18
 CATEGORIES=	editors elisp
 MASTER_SITES=	SF/emhacks/${PORTNAME}/${PORTVERSION} \
 		http://dryice.name/computer/FreeBSD/distfiles/
diff --git a/editors/vanubi/Makefile b/editors/vanubi/Makefile
index f294695bc4a7..f0f9f73488d2 100644
--- a/editors/vanubi/Makefile
+++ b/editors/vanubi/Makefile
@@ -13,6 +13,9 @@ COMMENT=	Programming editor written in Vala
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+DEPRECATED=	Vanubi is no longer actively maintained
+EXPIRATION_DATE=	2017-10-06
+
 BUILD_DEPENDS=	valac:lang/vala
 
 GH_TAGNAME=	eedac1d
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 00c25875981f..7594c27ccb1c 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	vim
-PORTVERSION=	8.0.1035
+PORTVERSION=	8.0.1098
 DISTVERSIONPREFIX=	v
 CATEGORIES=	editors
 
diff --git a/editors/vim/distinfo b/editors/vim/distinfo
index 5756c0c1ce45..bff0b2fb819f 100644
--- a/editors/vim/distinfo
+++ b/editors/vim/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504365547
-SHA256 (vim-vim-v8.0.1035_GH0.tar.gz) = dd00d73ffecdf3257cf9290c36a728781f75e80bd9857176b3f826fbe5e23465
-SIZE (vim-vim-v8.0.1035_GH0.tar.gz) = 13308675
+TIMESTAMP = 1505258025
+SHA256 (vim-vim-v8.0.1098_GH0.tar.gz) = 32c52d0c2de454bda8105fabe5a51c0f5259d766c8cae23adddd841b32e2761f
+SIZE (vim-vim-v8.0.1098_GH0.tar.gz) = 13316559
diff --git a/editors/web-mode/Makefile b/editors/web-mode/Makefile
index c2cf9f3ad352..6f15853e92a9 100644
--- a/editors/web-mode/Makefile
+++ b/editors/web-mode/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	web-mode
 PORTVERSION=	14
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	editors elisp
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/editors/with-editor/Makefile b/editors/with-editor/Makefile
index 220a042317f2..6bba9bb345eb 100644
--- a/editors/with-editor/Makefile
+++ b/editors/with-editor/Makefile
@@ -2,18 +2,17 @@
 # $FreeBSD$
 
 PORTNAME=	with-editor
-PORTVERSION=	2.5.11
+PORTVERSION=	2.6.0
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	editors elisp
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
 MAINTAINER=	yasu@utahime.org
-COMMENT=	Use the Emacsclient as the $EDITOR of child processes
+COMMENT=	Use the Emacsclient as the $$EDITOR of child processes
 
-LICENSE=	GPLv3
-
-BUILD_DEPENDS=	dash.el>0:devel/dash.el
-RUN_DEPENDS=	dash.el>0:devel/dash.el
+LICENSE=	GPLv3+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	magit
diff --git a/editors/with-editor/distinfo b/editors/with-editor/distinfo
index 6cac7e010882..e4513f97856e 100644
--- a/editors/with-editor/distinfo
+++ b/editors/with-editor/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1497515723
-SHA256 (magit-with-editor-v2.5.11_GH0.tar.gz) = 65e8a07e283dc157c4e282fb31ebfde0b58a2d31372bdaf7a864343bcb5cda9f
-SIZE (magit-with-editor-v2.5.11_GH0.tar.gz) = 28112
+TIMESTAMP = 1504782599
+SHA256 (magit-with-editor-v2.6.0_GH0.tar.gz) = 8f26a619d745f0a47281fd389c6f947733752472eec26a2b1d5e7f641063ea04
+SIZE (magit-with-editor-v2.6.0_GH0.tar.gz) = 28124
diff --git a/editors/yzis/Makefile b/editors/yzis/Makefile
index 540f40223d59..a44e811b9d2f 100644
--- a/editors/yzis/Makefile
+++ b/editors/yzis/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	yzis
 PORTVERSION=	1.0.a.1
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	editors
 MASTER_SITES=	http://labs.freehackers.org/attachments/download/45/ \
 		http://contribs.martymac.org/FreeBSD-ports/distfiles/
diff --git a/editors/zile/Makefile b/editors/zile/Makefile
index df9977c7f89e..52d231758e9e 100644
--- a/editors/zile/Makefile
+++ b/editors/zile/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	zile
 PORTVERSION=	2.4.13
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	GNU
 
diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
index 4ed61fe7166b..8da8bd6465ec 100644
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	bochs
 PORTVERSION=	2.6.8
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	2
 CATEGORIES=	emulators
 MASTER_SITES=	SF
diff --git a/emulators/catapult/Makefile b/emulators/catapult/Makefile
index 7ee2a0064bc6..c1e34d9900cc 100644
--- a/emulators/catapult/Makefile
+++ b/emulators/catapult/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	catapult
 PORTVERSION=	0.13.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	https://github.com/openMSX/openMSX/releases/download/RELEASE_${PORTVERSION:S/./_/g}/
 DISTNAME=	openmsx-${PORTNAME}-${PORTVERSION}
diff --git a/emulators/citra/Makefile b/emulators/citra/Makefile
index c1b3668bf335..81aa6ec3ff56 100644
--- a/emulators/citra/Makefile
+++ b/emulators/citra/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	citra
 PORTVERSION=	s20170809
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	emulators
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/emulators/dolphin-emu/Makefile b/emulators/dolphin-emu/Makefile
index 8180a1f260ea..b4ad67ad2d96 100644
--- a/emulators/dolphin-emu/Makefile
+++ b/emulators/dolphin-emu/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dolphin-emu
 PORTVERSION=	5.0
-PORTREVISION=	8
+PORTREVISION=	10
 CATEGORIES=	emulators
 
 MAINTAINER=	martymac@FreeBSD.org
diff --git a/emulators/fceux/Makefile b/emulators/fceux/Makefile
index 63f932ba5434..73e3926bfbf1 100644
--- a/emulators/fceux/Makefile
+++ b/emulators/fceux/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	fceux
 PORTVERSION=	2.2.3
 DISTVERSIONSUFFIX=	.src
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	SF/fceultra/Source%20Code/${PORTVERSION}%20src/
 
diff --git a/emulators/fuse-utils/Makefile b/emulators/fuse-utils/Makefile
index 7642f3961f30..8a325b0fd3ca 100644
--- a/emulators/fuse-utils/Makefile
+++ b/emulators/fuse-utils/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	fuse-utils
-PORTVERSION=	1.3.2
+PORTVERSION=	1.3.4
 CATEGORIES=	emulators
 MASTER_SITES=	SF/fuse-emulator/${PORTNAME}/${PORTVERSION}
 
diff --git a/emulators/fuse-utils/distinfo b/emulators/fuse-utils/distinfo
index 38286c109d65..f017c973c64c 100644
--- a/emulators/fuse-utils/distinfo
+++ b/emulators/fuse-utils/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502635214
-SHA256 (fuse-utils-1.3.2.tar.gz) = 45b664bf7b2130899bffad4606d8de824c002ee2f0af9683ad343630efe4190a
-SIZE (fuse-utils-1.3.2.tar.gz) = 490454
+TIMESTAMP = 1504428055
+SHA256 (fuse-utils-1.3.4.tar.gz) = d8615623f78001ec098f0bb262da6184930ab3654cfd4f00c3232f1a5f295fe0
+SIZE (fuse-utils-1.3.4.tar.gz) = 493813
diff --git a/emulators/gxemul/Makefile b/emulators/gxemul/Makefile
index 848b90047594..98d6e422738e 100644
--- a/emulators/gxemul/Makefile
+++ b/emulators/gxemul/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gxemul
 PORTVERSION=	0.6.0.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	emulators
 MASTER_SITES=	http://gxemul.sourceforge.net/src/ \
 		http://gavare.se/gxemul/src/
diff --git a/emulators/higan/Makefile b/emulators/higan/Makefile
index 80d4344ff55a..cc5a024fe42c 100644
--- a/emulators/higan/Makefile
+++ b/emulators/higan/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	higan
 PORTVERSION=	103
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.byuu.org/ \
 		http://www.cyberbotx.com/higan/
diff --git a/emulators/mame/Makefile b/emulators/mame/Makefile
index de7bc2dc6207..2cb5c20c63c3 100644
--- a/emulators/mame/Makefile
+++ b/emulators/mame/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME?=	mame
 PORTVERSION=	0.166
-PORTREVISION?=	4
+PORTREVISION?=	5
 CATEGORIES=	emulators
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/emulators/mednafen/Makefile b/emulators/mednafen/Makefile
index e76c8d16da90..b15119e360f4 100644
--- a/emulators/mednafen/Makefile
+++ b/emulators/mednafen/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	mednafen
 PORTVERSION=	0.9.45.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	emulators games
 MASTER_SITES=	https://mednafen.github.io/releases/files/
diff --git a/emulators/mupen64plus-rsp-cxd4/Makefile b/emulators/mupen64plus-rsp-cxd4/Makefile
index 0ab2c5caf180..747c0d8ea758 100644
--- a/emulators/mupen64plus-rsp-cxd4/Makefile
+++ b/emulators/mupen64plus-rsp-cxd4/Makefile
@@ -1,7 +1,7 @@
 # Created by: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	1
+PORTREVISION=	2
 PKGNAMESUFFIX=	-rsp-cxd4
 DISTFILES=	${PORTNAME}${PKGNAMESUFFIX}-src-${PORTVERSION}${EXTRACT_SUFX}:plugin
 
diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile
index c1ab26c2192a..ae297f01efdd 100644
--- a/emulators/open-vm-tools/Makefile
+++ b/emulators/open-vm-tools/Makefile
@@ -4,6 +4,7 @@
 PORTNAME=		open-vm-tools
 PORTVERSION=		${RELEASE_VER}
 DISTVERSIONPREFIX=	stable-
+PORTREVISION=		2
 PORTEPOCH=		2
 CATEGORIES=		emulators
 
diff --git a/emulators/openmsx/Makefile b/emulators/openmsx/Makefile
index 8e1594be5ba8..b81e0e25b0da 100644
--- a/emulators/openmsx/Makefile
+++ b/emulators/openmsx/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	openmsx
 PORTVERSION=	0.13.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	emulators
 MASTER_SITES=	https://github.com/openMSX/openMSX/releases/download/RELEASE_${PORTVERSION:S/./_/g}/
 
diff --git a/emulators/pearpc/Makefile b/emulators/pearpc/Makefile
index f53c97405d29..b62f7d39c91c 100644
--- a/emulators/pearpc/Makefile
+++ b/emulators/pearpc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pearpc
 PORTVERSION=	0.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}.0
 
diff --git a/emulators/pipelight/Makefile b/emulators/pipelight/Makefile
index 2ea56c63f734..e2b57d0a3ded 100644
--- a/emulators/pipelight/Makefile
+++ b/emulators/pipelight/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pipelight
 PORTVERSION=	0.2.8.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	emulators
 MASTER_SITES=	https://bitbucket.org/mmueller2012/pipelight/get/ \
 		http://repos.fds-team.de/pluginloader/v${DISTVERSION}/:plg
diff --git a/emulators/ppsspp/Makefile b/emulators/ppsspp/Makefile
index 229160ccc288..06b6daaebce9 100644
--- a/emulators/ppsspp/Makefile
+++ b/emulators/ppsspp/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	ppsspp
 DISTVERSIONPREFIX=	v
 DISTVERSION?=	1.4.2
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	emulators
 # XXX Get from Debian once #697821 lands
 MASTER_SITES=	https://bazaar.launchpad.net/~sergio-br2/${PORTNAME}/debian-sdl/download/5/${PORTNAME}.1-20140802045408-dd26dik367ztj5xg-8/:manpage
diff --git a/emulators/ppsspp/files/patch-system-libpng16 b/emulators/ppsspp/files/patch-system-libpng16
index efc8393d8821..8f80147b01e3 100644
--- a/emulators/ppsspp/files/patch-system-libpng16
+++ b/emulators/ppsspp/files/patch-system-libpng16
@@ -1,8 +1,10 @@
 Make build glue accept libpng 1.6.x and don't hardcode suffix
 
---- CMakeLists.txt.orig	2015-11-19 15:07:48 UTC
+One hunk in src/CMakeLists.txt was added to fix target generation with ninja.
+
+--- CMakeLists.txt.orig	2017-05-27 09:58:05 UTC
 +++ CMakeLists.txt
-@@ -709,9 +709,10 @@ else()
+@@ -582,9 +582,10 @@ else()
  	set(LIBZIP_LIBRARY libzip)
  endif()
  
@@ -16,9 +18,25 @@ Make build glue accept libpng 1.6.x and don't hardcode suffix
  find_package(PackageHandleStandardArgs)
  find_package_handle_standard_args(PNG REQUIRED_VARS PNG_LIBRARY PNG_PNG_INCLUDE_DIR)
  if (PNG_FOUND)
---- Core/Screenshot.cpp.orig	2015-02-26 20:05:06 UTC
+@@ -1618,12 +1619,11 @@ endif()
+ 
+ setup_target_project(${CoreLibName} Core)
+ 
+-# Generate git-version.cpp at build time.
+-add_custom_target(GitVersion ALL
+-	DEPENDS something_that_never_exists)
+-add_custom_command(OUTPUT something_that_never_exists
++add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/git-version.cpp
+ 	COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}
+ 		-P ${CMAKE_CURRENT_SOURCE_DIR}/git-version.cmake)
++# Generate git-version.cpp at build time.
++add_custom_target(GitVersion DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/git-version.cpp)
+ 
+ set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/git-version.cpp
+ 	PROPERTIES GENERATED TRUE)
+--- Core/Screenshot.cpp.orig	2017-05-27 09:58:05 UTC
 +++ Core/Screenshot.cpp
-@@ -18,7 +18,7 @@
+@@ -21,7 +21,7 @@
  #ifdef USING_QT_UI
  #include <QtGui/QImage>
  #else
@@ -27,7 +45,7 @@ Make build glue accept libpng 1.6.x and don't hardcode suffix
  #include "ext/jpge/jpge.h"
  #endif
  
---- ext/native/image/png_load.cpp.orig	2015-09-06 20:37:59 UTC
+--- ext/native/image/png_load.cpp.orig	2017-05-27 09:58:05 UTC
 +++ ext/native/image/png_load.cpp
 @@ -5,7 +5,7 @@
  #ifdef USING_QT_UI
@@ -38,7 +56,7 @@ Make build glue accept libpng 1.6.x and don't hardcode suffix
  #endif
  
  #include "png_load.h"
---- Core/TextureReplacer.cpp.orig	2016-05-03 00:47:54 UTC
+--- Core/TextureReplacer.cpp.orig	2017-05-27 09:58:05 UTC
 +++ Core/TextureReplacer.cpp
 @@ -16,7 +16,7 @@
  // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
diff --git a/emulators/raine/Makefile b/emulators/raine/Makefile
index 2d08a272be2b..feaa7bef9021 100644
--- a/emulators/raine/Makefile
+++ b/emulators/raine/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	raine
 PORTVERSION=	0.51.9
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	emulators games
 MASTER_SITES=	GENTOO
 DISTNAME=	${PORTNAME}s-${PORTVERSION}
diff --git a/emulators/riscv-isa-sim/Makefile b/emulators/riscv-isa-sim/Makefile
index a4f28cc43702..54c02aa0f156 100644
--- a/emulators/riscv-isa-sim/Makefile
+++ b/emulators/riscv-isa-sim/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	riscv-isa-sim
 DISTVERSION=	git
-PORTREVISION=	20170809
+PORTREVISION=	20170810
 CATEGORIES=	emulators
 
 MAINTAINER=	lwhsu@FreeBSD.org
diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile
index ce583c582657..47a210140fb5 100644
--- a/emulators/rpcs3/Makefile
+++ b/emulators/rpcs3/Makefile
@@ -2,8 +2,8 @@
 
 PORTNAME=	rpcs3
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.0.3-276
-DISTVERSIONSUFFIX=	-gd4d0d35e
+DISTVERSION=	0.0.3-305
+DISTVERSIONSUFFIX=	-gf0358f85
 CATEGORIES=	emulators
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/emulators/rpcs3/distinfo b/emulators/rpcs3/distinfo
index 8079dc1ff1b6..6a19dca61c86 100644
--- a/emulators/rpcs3/distinfo
+++ b/emulators/rpcs3/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1504637086
-SHA256 (RPCS3-rpcs3-v0.0.3-276-gd4d0d35e_GH0.tar.gz) = 88b7322ed64f37c8d6d20073ffc3e2301c6059169c5fa43bc7616b0ba2652dc1
-SIZE (RPCS3-rpcs3-v0.0.3-276-gd4d0d35e_GH0.tar.gz) = 11359358
+TIMESTAMP = 1505065599
+SHA256 (RPCS3-rpcs3-v0.0.3-305-gf0358f85_GH0.tar.gz) = e39b8db110c9a97fab347319b102507c7643b3e5b5ac7a20c0a9841f39ec6db1
+SIZE (RPCS3-rpcs3-v0.0.3-305-gf0358f85_GH0.tar.gz) = 4166246
 SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-25-gca39ce8_GH0.tar.gz) = e50e4f4e9035e891e16867e995f44aac87ce734a9dde169f02fc9719b2ce3642
 SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-25-gca39ce8_GH0.tar.gz) = 105623
 SHA256 (RPCS3-pugixml-f205aaf_GH0.tar.gz) = 3b2a7e21625d8cbeb3aa1841b8816f6cab0752e89008b9fc67a325c800f153b5
diff --git a/emulators/skyeye/Makefile b/emulators/skyeye/Makefile
index dce9f3d967e9..5664c382aeb7 100644
--- a/emulators/skyeye/Makefile
+++ b/emulators/skyeye/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	skyeye
 PORTVERSION=	1.2.5
-PORTREVISION=	2
+PORTREVISION=	3
 DISTVERSIONSUFFIX=	_REL
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/emulators/snes9x-gtk/Makefile b/emulators/snes9x-gtk/Makefile
index eabf00ea5088..6fc9c1470e60 100644
--- a/emulators/snes9x-gtk/Makefile
+++ b/emulators/snes9x-gtk/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	snes9x
 PORTVERSION=	1.54.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	emulators
 PKGNAMESUFFIX=	-gtk
 
diff --git a/emulators/stella/Makefile b/emulators/stella/Makefile
index 8086a699ab77..e11aa7752ba6 100644
--- a/emulators/stella/Makefile
+++ b/emulators/stella/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	stella
 PORTVERSION=	4.7.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	https://github.com/stella-emu/stella/releases/download/release-${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
diff --git a/emulators/virtualbox-ose-additions/Makefile b/emulators/virtualbox-ose-additions/Makefile
index 8d5056c14911..d6d1b9ef823d 100644
--- a/emulators/virtualbox-ose-additions/Makefile
+++ b/emulators/virtualbox-ose-additions/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	virtualbox-ose
 PORTVERSION=	5.1.26
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.virtualbox.org/virtualbox/${PORTVERSION}/
 PKGNAMESUFFIX?=	-additions
diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile
index 5a2bf5799ece..e938478bb00b 100644
--- a/emulators/virtualbox-ose/Makefile
+++ b/emulators/virtualbox-ose/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	virtualbox-ose
 PORTVERSION=	5.1.26
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.virtualbox.org/virtualbox/${PORTVERSION}/
 DISTFILES=	VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}
diff --git a/emulators/virtualbox-ose/files/patch-src_VBox_Main_src-server_freebsd_PerformanceFreeBSD.cpp b/emulators/virtualbox-ose/files/patch-src_VBox_Main_src-server_freebsd_PerformanceFreeBSD.cpp
new file mode 100644
index 000000000000..631547ac9cee
--- /dev/null
+++ b/emulators/virtualbox-ose/files/patch-src_VBox_Main_src-server_freebsd_PerformanceFreeBSD.cpp
@@ -0,0 +1,24 @@
+--- src/VBox/Main/src-server/freebsd/PerformanceFreeBSD.cpp.orig	2017-07-27 13:18:27 UTC
++++ src/VBox/Main/src-server/freebsd/PerformanceFreeBSD.cpp
+@@ -80,8 +80,10 @@ int CollectorFreeBSD::getHostMemoryUsage(ULONG *total,
+     cbParameter = sizeof(cPagesMemInactive);
+     if (!sysctlbyname("vm.stats.vm.v_inactive_count", &cPagesMemInactive, &cbParameter, NULL, 0))
+         cProcessed++;
++#if __FreeBSD_version < 1200016
+     cbParameter = sizeof(cPagesMemCached);
+     if (!sysctlbyname("vm.stats.vm.v_cache_count", &cPagesMemCached, &cbParameter, NULL, 0))
++#endif
+         cProcessed++;
+     cbParameter = sizeof(cbPage);
+     if (!sysctlbyname("hw.pagesize", &cbPage, &cbParameter, NULL, 0))
+@@ -90,8 +92,8 @@ int CollectorFreeBSD::getHostMemoryUsage(ULONG *total,
+     if (cProcessed == 6)
+     {
+         *total     = cbMemPhys / _1K;
+-        *used      = cPagesMemUsed * (cbPage / _1K);
+-        *available = (cPagesMemFree + cPagesMemInactive + cPagesMemCached ) * (cbPage / _1K);
++        *used      = (uint64_t)cPagesMemUsed * (cbPage / _1K);
++        *available = ((uint64_t)cPagesMemFree + cPagesMemInactive + cPagesMemCached) * (cbPage / _1K);
+     }
+     else
+         rc = VERR_NOT_SUPPORTED;
diff --git a/emulators/virtualbox-ose/files/patch-src_VBox_Runtime_r3_freebsd_systemmem-freebsd.cpp b/emulators/virtualbox-ose/files/patch-src_VBox_Runtime_r3_freebsd_systemmem-freebsd.cpp
new file mode 100644
index 000000000000..92af93646dd6
--- /dev/null
+++ b/emulators/virtualbox-ose/files/patch-src_VBox_Runtime_r3_freebsd_systemmem-freebsd.cpp
@@ -0,0 +1,39 @@
+--- src/VBox/Runtime/r3/freebsd/systemmem-freebsd.cpp.orig	2017-07-27 13:18:46 UTC
++++ src/VBox/Runtime/r3/freebsd/systemmem-freebsd.cpp
+@@ -65,7 +65,6 @@ RTDECL(int) RTSystemQueryAvailableRam(uint64_t *pcb)
+     u_int cPagesMemFree = 0;
+     u_int cPagesMemInactive = 0;
+     u_int cPagesMemCached = 0;
+-    u_int cPagesMemUsed = 0;
+     int cbPage = 0;
+     size_t cbParameter;
+     int cProcessed = 0;
+@@ -73,25 +72,23 @@ RTDECL(int) RTSystemQueryAvailableRam(uint64_t *pcb)
+     cbParameter = sizeof(cPagesMemFree);
+     if (sysctlbyname("vm.stats.vm.v_free_count", &cPagesMemFree, &cbParameter, NULL, 0))
+         rc = RTErrConvertFromErrno(errno);
+-    cbParameter = sizeof(cPagesMemUsed);
+-    if (   RT_SUCCESS(rc)
+-        && sysctlbyname("vm.stats.vm.v_active_count", &cPagesMemUsed, &cbParameter, NULL, 0))
+-        rc = RTErrConvertFromErrno(errno);
+     cbParameter = sizeof(cPagesMemInactive);
+     if (   RT_SUCCESS(rc)
+         && sysctlbyname("vm.stats.vm.v_inactive_count", &cPagesMemInactive, &cbParameter, NULL, 0))
+         rc = RTErrConvertFromErrno(errno);
++#if __FreeBSD_version < 1200016
+     cbParameter = sizeof(cPagesMemCached);
+     if (   RT_SUCCESS(rc)
+         && sysctlbyname("vm.stats.vm.v_cache_count", &cPagesMemCached, &cbParameter, NULL, 0))
+         rc = RTErrConvertFromErrno(errno);
++#endif
+     cbParameter = sizeof(cbPage);
+     if (   RT_SUCCESS(rc)
+         && sysctlbyname("hw.pagesize", &cbPage, &cbParameter, NULL, 0))
+         rc = RTErrConvertFromErrno(errno);
+ 
+     if (RT_SUCCESS(rc))
+-        *pcb = (cPagesMemFree + cPagesMemInactive + cPagesMemCached ) * cbPage;
++        *pcb = ((uint64_t)cPagesMemFree + cPagesMemInactive + cPagesMemCached) * cbPage;
+ 
+     return rc;
+ }
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index c46e74fec0ae..6116b574937b 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -2,7 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	wine
-DISTVERSION=	2.15
+DISTVERSION=	2.16
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/Source \
@@ -17,6 +18,8 @@ LICENSE=	LGPL21 LGPL3
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+ONLY_FOR_ARCHS=	amd64 i386
+
 BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex \
 		prelink:sysutils/prelink
 LIB_DEPENDS=	libxml2.so:textproc/libxml2
@@ -42,7 +45,6 @@ USES=		bison compiler:c11 desktop-file-utils gmake shebangfix tar:xz
 .if !defined(USE_LDCONFIG32)
 USE_LDCONFIG=	${WINELIBDIR} ${WINELIBDIR}/wine
 .endif
-ONLY_FOR_ARCHS=	amd64 i386
 SHEBANG_FILES=	tools/make_requests tools/winemaker/winemaker \
 		tools/winedump/function_grep.pl
 
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index acf2c7ce42e2..a75729fc92cc 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1503499243
-SHA256 (wine-2.15.tar.xz) = d82d500cbf81fb08c711d3619bd52373138a05574d044f089af89707274868b3
-SIZE (wine-2.15.tar.xz) = 19463720
-SHA256 (v2.15.tar.gz) = f2b5c43fbc185a6fd6399f4c351b83a172737977b2ebb1cbdeddd1838d044bc2
-SIZE (v2.15.tar.gz) = 10190900
+TIMESTAMP = 1504873829
+SHA256 (wine-2.16.tar.xz) = a561edcabecd6c44948e5b2ef11941b2ba047275240418fa2c98c1fdceda2c21
+SIZE (wine-2.16.tar.xz) = 19484716
+SHA256 (v2.16.tar.gz) = da0ef4b0eafe9cd1b9cf26a5b950088adf1308e17a0d6f4ae62516b6ee64248e
+SIZE (v2.16.tar.gz) = 10220855
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index 6aff51ca4005..1bb483f560a4 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -434,6 +434,7 @@ include/wine/windows/ks.h
 include/wine/windows/ksguid.h
 include/wine/windows/ksmedia.h
 include/wine/windows/ksuuids.h
+include/wine/windows/libloaderapi.h
 include/wine/windows/lm.h
 include/wine/windows/lmaccess.h
 include/wine/windows/lmapibuf.h
@@ -1074,6 +1075,7 @@ lib/wine/api-ms-win-dx-d3dkmt-l1-1-0.dll.so
 lib/wine/api-ms-win-eventing-classicprovider-l1-1-0.dll.so
 lib/wine/api-ms-win-eventing-consumer-l1-1-0.dll.so
 lib/wine/api-ms-win-eventing-controller-l1-1-0.dll.so
+lib/wine/api-ms-win-eventing-legacy-l1-1-0.dll.so
 lib/wine/api-ms-win-eventing-provider-l1-1-0.dll.so
 lib/wine/api-ms-win-eventlog-legacy-l1-1-0.dll.so
 lib/wine/api-ms-win-mm-misc-l1-1-1.dll.so
@@ -1458,6 +1460,7 @@ lib/wine/fakedlls/api-ms-win-dx-d3dkmt-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-eventing-classicprovider-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-eventing-consumer-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-eventing-controller-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-eventing-legacy-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-eventing-provider-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-eventlog-legacy-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-mm-misc-l1-1-1.dll
@@ -2110,6 +2113,7 @@ lib/wine/fakedlls/wmi.dll
 lib/wine/fakedlls/wmic.exe
 lib/wine/fakedlls/wmiutils.dll
 lib/wine/fakedlls/wmp.dll
+lib/wine/fakedlls/wmphoto.dll
 lib/wine/fakedlls/wmplayer.exe
 lib/wine/fakedlls/wmvcore.dll
 lib/wine/fakedlls/wnaspi32.dll
@@ -2769,6 +2773,7 @@ lib/wine/wmi.dll.so
 lib/wine/wmic.exe.so
 lib/wine/wmiutils.dll.so
 lib/wine/wmp.dll.so
+lib/wine/wmphoto.dll.so
 lib/wine/wmplayer.exe.so
 lib/wine/wmvcore.dll.so
 lib/wine/wnaspi32.dll.so
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 941941c1d3f2..af8cfa5669b1 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	wine
 DISTVERSION=	2.0.2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/Source \
diff --git a/emulators/wxmupen64plus/Makefile b/emulators/wxmupen64plus/Makefile
index 9d6ba3799c3e..ac0e047ebbb8 100644
--- a/emulators/wxmupen64plus/Makefile
+++ b/emulators/wxmupen64plus/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	wxmupen64plus
 PORTVERSION=	0.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	emulators
 MASTER_SITES=	https://bitbucket.org/auria/wxmupen64plus/get/
 DISTNAME=	${PORTVERSION}
diff --git a/emulators/x49gp/Makefile b/emulators/x49gp/Makefile
index 0768af5ece6f..732149c12dab 100644
--- a/emulators/x49gp/Makefile
+++ b/emulators/x49gp/Makefile
@@ -5,7 +5,7 @@
 
 PORTNAME=	x49gp
 PORTVERSION=	20100425
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	emulators math
 MASTER_SITES=	LOCAL/shaun
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} sdcard64.tar.gz
diff --git a/finance/bitcoin-armory/Makefile b/finance/bitcoin-armory/Makefile
index 762ec809126b..c96a273029c7 100644
--- a/finance/bitcoin-armory/Makefile
+++ b/finance/bitcoin-armory/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	BitcoinArmory
 PORTVERSION=	0.93.3
 DISTVERSIONPREFIX=	v
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	finance
 
 MAINTAINER=	yuri@rawbw.com
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index 0d7eb41292b9..197c0e621ea9 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gnucash
 PORTVERSION=	2.6.17
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	finance gnome
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20%28stable%29/${PORTVERSION}
 
diff --git a/finance/kmymoney-kde4/files/patch-kmymoney_dialogs_settings_CMakeLists.txt b/finance/kmymoney-kde4/files/patch-kmymoney_dialogs_settings_CMakeLists.txt
new file mode 100644
index 000000000000..60b540826f87
--- /dev/null
+++ b/finance/kmymoney-kde4/files/patch-kmymoney_dialogs_settings_CMakeLists.txt
@@ -0,0 +1,32 @@
+The project is actually called 'KMyMoney' not 'KMyMoney2'. Therefore the top-directory variables are:
+  * KMyMoney_BINARY_DIR
+  * KMyMoney_SOURCE_DIR
+
+Further fix the paths to point to the proper subdirectory, and add a custom_target to depend on.
+
+--- kmymoney/dialogs/settings/CMakeLists.txt.orig	2016-06-14 19:16:15 UTC
++++ kmymoney/dialogs/settings/CMakeLists.txt
+@@ -1,12 +1,13 @@
+ add_custom_command(
+-  OUTPUT ${KMyMoney2_BINARY_DIR}/kmymoneysettings.h  ${KMyMoney2_BINARY_DIR}/kmymoneysettings.cpp
+-  DEPENDS ${KMyMoney2_SOURCE_DIR}/kmymoney.kcfg ${KMyMoney2_SOURCE_DIR}/kmymoneysettings.kcfgc
+-  COMMAND ${KDE4_KCFGC_EXECUTABLE} -d ${KMyMoney2_BINARY_DIR}/ ${KMyMoney2_SOURCE_DIR}/kmymoney.kcfg ${KMyMoney2_SOURCE_DIR}/kmymoneysettings.kcfgc
++  OUTPUT ${KMyMoney_BINARY_DIR}/kmymoneysettings.h  ${KMyMoney_BINARY_DIR}/kmymoneysettings.cpp
++  DEPENDS ${KMyMoney_SOURCE_DIR}/kmymoney/kmymoney.kcfg ${KMyMoney_SOURCE_DIR}/kmymoney/kmymoneysettings.kcfgc
++  COMMAND ${KDE4_KCFGC_EXECUTABLE} -d ${KMyMoney_BINARY_DIR}/kmymoney ${KMyMoney_SOURCE_DIR}/kmymoney/kmymoney.kcfg ${KMyMoney_SOURCE_DIR}/kmymoney/kmymoneysettings.kcfgc
+   )
+ 
++add_custom_target(generate-kmymoneysettings_h DEPENDS ${KMyMoney_BINARY_DIR}/kmymoneysettings.h)
+ 
+ set (libsettings_a_SOURCES
+-  ${KMyMoney2_BINARY_DIR}/kmymoneysettings.h
++  ${KMyMoney_BINARY_DIR}/kmymoneysettings.h
+   ksettingscolors.cpp
+   ksettingsfonts.cpp
+   ksettingsforecast.cpp
+@@ -32,4 +33,5 @@ kde4_add_ui_files(libsettings_a_SOURCES ${libsettings_
+ 
+ kde4_add_library(settings STATIC ${libsettings_a_SOURCES})
+ 
++add_dependencies(settings generate-kmymoneysettings_h)
+ add_dependencies(settings widgets kmm_config)
diff --git a/finance/ledger/Makefile b/finance/ledger/Makefile
index ec678882758d..9ca48a40caac 100644
--- a/finance/ledger/Makefile
+++ b/finance/ledger/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	ledger
 PORTVERSION=	3.1.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	finance
 
 MAINTAINER=	woodycarey@hotmail.com
diff --git a/finance/moneymanagerex/Makefile b/finance/moneymanagerex/Makefile
index c63aac47bf68..4c87adb50f90 100644
--- a/finance/moneymanagerex/Makefile
+++ b/finance/moneymanagerex/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	mmex
 PORTVERSION=	1.2.7
 DISTVERSIONPREFIX=	v
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	finance
 MASTER_SITES=	https://github.com/vslavik/bakefile/releases/download/v0.2.9/:bakefile
 DISTFILES=	bakefile-0.2.9${EXTRACT_SUFX}:bakefile
diff --git a/finance/qhacc/Makefile b/finance/qhacc/Makefile
index 8e24aa2c6d24..d4fed19b5c9b 100644
--- a/finance/qhacc/Makefile
+++ b/finance/qhacc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	qhacc
 PORTVERSION=	4.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	finance
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
diff --git a/finance/skrooge/Makefile b/finance/skrooge/Makefile
index 3148df06e3b5..c3b3b6b4d0bc 100644
--- a/finance/skrooge/Makefile
+++ b/finance/skrooge/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	skrooge
-PORTVERSION=	2.8.1
-PORTREVISION=	1
+PORTVERSION=	2.9.0
 CATEGORIES=	finance kde
 MASTER_SITES=	KDE/stable/${PORTNAME}
 DIST_SUBDIR=	KDE/${PORTNAME}
diff --git a/finance/skrooge/distinfo b/finance/skrooge/distinfo
index 028395038602..8b8d7741fada 100644
--- a/finance/skrooge/distinfo
+++ b/finance/skrooge/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1492976378
-SHA256 (KDE/skrooge/skrooge-2.8.1.tar.xz) = 8f166db74a27db0ce0ea197f89dfd021224afc3e4875e36438a4496f10746460
-SIZE (KDE/skrooge/skrooge-2.8.1.tar.xz) = 19299556
+TIMESTAMP = 1505377701
+SHA256 (KDE/skrooge/skrooge-2.9.0.tar.xz) = ad02403026b649203f0381cc599a7754d36f41cc75cc03d14e63bfdb666e7bb5
+SIZE (KDE/skrooge/skrooge-2.9.0.tar.xz) = 19310412
diff --git a/finance/skrooge/pkg-plist b/finance/skrooge/pkg-plist
index 285e26026ce7..e46470a315ef 100644
--- a/finance/skrooge/pkg-plist
+++ b/finance/skrooge/pkg-plist
@@ -1,4 +1,6 @@
 bin/skrooge
+bin/skrooge-sabb.py
+bin/skrooge-yahoodl.py
 bin/skroogeconvert
 etc/xdg/skrooge_monthly.knsrc
 etc/xdg/skrooge_unit.knsrc
@@ -379,6 +381,9 @@ share/kservices5/org.kde.skg-plugin-selectall.desktop
 share/kservices5/org.kde.skg-plugin-statistic.desktop
 share/kservices5/org.kde.skg-plugin-undoredo.desktop
 share/kservices5/org.kde.skrooge-import-afb120.desktop
+share/kservices5/org.kde.skrooge-import-backend-aqbanking.desktop
+share/kservices5/org.kde.skrooge-import-backend-weboob.desktop
+share/kservices5/org.kde.skrooge-import-backend-weboob0g.desktop
 share/kservices5/org.kde.skrooge-import-backend.desktop
 share/kservices5/org.kde.skrooge-import-csv.desktop
 share/kservices5/org.kde.skrooge-import-gnc.desktop
@@ -408,6 +413,7 @@ share/kservices5/org.kde.skrooge-plugin-search.desktop
 share/kservices5/org.kde.skrooge-plugin-tracker.desktop
 share/kservices5/org.kde.skrooge-plugin-unit.desktop
 share/kservicetypes5/org.kde.skg-plugin.desktop
+share/kservicetypes5/org.kde.skrooge-import-backend-type.desktop
 share/kservicetypes5/org.kde.skrooge-import-plugin.desktop
 share/kxmlgui5/skg/skgmainpanel.rc
 share/kxmlgui5/skg_advice/skg_advice.rc
@@ -477,8 +483,6 @@ share/locale/zh_CN/LC_MESSAGES/skrooge.mo
 share/locale/zh_TW/LC_MESSAGES/skrooge.mo
 share/metainfo/org.kde.skrooge.appdata.xml
 share/mime/packages/x-skg.xml
-%%DATADIR%%/backends/weboob.backend
-%%DATADIR%%/backends/weboob0g.backend
 %%DATADIR%%/categories/fr/associations.qif
 %%DATADIR%%/categories/fr/liberal.qif
 %%DATADIR%%/categories/fr/plan_comptable.qif
@@ -690,14 +694,14 @@ share/mime/packages/x-skg.xml
 %%DATADIR%%/currency/zwl.desktop
 %%DATADIR%%/extractors/allo_pneus.extractor
 %%DATADIR%%/extractors/bebe_au_naturel.extractor
-%%DATADIR%%/extractors/biofan.extractor
 %%DATADIR%%/extractors/easycartouche.extractor
 %%DATADIR%%/extractors/engie.extractor
 %%DATADIR%%/extractors/etikolo.extractor
 %%DATADIR%%/extractors/free.extractor
 %%DATADIR%%/extractors/free_mobile.extractor
 %%DATADIR%%/extractors/ldlc.extractor
-%%DATADIR%%/extractors/oscaro.extractor
+%%DATADIR%%/extractors/oscaro_v1.extractor
+%%DATADIR%%/extractors/oscaro_v2.extractor
 %%DATADIR%%/extractors/oxybul.extractor
 %%DATADIR%%/extractors/pixmania.extractor
 %%DATADIR%%/extractors/sarenza.extractor
@@ -764,6 +768,7 @@ share/mime/packages/x-skg.xml
 %%DATADIR%%/images/logo/caisse_epargne.png
 %%DATADIR%%/images/logo/capitec__470010.png
 %%DATADIR%%/images/logo/cic__30066.png
+%%DATADIR%%/images/logo/citadele.png
 %%DATADIR%%/images/logo/citibank.png
 %%DATADIR%%/images/logo/cnp.png
 %%DATADIR%%/images/logo/commonwealth.png
@@ -790,6 +795,7 @@ share/mime/packages/x-skg.xml
 %%DATADIR%%/images/logo/hellobank.png
 %%DATADIR%%/images/logo/home_credit_bank.png
 %%DATADIR%%/images/logo/hsbc.png
+%%DATADIR%%/images/logo/humanis.png
 %%DATADIR%%/images/logo/ing_direct__14559.png
 %%DATADIR%%/images/logo/ing_direct__30438.png
 %%DATADIR%%/images/logo/investec__580105.png
@@ -817,6 +823,7 @@ share/mime/packages/x-skg.xml
 %%DATADIR%%/images/logo/medicinos_bankas.png
 %%DATADIR%%/images/logo/merrill_lynch.png
 %%DATADIR%%/images/logo/monabanq.png
+%%DATADIR%%/images/logo/morning.png
 %%DATADIR%%/images/logo/national_bank.png
 %%DATADIR%%/images/logo/nationwide.png
 %%DATADIR%%/images/logo/natwest.png
@@ -852,6 +859,7 @@ share/mime/packages/x-skg.xml
 %%DATADIR%%/images/logo/westpac.png
 %%DATADIR%%/images/logo/woori_bank.png
 %%DATADIR%%/images/splash.png
+%%DATADIR%%/quotes/BitcoinAverage.txt
 %%DATADIR%%/quotes/BitcoinCharts.txt
 %%DATADIR%%/quotes/GrandTrunk.txt
 %%DATADIR%%/quotes/Skrooge.txt
diff --git a/french/aster/Makefile b/french/aster/Makefile
index 2370252e45f2..19a475bf6f8b 100644
--- a/french/aster/Makefile
+++ b/french/aster/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	aster
 DISTVERSION=	${ASTER_DISTVERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	french cad
 CATEGORIES=	french cad
 
diff --git a/french/eficas/Makefile b/french/eficas/Makefile
index c422c02de8da..28f6e73bcd49 100644
--- a/french/eficas/Makefile
+++ b/french/eficas/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	eficas
 DISTVERSION=	2016.0-1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	french cad
 
 MAINTAINER=	thierry@FreeBSD.org
diff --git a/french/med/Makefile b/french/med/Makefile
index 3033dd309b7b..b64efdf43259 100644
--- a/french/med/Makefile
+++ b/french/med/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	med
 DISTVERSION=	3.2.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	french science
 
 MAINTAINER=	thierry@FreeBSD.org
diff --git a/ftp/filezilla/Makefile b/ftp/filezilla/Makefile
index 6d9682c90e53..4f0a68862159 100644
--- a/ftp/filezilla/Makefile
+++ b/ftp/filezilla/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	filezilla
 PORTVERSION=	3.24.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ftp
 MASTER_SITES=	SF/${PORTNAME}/FileZilla_Client/${PORTVERSION}
 DISTNAME=	FileZilla_${PORTVERSION}_src
diff --git a/ftp/lftp/Makefile b/ftp/lftp/Makefile
index cb3cfd6f7f0a..0eff8b6dc3c7 100644
--- a/ftp/lftp/Makefile
+++ b/ftp/lftp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	lftp
 PORTVERSION=	4.8.0
+PORTREVISION=	1
 CATEGORIES=	ftp ipv6
 MASTER_SITES=	http://lftp.tech/ftp/ \
 		http://lftp.tech/ftp/old/ \
diff --git a/ftp/libfilezilla/Makefile b/ftp/libfilezilla/Makefile
index d4b14191cdff..94b18196f149 100644
--- a/ftp/libfilezilla/Makefile
+++ b/ftp/libfilezilla/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	libfilezilla
 PORTVERSION=	0.9.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ftp
 MASTER_SITES=	http://download.filezilla-project.org/${PORTNAME}/
 
diff --git a/ftp/net2ftp/Makefile b/ftp/net2ftp/Makefile
index 58163fe8ca9b..83be7b4e113d 100644
--- a/ftp/net2ftp/Makefile
+++ b/ftp/net2ftp/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	net2ftp
-PORTVERSION=	1.0
+PORTVERSION=	1.1
 CATEGORIES=	ftp
 MASTER_SITES=	http://www.net2ftp.com/download/
 DISTNAME=	${PORTNAME}_v${PORTVERSION}
@@ -12,11 +12,10 @@ COMMENT=	Web-based FTP client written in PHP
 
 LICENSE=	GPLv2
 
-USES=		zip
-IGNORE_WITH_PHP=	70
+USES=		php zip
 NO_BUILD=	YES
 .if !defined(WITHOUT_PHP_DEPENDS)
-USE_PHP=	ftp mysql pcre session zlib
+USE_PHP=	ftp mysqli pcre session zlib
 .endif
 
 SUB_FILES+=	pkg-message
diff --git a/ftp/net2ftp/distinfo b/ftp/net2ftp/distinfo
index c0ab6bca92ab..3b2efad01db5 100644
--- a/ftp/net2ftp/distinfo
+++ b/ftp/net2ftp/distinfo
@@ -1,2 +1,3 @@
-SHA256 (net2ftp_v1.0.zip) = c0071ccec8fd0f1309904f5cacc7d5173b5a3b57bede70ea078d892c676c9c31
-SIZE (net2ftp_v1.0.zip) = 4460502
+TIMESTAMP = 1504983980
+SHA256 (net2ftp_v1.1.zip) = 25b5655dc3df7fa86b5973f88d0e9b14996d0c239ab9d689bd9612997a87c770
+SIZE (net2ftp_v1.1.zip) = 6302110
diff --git a/ftp/net2ftp/pkg-plist b/ftp/net2ftp/pkg-plist
index c3230c0f60ed..d7a1277e810b 100644
--- a/ftp/net2ftp/pkg-plist
+++ b/ftp/net2ftp/pkg-plist
@@ -6,12 +6,6 @@
 %%WWWDIR%%/favicon.png
 %%WWWDIR%%/help.html
 %%WWWDIR%%/htaccess.txt
-%%WWWDIR%%/includes/StonePhpSafeCrypt.php
-%%WWWDIR%%/includes/StonePhpSafeCrypt_blockscramble.php
-%%WWWDIR%%/includes/StonePhpSafeCrypt_compressors.php
-%%WWWDIR%%/includes/StonePhpSafeCrypt_config.php
-%%WWWDIR%%/includes/StonePhpSafeCrypt_packcrypt.php
-%%WWWDIR%%/includes/StonePhpSafeCrypt_testconfig.php
 %%WWWDIR%%/includes/authorizations.inc.php
 %%WWWDIR%%/includes/before430.inc.php
 %%WWWDIR%%/includes/browse.inc.php
@@ -30,6 +24,7 @@
 %%WWWDIR%%/includes/registerglobals.inc.php
 %%WWWDIR%%/includes/zip.lib.php
 %%WWWDIR%%/index.php
+%%WWWDIR%%/index.xml.php
 %%WWWDIR%%/languages/ar-utf.inc.php
 %%WWWDIR%%/languages/ar.inc.php
 %%WWWDIR%%/languages/cs.inc.php
@@ -37,6 +32,7 @@
 %%WWWDIR%%/languages/de.inc.php
 %%WWWDIR%%/languages/en-utf.inc.php
 %%WWWDIR%%/languages/en.inc.php
+%%WWWDIR%%/languages/en_raw.inc.php
 %%WWWDIR%%/languages/es.inc.php
 %%WWWDIR%%/languages/fi.inc.php
 %%WWWDIR%%/languages/fr.inc.php
@@ -68,7 +64,7 @@
 %%WWWDIR%%/modules/advanced_webserver/advanced_webserver.inc.php
 %%WWWDIR%%/modules/bookmark/bookmark.inc.php
 %%WWWDIR%%/modules/browse/browse.inc.php
-%%WWWDIR%%/modules/browse/browse_main.js.php
+%%WWWDIR%%/modules/browse/browse_main.js
 %%WWWDIR%%/modules/browse/browse_main_mobile.js
 %%WWWDIR%%/modules/browse/browse_popup.js
 %%WWWDIR%%/modules/calculatesize/calculatesize.inc.php
@@ -96,6 +92,7 @@
 %%WWWDIR%%/modules/newdir/newdir.inc.php
 %%WWWDIR%%/modules/raw/raw.inc.php
 %%WWWDIR%%/modules/rename/rename.inc.php
+%%WWWDIR%%/modules/serverfingerprint/serverfingerprint.inc.php
 %%WWWDIR%%/modules/unzip/unzip.inc.php
 %%WWWDIR%%/modules/upload/upload.inc.php
 %%WWWDIR%%/modules/upload/upload.js
@@ -103,60 +100,134 @@
 %%WWWDIR%%/modules/zip/zip.inc.php
 %%WWWDIR%%/package_list.txt
 %%WWWDIR%%/plugins/ace/ace.js
+%%WWWDIR%%/plugins/ace/ext-beautify.js
+%%WWWDIR%%/plugins/ace/ext-chromevox.js
+%%WWWDIR%%/plugins/ace/ext-elastic_tabstops_lite.js
+%%WWWDIR%%/plugins/ace/ext-emmet.js
+%%WWWDIR%%/plugins/ace/ext-error_marker.js
+%%WWWDIR%%/plugins/ace/ext-keybinding_menu.js
+%%WWWDIR%%/plugins/ace/ext-language_tools.js
+%%WWWDIR%%/plugins/ace/ext-linking.js
+%%WWWDIR%%/plugins/ace/ext-modelist.js
+%%WWWDIR%%/plugins/ace/ext-old_ie.js
+%%WWWDIR%%/plugins/ace/ext-searchbox.js
+%%WWWDIR%%/plugins/ace/ext-settings_menu.js
+%%WWWDIR%%/plugins/ace/ext-spellcheck.js
+%%WWWDIR%%/plugins/ace/ext-split.js
 %%WWWDIR%%/plugins/ace/ext-static_highlight.js
+%%WWWDIR%%/plugins/ace/ext-statusbar.js
 %%WWWDIR%%/plugins/ace/ext-textarea.js
+%%WWWDIR%%/plugins/ace/ext-themelist.js
+%%WWWDIR%%/plugins/ace/ext-whitespace.js
 %%WWWDIR%%/plugins/ace/keybinding-emacs.js
 %%WWWDIR%%/plugins/ace/keybinding-vim.js
 %%WWWDIR%%/plugins/ace/mode-abap.js
+%%WWWDIR%%/plugins/ace/mode-abc.js
+%%WWWDIR%%/plugins/ace/mode-actionscript.js
+%%WWWDIR%%/plugins/ace/mode-ada.js
+%%WWWDIR%%/plugins/ace/mode-apache_conf.js
+%%WWWDIR%%/plugins/ace/mode-applescript.js
 %%WWWDIR%%/plugins/ace/mode-asciidoc.js
+%%WWWDIR%%/plugins/ace/mode-assembly_x86.js
+%%WWWDIR%%/plugins/ace/mode-autohotkey.js
+%%WWWDIR%%/plugins/ace/mode-batchfile.js
 %%WWWDIR%%/plugins/ace/mode-c9search.js
 %%WWWDIR%%/plugins/ace/mode-c_cpp.js
+%%WWWDIR%%/plugins/ace/mode-cirru.js
 %%WWWDIR%%/plugins/ace/mode-clojure.js
+%%WWWDIR%%/plugins/ace/mode-cobol.js
 %%WWWDIR%%/plugins/ace/mode-coffee.js
 %%WWWDIR%%/plugins/ace/mode-coldfusion.js
 %%WWWDIR%%/plugins/ace/mode-csharp.js
 %%WWWDIR%%/plugins/ace/mode-css.js
+%%WWWDIR%%/plugins/ace/mode-curly.js
+%%WWWDIR%%/plugins/ace/mode-d.js
 %%WWWDIR%%/plugins/ace/mode-dart.js
 %%WWWDIR%%/plugins/ace/mode-diff.js
+%%WWWDIR%%/plugins/ace/mode-django.js
+%%WWWDIR%%/plugins/ace/mode-dockerfile.js
 %%WWWDIR%%/plugins/ace/mode-dot.js
+%%WWWDIR%%/plugins/ace/mode-eiffel.js
+%%WWWDIR%%/plugins/ace/mode-ejs.js
+%%WWWDIR%%/plugins/ace/mode-elixir.js
+%%WWWDIR%%/plugins/ace/mode-elm.js
+%%WWWDIR%%/plugins/ace/mode-erlang.js
+%%WWWDIR%%/plugins/ace/mode-forth.js
+%%WWWDIR%%/plugins/ace/mode-ftl.js
+%%WWWDIR%%/plugins/ace/mode-gcode.js
+%%WWWDIR%%/plugins/ace/mode-gherkin.js
+%%WWWDIR%%/plugins/ace/mode-gitignore.js
 %%WWWDIR%%/plugins/ace/mode-glsl.js
 %%WWWDIR%%/plugins/ace/mode-golang.js
 %%WWWDIR%%/plugins/ace/mode-groovy.js
 %%WWWDIR%%/plugins/ace/mode-haml.js
+%%WWWDIR%%/plugins/ace/mode-handlebars.js
+%%WWWDIR%%/plugins/ace/mode-haskell.js
 %%WWWDIR%%/plugins/ace/mode-haxe.js
 %%WWWDIR%%/plugins/ace/mode-html.js
+%%WWWDIR%%/plugins/ace/mode-html_ruby.js
+%%WWWDIR%%/plugins/ace/mode-ini.js
+%%WWWDIR%%/plugins/ace/mode-io.js
+%%WWWDIR%%/plugins/ace/mode-jack.js
 %%WWWDIR%%/plugins/ace/mode-jade.js
 %%WWWDIR%%/plugins/ace/mode-java.js
 %%WWWDIR%%/plugins/ace/mode-javascript.js
 %%WWWDIR%%/plugins/ace/mode-json.js
+%%WWWDIR%%/plugins/ace/mode-jsoniq.js
 %%WWWDIR%%/plugins/ace/mode-jsp.js
 %%WWWDIR%%/plugins/ace/mode-jsx.js
+%%WWWDIR%%/plugins/ace/mode-julia.js
 %%WWWDIR%%/plugins/ace/mode-latex.js
+%%WWWDIR%%/plugins/ace/mode-lean.js
 %%WWWDIR%%/plugins/ace/mode-less.js
 %%WWWDIR%%/plugins/ace/mode-liquid.js
 %%WWWDIR%%/plugins/ace/mode-lisp.js
+%%WWWDIR%%/plugins/ace/mode-live_script.js
+%%WWWDIR%%/plugins/ace/mode-livescript.js
+%%WWWDIR%%/plugins/ace/mode-logiql.js
+%%WWWDIR%%/plugins/ace/mode-lsl.js
 %%WWWDIR%%/plugins/ace/mode-lua.js
-%%WWWDIR%%/plugins/ace/mode-luahtml.js
 %%WWWDIR%%/plugins/ace/mode-luapage.js
 %%WWWDIR%%/plugins/ace/mode-lucene.js
 %%WWWDIR%%/plugins/ace/mode-makefile.js
 %%WWWDIR%%/plugins/ace/mode-markdown.js
+%%WWWDIR%%/plugins/ace/mode-mask.js
+%%WWWDIR%%/plugins/ace/mode-matlab.js
+%%WWWDIR%%/plugins/ace/mode-mel.js
+%%WWWDIR%%/plugins/ace/mode-mips_assembler.js
+%%WWWDIR%%/plugins/ace/mode-mipsassembler.js
+%%WWWDIR%%/plugins/ace/mode-mushcode.js
+%%WWWDIR%%/plugins/ace/mode-mysql.js
+%%WWWDIR%%/plugins/ace/mode-nix.js
 %%WWWDIR%%/plugins/ace/mode-objectivec.js
 %%WWWDIR%%/plugins/ace/mode-ocaml.js
+%%WWWDIR%%/plugins/ace/mode-pascal.js
 %%WWWDIR%%/plugins/ace/mode-perl.js
 %%WWWDIR%%/plugins/ace/mode-pgsql.js
 %%WWWDIR%%/plugins/ace/mode-php.js
+%%WWWDIR%%/plugins/ace/mode-plain_text.js
 %%WWWDIR%%/plugins/ace/mode-powershell.js
+%%WWWDIR%%/plugins/ace/mode-praat.js
+%%WWWDIR%%/plugins/ace/mode-prolog.js
+%%WWWDIR%%/plugins/ace/mode-properties.js
+%%WWWDIR%%/plugins/ace/mode-protobuf.js
 %%WWWDIR%%/plugins/ace/mode-python.js
 %%WWWDIR%%/plugins/ace/mode-r.js
 %%WWWDIR%%/plugins/ace/mode-rdoc.js
 %%WWWDIR%%/plugins/ace/mode-rhtml.js
 %%WWWDIR%%/plugins/ace/mode-ruby.js
+%%WWWDIR%%/plugins/ace/mode-rust.js
 %%WWWDIR%%/plugins/ace/mode-sass.js
 %%WWWDIR%%/plugins/ace/mode-scad.js
 %%WWWDIR%%/plugins/ace/mode-scala.js
+%%WWWDIR%%/plugins/ace/mode-scheme.js
 %%WWWDIR%%/plugins/ace/mode-scss.js
 %%WWWDIR%%/plugins/ace/mode-sh.js
+%%WWWDIR%%/plugins/ace/mode-sjs.js
+%%WWWDIR%%/plugins/ace/mode-smarty.js
+%%WWWDIR%%/plugins/ace/mode-snippets.js
+%%WWWDIR%%/plugins/ace/mode-soy_template.js
+%%WWWDIR%%/plugins/ace/mode-space.js
 %%WWWDIR%%/plugins/ace/mode-sql.js
 %%WWWDIR%%/plugins/ace/mode-stylus.js
 %%WWWDIR%%/plugins/ace/mode-svg.js
@@ -164,69 +235,292 @@
 %%WWWDIR%%/plugins/ace/mode-tex.js
 %%WWWDIR%%/plugins/ace/mode-text.js
 %%WWWDIR%%/plugins/ace/mode-textile.js
+%%WWWDIR%%/plugins/ace/mode-toml.js
+%%WWWDIR%%/plugins/ace/mode-twig.js
 %%WWWDIR%%/plugins/ace/mode-typescript.js
+%%WWWDIR%%/plugins/ace/mode-vala.js
+%%WWWDIR%%/plugins/ace/mode-vbscript.js
+%%WWWDIR%%/plugins/ace/mode-velocity.js
+%%WWWDIR%%/plugins/ace/mode-verilog.js
+%%WWWDIR%%/plugins/ace/mode-vhdl.js
 %%WWWDIR%%/plugins/ace/mode-xml.js
 %%WWWDIR%%/plugins/ace/mode-xquery.js
 %%WWWDIR%%/plugins/ace/mode-yaml.js
+%%WWWDIR%%/plugins/ace/snippets/abap.js
+%%WWWDIR%%/plugins/ace/snippets/abc.js
+%%WWWDIR%%/plugins/ace/snippets/actionscript.js
+%%WWWDIR%%/plugins/ace/snippets/ada.js
+%%WWWDIR%%/plugins/ace/snippets/apache_conf.js
+%%WWWDIR%%/plugins/ace/snippets/applescript.js
+%%WWWDIR%%/plugins/ace/snippets/asciidoc.js
+%%WWWDIR%%/plugins/ace/snippets/assembly_x86.js
+%%WWWDIR%%/plugins/ace/snippets/autohotkey.js
+%%WWWDIR%%/plugins/ace/snippets/batchfile.js
+%%WWWDIR%%/plugins/ace/snippets/c9search.js
+%%WWWDIR%%/plugins/ace/snippets/c_cpp.js
+%%WWWDIR%%/plugins/ace/snippets/cirru.js
+%%WWWDIR%%/plugins/ace/snippets/clojure.js
+%%WWWDIR%%/plugins/ace/snippets/cobol.js
+%%WWWDIR%%/plugins/ace/snippets/coffee.js
+%%WWWDIR%%/plugins/ace/snippets/coldfusion.js
+%%WWWDIR%%/plugins/ace/snippets/csharp.js
+%%WWWDIR%%/plugins/ace/snippets/css.js
+%%WWWDIR%%/plugins/ace/snippets/curly.js
+%%WWWDIR%%/plugins/ace/snippets/d.js
+%%WWWDIR%%/plugins/ace/snippets/dart.js
+%%WWWDIR%%/plugins/ace/snippets/diff.js
+%%WWWDIR%%/plugins/ace/snippets/django.js
+%%WWWDIR%%/plugins/ace/snippets/dockerfile.js
+%%WWWDIR%%/plugins/ace/snippets/dot.js
+%%WWWDIR%%/plugins/ace/snippets/eiffel.js
+%%WWWDIR%%/plugins/ace/snippets/ejs.js
+%%WWWDIR%%/plugins/ace/snippets/elixir.js
+%%WWWDIR%%/plugins/ace/snippets/elm.js
+%%WWWDIR%%/plugins/ace/snippets/erlang.js
+%%WWWDIR%%/plugins/ace/snippets/forth.js
+%%WWWDIR%%/plugins/ace/snippets/ftl.js
+%%WWWDIR%%/plugins/ace/snippets/gcode.js
+%%WWWDIR%%/plugins/ace/snippets/gherkin.js
+%%WWWDIR%%/plugins/ace/snippets/gitignore.js
+%%WWWDIR%%/plugins/ace/snippets/glsl.js
+%%WWWDIR%%/plugins/ace/snippets/golang.js
+%%WWWDIR%%/plugins/ace/snippets/groovy.js
+%%WWWDIR%%/plugins/ace/snippets/haml.js
+%%WWWDIR%%/plugins/ace/snippets/handlebars.js
+%%WWWDIR%%/plugins/ace/snippets/haskell.js
+%%WWWDIR%%/plugins/ace/snippets/haxe.js
+%%WWWDIR%%/plugins/ace/snippets/html.js
+%%WWWDIR%%/plugins/ace/snippets/html_ruby.js
+%%WWWDIR%%/plugins/ace/snippets/ini.js
+%%WWWDIR%%/plugins/ace/snippets/io.js
+%%WWWDIR%%/plugins/ace/snippets/jack.js
+%%WWWDIR%%/plugins/ace/snippets/jade.js
+%%WWWDIR%%/plugins/ace/snippets/java.js
+%%WWWDIR%%/plugins/ace/snippets/javascript.js
+%%WWWDIR%%/plugins/ace/snippets/json.js
+%%WWWDIR%%/plugins/ace/snippets/jsoniq.js
+%%WWWDIR%%/plugins/ace/snippets/jsp.js
+%%WWWDIR%%/plugins/ace/snippets/jsx.js
+%%WWWDIR%%/plugins/ace/snippets/julia.js
+%%WWWDIR%%/plugins/ace/snippets/latex.js
+%%WWWDIR%%/plugins/ace/snippets/lean.js
+%%WWWDIR%%/plugins/ace/snippets/less.js
+%%WWWDIR%%/plugins/ace/snippets/liquid.js
+%%WWWDIR%%/plugins/ace/snippets/lisp.js
+%%WWWDIR%%/plugins/ace/snippets/live_script.js
+%%WWWDIR%%/plugins/ace/snippets/livescript.js
+%%WWWDIR%%/plugins/ace/snippets/logiql.js
+%%WWWDIR%%/plugins/ace/snippets/lsl.js
+%%WWWDIR%%/plugins/ace/snippets/lua.js
+%%WWWDIR%%/plugins/ace/snippets/luapage.js
+%%WWWDIR%%/plugins/ace/snippets/lucene.js
+%%WWWDIR%%/plugins/ace/snippets/makefile.js
+%%WWWDIR%%/plugins/ace/snippets/markdown.js
+%%WWWDIR%%/plugins/ace/snippets/mask.js
+%%WWWDIR%%/plugins/ace/snippets/matlab.js
+%%WWWDIR%%/plugins/ace/snippets/mel.js
+%%WWWDIR%%/plugins/ace/snippets/mips_assembler.js
+%%WWWDIR%%/plugins/ace/snippets/mipsassembler.js
+%%WWWDIR%%/plugins/ace/snippets/mushcode.js
+%%WWWDIR%%/plugins/ace/snippets/mysql.js
+%%WWWDIR%%/plugins/ace/snippets/nix.js
+%%WWWDIR%%/plugins/ace/snippets/objectivec.js
+%%WWWDIR%%/plugins/ace/snippets/ocaml.js
+%%WWWDIR%%/plugins/ace/snippets/pascal.js
+%%WWWDIR%%/plugins/ace/snippets/perl.js
+%%WWWDIR%%/plugins/ace/snippets/pgsql.js
+%%WWWDIR%%/plugins/ace/snippets/php.js
+%%WWWDIR%%/plugins/ace/snippets/plain_text.js
+%%WWWDIR%%/plugins/ace/snippets/powershell.js
+%%WWWDIR%%/plugins/ace/snippets/praat.js
+%%WWWDIR%%/plugins/ace/snippets/prolog.js
+%%WWWDIR%%/plugins/ace/snippets/properties.js
+%%WWWDIR%%/plugins/ace/snippets/protobuf.js
+%%WWWDIR%%/plugins/ace/snippets/python.js
+%%WWWDIR%%/plugins/ace/snippets/r.js
+%%WWWDIR%%/plugins/ace/snippets/rdoc.js
+%%WWWDIR%%/plugins/ace/snippets/rhtml.js
+%%WWWDIR%%/plugins/ace/snippets/ruby.js
+%%WWWDIR%%/plugins/ace/snippets/rust.js
+%%WWWDIR%%/plugins/ace/snippets/sass.js
+%%WWWDIR%%/plugins/ace/snippets/scad.js
+%%WWWDIR%%/plugins/ace/snippets/scala.js
+%%WWWDIR%%/plugins/ace/snippets/scheme.js
+%%WWWDIR%%/plugins/ace/snippets/scss.js
+%%WWWDIR%%/plugins/ace/snippets/sh.js
+%%WWWDIR%%/plugins/ace/snippets/sjs.js
+%%WWWDIR%%/plugins/ace/snippets/smarty.js
+%%WWWDIR%%/plugins/ace/snippets/snippets.js
+%%WWWDIR%%/plugins/ace/snippets/soy_template.js
+%%WWWDIR%%/plugins/ace/snippets/space.js
+%%WWWDIR%%/plugins/ace/snippets/sql.js
+%%WWWDIR%%/plugins/ace/snippets/stylus.js
+%%WWWDIR%%/plugins/ace/snippets/svg.js
+%%WWWDIR%%/plugins/ace/snippets/tcl.js
+%%WWWDIR%%/plugins/ace/snippets/tex.js
+%%WWWDIR%%/plugins/ace/snippets/text.js
+%%WWWDIR%%/plugins/ace/snippets/textile.js
+%%WWWDIR%%/plugins/ace/snippets/toml.js
+%%WWWDIR%%/plugins/ace/snippets/twig.js
+%%WWWDIR%%/plugins/ace/snippets/typescript.js
+%%WWWDIR%%/plugins/ace/snippets/vala.js
+%%WWWDIR%%/plugins/ace/snippets/vbscript.js
+%%WWWDIR%%/plugins/ace/snippets/velocity.js
+%%WWWDIR%%/plugins/ace/snippets/verilog.js
+%%WWWDIR%%/plugins/ace/snippets/vhdl.js
+%%WWWDIR%%/plugins/ace/snippets/xml.js
+%%WWWDIR%%/plugins/ace/snippets/xquery.js
+%%WWWDIR%%/plugins/ace/snippets/yaml.js
+%%WWWDIR%%/plugins/ace/theme-ambiance.js
+%%WWWDIR%%/plugins/ace/theme-chaos.js
+%%WWWDIR%%/plugins/ace/theme-chrome.js
+%%WWWDIR%%/plugins/ace/theme-clouds.js
+%%WWWDIR%%/plugins/ace/theme-clouds_midnight.js
+%%WWWDIR%%/plugins/ace/theme-cobalt.js
+%%WWWDIR%%/plugins/ace/theme-crimson_editor.js
+%%WWWDIR%%/plugins/ace/theme-dawn.js
+%%WWWDIR%%/plugins/ace/theme-dreamweaver.js
 %%WWWDIR%%/plugins/ace/theme-eclipse.js
+%%WWWDIR%%/plugins/ace/theme-github.js
+%%WWWDIR%%/plugins/ace/theme-idle_fingers.js
+%%WWWDIR%%/plugins/ace/theme-katzenmilch.js
+%%WWWDIR%%/plugins/ace/theme-kr_theme.js
+%%WWWDIR%%/plugins/ace/theme-kuroir.js
+%%WWWDIR%%/plugins/ace/theme-merbivore.js
+%%WWWDIR%%/plugins/ace/theme-merbivore_soft.js
+%%WWWDIR%%/plugins/ace/theme-mono_industrial.js
+%%WWWDIR%%/plugins/ace/theme-monokai.js
+%%WWWDIR%%/plugins/ace/theme-pastel_on_dark.js
+%%WWWDIR%%/plugins/ace/theme-solarized_dark.js
+%%WWWDIR%%/plugins/ace/theme-solarized_light.js
+%%WWWDIR%%/plugins/ace/theme-terminal.js
+%%WWWDIR%%/plugins/ace/theme-textmate.js
+%%WWWDIR%%/plugins/ace/theme-tomorrow.js
+%%WWWDIR%%/plugins/ace/theme-tomorrow_night.js
+%%WWWDIR%%/plugins/ace/theme-tomorrow_night_blue.js
+%%WWWDIR%%/plugins/ace/theme-tomorrow_night_bright.js
+%%WWWDIR%%/plugins/ace/theme-tomorrow_night_eighties.js
+%%WWWDIR%%/plugins/ace/theme-twilight.js
+%%WWWDIR%%/plugins/ace/theme-vibrant_ink.js
+%%WWWDIR%%/plugins/ace/theme-xcode.js
 %%WWWDIR%%/plugins/ace/worker-coffee.js
 %%WWWDIR%%/plugins/ace/worker-css.js
+%%WWWDIR%%/plugins/ace/worker-html.js
 %%WWWDIR%%/plugins/ace/worker-javascript.js
 %%WWWDIR%%/plugins/ace/worker-json.js
+%%WWWDIR%%/plugins/ace/worker-lua.js
+%%WWWDIR%%/plugins/ace/worker-php.js
+%%WWWDIR%%/plugins/ace/worker-xml.js
 %%WWWDIR%%/plugins/ace/worker-xquery.js
 %%WWWDIR%%/plugins/ckeditor/CHANGES.md
 %%WWWDIR%%/plugins/ckeditor/LICENSE.md
 %%WWWDIR%%/plugins/ckeditor/README.md
+%%WWWDIR%%/plugins/ckeditor/adapters/jquery.js
 %%WWWDIR%%/plugins/ckeditor/build-config.js
 %%WWWDIR%%/plugins/ckeditor/ckeditor.js
 %%WWWDIR%%/plugins/ckeditor/config.js
 %%WWWDIR%%/plugins/ckeditor/contents.css
+%%WWWDIR%%/plugins/ckeditor/lang/af.js
 %%WWWDIR%%/plugins/ckeditor/lang/ar.js
+%%WWWDIR%%/plugins/ckeditor/lang/bg.js
+%%WWWDIR%%/plugins/ckeditor/lang/bn.js
+%%WWWDIR%%/plugins/ckeditor/lang/bs.js
+%%WWWDIR%%/plugins/ckeditor/lang/ca.js
 %%WWWDIR%%/plugins/ckeditor/lang/cs.js
+%%WWWDIR%%/plugins/ckeditor/lang/cy.js
 %%WWWDIR%%/plugins/ckeditor/lang/da.js
+%%WWWDIR%%/plugins/ckeditor/lang/de-ch.js
 %%WWWDIR%%/plugins/ckeditor/lang/de.js
+%%WWWDIR%%/plugins/ckeditor/lang/el.js
+%%WWWDIR%%/plugins/ckeditor/lang/en-au.js
+%%WWWDIR%%/plugins/ckeditor/lang/en-ca.js
+%%WWWDIR%%/plugins/ckeditor/lang/en-gb.js
 %%WWWDIR%%/plugins/ckeditor/lang/en.js
+%%WWWDIR%%/plugins/ckeditor/lang/eo.js
 %%WWWDIR%%/plugins/ckeditor/lang/es.js
+%%WWWDIR%%/plugins/ckeditor/lang/et.js
+%%WWWDIR%%/plugins/ckeditor/lang/eu.js
+%%WWWDIR%%/plugins/ckeditor/lang/fa.js
 %%WWWDIR%%/plugins/ckeditor/lang/fi.js
+%%WWWDIR%%/plugins/ckeditor/lang/fo.js
+%%WWWDIR%%/plugins/ckeditor/lang/fr-ca.js
 %%WWWDIR%%/plugins/ckeditor/lang/fr.js
+%%WWWDIR%%/plugins/ckeditor/lang/gl.js
+%%WWWDIR%%/plugins/ckeditor/lang/gu.js
 %%WWWDIR%%/plugins/ckeditor/lang/he.js
+%%WWWDIR%%/plugins/ckeditor/lang/hi.js
+%%WWWDIR%%/plugins/ckeditor/lang/hr.js
 %%WWWDIR%%/plugins/ckeditor/lang/hu.js
+%%WWWDIR%%/plugins/ckeditor/lang/id.js
 %%WWWDIR%%/plugins/ckeditor/lang/is.js
 %%WWWDIR%%/plugins/ckeditor/lang/it.js
 %%WWWDIR%%/plugins/ckeditor/lang/ja.js
+%%WWWDIR%%/plugins/ckeditor/lang/ka.js
+%%WWWDIR%%/plugins/ckeditor/lang/km.js
+%%WWWDIR%%/plugins/ckeditor/lang/ko.js
+%%WWWDIR%%/plugins/ckeditor/lang/ku.js
+%%WWWDIR%%/plugins/ckeditor/lang/lt.js
+%%WWWDIR%%/plugins/ckeditor/lang/lv.js
+%%WWWDIR%%/plugins/ckeditor/lang/mk.js
+%%WWWDIR%%/plugins/ckeditor/lang/mn.js
+%%WWWDIR%%/plugins/ckeditor/lang/ms.js
+%%WWWDIR%%/plugins/ckeditor/lang/nb.js
 %%WWWDIR%%/plugins/ckeditor/lang/nl.js
+%%WWWDIR%%/plugins/ckeditor/lang/no.js
 %%WWWDIR%%/plugins/ckeditor/lang/pl.js
+%%WWWDIR%%/plugins/ckeditor/lang/pt-br.js
 %%WWWDIR%%/plugins/ckeditor/lang/pt.js
+%%WWWDIR%%/plugins/ckeditor/lang/ro.js
 %%WWWDIR%%/plugins/ckeditor/lang/ru.js
+%%WWWDIR%%/plugins/ckeditor/lang/si.js
+%%WWWDIR%%/plugins/ckeditor/lang/sk.js
+%%WWWDIR%%/plugins/ckeditor/lang/sl.js
+%%WWWDIR%%/plugins/ckeditor/lang/sq.js
+%%WWWDIR%%/plugins/ckeditor/lang/sr-latn.js
+%%WWWDIR%%/plugins/ckeditor/lang/sr.js
 %%WWWDIR%%/plugins/ckeditor/lang/sv.js
+%%WWWDIR%%/plugins/ckeditor/lang/th.js
 %%WWWDIR%%/plugins/ckeditor/lang/tr.js
+%%WWWDIR%%/plugins/ckeditor/lang/tt.js
+%%WWWDIR%%/plugins/ckeditor/lang/ug.js
+%%WWWDIR%%/plugins/ckeditor/lang/uk.js
 %%WWWDIR%%/plugins/ckeditor/lang/vi.js
 %%WWWDIR%%/plugins/ckeditor/lang/zh-cn.js
 %%WWWDIR%%/plugins/ckeditor/lang/zh.js
 %%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
 %%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt
+%%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/af.js
 %%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js
 %%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js
 %%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js
 %%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js
 %%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js
 %%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/da.js
+%%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/de-ch.js
 %%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/de.js
 %%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/el.js
+%%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/en-gb.js
 %%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/en.js
 %%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js
 %%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/es.js
 %%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/et.js
+%%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/eu.js
 %%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js
 %%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js
+%%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/fo.js
+%%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/fr-ca.js
 %%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js
+%%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/gl.js
 %%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js
 %%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/he.js
 %%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js
 %%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js
 %%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js
+%%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/id.js
 %%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/it.js
 %%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/ja.js
+%%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/km.js
+%%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/ko.js
 %%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js
 %%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js
 %%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js
@@ -240,57 +534,97 @@
 %%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js
 %%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js
 %%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js
+%%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/si.js
 %%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js
 %%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js
+%%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/sq.js
+%%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/sr-latn.js
+%%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/sr.js
 %%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/sv.js
+%%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/th.js
 %%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js
+%%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/tt.js
 %%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js
 %%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js
 %%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js
 %%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js
+%%WWWDIR%%/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/zh.js
 %%WWWDIR%%/plugins/ckeditor/plugins/about/dialogs/about.js
+%%WWWDIR%%/plugins/ckeditor/plugins/about/dialogs/hidpi/logo_ckeditor.png
 %%WWWDIR%%/plugins/ckeditor/plugins/about/dialogs/logo_ckeditor.png
 %%WWWDIR%%/plugins/ckeditor/plugins/clipboard/dialogs/paste.js
 %%WWWDIR%%/plugins/ckeditor/plugins/dialog/dialogDefinition.js
-%%WWWDIR%%/plugins/ckeditor/plugins/fakeobjects/images/spacer.gif
 %%WWWDIR%%/plugins/ckeditor/plugins/icons.png
+%%WWWDIR%%/plugins/ckeditor/plugins/icons_hidpi.png
 %%WWWDIR%%/plugins/ckeditor/plugins/image/dialogs/image.js
 %%WWWDIR%%/plugins/ckeditor/plugins/image/images/noimage.png
 %%WWWDIR%%/plugins/ckeditor/plugins/link/dialogs/anchor.js
 %%WWWDIR%%/plugins/ckeditor/plugins/link/dialogs/link.js
 %%WWWDIR%%/plugins/ckeditor/plugins/link/images/anchor.png
+%%WWWDIR%%/plugins/ckeditor/plugins/link/images/hidpi/anchor.png
+%%WWWDIR%%/plugins/ckeditor/plugins/magicline/images/hidpi/icon-rtl.png
+%%WWWDIR%%/plugins/ckeditor/plugins/magicline/images/hidpi/icon.png
+%%WWWDIR%%/plugins/ckeditor/plugins/magicline/images/icon-rtl.png
 %%WWWDIR%%/plugins/ckeditor/plugins/magicline/images/icon.png
 %%WWWDIR%%/plugins/ckeditor/plugins/pastefromword/filter/default.js
+%%WWWDIR%%/plugins/ckeditor/plugins/scayt/CHANGELOG.md
 %%WWWDIR%%/plugins/ckeditor/plugins/scayt/LICENSE.md
 %%WWWDIR%%/plugins/ckeditor/plugins/scayt/README.md
 %%WWWDIR%%/plugins/ckeditor/plugins/scayt/dialogs/options.js
 %%WWWDIR%%/plugins/ckeditor/plugins/scayt/dialogs/toolbar.css
 %%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt
+%%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/af.js
+%%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/ar.js
+%%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/bg.js
 %%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/ca.js
 %%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/cs.js
 %%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/cy.js
+%%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/da.js
+%%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/de-ch.js
 %%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/de.js
 %%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/el.js
+%%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/en-gb.js
 %%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/en.js
 %%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/eo.js
+%%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/es.js
 %%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/et.js
+%%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/eu.js
 %%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/fa.js
 %%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/fi.js
+%%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/fr-ca.js
 %%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/fr.js
+%%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/gl.js
 %%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/he.js
 %%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/hr.js
+%%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/hu.js
+%%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/id.js
 %%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/it.js
+%%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/ja.js
+%%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/km.js
+%%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/ko.js
 %%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/ku.js
+%%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/lt.js
 %%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/lv.js
 %%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/nb.js
 %%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/nl.js
 %%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/no.js
+%%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/pl.js
 %%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js
+%%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/pt.js
+%%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/ru.js
+%%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/si.js
 %%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/sk.js
+%%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/sl.js
+%%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/sq.js
 %%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/sv.js
+%%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/th.js
 %%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/tr.js
+%%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/tt.js
 %%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/ug.js
+%%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/uk.js
+%%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/vi.js
 %%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js
+%%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/lang/zh.js
 %%WWWDIR%%/plugins/ckeditor/plugins/specialchar/dialogs/specialchar.js
 %%WWWDIR%%/plugins/ckeditor/plugins/table/dialogs/table.js
 %%WWWDIR%%/plugins/ckeditor/plugins/tabletools/dialogs/tableCell.js
@@ -300,12 +634,76 @@
 %%WWWDIR%%/plugins/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
 %%WWWDIR%%/plugins/ckeditor/plugins/wsc/dialogs/wsc.css
 %%WWWDIR%%/plugins/ckeditor/plugins/wsc/dialogs/wsc.js
+%%WWWDIR%%/plugins/ckeditor/plugins/wsc/dialogs/wsc_ie.js
+%%WWWDIR%%/plugins/ckeditor/samples/css/samples.css
+%%WWWDIR%%/plugins/ckeditor/samples/img/github-top.png
+%%WWWDIR%%/plugins/ckeditor/samples/img/header-bg.png
+%%WWWDIR%%/plugins/ckeditor/samples/img/header-separator.png
+%%WWWDIR%%/plugins/ckeditor/samples/img/logo.png
+%%WWWDIR%%/plugins/ckeditor/samples/img/navigation-tip.png
+%%WWWDIR%%/plugins/ckeditor/samples/index.html
+%%WWWDIR%%/plugins/ckeditor/samples/js/sample.js
+%%WWWDIR%%/plugins/ckeditor/samples/js/sf.js
+%%WWWDIR%%/plugins/ckeditor/samples/old/ajax.html
+%%WWWDIR%%/plugins/ckeditor/samples/old/api.html
+%%WWWDIR%%/plugins/ckeditor/samples/old/appendto.html
+%%WWWDIR%%/plugins/ckeditor/samples/old/assets/inlineall/logo.png
+%%WWWDIR%%/plugins/ckeditor/samples/old/assets/outputxhtml/outputxhtml.css
+%%WWWDIR%%/plugins/ckeditor/samples/old/assets/posteddata.php
+%%WWWDIR%%/plugins/ckeditor/samples/old/assets/sample.jpg
+%%WWWDIR%%/plugins/ckeditor/samples/old/assets/uilanguages/languages.js
+%%WWWDIR%%/plugins/ckeditor/samples/old/datafiltering.html
+%%WWWDIR%%/plugins/ckeditor/samples/old/dialog/assets/my_dialog.js
+%%WWWDIR%%/plugins/ckeditor/samples/old/dialog/dialog.html
+%%WWWDIR%%/plugins/ckeditor/samples/old/divreplace.html
+%%WWWDIR%%/plugins/ckeditor/samples/old/enterkey/enterkey.html
+%%WWWDIR%%/plugins/ckeditor/samples/old/htmlwriter/assets/outputforflash/outputforflash.fla
+%%WWWDIR%%/plugins/ckeditor/samples/old/htmlwriter/assets/outputforflash/outputforflash.swf
+%%WWWDIR%%/plugins/ckeditor/samples/old/htmlwriter/assets/outputforflash/swfobject.js
+%%WWWDIR%%/plugins/ckeditor/samples/old/htmlwriter/outputforflash.html
+%%WWWDIR%%/plugins/ckeditor/samples/old/htmlwriter/outputhtml.html
+%%WWWDIR%%/plugins/ckeditor/samples/old/index.html
+%%WWWDIR%%/plugins/ckeditor/samples/old/inlineall.html
+%%WWWDIR%%/plugins/ckeditor/samples/old/inlinebycode.html
+%%WWWDIR%%/plugins/ckeditor/samples/old/inlinetextarea.html
+%%WWWDIR%%/plugins/ckeditor/samples/old/jquery.html
+%%WWWDIR%%/plugins/ckeditor/samples/old/magicline/magicline.html
+%%WWWDIR%%/plugins/ckeditor/samples/old/readonly.html
+%%WWWDIR%%/plugins/ckeditor/samples/old/replacebyclass.html
+%%WWWDIR%%/plugins/ckeditor/samples/old/replacebycode.html
+%%WWWDIR%%/plugins/ckeditor/samples/old/sample.css
+%%WWWDIR%%/plugins/ckeditor/samples/old/sample.js
+%%WWWDIR%%/plugins/ckeditor/samples/old/sample_posteddata.php
+%%WWWDIR%%/plugins/ckeditor/samples/old/tabindex.html
+%%WWWDIR%%/plugins/ckeditor/samples/old/toolbar/toolbar.html
+%%WWWDIR%%/plugins/ckeditor/samples/old/uicolor.html
+%%WWWDIR%%/plugins/ckeditor/samples/old/uilanguages.html
+%%WWWDIR%%/plugins/ckeditor/samples/old/wysiwygarea/fullpage.html
+%%WWWDIR%%/plugins/ckeditor/samples/old/xhtmlstyle.html
+%%WWWDIR%%/plugins/ckeditor/samples/toolbarconfigurator/css/fontello.css
+%%WWWDIR%%/plugins/ckeditor/samples/toolbarconfigurator/font/LICENSE.txt
+%%WWWDIR%%/plugins/ckeditor/samples/toolbarconfigurator/font/config.json
+%%WWWDIR%%/plugins/ckeditor/samples/toolbarconfigurator/font/fontello.eot
+%%WWWDIR%%/plugins/ckeditor/samples/toolbarconfigurator/font/fontello.svg
+%%WWWDIR%%/plugins/ckeditor/samples/toolbarconfigurator/font/fontello.ttf
+%%WWWDIR%%/plugins/ckeditor/samples/toolbarconfigurator/font/fontello.woff
+%%WWWDIR%%/plugins/ckeditor/samples/toolbarconfigurator/index.html
+%%WWWDIR%%/plugins/ckeditor/samples/toolbarconfigurator/js/abstracttoolbarmodifier.js
+%%WWWDIR%%/plugins/ckeditor/samples/toolbarconfigurator/js/fulltoolbareditor.js
+%%WWWDIR%%/plugins/ckeditor/samples/toolbarconfigurator/js/toolbarmodifier.js
+%%WWWDIR%%/plugins/ckeditor/samples/toolbarconfigurator/js/toolbartextmodifier.js
+%%WWWDIR%%/plugins/ckeditor/samples/toolbarconfigurator/lib/codemirror/LICENSE
+%%WWWDIR%%/plugins/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.css
+%%WWWDIR%%/plugins/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.js
+%%WWWDIR%%/plugins/ckeditor/samples/toolbarconfigurator/lib/codemirror/javascript.js
+%%WWWDIR%%/plugins/ckeditor/samples/toolbarconfigurator/lib/codemirror/neo.css
+%%WWWDIR%%/plugins/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.css
+%%WWWDIR%%/plugins/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.js
 %%WWWDIR%%/plugins/ckeditor/skins/moono/dialog.css
 %%WWWDIR%%/plugins/ckeditor/skins/moono/dialog_ie.css
 %%WWWDIR%%/plugins/ckeditor/skins/moono/dialog_ie7.css
 %%WWWDIR%%/plugins/ckeditor/skins/moono/dialog_ie8.css
 %%WWWDIR%%/plugins/ckeditor/skins/moono/dialog_iequirks.css
-%%WWWDIR%%/plugins/ckeditor/skins/moono/dialog_opera.css
 %%WWWDIR%%/plugins/ckeditor/skins/moono/editor.css
 %%WWWDIR%%/plugins/ckeditor/skins/moono/editor_gecko.css
 %%WWWDIR%%/plugins/ckeditor/skins/moono/editor_ie.css
@@ -313,9 +711,17 @@
 %%WWWDIR%%/plugins/ckeditor/skins/moono/editor_ie8.css
 %%WWWDIR%%/plugins/ckeditor/skins/moono/editor_iequirks.css
 %%WWWDIR%%/plugins/ckeditor/skins/moono/icons.png
+%%WWWDIR%%/plugins/ckeditor/skins/moono/icons_hidpi.png
 %%WWWDIR%%/plugins/ckeditor/skins/moono/images/arrow.png
 %%WWWDIR%%/plugins/ckeditor/skins/moono/images/close.png
-%%WWWDIR%%/plugins/ckeditor/skins/moono/images/mini.png
+%%WWWDIR%%/plugins/ckeditor/skins/moono/images/hidpi/close.png
+%%WWWDIR%%/plugins/ckeditor/skins/moono/images/hidpi/lock-open.png
+%%WWWDIR%%/plugins/ckeditor/skins/moono/images/hidpi/lock.png
+%%WWWDIR%%/plugins/ckeditor/skins/moono/images/hidpi/refresh.png
+%%WWWDIR%%/plugins/ckeditor/skins/moono/images/lock-open.png
+%%WWWDIR%%/plugins/ckeditor/skins/moono/images/lock.png
+%%WWWDIR%%/plugins/ckeditor/skins/moono/images/refresh.png
+%%WWWDIR%%/plugins/ckeditor/skins/moono/images/spinner.gif
 %%WWWDIR%%/plugins/ckeditor/skins/moono/readme.md
 %%WWWDIR%%/plugins/ckeditor/styles.js
 %%WWWDIR%%/plugins/jscalendar/ChangeLog
@@ -458,583 +864,118 @@
 %%WWWDIR%%/plugins/luminous/style/zenophilia.css
 %%WWWDIR%%/plugins/luminous/supported.php
 %%WWWDIR%%/plugins/luminous/versioncheck.php
+%%WWWDIR%%/plugins/phpseclib/Crypt/AES.php
+%%WWWDIR%%/plugins/phpseclib/Crypt/Base.php
+%%WWWDIR%%/plugins/phpseclib/Crypt/Blowfish.php
+%%WWWDIR%%/plugins/phpseclib/Crypt/DES.php
+%%WWWDIR%%/plugins/phpseclib/Crypt/Hash.php
+%%WWWDIR%%/plugins/phpseclib/Crypt/RC2.php
+%%WWWDIR%%/plugins/phpseclib/Crypt/RC4.php
+%%WWWDIR%%/plugins/phpseclib/Crypt/RSA.php
+%%WWWDIR%%/plugins/phpseclib/Crypt/Random.php
+%%WWWDIR%%/plugins/phpseclib/Crypt/Rijndael.php
+%%WWWDIR%%/plugins/phpseclib/Crypt/TripleDES.php
+%%WWWDIR%%/plugins/phpseclib/Crypt/Twofish.php
+%%WWWDIR%%/plugins/phpseclib/File/ANSI.php
+%%WWWDIR%%/plugins/phpseclib/File/ASN1.php
+%%WWWDIR%%/plugins/phpseclib/File/X509.php
+%%WWWDIR%%/plugins/phpseclib/Math/BigInteger.php
+%%WWWDIR%%/plugins/phpseclib/Net/SCP.php
+%%WWWDIR%%/plugins/phpseclib/Net/SFTP.php
+%%WWWDIR%%/plugins/phpseclib/Net/SFTP/Stream.php
+%%WWWDIR%%/plugins/phpseclib/Net/SSH1.php
+%%WWWDIR%%/plugins/phpseclib/Net/SSH2.php
+%%WWWDIR%%/plugins/phpseclib/System/SSH/Agent.php
+%%WWWDIR%%/plugins/phpseclib/System/SSH_Agent.php
+%%WWWDIR%%/plugins/phpseclib/bootstrap.php
+%%WWWDIR%%/plugins/phpseclib/openssl.cnf
 %%WWWDIR%%/plugins/plugins.inc.php
-%%WWWDIR%%/plugins/tinymce/langs/ar.js
-%%WWWDIR%%/plugins/tinymce/langs/cs.js
-%%WWWDIR%%/plugins/tinymce/langs/da.js
-%%WWWDIR%%/plugins/tinymce/langs/de.js
-%%WWWDIR%%/plugins/tinymce/langs/en.js
-%%WWWDIR%%/plugins/tinymce/langs/fi.js
-%%WWWDIR%%/plugins/tinymce/langs/fr.js
-%%WWWDIR%%/plugins/tinymce/langs/he.js
-%%WWWDIR%%/plugins/tinymce/langs/hu.js
-%%WWWDIR%%/plugins/tinymce/langs/it.js
-%%WWWDIR%%/plugins/tinymce/langs/ja.js
-%%WWWDIR%%/plugins/tinymce/langs/nl.js
-%%WWWDIR%%/plugins/tinymce/langs/pl.js
-%%WWWDIR%%/plugins/tinymce/langs/pt.js
-%%WWWDIR%%/plugins/tinymce/langs/ru.js
-%%WWWDIR%%/plugins/tinymce/langs/sv.js
-%%WWWDIR%%/plugins/tinymce/langs/tr.js
-%%WWWDIR%%/plugins/tinymce/langs/uk.js
-%%WWWDIR%%/plugins/tinymce/langs/vi.js
-%%WWWDIR%%/plugins/tinymce/langs/zh-cn.js
-%%WWWDIR%%/plugins/tinymce/langs/zh-tw.js
+%%WWWDIR%%/plugins/tinymce/jquery.tinymce.min.js
+%%WWWDIR%%/plugins/tinymce/langs/readme.md
 %%WWWDIR%%/plugins/tinymce/license.txt
-%%WWWDIR%%/plugins/tinymce/plugins/advhr/css/advhr.css
-%%WWWDIR%%/plugins/tinymce/plugins/advhr/editor_plugin.js
-%%WWWDIR%%/plugins/tinymce/plugins/advhr/editor_plugin_src.js
-%%WWWDIR%%/plugins/tinymce/plugins/advhr/js/rule.js
-%%WWWDIR%%/plugins/tinymce/plugins/advhr/langs/ar_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advhr/langs/cs_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advhr/langs/da_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advhr/langs/de_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advhr/langs/en_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advhr/langs/fi_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advhr/langs/fr_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advhr/langs/he_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advhr/langs/hu_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advhr/langs/it_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advhr/langs/ja_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advhr/langs/nl_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advhr/langs/pl_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advhr/langs/pt_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advhr/langs/ru_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advhr/langs/sv_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advhr/langs/tr_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advhr/langs/uk_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advhr/langs/vi_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advhr/langs/zh-cn_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advhr/langs/zh-tw_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advhr/rule.htm
-%%WWWDIR%%/plugins/tinymce/plugins/advimage/css/advimage.css
-%%WWWDIR%%/plugins/tinymce/plugins/advimage/editor_plugin.js
-%%WWWDIR%%/plugins/tinymce/plugins/advimage/editor_plugin_src.js
-%%WWWDIR%%/plugins/tinymce/plugins/advimage/image.htm
-%%WWWDIR%%/plugins/tinymce/plugins/advimage/img/sample.gif
-%%WWWDIR%%/plugins/tinymce/plugins/advimage/js/image.js
-%%WWWDIR%%/plugins/tinymce/plugins/advimage/langs/ar_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advimage/langs/cs_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advimage/langs/da_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advimage/langs/de_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advimage/langs/en_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advimage/langs/fi_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advimage/langs/fr_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advimage/langs/he_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advimage/langs/hu_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advimage/langs/it_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advimage/langs/ja_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advimage/langs/nl_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advimage/langs/pl_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advimage/langs/pt_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advimage/langs/ru_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advimage/langs/sv_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advimage/langs/tr_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advimage/langs/uk_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advimage/langs/vi_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advimage/langs/zh-cn_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advimage/langs/zh-tw_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advlink/css/advlink.css
-%%WWWDIR%%/plugins/tinymce/plugins/advlink/editor_plugin.js
-%%WWWDIR%%/plugins/tinymce/plugins/advlink/editor_plugin_src.js
-%%WWWDIR%%/plugins/tinymce/plugins/advlink/js/advlink.js
-%%WWWDIR%%/plugins/tinymce/plugins/advlink/langs/ar_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advlink/langs/cs_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advlink/langs/da_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advlink/langs/de_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advlink/langs/en_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advlink/langs/fi_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advlink/langs/fr_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advlink/langs/he_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advlink/langs/hu_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advlink/langs/it_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advlink/langs/ja_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advlink/langs/nl_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advlink/langs/pl_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advlink/langs/pt_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advlink/langs/ru_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advlink/langs/sv_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advlink/langs/tr_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advlink/langs/uk_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advlink/langs/vi_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advlink/langs/zh-cn_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advlink/langs/zh-tw_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/advlink/link.htm
-%%WWWDIR%%/plugins/tinymce/plugins/advlist/editor_plugin.js
-%%WWWDIR%%/plugins/tinymce/plugins/advlist/editor_plugin_src.js
-%%WWWDIR%%/plugins/tinymce/plugins/autolink/editor_plugin.js
-%%WWWDIR%%/plugins/tinymce/plugins/autolink/editor_plugin_src.js
-%%WWWDIR%%/plugins/tinymce/plugins/autoresize/editor_plugin.js
-%%WWWDIR%%/plugins/tinymce/plugins/autoresize/editor_plugin_src.js
-%%WWWDIR%%/plugins/tinymce/plugins/autosave/editor_plugin.js
-%%WWWDIR%%/plugins/tinymce/plugins/autosave/editor_plugin_src.js
-%%WWWDIR%%/plugins/tinymce/plugins/bbcode/editor_plugin.js
-%%WWWDIR%%/plugins/tinymce/plugins/bbcode/editor_plugin_src.js
-%%WWWDIR%%/plugins/tinymce/plugins/contextmenu/editor_plugin.js
-%%WWWDIR%%/plugins/tinymce/plugins/contextmenu/editor_plugin_src.js
-%%WWWDIR%%/plugins/tinymce/plugins/directionality/editor_plugin.js
-%%WWWDIR%%/plugins/tinymce/plugins/directionality/editor_plugin_src.js
-%%WWWDIR%%/plugins/tinymce/plugins/emotions/editor_plugin.js
-%%WWWDIR%%/plugins/tinymce/plugins/emotions/editor_plugin_src.js
-%%WWWDIR%%/plugins/tinymce/plugins/emotions/emotions.htm
-%%WWWDIR%%/plugins/tinymce/plugins/emotions/img/smiley-cool.gif
-%%WWWDIR%%/plugins/tinymce/plugins/emotions/img/smiley-cry.gif
-%%WWWDIR%%/plugins/tinymce/plugins/emotions/img/smiley-embarassed.gif
-%%WWWDIR%%/plugins/tinymce/plugins/emotions/img/smiley-foot-in-mouth.gif
-%%WWWDIR%%/plugins/tinymce/plugins/emotions/img/smiley-frown.gif
-%%WWWDIR%%/plugins/tinymce/plugins/emotions/img/smiley-innocent.gif
-%%WWWDIR%%/plugins/tinymce/plugins/emotions/img/smiley-kiss.gif
-%%WWWDIR%%/plugins/tinymce/plugins/emotions/img/smiley-laughing.gif
-%%WWWDIR%%/plugins/tinymce/plugins/emotions/img/smiley-money-mouth.gif
-%%WWWDIR%%/plugins/tinymce/plugins/emotions/img/smiley-sealed.gif
-%%WWWDIR%%/plugins/tinymce/plugins/emotions/img/smiley-smile.gif
-%%WWWDIR%%/plugins/tinymce/plugins/emotions/img/smiley-surprised.gif
-%%WWWDIR%%/plugins/tinymce/plugins/emotions/img/smiley-tongue-out.gif
-%%WWWDIR%%/plugins/tinymce/plugins/emotions/img/smiley-undecided.gif
-%%WWWDIR%%/plugins/tinymce/plugins/emotions/img/smiley-wink.gif
-%%WWWDIR%%/plugins/tinymce/plugins/emotions/img/smiley-yell.gif
-%%WWWDIR%%/plugins/tinymce/plugins/emotions/js/emotions.js
-%%WWWDIR%%/plugins/tinymce/plugins/emotions/langs/ar_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/emotions/langs/cs_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/emotions/langs/da_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/emotions/langs/de_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/emotions/langs/en_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/emotions/langs/fi_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/emotions/langs/fr_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/emotions/langs/he_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/emotions/langs/hu_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/emotions/langs/it_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/emotions/langs/ja_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/emotions/langs/nl_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/emotions/langs/pl_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/emotions/langs/pt_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/emotions/langs/ru_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/emotions/langs/sv_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/emotions/langs/tr_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/emotions/langs/uk_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/emotions/langs/vi_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/emotions/langs/zh-cn_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/emotions/langs/zh-tw_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/example/dialog.htm
-%%WWWDIR%%/plugins/tinymce/plugins/example/editor_plugin.js
-%%WWWDIR%%/plugins/tinymce/plugins/example/editor_plugin_src.js
-%%WWWDIR%%/plugins/tinymce/plugins/example/img/example.gif
-%%WWWDIR%%/plugins/tinymce/plugins/example/js/dialog.js
-%%WWWDIR%%/plugins/tinymce/plugins/example/langs/en.js
-%%WWWDIR%%/plugins/tinymce/plugins/example/langs/en_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/example_dependency/editor_plugin.js
-%%WWWDIR%%/plugins/tinymce/plugins/example_dependency/editor_plugin_src.js
-%%WWWDIR%%/plugins/tinymce/plugins/fullpage/css/fullpage.css
-%%WWWDIR%%/plugins/tinymce/plugins/fullpage/editor_plugin.js
-%%WWWDIR%%/plugins/tinymce/plugins/fullpage/editor_plugin_src.js
-%%WWWDIR%%/plugins/tinymce/plugins/fullpage/fullpage.htm
-%%WWWDIR%%/plugins/tinymce/plugins/fullpage/js/fullpage.js
-%%WWWDIR%%/plugins/tinymce/plugins/fullpage/langs/ar_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/fullpage/langs/cs_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/fullpage/langs/da_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/fullpage/langs/de_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/fullpage/langs/en_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/fullpage/langs/fi_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/fullpage/langs/fr_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/fullpage/langs/he_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/fullpage/langs/hu_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/fullpage/langs/it_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/fullpage/langs/ja_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/fullpage/langs/nl_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/fullpage/langs/pl_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/fullpage/langs/pt_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/fullpage/langs/ru_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/fullpage/langs/sv_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/fullpage/langs/tr_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/fullpage/langs/uk_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/fullpage/langs/vi_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/fullpage/langs/zh-cn_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/fullpage/langs/zh-tw_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/fullscreen/editor_plugin.js
-%%WWWDIR%%/plugins/tinymce/plugins/fullscreen/editor_plugin_src.js
-%%WWWDIR%%/plugins/tinymce/plugins/fullscreen/fullscreen.htm
-%%WWWDIR%%/plugins/tinymce/plugins/iespell/editor_plugin.js
-%%WWWDIR%%/plugins/tinymce/plugins/iespell/editor_plugin_src.js
-%%WWWDIR%%/plugins/tinymce/plugins/inlinepopups/editor_plugin.js
-%%WWWDIR%%/plugins/tinymce/plugins/inlinepopups/editor_plugin_src.js
-%%WWWDIR%%/plugins/tinymce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif
-%%WWWDIR%%/plugins/tinymce/plugins/inlinepopups/skins/clearlooks2/img/button.gif
-%%WWWDIR%%/plugins/tinymce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif
-%%WWWDIR%%/plugins/tinymce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif
-%%WWWDIR%%/plugins/tinymce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif
-%%WWWDIR%%/plugins/tinymce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif
-%%WWWDIR%%/plugins/tinymce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif
-%%WWWDIR%%/plugins/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css
-%%WWWDIR%%/plugins/tinymce/plugins/inlinepopups/template.htm
-%%WWWDIR%%/plugins/tinymce/plugins/insertdatetime/editor_plugin.js
-%%WWWDIR%%/plugins/tinymce/plugins/insertdatetime/editor_plugin_src.js
-%%WWWDIR%%/plugins/tinymce/plugins/layer/editor_plugin.js
-%%WWWDIR%%/plugins/tinymce/plugins/layer/editor_plugin_src.js
-%%WWWDIR%%/plugins/tinymce/plugins/legacyoutput/editor_plugin.js
-%%WWWDIR%%/plugins/tinymce/plugins/legacyoutput/editor_plugin_src.js
-%%WWWDIR%%/plugins/tinymce/plugins/lists/editor_plugin.js
-%%WWWDIR%%/plugins/tinymce/plugins/lists/editor_plugin_src.js
-%%WWWDIR%%/plugins/tinymce/plugins/media/css/media.css
-%%WWWDIR%%/plugins/tinymce/plugins/media/editor_plugin.js
-%%WWWDIR%%/plugins/tinymce/plugins/media/editor_plugin_src.js
-%%WWWDIR%%/plugins/tinymce/plugins/media/js/embed.js
-%%WWWDIR%%/plugins/tinymce/plugins/media/js/media.js
-%%WWWDIR%%/plugins/tinymce/plugins/media/langs/ar_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/media/langs/cs_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/media/langs/da_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/media/langs/de_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/media/langs/en_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/media/langs/fi_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/media/langs/fr_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/media/langs/he_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/media/langs/hu_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/media/langs/it_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/media/langs/ja_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/media/langs/nl_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/media/langs/pl_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/media/langs/pt_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/media/langs/ru_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/media/langs/sv_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/media/langs/tr_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/media/langs/uk_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/media/langs/vi_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/media/langs/zh-cn_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/media/langs/zh-tw_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/media/media.htm
+%%WWWDIR%%/plugins/tinymce/plugins/advlist/plugin.min.js
+%%WWWDIR%%/plugins/tinymce/plugins/anchor/plugin.min.js
+%%WWWDIR%%/plugins/tinymce/plugins/autolink/plugin.min.js
+%%WWWDIR%%/plugins/tinymce/plugins/autoresize/plugin.min.js
+%%WWWDIR%%/plugins/tinymce/plugins/autosave/plugin.min.js
+%%WWWDIR%%/plugins/tinymce/plugins/bbcode/plugin.min.js
+%%WWWDIR%%/plugins/tinymce/plugins/charmap/plugin.min.js
+%%WWWDIR%%/plugins/tinymce/plugins/code/plugin.min.js
+%%WWWDIR%%/plugins/tinymce/plugins/codesample/css/prism.css
+%%WWWDIR%%/plugins/tinymce/plugins/codesample/plugin.min.js
+%%WWWDIR%%/plugins/tinymce/plugins/colorpicker/plugin.min.js
+%%WWWDIR%%/plugins/tinymce/plugins/contextmenu/plugin.min.js
+%%WWWDIR%%/plugins/tinymce/plugins/directionality/plugin.min.js
+%%WWWDIR%%/plugins/tinymce/plugins/emoticons/img/smiley-cool.gif
+%%WWWDIR%%/plugins/tinymce/plugins/emoticons/img/smiley-cry.gif
+%%WWWDIR%%/plugins/tinymce/plugins/emoticons/img/smiley-embarassed.gif
+%%WWWDIR%%/plugins/tinymce/plugins/emoticons/img/smiley-foot-in-mouth.gif
+%%WWWDIR%%/plugins/tinymce/plugins/emoticons/img/smiley-frown.gif
+%%WWWDIR%%/plugins/tinymce/plugins/emoticons/img/smiley-innocent.gif
+%%WWWDIR%%/plugins/tinymce/plugins/emoticons/img/smiley-kiss.gif
+%%WWWDIR%%/plugins/tinymce/plugins/emoticons/img/smiley-laughing.gif
+%%WWWDIR%%/plugins/tinymce/plugins/emoticons/img/smiley-money-mouth.gif
+%%WWWDIR%%/plugins/tinymce/plugins/emoticons/img/smiley-sealed.gif
+%%WWWDIR%%/plugins/tinymce/plugins/emoticons/img/smiley-smile.gif
+%%WWWDIR%%/plugins/tinymce/plugins/emoticons/img/smiley-surprised.gif
+%%WWWDIR%%/plugins/tinymce/plugins/emoticons/img/smiley-tongue-out.gif
+%%WWWDIR%%/plugins/tinymce/plugins/emoticons/img/smiley-undecided.gif
+%%WWWDIR%%/plugins/tinymce/plugins/emoticons/img/smiley-wink.gif
+%%WWWDIR%%/plugins/tinymce/plugins/emoticons/img/smiley-yell.gif
+%%WWWDIR%%/plugins/tinymce/plugins/emoticons/plugin.min.js
+%%WWWDIR%%/plugins/tinymce/plugins/example/dialog.html
+%%WWWDIR%%/plugins/tinymce/plugins/example/plugin.min.js
+%%WWWDIR%%/plugins/tinymce/plugins/example_dependency/plugin.min.js
+%%WWWDIR%%/plugins/tinymce/plugins/fullpage/plugin.min.js
+%%WWWDIR%%/plugins/tinymce/plugins/fullscreen/plugin.min.js
+%%WWWDIR%%/plugins/tinymce/plugins/hr/plugin.min.js
+%%WWWDIR%%/plugins/tinymce/plugins/image/plugin.min.js
+%%WWWDIR%%/plugins/tinymce/plugins/imagetools/plugin.min.js
+%%WWWDIR%%/plugins/tinymce/plugins/importcss/plugin.min.js
+%%WWWDIR%%/plugins/tinymce/plugins/insertdatetime/plugin.min.js
+%%WWWDIR%%/plugins/tinymce/plugins/layer/plugin.min.js
+%%WWWDIR%%/plugins/tinymce/plugins/legacyoutput/plugin.min.js
+%%WWWDIR%%/plugins/tinymce/plugins/link/plugin.min.js
+%%WWWDIR%%/plugins/tinymce/plugins/lists/plugin.min.js
 %%WWWDIR%%/plugins/tinymce/plugins/media/moxieplayer.swf
-%%WWWDIR%%/plugins/tinymce/plugins/nonbreaking/editor_plugin.js
-%%WWWDIR%%/plugins/tinymce/plugins/nonbreaking/editor_plugin_src.js
-%%WWWDIR%%/plugins/tinymce/plugins/noneditable/editor_plugin.js
-%%WWWDIR%%/plugins/tinymce/plugins/noneditable/editor_plugin_src.js
-%%WWWDIR%%/plugins/tinymce/plugins/pagebreak/editor_plugin.js
-%%WWWDIR%%/plugins/tinymce/plugins/pagebreak/editor_plugin_src.js
-%%WWWDIR%%/plugins/tinymce/plugins/paste/editor_plugin.js
-%%WWWDIR%%/plugins/tinymce/plugins/paste/editor_plugin_src.js
-%%WWWDIR%%/plugins/tinymce/plugins/paste/js/pastetext.js
-%%WWWDIR%%/plugins/tinymce/plugins/paste/js/pasteword.js
-%%WWWDIR%%/plugins/tinymce/plugins/paste/langs/ar_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/paste/langs/cs_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/paste/langs/da_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/paste/langs/de_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/paste/langs/en_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/paste/langs/fi_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/paste/langs/fr_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/paste/langs/he_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/paste/langs/hu_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/paste/langs/it_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/paste/langs/ja_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/paste/langs/nl_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/paste/langs/pl_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/paste/langs/pt_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/paste/langs/ru_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/paste/langs/sv_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/paste/langs/tr_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/paste/langs/uk_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/paste/langs/vi_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/paste/langs/zh-cn_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/paste/langs/zh-tw_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/paste/pastetext.htm
-%%WWWDIR%%/plugins/tinymce/plugins/paste/pasteword.htm
-%%WWWDIR%%/plugins/tinymce/plugins/preview/editor_plugin.js
-%%WWWDIR%%/plugins/tinymce/plugins/preview/editor_plugin_src.js
-%%WWWDIR%%/plugins/tinymce/plugins/preview/example.html
-%%WWWDIR%%/plugins/tinymce/plugins/preview/jscripts/embed.js
-%%WWWDIR%%/plugins/tinymce/plugins/preview/preview.html
-%%WWWDIR%%/plugins/tinymce/plugins/print/editor_plugin.js
-%%WWWDIR%%/plugins/tinymce/plugins/print/editor_plugin_src.js
-%%WWWDIR%%/plugins/tinymce/plugins/save/editor_plugin.js
-%%WWWDIR%%/plugins/tinymce/plugins/save/editor_plugin_src.js
-%%WWWDIR%%/plugins/tinymce/plugins/searchreplace/css/searchreplace.css
-%%WWWDIR%%/plugins/tinymce/plugins/searchreplace/editor_plugin.js
-%%WWWDIR%%/plugins/tinymce/plugins/searchreplace/editor_plugin_src.js
-%%WWWDIR%%/plugins/tinymce/plugins/searchreplace/js/searchreplace.js
-%%WWWDIR%%/plugins/tinymce/plugins/searchreplace/langs/ar_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/searchreplace/langs/cs_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/searchreplace/langs/da_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/searchreplace/langs/de_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/searchreplace/langs/en_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/searchreplace/langs/fi_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/searchreplace/langs/fr_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/searchreplace/langs/he_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/searchreplace/langs/hu_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/searchreplace/langs/it_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/searchreplace/langs/ja_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/searchreplace/langs/nl_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/searchreplace/langs/pl_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/searchreplace/langs/pt_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/searchreplace/langs/ru_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/searchreplace/langs/sv_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/searchreplace/langs/tr_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/searchreplace/langs/uk_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/searchreplace/langs/vi_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/searchreplace/langs/zh-cn_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/searchreplace/langs/zh-tw_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/searchreplace/searchreplace.htm
-%%WWWDIR%%/plugins/tinymce/plugins/spellchecker/css/content.css
-%%WWWDIR%%/plugins/tinymce/plugins/spellchecker/editor_plugin.js
-%%WWWDIR%%/plugins/tinymce/plugins/spellchecker/editor_plugin_src.js
-%%WWWDIR%%/plugins/tinymce/plugins/spellchecker/img/wline.gif
-%%WWWDIR%%/plugins/tinymce/plugins/style/css/props.css
-%%WWWDIR%%/plugins/tinymce/plugins/style/editor_plugin.js
-%%WWWDIR%%/plugins/tinymce/plugins/style/editor_plugin_src.js
-%%WWWDIR%%/plugins/tinymce/plugins/style/js/props.js
-%%WWWDIR%%/plugins/tinymce/plugins/style/langs/ar_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/style/langs/cs_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/style/langs/da_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/style/langs/de_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/style/langs/en_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/style/langs/fi_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/style/langs/fr_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/style/langs/he_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/style/langs/hu_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/style/langs/it_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/style/langs/ja_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/style/langs/nl_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/style/langs/pl_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/style/langs/pt_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/style/langs/ru_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/style/langs/sv_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/style/langs/tr_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/style/langs/uk_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/style/langs/vi_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/style/langs/zh-cn_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/style/langs/zh-tw_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/style/props.htm
-%%WWWDIR%%/plugins/tinymce/plugins/style/readme.txt
-%%WWWDIR%%/plugins/tinymce/plugins/tabfocus/editor_plugin.js
-%%WWWDIR%%/plugins/tinymce/plugins/tabfocus/editor_plugin_src.js
-%%WWWDIR%%/plugins/tinymce/plugins/table/cell.htm
-%%WWWDIR%%/plugins/tinymce/plugins/table/css/cell.css
-%%WWWDIR%%/plugins/tinymce/plugins/table/css/row.css
-%%WWWDIR%%/plugins/tinymce/plugins/table/css/table.css
-%%WWWDIR%%/plugins/tinymce/plugins/table/editor_plugin.js
-%%WWWDIR%%/plugins/tinymce/plugins/table/editor_plugin_src.js
-%%WWWDIR%%/plugins/tinymce/plugins/table/js/cell.js
-%%WWWDIR%%/plugins/tinymce/plugins/table/js/merge_cells.js
-%%WWWDIR%%/plugins/tinymce/plugins/table/js/row.js
-%%WWWDIR%%/plugins/tinymce/plugins/table/js/table.js
-%%WWWDIR%%/plugins/tinymce/plugins/table/langs/ar_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/table/langs/cs_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/table/langs/da_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/table/langs/de_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/table/langs/en_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/table/langs/fi_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/table/langs/fr_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/table/langs/he_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/table/langs/hu_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/table/langs/it_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/table/langs/ja_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/table/langs/nl_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/table/langs/pl_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/table/langs/pt_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/table/langs/ru_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/table/langs/sv_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/table/langs/tr_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/table/langs/uk_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/table/langs/vi_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/table/langs/zh-cn_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/table/langs/zh-tw_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/table/merge_cells.htm
-%%WWWDIR%%/plugins/tinymce/plugins/table/row.htm
-%%WWWDIR%%/plugins/tinymce/plugins/table/table.htm
-%%WWWDIR%%/plugins/tinymce/plugins/template/blank.htm
-%%WWWDIR%%/plugins/tinymce/plugins/template/css/template.css
-%%WWWDIR%%/plugins/tinymce/plugins/template/editor_plugin.js
-%%WWWDIR%%/plugins/tinymce/plugins/template/editor_plugin_src.js
-%%WWWDIR%%/plugins/tinymce/plugins/template/js/template.js
-%%WWWDIR%%/plugins/tinymce/plugins/template/langs/ar_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/template/langs/cs_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/template/langs/da_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/template/langs/de_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/template/langs/en_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/template/langs/fi_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/template/langs/fr_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/template/langs/he_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/template/langs/hu_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/template/langs/it_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/template/langs/ja_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/template/langs/nl_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/template/langs/pl_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/template/langs/pt_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/template/langs/ru_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/template/langs/sv_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/template/langs/tr_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/template/langs/uk_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/template/langs/vi_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/template/langs/zh-cn_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/template/langs/zh-tw_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/template/template.htm
+%%WWWDIR%%/plugins/tinymce/plugins/media/plugin.min.js
+%%WWWDIR%%/plugins/tinymce/plugins/nonbreaking/plugin.min.js
+%%WWWDIR%%/plugins/tinymce/plugins/noneditable/plugin.min.js
+%%WWWDIR%%/plugins/tinymce/plugins/pagebreak/plugin.min.js
+%%WWWDIR%%/plugins/tinymce/plugins/paste/plugin.min.js
+%%WWWDIR%%/plugins/tinymce/plugins/preview/plugin.min.js
+%%WWWDIR%%/plugins/tinymce/plugins/print/plugin.min.js
+%%WWWDIR%%/plugins/tinymce/plugins/save/plugin.min.js
+%%WWWDIR%%/plugins/tinymce/plugins/searchreplace/plugin.min.js
+%%WWWDIR%%/plugins/tinymce/plugins/spellchecker/plugin.min.js
+%%WWWDIR%%/plugins/tinymce/plugins/tabfocus/plugin.min.js
+%%WWWDIR%%/plugins/tinymce/plugins/table/plugin.min.js
+%%WWWDIR%%/plugins/tinymce/plugins/template/plugin.min.js
+%%WWWDIR%%/plugins/tinymce/plugins/textcolor/plugin.min.js
+%%WWWDIR%%/plugins/tinymce/plugins/textpattern/plugin.min.js
 %%WWWDIR%%/plugins/tinymce/plugins/visualblocks/css/visualblocks.css
-%%WWWDIR%%/plugins/tinymce/plugins/visualblocks/editor_plugin.js
-%%WWWDIR%%/plugins/tinymce/plugins/visualblocks/editor_plugin_src.js
-%%WWWDIR%%/plugins/tinymce/plugins/visualchars/editor_plugin.js
-%%WWWDIR%%/plugins/tinymce/plugins/visualchars/editor_plugin_src.js
-%%WWWDIR%%/plugins/tinymce/plugins/wordcount/editor_plugin.js
-%%WWWDIR%%/plugins/tinymce/plugins/wordcount/editor_plugin_src.js
-%%WWWDIR%%/plugins/tinymce/plugins/xhtmlxtras/abbr.htm
-%%WWWDIR%%/plugins/tinymce/plugins/xhtmlxtras/acronym.htm
-%%WWWDIR%%/plugins/tinymce/plugins/xhtmlxtras/attributes.htm
-%%WWWDIR%%/plugins/tinymce/plugins/xhtmlxtras/cite.htm
-%%WWWDIR%%/plugins/tinymce/plugins/xhtmlxtras/css/attributes.css
-%%WWWDIR%%/plugins/tinymce/plugins/xhtmlxtras/css/popup.css
-%%WWWDIR%%/plugins/tinymce/plugins/xhtmlxtras/del.htm
-%%WWWDIR%%/plugins/tinymce/plugins/xhtmlxtras/editor_plugin.js
-%%WWWDIR%%/plugins/tinymce/plugins/xhtmlxtras/editor_plugin_src.js
-%%WWWDIR%%/plugins/tinymce/plugins/xhtmlxtras/ins.htm
-%%WWWDIR%%/plugins/tinymce/plugins/xhtmlxtras/js/abbr.js
-%%WWWDIR%%/plugins/tinymce/plugins/xhtmlxtras/js/acronym.js
-%%WWWDIR%%/plugins/tinymce/plugins/xhtmlxtras/js/attributes.js
-%%WWWDIR%%/plugins/tinymce/plugins/xhtmlxtras/js/cite.js
-%%WWWDIR%%/plugins/tinymce/plugins/xhtmlxtras/js/del.js
-%%WWWDIR%%/plugins/tinymce/plugins/xhtmlxtras/js/element_common.js
-%%WWWDIR%%/plugins/tinymce/plugins/xhtmlxtras/js/ins.js
-%%WWWDIR%%/plugins/tinymce/plugins/xhtmlxtras/langs/ar_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/xhtmlxtras/langs/cs_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/xhtmlxtras/langs/da_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/xhtmlxtras/langs/de_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/xhtmlxtras/langs/en_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/xhtmlxtras/langs/fi_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/xhtmlxtras/langs/fr_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/xhtmlxtras/langs/he_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/xhtmlxtras/langs/hu_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/xhtmlxtras/langs/it_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/xhtmlxtras/langs/ja_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/xhtmlxtras/langs/nl_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/xhtmlxtras/langs/pl_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/xhtmlxtras/langs/pt_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/xhtmlxtras/langs/ru_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/xhtmlxtras/langs/sv_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/xhtmlxtras/langs/tr_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/xhtmlxtras/langs/uk_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/xhtmlxtras/langs/vi_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/xhtmlxtras/langs/zh-cn_dlg.js
-%%WWWDIR%%/plugins/tinymce/plugins/xhtmlxtras/langs/zh-tw_dlg.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/about.htm
-%%WWWDIR%%/plugins/tinymce/themes/advanced/anchor.htm
-%%WWWDIR%%/plugins/tinymce/themes/advanced/charmap.htm
-%%WWWDIR%%/plugins/tinymce/themes/advanced/color_picker.htm
-%%WWWDIR%%/plugins/tinymce/themes/advanced/editor_template.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/editor_template_src.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/image.htm
-%%WWWDIR%%/plugins/tinymce/themes/advanced/img/colorpicker.jpg
-%%WWWDIR%%/plugins/tinymce/themes/advanced/img/flash.gif
-%%WWWDIR%%/plugins/tinymce/themes/advanced/img/icons.gif
-%%WWWDIR%%/plugins/tinymce/themes/advanced/img/iframe.gif
-%%WWWDIR%%/plugins/tinymce/themes/advanced/img/pagebreak.gif
-%%WWWDIR%%/plugins/tinymce/themes/advanced/img/quicktime.gif
-%%WWWDIR%%/plugins/tinymce/themes/advanced/img/realmedia.gif
-%%WWWDIR%%/plugins/tinymce/themes/advanced/img/shockwave.gif
-%%WWWDIR%%/plugins/tinymce/themes/advanced/img/trans.gif
-%%WWWDIR%%/plugins/tinymce/themes/advanced/img/video.gif
-%%WWWDIR%%/plugins/tinymce/themes/advanced/img/windowsmedia.gif
-%%WWWDIR%%/plugins/tinymce/themes/advanced/js/about.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/js/anchor.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/js/charmap.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/js/color_picker.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/js/image.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/js/link.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/js/source_editor.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/langs/ar.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/langs/ar_dlg.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/langs/cs.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/langs/cs_dlg.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/langs/da.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/langs/da_dlg.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/langs/de.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/langs/de_dlg.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/langs/en.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/langs/en_dlg.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/langs/fi.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/langs/fi_dlg.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/langs/fr.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/langs/fr_dlg.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/langs/he.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/langs/he_dlg.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/langs/hu.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/langs/hu_dlg.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/langs/it.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/langs/it_dlg.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/langs/ja.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/langs/ja_dlg.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/langs/nl.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/langs/nl_dlg.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/langs/pl.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/langs/pl_dlg.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/langs/pt.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/langs/pt_dlg.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/langs/ru.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/langs/ru_dlg.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/langs/sv.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/langs/sv_dlg.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/langs/tr.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/langs/tr_dlg.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/langs/uk.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/langs/uk_dlg.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/langs/vi.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/langs/vi_dlg.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/langs/zh-cn.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/langs/zh-cn_dlg.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/langs/zh-tw.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/langs/zh-tw_dlg.js
-%%WWWDIR%%/plugins/tinymce/themes/advanced/link.htm
-%%WWWDIR%%/plugins/tinymce/themes/advanced/shortcuts.htm
-%%WWWDIR%%/plugins/tinymce/themes/advanced/skins/default/content.css
-%%WWWDIR%%/plugins/tinymce/themes/advanced/skins/default/dialog.css
-%%WWWDIR%%/plugins/tinymce/themes/advanced/skins/default/img/buttons.png
-%%WWWDIR%%/plugins/tinymce/themes/advanced/skins/default/img/items.gif
-%%WWWDIR%%/plugins/tinymce/themes/advanced/skins/default/img/menu_arrow.gif
-%%WWWDIR%%/plugins/tinymce/themes/advanced/skins/default/img/menu_check.gif
-%%WWWDIR%%/plugins/tinymce/themes/advanced/skins/default/img/progress.gif
-%%WWWDIR%%/plugins/tinymce/themes/advanced/skins/default/img/tabs.gif
-%%WWWDIR%%/plugins/tinymce/themes/advanced/skins/default/ui.css
-%%WWWDIR%%/plugins/tinymce/themes/advanced/skins/highcontrast/content.css
-%%WWWDIR%%/plugins/tinymce/themes/advanced/skins/highcontrast/dialog.css
-%%WWWDIR%%/plugins/tinymce/themes/advanced/skins/highcontrast/ui.css
-%%WWWDIR%%/plugins/tinymce/themes/advanced/skins/o2k7/content.css
-%%WWWDIR%%/plugins/tinymce/themes/advanced/skins/o2k7/dialog.css
-%%WWWDIR%%/plugins/tinymce/themes/advanced/skins/o2k7/img/button_bg.png
-%%WWWDIR%%/plugins/tinymce/themes/advanced/skins/o2k7/img/button_bg_black.png
-%%WWWDIR%%/plugins/tinymce/themes/advanced/skins/o2k7/img/button_bg_silver.png
-%%WWWDIR%%/plugins/tinymce/themes/advanced/skins/o2k7/ui.css
-%%WWWDIR%%/plugins/tinymce/themes/advanced/skins/o2k7/ui_black.css
-%%WWWDIR%%/plugins/tinymce/themes/advanced/skins/o2k7/ui_silver.css
-%%WWWDIR%%/plugins/tinymce/themes/advanced/source_editor.htm
-%%WWWDIR%%/plugins/tinymce/themes/simple/editor_template.js
-%%WWWDIR%%/plugins/tinymce/themes/simple/editor_template_src.js
-%%WWWDIR%%/plugins/tinymce/themes/simple/img/icons.gif
-%%WWWDIR%%/plugins/tinymce/themes/simple/langs/ar.js
-%%WWWDIR%%/plugins/tinymce/themes/simple/langs/cs.js
-%%WWWDIR%%/plugins/tinymce/themes/simple/langs/da.js
-%%WWWDIR%%/plugins/tinymce/themes/simple/langs/de.js
-%%WWWDIR%%/plugins/tinymce/themes/simple/langs/en.js
-%%WWWDIR%%/plugins/tinymce/themes/simple/langs/fi.js
-%%WWWDIR%%/plugins/tinymce/themes/simple/langs/fr.js
-%%WWWDIR%%/plugins/tinymce/themes/simple/langs/he.js
-%%WWWDIR%%/plugins/tinymce/themes/simple/langs/hu.js
-%%WWWDIR%%/plugins/tinymce/themes/simple/langs/it.js
-%%WWWDIR%%/plugins/tinymce/themes/simple/langs/ja.js
-%%WWWDIR%%/plugins/tinymce/themes/simple/langs/nl.js
-%%WWWDIR%%/plugins/tinymce/themes/simple/langs/pl.js
-%%WWWDIR%%/plugins/tinymce/themes/simple/langs/pt.js
-%%WWWDIR%%/plugins/tinymce/themes/simple/langs/ru.js
-%%WWWDIR%%/plugins/tinymce/themes/simple/langs/sv.js
-%%WWWDIR%%/plugins/tinymce/themes/simple/langs/tr.js
-%%WWWDIR%%/plugins/tinymce/themes/simple/langs/uk.js
-%%WWWDIR%%/plugins/tinymce/themes/simple/langs/vi.js
-%%WWWDIR%%/plugins/tinymce/themes/simple/langs/zh-cn.js
-%%WWWDIR%%/plugins/tinymce/themes/simple/langs/zh-tw.js
-%%WWWDIR%%/plugins/tinymce/themes/simple/skins/default/content.css
-%%WWWDIR%%/plugins/tinymce/themes/simple/skins/default/ui.css
-%%WWWDIR%%/plugins/tinymce/themes/simple/skins/o2k7/content.css
-%%WWWDIR%%/plugins/tinymce/themes/simple/skins/o2k7/img/button_bg.png
-%%WWWDIR%%/plugins/tinymce/themes/simple/skins/o2k7/ui.css
-%%WWWDIR%%/plugins/tinymce/tiny_mce.js
-%%WWWDIR%%/plugins/tinymce/tiny_mce_popup.js
-%%WWWDIR%%/plugins/tinymce/tiny_mce_src.js
-%%WWWDIR%%/plugins/tinymce/utils/editable_selects.js
-%%WWWDIR%%/plugins/tinymce/utils/form_utils.js
-%%WWWDIR%%/plugins/tinymce/utils/mctabs.js
-%%WWWDIR%%/plugins/tinymce/utils/validate.js
+%%WWWDIR%%/plugins/tinymce/plugins/visualblocks/plugin.min.js
+%%WWWDIR%%/plugins/tinymce/plugins/visualchars/plugin.min.js
+%%WWWDIR%%/plugins/tinymce/plugins/wordcount/plugin.min.js
+%%WWWDIR%%/plugins/tinymce/skins/lightgray/content.inline.min.css
+%%WWWDIR%%/plugins/tinymce/skins/lightgray/content.min.css
+%%WWWDIR%%/plugins/tinymce/skins/lightgray/fonts/tinymce-small.eot
+%%WWWDIR%%/plugins/tinymce/skins/lightgray/fonts/tinymce-small.svg
+%%WWWDIR%%/plugins/tinymce/skins/lightgray/fonts/tinymce-small.ttf
+%%WWWDIR%%/plugins/tinymce/skins/lightgray/fonts/tinymce-small.woff
+%%WWWDIR%%/plugins/tinymce/skins/lightgray/fonts/tinymce.eot
+%%WWWDIR%%/plugins/tinymce/skins/lightgray/fonts/tinymce.svg
+%%WWWDIR%%/plugins/tinymce/skins/lightgray/fonts/tinymce.ttf
+%%WWWDIR%%/plugins/tinymce/skins/lightgray/fonts/tinymce.woff
+%%WWWDIR%%/plugins/tinymce/skins/lightgray/img/anchor.gif
+%%WWWDIR%%/plugins/tinymce/skins/lightgray/img/loader.gif
+%%WWWDIR%%/plugins/tinymce/skins/lightgray/img/object.gif
+%%WWWDIR%%/plugins/tinymce/skins/lightgray/img/trans.gif
+%%WWWDIR%%/plugins/tinymce/skins/lightgray/skin.ie7.min.css
+%%WWWDIR%%/plugins/tinymce/skins/lightgray/skin.min.css
+%%WWWDIR%%/plugins/tinymce/themes/inlite/theme.min.js
+%%WWWDIR%%/plugins/tinymce/themes/modern/theme.min.js
+%%WWWDIR%%/plugins/tinymce/tinymce.min.js
 %%WWWDIR%%/robots.txt
 %%WWWDIR%%/skins/iphone/advanced1.template.php
 %%WWWDIR%%/skins/iphone/advanced_ftpserver1.template.php
@@ -1418,6 +1359,7 @@
 %%WWWDIR%%/skins/shinra/raw1.template.php
 %%WWWDIR%%/skins/shinra/rename1.template.php
 %%WWWDIR%%/skins/shinra/rename2.template.php
+%%WWWDIR%%/skins/shinra/serverfingerprint.template.php
 %%WWWDIR%%/skins/shinra/skins/glossy/balloon.png
 %%WWWDIR%%/skins/shinra/skins/glossy/gloss.png
 %%WWWDIR%%/skins/shinra/skins/glossy/glossy-bottom.png
@@ -1439,6 +1381,4 @@
 %%WWWDIR%%/temp/chmod_this_dir_to_777.txt
 %%WWWDIR%%/temp/index.php
 %%WWWDIR%%/version.js
-@dir %%WWWDIR%%/plugins/tinymce/plugins/spellchecker/classes/utils
-@dir %%WWWDIR%%/plugins/tinymce/plugins/spellchecker/includes
 @dir %%WWWDIR%%/plugins/versioncheck
diff --git a/games/0ad/Makefile b/games/0ad/Makefile
index 1652f4c7f34c..fad694b52b68 100644
--- a/games/0ad/Makefile
+++ b/games/0ad/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	0ad
 PORTVERSION=	0.0.22
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://releases.wildfiregames.com/ \
 		SF/zero-ad/releases
diff --git a/games/0ad/files/patch-source_lobby_XmppClient.cpp b/games/0ad/files/patch-source_lobby_XmppClient.cpp
index a3d74e0b0573..d795d910536b 100644
--- a/games/0ad/files/patch-source_lobby_XmppClient.cpp
+++ b/games/0ad/files/patch-source_lobby_XmppClient.cpp
@@ -1,11 +1,30 @@
---- source/lobby/XmppClient.cpp.orig	2017-07-28 19:57:26 UTC
+--- source/lobby/XmppClient.cpp.orig	2017-06-18 18:48:18 UTC
 +++ source/lobby/XmppClient.cpp
-@@ -955,7 +955,7 @@ std::time_t XmppClient::ComputeTimestamp(const glooxwr
- 	if (!strptime(timestampStr.c_str(), "%Y-%m-%dT%H:%M:%SZ", &timestamp))
- 		LOGERROR("Received delayed message with corrupted timestamp %s", timestampStr.to_string());
+@@ -25,10 +25,6 @@
  
+ #include "i18n/L10n.h"
+ 
+-#if OS_WIN
+-#include "lib/sysdep/os/win/wposix/wtime.h"
+-#endif
+-
+ #include "lib/external_libraries/enet.h"
+ #include "lib/utf8.h"
+ #include "network/NetServer.h"
+@@ -948,14 +944,8 @@ std::time_t XmppClient::ComputeTimestamp(const glooxwr
+ 	if (!msg.when())
+ 		return std::time(nullptr);
+ 
+-	glooxwrapper::string timestampStr = msg.when()->stamp();
+-	struct tm timestamp = {0};
+-
+-	// See http://xmpp.org/extensions/xep-0082.html#sect-idp285136 for format
+-	if (!strptime(timestampStr.c_str(), "%Y-%m-%dT%H:%M:%SZ", &timestamp))
+-		LOGERROR("Received delayed message with corrupted timestamp %s", timestampStr.to_string());
+-
 -	return std::mktime(&timestamp) - timezone;
-+	return std::mktime(&timestamp);
++	// See XEP-0082 for the date format
++	return g_L10n.ParseDateTime(msg.when()->stamp().to_string(), "Y-M-d'T'H:m:sZ", Locale::getUS()) / 1000.0;
  }
  
  /**
diff --git a/games/3omns/Makefile b/games/3omns/Makefile
index d6b4e6216e31..cca594cf5d68 100644
--- a/games/3omns/Makefile
+++ b/games/3omns/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	3omns
 PORTVERSION=	0.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	SF/nemysisfreebsdp/${CATEGORIES}/:icons
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
diff --git a/games/7kaa/Makefile b/games/7kaa/Makefile
index 55d6c1e27371..f1a8139f7bf8 100644
--- a/games/7kaa/Makefile
+++ b/games/7kaa/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	7kaa
 PORTVERSION=	2.14.7
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF/skfans/7KAA%20${PORTVERSION}
 
diff --git a/games/Makefile b/games/Makefile
index 5eee07660ab7..3525df391171 100644
--- a/games/Makefile
+++ b/games/Makefile
@@ -410,6 +410,7 @@
     SUBDIR += gturing
     SUBDIR += gtypist
     SUBDIR += gunfudeadlands
+    SUBDIR += gzdoom
     SUBDIR += hangman
     SUBDIR += hedgewars
     SUBDIR += help_hannahs_horse
@@ -672,6 +673,7 @@
     SUBDIR += numptyphysics
     SUBDIR += numptyphysics-npcomplete
     SUBDIR += nwndata
+    SUBDIR += nxengine
     SUBDIR += odamex
     SUBDIR += oldrunner
     SUBDIR += omega
@@ -888,6 +890,7 @@
     SUBDIR += sdl_jewels
     SUBDIR += sdl_lopan
     SUBDIR += sdl_scavenger
+    SUBDIR += sdlpop
     SUBDIR += sdlroids
     SUBDIR += sdlsand
     SUBDIR += sea-defender
diff --git a/games/adonthell/Makefile b/games/adonthell/Makefile
index 3d61acae147f..c3268023bd04 100644
--- a/games/adonthell/Makefile
+++ b/games/adonthell/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	adonthell
 PORTVERSION=	0.3.5
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	games
 MASTER_SITES=	SAVANNAH
 DISTFILES=	${PORTNAME}-src-${PORTVERSION}${EXTRACT_SUFX} \
diff --git a/games/alienarena/Makefile b/games/alienarena/Makefile
index c5855d702b83..959181beac49 100644
--- a/games/alienarena/Makefile
+++ b/games/alienarena/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	alienarena
 PORTVERSION=	2013.766
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games
 MASTER_SITES=	SF/alienarena.mirror/Alien%20Arena%207.66/ \
 		http://icculus.org/alienarena/Files/ \
diff --git a/games/asc/Makefile b/games/asc/Makefile
index 22f57a5f1abf..6b6bacb599fe 100644
--- a/games/asc/Makefile
+++ b/games/asc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	asc
 PORTVERSION=	2.6.1.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}-hq/ASC%20Source/${PORTVERSION:R} \
 		http://www.asc-hq.org/music/:music
diff --git a/games/assaultcube/pkg-descr b/games/assaultcube/pkg-descr
index 9c46536c1dc0..1f8f54fb1a92 100644
--- a/games/assaultcube/pkg-descr
+++ b/games/assaultcube/pkg-descr
@@ -3,4 +3,4 @@ game Cube. Set in a realistic looking environment, as far as that's possible
 with this engine, while gameplay stays fast and arcade. This game is all about
 team oriented multiplayer fun.
 
-WWW: http://assault.cubers.net/
+WWW: https://assault.cubers.net/
diff --git a/games/blinkensisters/Makefile b/games/blinkensisters/Makefile
index c93ba6c8c3e0..dca5a46f891f 100644
--- a/games/blinkensisters/Makefile
+++ b/games/blinkensisters/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	blinkensisters
 PORTVERSION=	0.5.3
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/Blinkensisters%20-%20Lost%20Pixels/LostPixels%20${PORTVERSION}
 
diff --git a/games/braincurses/Makefile b/games/braincurses/Makefile
index efaadb4da19a..705a5f052712 100644
--- a/games/braincurses/Makefile
+++ b/games/braincurses/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	braincurses
 PORTVERSION=	1.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	games
 
diff --git a/games/bzflag/Makefile b/games/bzflag/Makefile
index 96fc46e40dfd..ec2a21bfdfe6 100644
--- a/games/bzflag/Makefile
+++ b/games/bzflag/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	bzflag
 PORTVERSION=	2.4.10
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	https://download.bzflag.org/bzflag/source/${PORTVERSION}/
 
diff --git a/games/cataclysm-dda/Makefile b/games/cataclysm-dda/Makefile
index c5d452eeb92d..aee413a733a3 100644
--- a/games/cataclysm-dda/Makefile
+++ b/games/cataclysm-dda/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cataclysm-dda
 PORTVERSION=	0.C
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	games
 
diff --git a/games/cockatrice/Makefile b/games/cockatrice/Makefile
index d281fe6e2690..43f31bc60fee 100644
--- a/games/cockatrice/Makefile
+++ b/games/cockatrice/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Cockatrice
 PORTVERSION=	0.0.g2017.05.05
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 
 MAINTAINER=	sbruno@FreeBSD.org
diff --git a/games/connectagram/Makefile b/games/connectagram/Makefile
index d2c467940727..0fc04a75eaa7 100644
--- a/games/connectagram/Makefile
+++ b/games/connectagram/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	connectagram
 PORTVERSION=	1.2.5
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-src
 CATEGORIES=	games
 MASTER_SITES=	http://gottcode.org/connectagram/
diff --git a/games/corsix-th/Makefile b/games/corsix-th/Makefile
index 8dc69e9fcaf6..4cba495afa7c 100644
--- a/games/corsix-th/Makefile
+++ b/games/corsix-th/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	corsixth
 PORTVERSION=	0.60
 DISTVERSIONPREFIX=	v
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 
 MAINTAINER=	madpilot@FreeBSD.org
diff --git a/games/craft/Makefile b/games/craft/Makefile
index cacfba65ed36..3f21673dba8c 100644
--- a/games/craft/Makefile
+++ b/games/craft/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	craft
 PORTVERSION=	1.0
 DISTVERSIONPREFIX=	v
 DISTVERSIONSUFFIX=	fbsd
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 
 MAINTAINER=	danilo@FreeBSD.org
diff --git a/games/criticalmass/Makefile b/games/criticalmass/Makefile
index 5b0be2a073b3..59b4162d0e61 100644
--- a/games/criticalmass/Makefile
+++ b/games/criticalmass/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	criticalmass
 PORTVERSION=	1.0.2
-PORTREVISION=	6
+PORTREVISION=	7
 PORTEPOCH=	1
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/Critical%20Mass/${PORTVERSION}
diff --git a/games/critterding/Makefile b/games/critterding/Makefile
index b4800b4bc647..936bdc5a6631 100644
--- a/games/critterding/Makefile
+++ b/games/critterding/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	critterding
 DISTVERSION=	beta12
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/sources
 
diff --git a/games/dodgindiamond2/Makefile b/games/dodgindiamond2/Makefile
index 1d2d13d44706..f5e6ed4f271c 100644
--- a/games/dodgindiamond2/Makefile
+++ b/games/dodgindiamond2/Makefile
@@ -11,25 +11,28 @@ DISTNAME=	dd2-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Old school shoot'em up game
 
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 USE_SDL=	sdl image mixer
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var/games
 
-OPTIONS_DEFINE=	DOCS
+DATADIR=	${PREFIX}/share/dd2
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|COPYING||g' ${WRKSRC}/Makefile.in
-.if empty(PORT_OPTIONS:MDOCS)
+
+post-patch-DOCS-off:
 	@${REINPLACE_CMD} '/install-data-am:/s/install-docsDATA//' \
 		${WRKSRC}/Makefile.in
-.endif
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc
 	${INSTALL_DATA} ${WRKSRC}/src/data/dd2.cfg ${STAGEDIR}${PREFIX}/etc/dd2.cfg.sample
-	${MKDIR} ${STAGEDIR}/var/games
+	@${MKDIR} ${STAGEDIR}/var/games
 	${TOUCH} ${STAGEDIR}/var/games/dd2-hiscore.sample
 
 .include <bsd.port.mk>
diff --git a/games/dodgindiamond2/files/patch-src__Makefile.in b/games/dodgindiamond2/files/patch-src__Makefile.in
index f0b924eeede9..15ef7529fcf1 100644
--- a/games/dodgindiamond2/files/patch-src__Makefile.in
+++ b/games/dodgindiamond2/files/patch-src__Makefile.in
@@ -1,6 +1,6 @@
---- src/Makefile.in.orig	Thu Jul 15 15:23:01 2004
-+++ src/Makefile.in	Thu Jul 15 15:23:41 2004
-@@ -73,7 +73,7 @@
+--- src/Makefile.in.orig	2007-08-16 17:11:33 UTC
++++ src/Makefile.in
+@@ -73,7 +73,7 @@ bin_PROGRAMS = dd2
  dd2_SOURCES = menu.c SDL_plus.c cfg.c engine.c control.c engine.h control.h cfg.h SDL_plus.h menu.h main.c main.h
  EXTRA_DIST = menu.c SDL_plus.c cfg.c engine.c control.c engine.h control.h cfg.h SDL_plus.h menu.h main.c main.h
  
diff --git a/games/dodgindiamond2/files/patch-src__data__Makefile.in b/games/dodgindiamond2/files/patch-src__data__Makefile.in
index 54a315bc23ec..6fa531b2ad19 100644
--- a/games/dodgindiamond2/files/patch-src__data__Makefile.in
+++ b/games/dodgindiamond2/files/patch-src__data__Makefile.in
@@ -1,6 +1,6 @@
---- src/data/Makefile.in.orig	Fri Jul  2 17:43:12 2004
-+++ src/data/Makefile.in	Thu Jul 15 15:28:35 2004
-@@ -65,7 +65,7 @@
+--- src/data/Makefile.in.orig	2007-08-16 17:11:33 UTC
++++ src/data/Makefile.in
+@@ -65,7 +65,7 @@ SDL_CONFIG = @SDL_CONFIG@
  SDL_LIBS = @SDL_LIBS@
  VERSION = @VERSION@
  
@@ -9,7 +9,7 @@
  
  EXTRA_DIST = bgm1.xm bgm2.xm efx1.wav efx2.wav efx3.wav efx4.wav efx5.wav efx6.wav efx7.wav efx8.wav gfx.bmp dd2.cfg game.act dd2-hiscore
  
-@@ -192,7 +192,6 @@
+@@ -197,7 +197,6 @@ maintainer-clean-generic clean mostlycle
  
  
  install-data-hook:
diff --git a/games/dodgindiamond2/files/patch-src__main.c b/games/dodgindiamond2/files/patch-src__main.c
index ad1f4590b3a8..3c41f58577bd 100644
--- a/games/dodgindiamond2/files/patch-src__main.c
+++ b/games/dodgindiamond2/files/patch-src__main.c
@@ -1,6 +1,6 @@
---- src/main.c.orig	Thu Jul 15 15:04:36 2004
-+++ src/main.c	Thu Jul 15 15:17:57 2004
-@@ -284,7 +284,7 @@
+--- src/main.c.orig	2007-08-14 18:59:42 UTC
++++ src/main.c
+@@ -285,7 +285,7 @@ main (int argc, char *argv[])
  	sprintf(buffer,"%.500s/.dd2rc",getenv("HOME"));
  	if(!loadCFG(buffer,&conf)) {
  		/* if there's no local, use global */
@@ -9,7 +9,7 @@
  		if(!loadCFG(buffer,&conf))
  			fprintf(stderr,"unable to read configuration, using defaults\n");
  	}
-@@ -295,7 +295,7 @@
+@@ -296,7 +296,7 @@ main (int argc, char *argv[])
  #endif
  
  	/* read hi-scores */
@@ -18,7 +18,7 @@
  	if(!loadScore(buffer,hiscore))
  		fprintf(stderr,"unable to read hi-scores, using defaults\n");
  
-@@ -462,7 +462,7 @@
+@@ -463,7 +463,7 @@ main (int argc, char *argv[])
  	saveCFG(buffer,&conf);
  
  	/* save hi-scores */
diff --git a/games/dodgindiamond2/pkg-descr b/games/dodgindiamond2/pkg-descr
index dc4223f1b02e..d4e83eef6273 100644
--- a/games/dodgindiamond2/pkg-descr
+++ b/games/dodgindiamond2/pkg-descr
@@ -3,4 +3,4 @@ aims to be an 'old school' arcade game with low resolution graphics,
 top-down scroll action, energy based gameplay and different weapons
 with several levels of power.
 
-WWW: http://www.usebox.net/jjm/dd2/
+WWW: https://www.usebox.net/jjm/dd2/
diff --git a/games/dodgindiamond2/pkg-plist b/games/dodgindiamond2/pkg-plist
index 07045419a9bf..45e8ce48d808 100644
--- a/games/dodgindiamond2/pkg-plist
+++ b/games/dodgindiamond2/pkg-plist
@@ -1,18 +1,18 @@
 @(,games,2755) bin/dd2
 @sample(,games,664) /var/games/dd2-hiscore.sample
 @sample etc/dd2.cfg.sample
-share/dd2/bgm1.xm
-share/dd2/bgm2.xm
-share/dd2/efx1.wav
-share/dd2/efx2.wav
-share/dd2/efx3.wav
-share/dd2/efx4.wav
-share/dd2/efx5.wav
-share/dd2/efx6.wav
-share/dd2/efx7.wav
-share/dd2/efx8.wav
-share/dd2/game.act
-share/dd2/gfx.bmp
+%%DATADIR%%/bgm1.xm
+%%DATADIR%%/bgm2.xm
+%%DATADIR%%/efx1.wav
+%%DATADIR%%/efx2.wav
+%%DATADIR%%/efx3.wav
+%%DATADIR%%/efx4.wav
+%%DATADIR%%/efx5.wav
+%%DATADIR%%/efx6.wav
+%%DATADIR%%/efx7.wav
+%%DATADIR%%/efx8.wav
+%%DATADIR%%/game.act
+%%DATADIR%%/gfx.bmp
 %%PORTDOCS%%share/doc/dd2/AUTHORS
 %%PORTDOCS%%share/doc/dd2/ChangeLog
 %%PORTDOCS%%share/doc/dd2/NEWS
diff --git a/games/doomsday/Makefile b/games/doomsday/Makefile
index 9eecdc6b2633..a345b2144e6d 100644
--- a/games/doomsday/Makefile
+++ b/games/doomsday/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	doomsday
 PORTVERSION=	1.15.8
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games
 MASTER_SITES=	SF/deng/Doomsday%20Engine/${PORTVERSION}
 DISTNAME=	${PORTNAME}-stable-${PORTVERSION}
diff --git a/games/dunelegacy/Makefile b/games/dunelegacy/Makefile
index fb574b792251..117c2cee9cc6 100644
--- a/games/dunelegacy/Makefile
+++ b/games/dunelegacy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	dunelegacy
 PORTVERSION=	0.96.4
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
diff --git a/games/dustrac/Makefile b/games/dustrac/Makefile
index 0385d3b9ce1b..42ad6c53ab8d 100644
--- a/games/dustrac/Makefile
+++ b/games/dustrac/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	dustrac
 PORTVERSION=	1.11.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/games/easyrpg-player/Makefile b/games/easyrpg-player/Makefile
index 270ebc0e852f..0559ee0d8d86 100644
--- a/games/easyrpg-player/Makefile
+++ b/games/easyrpg-player/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	easyrpg-player
 PORTVERSION=	0.5.2
+PORTREVISION=	1
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
diff --git a/games/el/Makefile b/games/el/Makefile
index ccce8c2b95ea..061a17ec12c8 100644
--- a/games/el/Makefile
+++ b/games/el/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	el
 PORTVERSION=	1.9.4.3
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	games
 
diff --git a/games/ember/Makefile b/games/ember/Makefile
index 04f55d5a2e84..ae170250aa9a 100644
--- a/games/ember/Makefile
+++ b/games/ember/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ember
 PORTVERSION=	0.7.2
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	games
 MASTER_SITES=	SF/worldforge/Ember%20%28OGRE%20client%29/${PORTVERSION} \
 		http://amber.worldforge.org/ember/releases/stable/
diff --git a/games/emptyepsilon/Makefile b/games/emptyepsilon/Makefile
index 8d02acf19b67..d9b5f2d9eddc 100644
--- a/games/emptyepsilon/Makefile
+++ b/games/emptyepsilon/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	emptyepsilon
 PORTVERSION=	2017.05.06
+PORTREVISION=	1
 DISTVERSIONPREFIX=	EE-
 CATEGORIES=	games
 
diff --git a/games/endless-sky/Makefile b/games/endless-sky/Makefile
index 10453e27b16b..b243e6381b91 100644
--- a/games/endless-sky/Makefile
+++ b/games/endless-sky/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	endless-sky
 PORTVERSION=	0.9.8
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	games
 
diff --git a/games/etracer/Makefile b/games/etracer/Makefile
index 4f358503a9a8..0affd847386d 100644
--- a/games/etracer/Makefile
+++ b/games/etracer/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	etracer
 PORTVERSION=	0.6.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	SF/extremetuxracer/releases/${PORTVERSION}
 DISTNAME=	etr-${PORTVERSION}
diff --git a/games/exult/Makefile b/games/exult/Makefile
index e430b8396203..114b1a8177dd 100644
--- a/games/exult/Makefile
+++ b/games/exult/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	exult
 PORTVERSION=	1.5.0.20160514
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile
index 539bc36b24e9..ad78726f786d 100644
--- a/games/flightgear/Makefile
+++ b/games/flightgear/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	flightgear
 PORTVERSION=	2017.1.3
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	games
 MASTER_SITES=	SF/flightgear/release-${PORTVERSION:R}
 
diff --git a/games/fotaq/Makefile b/games/fotaq/Makefile
index 9a055b10b4b7..aff4108542e8 100644
--- a/games/fotaq/Makefile
+++ b/games/fotaq/Makefile
@@ -15,18 +15,19 @@ RUN_DEPENDS=	scummvm:games/scummvm
 
 USES=		zip
 NO_BUILD=	yes
+NO_ARCH=	yes
 NO_WRKSUBDIR=	yes
 
 SUB_FILES=	pkg-message
 
-PKGMESSAGE=	${WRKDIR}/pkg-message
-
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
-	@${INSTALL_DATA} ${WRKSRC}/queen.1c ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/queen.1c ${STAGEDIR}${DATADIR}
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/readme.txt ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/readme.txt ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/games/freecell-solver/Makefile b/games/freecell-solver/Makefile
index c703c9181bb4..2b854c26567c 100644
--- a/games/freecell-solver/Makefile
+++ b/games/freecell-solver/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	freecell-solver
 PORTVERSION=	4.12.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://fc-solve.shlomifish.org/downloads/fc-solve/
 
diff --git a/games/freedink-dfarc/Makefile b/games/freedink-dfarc/Makefile
index 9b02718172a3..5d3534b44478 100644
--- a/games/freedink-dfarc/Makefile
+++ b/games/freedink-dfarc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	freedink-dfarc
 PORTVERSION=	3.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	GNU/freedink
 DISTNAME=	dfarc-${PORTVERSION}
diff --git a/games/freeminer/Makefile b/games/freeminer/Makefile
index 9bd857aa3f7a..aea3db62201d 100644
--- a/games/freeminer/Makefile
+++ b/games/freeminer/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	freeminer
 PORTVERSION=	0.4.10.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
diff --git a/games/gnomebreakout/Makefile b/games/gnomebreakout/Makefile
index 3a2721c3079d..98d4a4d3b190 100644
--- a/games/gnomebreakout/Makefile
+++ b/games/gnomebreakout/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gnomebreakout
 PORTVERSION=	0.5.3
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	games gnome
 MASTER_SITES=	SF/${PORTNAME:S/eb/e-b/}/${PORTNAME:S/eb/e-b/}/${PORTVERSION}/ \
 		http://www.users.on.net/~mipearson/
diff --git a/games/gnubg/Makefile b/games/gnubg/Makefile
index 5edfde4c4994..14c6024ee05d 100644
--- a/games/gnubg/Makefile
+++ b/games/gnubg/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gnubg
 PORTVERSION=	1.05.002
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	http://files.gnubg.org/media/sources/
 DISTFILES=	gnubg-release-${PORTVERSION}-sources.tar.gz
diff --git a/games/gnudoku/Makefile b/games/gnudoku/Makefile
index 10d80250da48..96b8accc56d1 100644
--- a/games/gnudoku/Makefile
+++ b/games/gnudoku/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	GNUDoku
 PORTVERSION=	0.93
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	games
 MASTER_SITES=	http://offload2.icculus.org:9090/~jcspray/GNUDoku/ \
 		http://mirror.amdmi3.ru/distfiles/
diff --git a/games/golly/Makefile b/games/golly/Makefile
index 58d9bd9c7290..f5069dd05546 100644
--- a/games/golly/Makefile
+++ b/games/golly/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	golly
 PORTVERSION=	2.7
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONSUFFIX=	-src
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/games/gottet/Makefile b/games/gottet/Makefile
index f15981f85468..42bd9ee7cbd4 100644
--- a/games/gottet/Makefile
+++ b/games/gottet/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gottet
 PORTVERSION=	1.1.3
-PORTREVISION=	2
+PORTREVISION=	3
 DISTVERSIONSUFFIX=	-src
 CATEGORIES=	games
 MASTER_SITES=	http://gottcode.org/gottet/
diff --git a/games/gtkevemon/Makefile b/games/gtkevemon/Makefile
index 6228c6983dee..3a9261f9e736 100644
--- a/games/gtkevemon/Makefile
+++ b/games/gtkevemon/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	gtkevemon
 PORTVERSION=	1.10.2016.02.17
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	games
 
 MAINTAINER=	feld@FreeBSD.org
diff --git a/games/gtkpool/Makefile b/games/gtkpool/Makefile
index db629aa62a7e..b454152d8643 100644
--- a/games/gtkpool/Makefile
+++ b/games/gtkpool/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gtkpool
 PORTVERSION=	0.5.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.seul.org/pub/gtkpool/ \
 		http://www.sourcefiles.org/Games/Sports/Pool/
diff --git a/games/gzdoom/Makefile b/games/gzdoom/Makefile
new file mode 100644
index 000000000000..a16a7f293f03
--- /dev/null
+++ b/games/gzdoom/Makefile
@@ -0,0 +1,57 @@
+# $FreeBSD$
+
+PORTNAME=	gzdoom
+PORTVERSION=	3.1.0
+DISTVERSIONPREFIX=	g
+CATEGORIES=	games
+
+MAINTAINER=	bsdports@kyle-evans.net
+COMMENT=	GL-enhanced source port for Doom-engine games
+
+LICENSE=	BSD3CLAUSE GPLv3 LGPL3
+LICENSE_COMB=	multi
+LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/docs/licenses/bsd.txt
+LICENSE_FILE_GPLv3=	${WRKSRC}/docs/licenses/gpl.txt
+LICENSE_FILE_LGPL3=	${WRKSRC}/docs/licenses/lgpl.txt
+
+BUILD_DEPENDS=	zip:archivers/zip
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
+		libsndfile.so:audio/libsndfile \
+		libfluidsynth.so:audio/fluidsynth \
+		libgme.so:audio/libgme
+
+DATADIR=	${DMDIR}/${PORTNAME}
+
+USES=		cmake:outsource	gettext jpeg openal pkgconfig
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	coelckers
+
+USE_GNOME=	atk cairo gdkpixbuf2 gtk20 pango
+USE_SDL=	sdl2
+USE_GL=		gl glu
+CXXFLAGS+=	-DSHARE_DIR=\\\"${DATADIR}\\\"
+LDFLAGS+=	-Wl,--as-needed
+
+DESKTOP_ENTRIES=	"GZDoom" "" "${PORTNAME}" "${PORTNAME}" "Game;Shooter;" ""
+
+PLIST_FILES=	bin/${PORTNAME} \
+		${DATADIR}/${PORTNAME}.pk3 \
+		share/pixmaps/${PORTNAME}.xpm
+
+.include <bsd.port.pre.mk>
+
+.if ${OPSYS} == "FreeBSD" && ${OSVERSION} < 1004000
+BROKEN=		Fails to link due to lack of thread_local
+.endif
+
+.include "${.CURDIR}/../doom-data/Makefile.include"
+
+do-install:
+	${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_PROGRAM} ${CONFIGURE_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${CONFIGURE_WRKSRC}/${PORTNAME}.pk3 ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.xpm ${STAGEDIR}${PREFIX}/share/pixmaps
+
+.include <bsd.port.post.mk>
diff --git a/games/gzdoom/distinfo b/games/gzdoom/distinfo
new file mode 100644
index 000000000000..6bd541b000ec
--- /dev/null
+++ b/games/gzdoom/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1498082404
+SHA256 (coelckers-gzdoom-g3.1.0_GH0.tar.gz) = c011ce9a95b765da5b81cf723062379d585c57cb586848385a2319deba1996c3
+SIZE (coelckers-gzdoom-g3.1.0_GH0.tar.gz) = 9026969
diff --git a/games/gzdoom/files/gzdoom.xpm b/games/gzdoom/files/gzdoom.xpm
new file mode 100644
index 000000000000..55f530c62f0b
--- /dev/null
+++ b/games/gzdoom/files/gzdoom.xpm
@@ -0,0 +1,83 @@
+/* XPM */
+static char * gzdoom_xpm[] = {
+"48 48 32 1",
+" 	c None",
+".	c #ADA990",
+"+	c #999966",
+"@	c #666666",
+"#	c #393939",
+"$	c #555555",
+"%	c #996666",
+"&	c #777777",
+"*	c #5F5F5F",
+"=	c #333333",
+"-	c #4D4D4D",
+";	c #868686",
+">	c #969696",
+",	c #1C1C1C",
+"'	c #339933",
+")	c #336633",
+"!	c #66CC66",
+"~	c #66FF66",
+"{	c #66CC33",
+"]	c #222222",
+"^	c #333300",
+"/	c #292929",
+"(	c #040404",
+"_	c #0C0C0C",
+":	c #663333",
+"<	c #996633",
+"[	c #CC9966",
+"}	c #CC6633",
+"|	c #CC9999",
+"1	c #FFCC99",
+"2	c #FF9966",
+"3	c #FFCCCC",
+"                  ...                           ",
+"                ++@##$+                         ",
+"                +...+%&+                        ",
+"              %*=-*&;$=&*                       ",
+"             %**=$@;>@=&*%                      ",
+"             &**@$*@@$-.+&                      ",
+"              %$%@*..$@..                       ",
+"               ,#@+++@@#&                       ",
+"              $,#$$@@$#=$''                     ",
+"         )!!!~!{=],,,,]^)'!{')         =/,      ",
+"        )){'~!!'')=],=))'{)''))      /=],(      ",
+"        )'!!'!)~'{'),)'''''''))  @@/==]((       ",
+"        ^)''')'{{''')'''''),))) $$@$/,(         ",
+"        ,^))),))''''))'')^,__/$$$-#-((          ",
+"        :<[}<,_)))))))),___,]#@@-/]]            ",
+"       :<|12<:_,,,,,_,#$$-#/,^^=^}}<            ",
+"       :<[1}::,^,,__,#$-==/,,::^:<<<            ",
+"       ::&+@#^,,__/)#-=/,,,,-::^<::=            ",
+"       :*+12[:==_,$-=/,,,,/,#::::=^             ",
+"       #*}331}-$]-==/,,,,// ##:=^               ",
+"       /]<13[---],,,,,,,]_]                     ",
+"        ,:--/,___]]]]:^___/                     ",
+"          _______,^^,^,__/#                     ",
+"          ______:::::/$,,/#                     ",
+"           ____^:::=,^^^^,^^                    ",
+"            __,,:=^,,)))^,,=                    ",
+"            _,,),,,,,^)^^^,,                    ",
+"            ,^,,),__,^))),,^                    ",
+"            ,,,^^,,,,,)))),,                    ",
+"             ,,,,,,,)^))))^                     ",
+"             ,,^,,,^^)))))^                     ",
+"             ,^^,,,,)))))),                     ",
+"              ,^,,,,))^))),                     ",
+"              ],,,,,$&&&*$#                     ",
+"               ],,,]#****$#                     ",
+"               ]]]]]^####,                      ",
+"                ]]]]*,,,,#*                     ",
+"                 ,_,#@&&@*/                     ",
+"                  __$####=#                     ",
+"                  ,_/$$$$$#                     ",
+"                  ,,,$*$$$                      ",
+"                 ],,,$**$#                      ",
+"                 ],,,@&&@#                      ",
+"                 ],,,$**#=                      ",
+"                  ,,=+++%$                      ",
+"                    *%%%*$                      ",
+"                    /$*$#/                      ",
+"                     ],,]]                      "};
diff --git a/games/gzdoom/files/patch-src_dobject.h b/games/gzdoom/files/patch-src_dobject.h
new file mode 100644
index 000000000000..c2ab03fbc97b
--- /dev/null
+++ b/games/gzdoom/files/patch-src_dobject.h
@@ -0,0 +1,11 @@
+--- src/dobject.h.orig	2017-06-22 13:58:35 UTC
++++ src/dobject.h
+@@ -198,7 +198,7 @@ class DObject (protected)
+ 	enum { MetaClassNum = CLASSREG_PClass };
+ 
+ 	// Per-instance variables. There are four.
+-#ifdef _DEBUG
++#ifndef NDEBUG
+ public:
+ 	enum
+ 	{
diff --git a/games/gzdoom/files/patch-src_scripting_vm_vm.h b/games/gzdoom/files/patch-src_scripting_vm_vm.h
new file mode 100644
index 000000000000..a23649420a27
--- /dev/null
+++ b/games/gzdoom/files/patch-src_scripting_vm_vm.h
@@ -0,0 +1,11 @@
+--- src/scripting/vm/vm.h.orig	2017-06-22 13:58:53 UTC
++++ src/scripting/vm/vm.h
+@@ -376,7 +376,7 @@ int VMCall(VMFunction *func, VMValue *params, int nump
+ // variable name <x> at position <p>
+ void NullParam(const char *varname);
+ 
+-#ifdef _DEBUG
++#ifndef NDEBUG
+ bool AssertObject(void * ob);
+ #endif
+ 
diff --git a/games/gzdoom/files/patch-src_scripting_vm_vmexec.cpp b/games/gzdoom/files/patch-src_scripting_vm_vmexec.cpp
new file mode 100644
index 000000000000..822a54be2e6f
--- /dev/null
+++ b/games/gzdoom/files/patch-src_scripting_vm_vmexec.cpp
@@ -0,0 +1,11 @@
+--- src/scripting/vm/vmexec.cpp.orig	2017-06-22 13:59:05 UTC
++++ src/scripting/vm/vmexec.cpp
+@@ -229,7 +229,7 @@ void VMFillParams(VMValue *params, VMFrame *callee, in
+ }
+ 
+ 
+-#ifdef _DEBUG
++#ifndef NDEBUG
+ bool AssertObject(void * ob)
+ {
+ 	auto obj = (DObject*)ob;
diff --git a/games/gzdoom/pkg-descr b/games/gzdoom/pkg-descr
new file mode 100644
index 000000000000..f59f687de0f5
--- /dev/null
+++ b/games/gzdoom/pkg-descr
@@ -0,0 +1,17 @@
+GZDoom is a GL-enhanced fork of ZDoom, a source port of ID Software's DOOM
+engine. It is based on the source code of id Software's DOOM. GZDoom boasts
+enhanced modding support, as well as support for the following games:
+
+* Ultimate Doom
+* Doom II
+* Final Doom
+* Heretic
+* Hexen
+* Strife
+* Chex Quest (1 & 3)
+* Action Doom II
+* Harmony v1.1
+* Hacx
+* The Adventures of Square 
+
+WWW: http://gzdoom.drdteam.org/
diff --git a/games/hexalate/Makefile b/games/hexalate/Makefile
index 577e0dee8bb1..18d30bde8175 100644
--- a/games/hexalate/Makefile
+++ b/games/hexalate/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	hexalate
 PORTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://gottcode.org/${PORTNAME}/ \
 		http://mirror.amdmi3.ru/distfiles/
diff --git a/games/hexxagon/Makefile b/games/hexxagon/Makefile
index cf55433cdc32..80ab32734c11 100644
--- a/games/hexxagon/Makefile
+++ b/games/hexxagon/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	hexxagon
 PORTVERSION=	1.0.2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.nesqi.se/download/
 
diff --git a/games/hoverboard-sdl/Makefile b/games/hoverboard-sdl/Makefile
index 31ffb2d3af2a..cf646cc13b95 100644
--- a/games/hoverboard-sdl/Makefile
+++ b/games/hoverboard-sdl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	hoverboard
 PORTVERSION=	0.7.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
diff --git a/games/instead/Makefile b/games/instead/Makefile
index 31461ee8e377..9d2455c41ac3 100644
--- a/games/instead/Makefile
+++ b/games/instead/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	instead
-PORTVERSION=	3.0.1
+PORTVERSION=	3.1.2
 CATEGORIES=	games
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}_${PORTVERSION}
diff --git a/games/instead/distinfo b/games/instead/distinfo
index 0c63014882de..bb4a62a2fc4b 100644
--- a/games/instead/distinfo
+++ b/games/instead/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1496649949
-SHA256 (instead_3.0.1.tar.gz) = eb5b1e2dfde2c13b391fe3275e8886d202f9479a7b58b4d7daa1fd3272fdd87a
-SIZE (instead_3.0.1.tar.gz) = 5583401
+TIMESTAMP = 1505291817
+SHA256 (instead_3.1.2.tar.gz) = e1990bf8d48471fbc8fce60914e343df6bff87eac9cfbfad7d980c56c54e9282
+SIZE (instead_3.1.2.tar.gz) = 5594195
diff --git a/games/instead/pkg-descr b/games/instead/pkg-descr
index 94e61d3bd470..653bc200cf14 100644
--- a/games/instead/pkg-descr
+++ b/games/instead/pkg-descr
@@ -1,4 +1,4 @@
 INSTEAD was designed to interpret the games that are the mix of visual novels,
 text quests and classical 90'ss quests.
 
-WWW: http://instead.syscall.ru/
+WWW: https://instead.syscall.ru/
diff --git a/games/irrlamb/Makefile b/games/irrlamb/Makefile
index 1adfc5ee9c99..15387274f4e3 100644
--- a/games/irrlamb/Makefile
+++ b/games/irrlamb/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	irrlamb
 PORTVERSION=	0.2.1
-PORTREVISION=	4
+PORTREVISION=	5
 DISTVERSIONPREFIX=	v
 CATEGORIES=	games
 
diff --git a/games/jfsw/distinfo b/games/jfsw/distinfo
index 5d99db04e3ec..27e236b74b9f 100644
--- a/games/jfsw/distinfo
+++ b/games/jfsw/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1496751228
+TIMESTAMP = 1505332960
 SHA256 (jonof-jfsw-20131019-5cff6a81708ff053b569ba4400fba073afe207fe_GH0.tar.gz) = 605a84a06de4c5f1ea5e0603e39a55c9eaa4421f9d8138fe0fa49c2059a59b48
 SIZE (jonof-jfsw-20131019-5cff6a81708ff053b569ba4400fba073afe207fe_GH0.tar.gz) = 1393801
 SHA256 (jonof-jfbuild-a73583184aca466cebde152db2ce1020591d7049_GH0.tar.gz) = 1a9669d5fc8940c20d7169f524a6e3b99944ff0fd4c75479bbf98e4f2b1a94e2
 SIZE (jonof-jfbuild-a73583184aca466cebde152db2ce1020591d7049_GH0.tar.gz) = 1434766
-SHA256 (jonof-jfaudiolib-a39ccf5e95961952d27754a255940be1d76ce85e_GH0.tar.gz) = 1469349178a6cfe8b5b46e5ebc86697d733c9c51b98453f3705095b5bc99ec3c
-SIZE (jonof-jfaudiolib-a39ccf5e95961952d27754a255940be1d76ce85e_GH0.tar.gz) = 1041164
+SHA256 (jonof-jfaudiolib-a39ccf5e95961952d27754a255940be1d76ce85e_GH0.tar.gz) = 92d82f904df2f9cd546fafce9cea3462f6b092baa8a4f79426413fed3a426bcf
+SIZE (jonof-jfaudiolib-a39ccf5e95961952d27754a255940be1d76ce85e_GH0.tar.gz) = 1041181
 SHA256 (jonof-jfmact-b1071da75cd465f59257240e5dbc60a014580190_GH0.tar.gz) = 61f98c885995d5d7c1f7bb7315eed118f95b53312ad7dfbd190006ba3446ee24
 SIZE (jonof-jfmact-b1071da75cd465f59257240e5dbc60a014580190_GH0.tar.gz) = 25410
diff --git a/games/liblcf/Makefile b/games/liblcf/Makefile
index 80432e0b582c..02121d2cad35 100644
--- a/games/liblcf/Makefile
+++ b/games/liblcf/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	liblcf
 PORTVERSION=	0.5.2
+PORTREVISION=	1
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
diff --git a/games/libretro-cores/Makefile b/games/libretro-cores/Makefile
index ab6408ccaef7..b6e7800cd288 100644
--- a/games/libretro-cores/Makefile
+++ b/games/libretro-cores/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libretro-cores
 PORTVERSION=	0.20161109
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 
 MAINTAINER=	yuri@rawbw.com
diff --git a/games/lordsawar/Makefile b/games/lordsawar/Makefile
index 3fabbba48a50..1d8fb36cdf5f 100644
--- a/games/lordsawar/Makefile
+++ b/games/lordsawar/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	lordsawar
 PORTVERSION=	0.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	SAVANNAH
 
diff --git a/games/lugaru/Makefile b/games/lugaru/Makefile
index 2520ac982a6e..1c8d492273f2 100644
--- a/games/lugaru/Makefile
+++ b/games/lugaru/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	lugaru
 PORTVERSION=	269
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	games
 MASTER_SITES=	https://bitbucket.org/oss${PORTNAME}/${PORTNAME}/downloads/
 DISTNAME=	${PORTNAME}-rev${DISTVERSION}-src
diff --git a/games/megaglest/Makefile b/games/megaglest/Makefile
index 5f289e5d529a..810d7d18bfff 100644
--- a/games/megaglest/Makefile
+++ b/games/megaglest/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	megaglest
 PORTVERSION=	3.13.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 
 MAINTAINER=	monwarez@mailoo.org
diff --git a/games/mirrormagic/Makefile b/games/mirrormagic/Makefile
index c5adef0be063..34962320aea1 100644
--- a/games/mirrormagic/Makefile
+++ b/games/mirrormagic/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mirrormagic
 PORTVERSION=	2.0.2
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	games
 MASTER_SITES=	http://www.artsoft.org/RELEASES/unix/mirrormagic/ \
 		http://mirror.amdmi3.ru/distfiles/
diff --git a/games/monster-masher/Makefile b/games/monster-masher/Makefile
index cc93256b5f1b..1259bf49e694 100644
--- a/games/monster-masher/Makefile
+++ b/games/monster-masher/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	monster
 PORTVERSION=	1.8.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games gnome
 MASTER_SITES=	http://people.iola.dk/olau/monster-masher/source/
 PKGNAMESUFFIX=	-masher
diff --git a/games/naev/Makefile b/games/naev/Makefile
index 5a7b5abf1e04..797f7431dc8b 100644
--- a/games/naev/Makefile
+++ b/games/naev/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	naev
 PORTVERSION=	0.7.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}/
 
diff --git a/games/nxengine/Makefile b/games/nxengine/Makefile
new file mode 100644
index 000000000000..82b22276b130
--- /dev/null
+++ b/games/nxengine/Makefile
@@ -0,0 +1,48 @@
+# Created by: Nikolai Lifanov <lifanov@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	nxengine
+PORTVERSION=	1.0.0.6
+CATEGORIES=	games
+MASTER_SITES=	http://nxengine.sourceforge.net/dl/ \
+		http://www.cavestory.org/downloads/:data \
+		SF/lifanov-ports-distfiles/games/${PORTNAME}/:icons
+DISTFILES=	nx-src-${DISTVERSION:S/.//g}.tar.bz2 \
+		cavestoryen.zip:data \
+		${PORTNAME}.png:icons
+EXTRACT_ONLY=	${DISTFILES:[1..2]:S/:data//}
+
+MAINTAINER=	lifanov@FreeBSD.org
+COMMENT=	Engine-rewrite of the classic platformer Cave Story
+
+LICENSE=	GPLv3 FREEWARE
+LICENSE_COMB=	multi
+LICENSE_NAME_FREEWARE=	Cave Story freeware license
+LICENSE_FILE_GPLv3=	${WRKSRC}/LICENSE
+LICENSE_FILE_FREEWARE=	${WRKDIR}/CaveStory/Readme.txt
+LICENSE_PERMS_FREEWARE=	dist-mirror pkg-mirror auto-accept
+LICENSE_DISTFILES_GPLv3=	${DISTFILES:[1]}
+LICENSE_DISTFILES_FREEWARE=	${DISTFILES:[2]:S/:data//}
+
+DESKTOP_ENTRIES="NXEngine" "" "${PORTNAME}" \
+		"${PORTNAME}" "Game;AdventureGame;" ""
+
+WRKSRC=		${WRKDIR}/nx
+USE_SDL=	sdl ttf
+SUB_FILES=	${PORTNAME}
+
+pre-build:
+	@${REINPLACE_CMD} -e 's/g++/${CXX}/' ${WRKSRC}/Makefile
+
+do-install:
+	${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/nx ${STAGEDIR}${DATADIR}
+.for f in sprites.sif smalfont.bmp tilekey.dat font.ttf
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DATADIR}
+.endfor
+	${INSTALL_SCRIPT} ${WRKDIR}/nxengine ${STAGEDIR}${PREFIX}/bin
+	(cd ${WRKDIR}/CaveStory; ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
+	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps
+
+.include <bsd.port.mk>
diff --git a/games/nxengine/distinfo b/games/nxengine/distinfo
new file mode 100644
index 000000000000..b6ceae92099c
--- /dev/null
+++ b/games/nxengine/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1504880228
+SHA256 (nx-src-1006.tar.bz2) = cf9cbf15dfdfdc9936720a714876bb1524afbd2931e3eaa4c89984a40b21ad68
+SIZE (nx-src-1006.tar.bz2) = 540467
+SHA256 (cavestoryen.zip) = aa87fa30bee9b4980640c7e104791354e0f1f6411ee0d45a70af70046aa0685f
+SIZE (cavestoryen.zip) = 1136575
+SHA256 (nxengine.png) = d6d8866939c10342bd3feebef311648586bed38f0390acbe16fd42f5240ff4e7
+SIZE (nxengine.png) = 536
diff --git a/games/nxengine/files/nxengine.in b/games/nxengine/files/nxengine.in
new file mode 100644
index 000000000000..474fa490c78a
--- /dev/null
+++ b/games/nxengine/files/nxengine.in
@@ -0,0 +1,10 @@
+#!/bin/sh
+# Wrap nx: it finds game data files
+#  relative to itself
+
+if [ ! -d "$HOME"/.nxengine ]; then
+	mkdir -p "$HOME"/.nxengine
+	ln -s %%DATADIR%%/* "$HOME"/.nxengine/
+fi
+cd "$HOME"/.nxengine && exec ./nx "$@"
+
diff --git a/games/nxengine/files/patch-sound_org.cpp b/games/nxengine/files/patch-sound_org.cpp
new file mode 100644
index 000000000000..03cc4bccf346
--- /dev/null
+++ b/games/nxengine/files/patch-sound_org.cpp
@@ -0,0 +1,11 @@
+--- sound/org.cpp.orig	2012-04-29 19:01:52 UTC
++++ sound/org.cpp
+@@ -4,7 +4,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <math.h>
+-#include <endian.h>
++#include <sys/endian.h>
+ 
+ #include "../common/basics.h"
+ #include "org.h"
diff --git a/games/nxengine/files/patch-sound_pxt.cpp b/games/nxengine/files/patch-sound_pxt.cpp
new file mode 100644
index 000000000000..c7dc16ffa9ae
--- /dev/null
+++ b/games/nxengine/files/patch-sound_pxt.cpp
@@ -0,0 +1,11 @@
+--- sound/pxt.cpp.orig	2012-04-29 19:01:52 UTC
++++ sound/pxt.cpp
+@@ -6,7 +6,7 @@
+ #include <math.h>			// for sin()
+ #include <stdlib.h>
+ #include <string.h>
+-#include <endian.h>
++#include <sys/endian.h>
+ 
+ #include "../config.h"
+ #include "pxt.h"
diff --git a/games/nxengine/pkg-descr b/games/nxengine/pkg-descr
new file mode 100644
index 000000000000..0e838a419b34
--- /dev/null
+++ b/games/nxengine/pkg-descr
@@ -0,0 +1,4 @@
+NXEngine is a complete open-source clone/rewrite of the masterpiece
+jump-and-run platformer Doukutsu Monogatari (also known as Cave Story).
+
+WWW: http://nxengine.sourceforge.net/
diff --git a/games/nxengine/pkg-plist b/games/nxengine/pkg-plist
new file mode 100644
index 000000000000..c7a423b38932
--- /dev/null
+++ b/games/nxengine/pkg-plist
@@ -0,0 +1,444 @@
+bin/nxengine
+%%DATADIR%%/Config.dat
+%%DATADIR%%/DoConfig.exe
+%%DATADIR%%/Doukutsu.exe
+%%DATADIR%%/Manual.html
+%%DATADIR%%/Manual/Display.html
+%%DATADIR%%/Manual/Ditch.html
+%%DATADIR%%/Manual/Ditch.png
+%%DATADIR%%/Manual/DoukutsuL.html
+%%DATADIR%%/Manual/Dummy.html
+%%DATADIR%%/Manual/Enemy.png
+%%DATADIR%%/Manual/Intro.html
+%%DATADIR%%/Manual/Item.html
+%%DATADIR%%/Manual/KeyControl.html
+%%DATADIR%%/Manual/MyChar.png
+%%DATADIR%%/Manual/Status.png
+%%DATADIR%%/Manual/Thumbs.db
+%%DATADIR%%/Manual/Title.png
+%%DATADIR%%/Manual/Troubleshooting.html
+%%DATADIR%%/Manual/itemBox.png
+%%DATADIR%%/Manual/itemDisk.png
+%%DATADIR%%/Manual/itemEnergy.png
+%%DATADIR%%/Manual/itemHeart.png
+%%DATADIR%%/Manual/itemMax.png
+%%DATADIR%%/Manual/itemMissile.png
+%%DATADIR%%/Manual/itemServer.png
+%%DATADIR%%/Manual/mochiKey.png
+%%DATADIR%%/Manual/mochiMap.png
+%%DATADIR%%/Manual/mochiRocket.png
+%%DATADIR%%/Manual/naoku_curly.png
+%%DATADIR%%/Manual/snapAction.png
+%%DATADIR%%/Manual/snapDisplay.png
+%%DATADIR%%/Manual/snapEscape.png
+%%DATADIR%%/Manual/snapMochi.png
+%%DATADIR%%/Manual/snapSave.png
+%%DATADIR%%/Manual/snapTalk.png
+%%DATADIR%%/Manual/snapTitle.png
+%%DATADIR%%/OrgView.exe
+%%DATADIR%%/Readme.txt
+%%DATADIR%%/data/Arms.pbm
+%%DATADIR%%/data/ArmsImage.pbm
+%%DATADIR%%/data/ArmsItem.tsc
+%%DATADIR%%/data/Bullet.pbm
+%%DATADIR%%/data/Caret.pbm
+%%DATADIR%%/data/Credit.tsc
+%%DATADIR%%/data/Face.pbm
+%%DATADIR%%/data/Fade.pbm
+%%DATADIR%%/data/Head.tsc
+%%DATADIR%%/data/ItemImage.pbm
+%%DATADIR%%/data/Loading.pbm
+%%DATADIR%%/data/MyChar.pbm
+%%DATADIR%%/data/Npc/Npc0.pbm
+%%DATADIR%%/data/Npc/NpcAlmo1.pbm
+%%DATADIR%%/data/Npc/NpcAlmo2.pbm
+%%DATADIR%%/data/Npc/NpcBallos.pbm
+%%DATADIR%%/data/Npc/NpcBllg.pbm
+%%DATADIR%%/data/Npc/NpcCemet.pbm
+%%DATADIR%%/data/Npc/NpcCent.pbm
+%%DATADIR%%/data/Npc/NpcCurly.pbm
+%%DATADIR%%/data/Npc/NpcDark.pbm
+%%DATADIR%%/data/Npc/NpcDr.pbm
+%%DATADIR%%/data/Npc/NpcEggs1.pbm
+%%DATADIR%%/data/Npc/NpcEggs2.pbm
+%%DATADIR%%/data/Npc/NpcFrog.pbm
+%%DATADIR%%/data/Npc/NpcGuest.pbm
+%%DATADIR%%/data/Npc/NpcHell.pbm
+%%DATADIR%%/data/Npc/NpcHeri.pbm
+%%DATADIR%%/data/Npc/NpcIronH.pbm
+%%DATADIR%%/data/Npc/NpcIsland.pbm
+%%DATADIR%%/data/Npc/NpcKings.pbm
+%%DATADIR%%/data/Npc/NpcMaze.pbm
+%%DATADIR%%/data/Npc/NpcMiza.pbm
+%%DATADIR%%/data/Npc/NpcMoon.pbm
+%%DATADIR%%/data/Npc/NpcOmg.pbm
+%%DATADIR%%/data/Npc/NpcPlant.pbm
+%%DATADIR%%/data/Npc/NpcPress.pbm
+%%DATADIR%%/data/Npc/NpcPriest.pbm
+%%DATADIR%%/data/Npc/NpcRavil.pbm
+%%DATADIR%%/data/Npc/NpcRed.pbm
+%%DATADIR%%/data/Npc/NpcRegu.pbm
+%%DATADIR%%/data/Npc/NpcSand.pbm
+%%DATADIR%%/data/Npc/NpcStream.pbm
+%%DATADIR%%/data/Npc/NpcSym.pbm
+%%DATADIR%%/data/Npc/NpcToro.pbm
+%%DATADIR%%/data/Npc/NpcTwinD.pbm
+%%DATADIR%%/data/Npc/NpcWeed.pbm
+%%DATADIR%%/data/Npc/NpcX.pbm
+%%DATADIR%%/data/Stage/0.pxa
+%%DATADIR%%/data/Stage/0.pxe
+%%DATADIR%%/data/Stage/0.pxm
+%%DATADIR%%/data/Stage/0.tsc
+%%DATADIR%%/data/Stage/555.pxe
+%%DATADIR%%/data/Stage/Almond.pxa
+%%DATADIR%%/data/Stage/Almond.pxe
+%%DATADIR%%/data/Stage/Almond.pxm
+%%DATADIR%%/data/Stage/Almond.tsc
+%%DATADIR%%/data/Stage/Ballo1.pxe
+%%DATADIR%%/data/Stage/Ballo1.pxm
+%%DATADIR%%/data/Stage/Ballo1.tsc
+%%DATADIR%%/data/Stage/Ballo2.pxe
+%%DATADIR%%/data/Stage/Ballo2.pxm
+%%DATADIR%%/data/Stage/Ballo2.tsc
+%%DATADIR%%/data/Stage/Barr.pxa
+%%DATADIR%%/data/Stage/Barr.pxe
+%%DATADIR%%/data/Stage/Barr.pxm
+%%DATADIR%%/data/Stage/Barr.tsc
+%%DATADIR%%/data/Stage/Blcny1.pxe
+%%DATADIR%%/data/Stage/Blcny1.pxm
+%%DATADIR%%/data/Stage/Blcny1.tsc
+%%DATADIR%%/data/Stage/Blcny2.pxe
+%%DATADIR%%/data/Stage/Blcny2.pxm
+%%DATADIR%%/data/Stage/Blcny2.tsc
+%%DATADIR%%/data/Stage/Cave.pxa
+%%DATADIR%%/data/Stage/Cave.pxe
+%%DATADIR%%/data/Stage/Cave.pxm
+%%DATADIR%%/data/Stage/Cave.tsc
+%%DATADIR%%/data/Stage/Cemet.pxe
+%%DATADIR%%/data/Stage/Cemet.pxm
+%%DATADIR%%/data/Stage/Cemet.tsc
+%%DATADIR%%/data/Stage/Cent.pxa
+%%DATADIR%%/data/Stage/Cent.pxe
+%%DATADIR%%/data/Stage/Cent.pxm
+%%DATADIR%%/data/Stage/Cent.tsc
+%%DATADIR%%/data/Stage/CentW.pxe
+%%DATADIR%%/data/Stage/CentW.pxm
+%%DATADIR%%/data/Stage/CentW.tsc
+%%DATADIR%%/data/Stage/Chako.pxe
+%%DATADIR%%/data/Stage/Chako.pxm
+%%DATADIR%%/data/Stage/Chako.tsc
+%%DATADIR%%/data/Stage/Clock.pxe
+%%DATADIR%%/data/Stage/Clock.pxm
+%%DATADIR%%/data/Stage/Clock.tsc
+%%DATADIR%%/data/Stage/Comu.pxe
+%%DATADIR%%/data/Stage/Comu.pxm
+%%DATADIR%%/data/Stage/Comu.tsc
+%%DATADIR%%/data/Stage/Cook.pxm
+%%DATADIR%%/data/Stage/Cthu.pxe
+%%DATADIR%%/data/Stage/Cthu.pxm
+%%DATADIR%%/data/Stage/Cthu.tsc
+%%DATADIR%%/data/Stage/Cthu2.pxe
+%%DATADIR%%/data/Stage/Cthu2.pxm
+%%DATADIR%%/data/Stage/Cthu2.tsc
+%%DATADIR%%/data/Stage/Curly.pxe
+%%DATADIR%%/data/Stage/Curly.pxm
+%%DATADIR%%/data/Stage/Curly.tsc
+%%DATADIR%%/data/Stage/CurlyS.pxe
+%%DATADIR%%/data/Stage/CurlyS.pxm
+%%DATADIR%%/data/Stage/CurlyS.tsc
+%%DATADIR%%/data/Stage/Dark.pxe
+%%DATADIR%%/data/Stage/Dark.pxm
+%%DATADIR%%/data/Stage/Dark.tsc
+%%DATADIR%%/data/Stage/Drain.pxe
+%%DATADIR%%/data/Stage/Drain.pxm
+%%DATADIR%%/data/Stage/Drain.tsc
+%%DATADIR%%/data/Stage/EgEnd1.pxe
+%%DATADIR%%/data/Stage/EgEnd1.pxm
+%%DATADIR%%/data/Stage/EgEnd1.tsc
+%%DATADIR%%/data/Stage/EgEnd2.pxe
+%%DATADIR%%/data/Stage/EgEnd2.pxm
+%%DATADIR%%/data/Stage/EgEnd2.tsc
+%%DATADIR%%/data/Stage/Egg1.pxe
+%%DATADIR%%/data/Stage/Egg1.pxm
+%%DATADIR%%/data/Stage/Egg1.tsc
+%%DATADIR%%/data/Stage/Egg6.pxe
+%%DATADIR%%/data/Stage/Egg6.pxm
+%%DATADIR%%/data/Stage/Egg6.tsc
+%%DATADIR%%/data/Stage/EggIn.pxa
+%%DATADIR%%/data/Stage/EggR.pxe
+%%DATADIR%%/data/Stage/EggR.pxm
+%%DATADIR%%/data/Stage/EggR.tsc
+%%DATADIR%%/data/Stage/EggR2.pxe
+%%DATADIR%%/data/Stage/EggR2.pxm
+%%DATADIR%%/data/Stage/EggR2.tsc
+%%DATADIR%%/data/Stage/EggX.pxa
+%%DATADIR%%/data/Stage/EggX.pxe
+%%DATADIR%%/data/Stage/EggX.pxm
+%%DATADIR%%/data/Stage/EggX.tsc
+%%DATADIR%%/data/Stage/EggX2.pxe
+%%DATADIR%%/data/Stage/EggX2.pxm
+%%DATADIR%%/data/Stage/EggX2.tsc
+%%DATADIR%%/data/Stage/Eggs.pxa
+%%DATADIR%%/data/Stage/Eggs.pxe
+%%DATADIR%%/data/Stage/Eggs.pxm
+%%DATADIR%%/data/Stage/Eggs.tsc
+%%DATADIR%%/data/Stage/Eggs2.pxe
+%%DATADIR%%/data/Stage/Eggs2.pxm
+%%DATADIR%%/data/Stage/Eggs2.tsc
+%%DATADIR%%/data/Stage/Fall.pxa
+%%DATADIR%%/data/Stage/Fall.pxe
+%%DATADIR%%/data/Stage/Fall.pxm
+%%DATADIR%%/data/Stage/Fall.tsc
+%%DATADIR%%/data/Stage/Frog.pxe
+%%DATADIR%%/data/Stage/Frog.pxm
+%%DATADIR%%/data/Stage/Frog.tsc
+%%DATADIR%%/data/Stage/Gard.pxa
+%%DATADIR%%/data/Stage/Gard.pxe
+%%DATADIR%%/data/Stage/Gard.pxm
+%%DATADIR%%/data/Stage/Gard.tsc
+%%DATADIR%%/data/Stage/Hell.pxa
+%%DATADIR%%/data/Stage/Hell1.pxe
+%%DATADIR%%/data/Stage/Hell1.pxm
+%%DATADIR%%/data/Stage/Hell1.tsc
+%%DATADIR%%/data/Stage/Hell2.pxe
+%%DATADIR%%/data/Stage/Hell2.pxm
+%%DATADIR%%/data/Stage/Hell2.tsc
+%%DATADIR%%/data/Stage/Hell3.pxe
+%%DATADIR%%/data/Stage/Hell3.pxm
+%%DATADIR%%/data/Stage/Hell3.tsc
+%%DATADIR%%/data/Stage/Hell4.pxe
+%%DATADIR%%/data/Stage/Hell4.pxm
+%%DATADIR%%/data/Stage/Hell4.tsc
+%%DATADIR%%/data/Stage/Hell42.pxe
+%%DATADIR%%/data/Stage/Hell42.pxm
+%%DATADIR%%/data/Stage/Hell42.tsc
+%%DATADIR%%/data/Stage/Island.pxe
+%%DATADIR%%/data/Stage/Island.pxm
+%%DATADIR%%/data/Stage/Island.tsc
+%%DATADIR%%/data/Stage/Itoh.pxe
+%%DATADIR%%/data/Stage/Itoh.pxm
+%%DATADIR%%/data/Stage/Itoh.tsc
+%%DATADIR%%/data/Stage/Jail.pxa
+%%DATADIR%%/data/Stage/Jail1.pxe
+%%DATADIR%%/data/Stage/Jail1.pxm
+%%DATADIR%%/data/Stage/Jail1.tsc
+%%DATADIR%%/data/Stage/Jail2.pxe
+%%DATADIR%%/data/Stage/Jail2.pxm
+%%DATADIR%%/data/Stage/Jail2.tsc
+%%DATADIR%%/data/Stage/Jenka1.pxe
+%%DATADIR%%/data/Stage/Jenka1.pxm
+%%DATADIR%%/data/Stage/Jenka1.tsc
+%%DATADIR%%/data/Stage/Jenka2.pxe
+%%DATADIR%%/data/Stage/Jenka2.pxm
+%%DATADIR%%/data/Stage/Jenka2.tsc
+%%DATADIR%%/data/Stage/Kings.pxe
+%%DATADIR%%/data/Stage/Kings.pxm
+%%DATADIR%%/data/Stage/Kings.tsc
+%%DATADIR%%/data/Stage/Labo.pxa
+%%DATADIR%%/data/Stage/Little.pxe
+%%DATADIR%%/data/Stage/Little.pxm
+%%DATADIR%%/data/Stage/Little.tsc
+%%DATADIR%%/data/Stage/Lounge.pxe
+%%DATADIR%%/data/Stage/Lounge.pxm
+%%DATADIR%%/data/Stage/Lounge.tsc
+%%DATADIR%%/data/Stage/Malco.pxe
+%%DATADIR%%/data/Stage/Malco.pxm
+%%DATADIR%%/data/Stage/Malco.tsc
+%%DATADIR%%/data/Stage/Mapi.pxe
+%%DATADIR%%/data/Stage/Mapi.pxm
+%%DATADIR%%/data/Stage/Mapi.tsc
+%%DATADIR%%/data/Stage/Maze.pxa
+%%DATADIR%%/data/Stage/MazeA.pxe
+%%DATADIR%%/data/Stage/MazeA.pxm
+%%DATADIR%%/data/Stage/MazeA.tsc
+%%DATADIR%%/data/Stage/MazeB.pxe
+%%DATADIR%%/data/Stage/MazeB.pxm
+%%DATADIR%%/data/Stage/MazeB.tsc
+%%DATADIR%%/data/Stage/MazeD.pxe
+%%DATADIR%%/data/Stage/MazeD.pxm
+%%DATADIR%%/data/Stage/MazeD.tsc
+%%DATADIR%%/data/Stage/MazeH.pxe
+%%DATADIR%%/data/Stage/MazeH.pxm
+%%DATADIR%%/data/Stage/MazeH.tsc
+%%DATADIR%%/data/Stage/MazeI.pxe
+%%DATADIR%%/data/Stage/MazeI.pxm
+%%DATADIR%%/data/Stage/MazeI.tsc
+%%DATADIR%%/data/Stage/MazeM.pxe
+%%DATADIR%%/data/Stage/MazeM.pxm
+%%DATADIR%%/data/Stage/MazeM.tsc
+%%DATADIR%%/data/Stage/MazeO.pxe
+%%DATADIR%%/data/Stage/MazeO.pxm
+%%DATADIR%%/data/Stage/MazeO.tsc
+%%DATADIR%%/data/Stage/MazeS.pxe
+%%DATADIR%%/data/Stage/MazeS.pxm
+%%DATADIR%%/data/Stage/MazeS.tsc
+%%DATADIR%%/data/Stage/MazeW.pxe
+%%DATADIR%%/data/Stage/MazeW.pxm
+%%DATADIR%%/data/Stage/MazeW.tsc
+%%DATADIR%%/data/Stage/MiBox.pxe
+%%DATADIR%%/data/Stage/MiBox.pxm
+%%DATADIR%%/data/Stage/MiBox.tsc
+%%DATADIR%%/data/Stage/Mimi.pxa
+%%DATADIR%%/data/Stage/Mimi.pxe
+%%DATADIR%%/data/Stage/Mimi.pxm
+%%DATADIR%%/data/Stage/Mimi.tsc
+%%DATADIR%%/data/Stage/Momo.pxe
+%%DATADIR%%/data/Stage/Momo.pxm
+%%DATADIR%%/data/Stage/Momo.tsc
+%%DATADIR%%/data/Stage/New.pxe
+%%DATADIR%%/data/Stage/Oside.pxa
+%%DATADIR%%/data/Stage/Oside.pxe
+%%DATADIR%%/data/Stage/Oside.pxm
+%%DATADIR%%/data/Stage/Oside.tsc
+%%DATADIR%%/data/Stage/Ostep.pxe
+%%DATADIR%%/data/Stage/Ostep.pxm
+%%DATADIR%%/data/Stage/Ostep.tsc
+%%DATADIR%%/data/Stage/Pens.pxa
+%%DATADIR%%/data/Stage/Pens1.pxe
+%%DATADIR%%/data/Stage/Pens1.pxm
+%%DATADIR%%/data/Stage/Pens1.tsc
+%%DATADIR%%/data/Stage/Pens2.pxe
+%%DATADIR%%/data/Stage/Pens2.pxm
+%%DATADIR%%/data/Stage/Pens2.tsc
+%%DATADIR%%/data/Stage/Pixel.pxe
+%%DATADIR%%/data/Stage/Pixel.pxm
+%%DATADIR%%/data/Stage/Pixel.tsc
+%%DATADIR%%/data/Stage/Plant.pxe
+%%DATADIR%%/data/Stage/Plant.pxm
+%%DATADIR%%/data/Stage/Plant.tsc
+%%DATADIR%%/data/Stage/Pole.pxe
+%%DATADIR%%/data/Stage/Pole.pxm
+%%DATADIR%%/data/Stage/Pole.tsc
+%%DATADIR%%/data/Stage/Pool.pxe
+%%DATADIR%%/data/Stage/Pool.pxm
+%%DATADIR%%/data/Stage/Pool.tsc
+%%DATADIR%%/data/Stage/Prefa1.pxe
+%%DATADIR%%/data/Stage/Prefa1.pxm
+%%DATADIR%%/data/Stage/Prefa1.tsc
+%%DATADIR%%/data/Stage/Prefa2.pxe
+%%DATADIR%%/data/Stage/Prefa2.pxm
+%%DATADIR%%/data/Stage/Prefa2.tsc
+%%DATADIR%%/data/Stage/Priso1.pxe
+%%DATADIR%%/data/Stage/Priso1.pxm
+%%DATADIR%%/data/Stage/Priso1.tsc
+%%DATADIR%%/data/Stage/Priso2.pxe
+%%DATADIR%%/data/Stage/Priso2.pxm
+%%DATADIR%%/data/Stage/Priso2.tsc
+%%DATADIR%%/data/Stage/Prt0.pbm
+%%DATADIR%%/data/Stage/PrtAlmond.pbm
+%%DATADIR%%/data/Stage/PrtBarr.pbm
+%%DATADIR%%/data/Stage/PrtCave.pbm
+%%DATADIR%%/data/Stage/PrtCent.pbm
+%%DATADIR%%/data/Stage/PrtEggIn.pbm
+%%DATADIR%%/data/Stage/PrtEggX.pbm
+%%DATADIR%%/data/Stage/PrtEggs.pbm
+%%DATADIR%%/data/Stage/PrtFall.pbm
+%%DATADIR%%/data/Stage/PrtGard.pbm
+%%DATADIR%%/data/Stage/PrtHell.pbm
+%%DATADIR%%/data/Stage/PrtJail.pbm
+%%DATADIR%%/data/Stage/PrtLabo.pbm
+%%DATADIR%%/data/Stage/PrtMaze.pbm
+%%DATADIR%%/data/Stage/PrtMimi.pbm
+%%DATADIR%%/data/Stage/PrtOside.pbm
+%%DATADIR%%/data/Stage/PrtPens.pbm
+%%DATADIR%%/data/Stage/PrtRiver.pbm
+%%DATADIR%%/data/Stage/PrtSand.pbm
+%%DATADIR%%/data/Stage/PrtStore.pbm
+%%DATADIR%%/data/Stage/PrtWeed.pbm
+%%DATADIR%%/data/Stage/PrtWhite.pbm
+%%DATADIR%%/data/Stage/Ring1.pxe
+%%DATADIR%%/data/Stage/Ring1.pxm
+%%DATADIR%%/data/Stage/Ring1.tsc
+%%DATADIR%%/data/Stage/Ring2.pxe
+%%DATADIR%%/data/Stage/Ring2.pxm
+%%DATADIR%%/data/Stage/Ring2.tsc
+%%DATADIR%%/data/Stage/Ring3.pxe
+%%DATADIR%%/data/Stage/Ring3.pxm
+%%DATADIR%%/data/Stage/Ring3.tsc
+%%DATADIR%%/data/Stage/River.pxa
+%%DATADIR%%/data/Stage/River.pxe
+%%DATADIR%%/data/Stage/River.pxm
+%%DATADIR%%/data/Stage/River.tsc
+%%DATADIR%%/data/Stage/Sand.pxa
+%%DATADIR%%/data/Stage/Sand.pxe
+%%DATADIR%%/data/Stage/Sand.pxm
+%%DATADIR%%/data/Stage/Sand.tsc
+%%DATADIR%%/data/Stage/SandE.pxe
+%%DATADIR%%/data/Stage/SandE.pxm
+%%DATADIR%%/data/Stage/SandE.tsc
+%%DATADIR%%/data/Stage/Santa.pxe
+%%DATADIR%%/data/Stage/Santa.pxm
+%%DATADIR%%/data/Stage/Santa.tsc
+%%DATADIR%%/data/Stage/Shelt.pxa
+%%DATADIR%%/data/Stage/Shelt.pxe
+%%DATADIR%%/data/Stage/Shelt.pxm
+%%DATADIR%%/data/Stage/Shelt.tsc
+%%DATADIR%%/data/Stage/Start.pxe
+%%DATADIR%%/data/Stage/Start.pxm
+%%DATADIR%%/data/Stage/Start.tsc
+%%DATADIR%%/data/Stage/Statue.pxe
+%%DATADIR%%/data/Stage/Statue.pxm
+%%DATADIR%%/data/Stage/Statue.tsc
+%%DATADIR%%/data/Stage/Store.pxa
+%%DATADIR%%/data/Stage/Stream.pxe
+%%DATADIR%%/data/Stage/Stream.pxm
+%%DATADIR%%/data/Stage/Stream.tsc
+%%DATADIR%%/data/Stage/Weed.pxa
+%%DATADIR%%/data/Stage/Weed.pxe
+%%DATADIR%%/data/Stage/Weed.pxm
+%%DATADIR%%/data/Stage/Weed.tsc
+%%DATADIR%%/data/Stage/WeedB.pxe
+%%DATADIR%%/data/Stage/WeedB.pxm
+%%DATADIR%%/data/Stage/WeedB.tsc
+%%DATADIR%%/data/Stage/WeedD.pxe
+%%DATADIR%%/data/Stage/WeedD.pxm
+%%DATADIR%%/data/Stage/WeedD.tsc
+%%DATADIR%%/data/Stage/WeedS.pxe
+%%DATADIR%%/data/Stage/WeedS.pxm
+%%DATADIR%%/data/Stage/WeedS.tsc
+%%DATADIR%%/data/Stage/White.pxa
+%%DATADIR%%/data/Stage/e_Blcn.pxe
+%%DATADIR%%/data/Stage/e_Blcn.pxm
+%%DATADIR%%/data/Stage/e_Blcn.tsc
+%%DATADIR%%/data/Stage/e_Ceme.pxe
+%%DATADIR%%/data/Stage/e_Ceme.pxm
+%%DATADIR%%/data/Stage/e_Ceme.tsc
+%%DATADIR%%/data/Stage/e_Jenk.pxe
+%%DATADIR%%/data/Stage/e_Jenk.pxm
+%%DATADIR%%/data/Stage/e_Jenk.tsc
+%%DATADIR%%/data/Stage/e_Labo.pxe
+%%DATADIR%%/data/Stage/e_Labo.pxm
+%%DATADIR%%/data/Stage/e_Labo.tsc
+%%DATADIR%%/data/Stage/e_Malc.pxe
+%%DATADIR%%/data/Stage/e_Malc.pxm
+%%DATADIR%%/data/Stage/e_Malc.tsc
+%%DATADIR%%/data/Stage/e_Maze.pxe
+%%DATADIR%%/data/Stage/e_Maze.pxm
+%%DATADIR%%/data/Stage/e_Maze.tsc
+%%DATADIR%%/data/Stage/e_Sky.pxe
+%%DATADIR%%/data/Stage/e_Sky.pxm
+%%DATADIR%%/data/Stage/e_Sky.tsc
+%%DATADIR%%/data/StageImage.pbm
+%%DATADIR%%/data/StageSelect.tsc
+%%DATADIR%%/data/TextBox.pbm
+%%DATADIR%%/data/Title.pbm
+%%DATADIR%%/data/bk0.pbm
+%%DATADIR%%/data/bkBlack.pbm
+%%DATADIR%%/data/bkBlue.pbm
+%%DATADIR%%/data/bkFall.pbm
+%%DATADIR%%/data/bkFog.pbm
+%%DATADIR%%/data/bkGard.pbm
+%%DATADIR%%/data/bkGray.pbm
+%%DATADIR%%/data/bkGreen.pbm
+%%DATADIR%%/data/bkMaze.pbm
+%%DATADIR%%/data/bkMoon.pbm
+%%DATADIR%%/data/bkRed.pbm
+%%DATADIR%%/data/bkWater.pbm
+%%DATADIR%%/data/casts.pbm
+%%DATADIR%%/data/npc.tbl
+%%DATADIR%%/font.ttf
+%%DATADIR%%/nx
+%%DATADIR%%/smalfont.bmp
+%%DATADIR%%/sprites.sif
+%%DATADIR%%/tilekey.dat
+share/pixmaps/nxengine.png
diff --git a/games/openbor/files/patch-source_ramlib_ram.c b/games/openbor/files/patch-source_ramlib_ram.c
index f8980f677d3e..b4abb51dec7d 100644
--- a/games/openbor/files/patch-source_ramlib_ram.c
+++ b/games/openbor/files/patch-source_ramlib_ram.c
@@ -48,7 +48,7 @@ Implement Linux-like memory stats for BSDs
  #if (__GNUC__ > 3)
  extern unsigned long _end;
  extern unsigned long _start;
-@@ -93,6 +114,49 @@ u64 getFreeRam(int byte_size)
+@@ -93,6 +114,48 @@ u64 getFreeRam(int byte_size)
          return 0;
      }
      return (u64)(((vms.inactive_count + vms.free_count) * size) / byte_size);
@@ -62,9 +62,8 @@ Implement Linux-like memory stats for BSDs
 +    return (u64)((vms.v_free_count + vms.v_inactive_count
 +                  + vms.v_cache_count) * getpagesize()) / byte_size;
 +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+    u_int v_free_count, v_inactive_count, v_cache_count;
++    u_int v_free_count = 0, v_inactive_count = 0, v_cache_count = 0;
 +    size_t sz = sizeof(u_int);
-+    v_free_count = v_inactive_count = v_cache_count = 0;
 +    sysctlbyname("vm.stats.vm.v_free_count",
 +                 &v_free_count, &sz, NULL, 0);
 +    sysctlbyname("vm.stats.vm.v_inactive_count",
diff --git a/games/openbor3482/files/patch-source_ramlib_ram.c b/games/openbor3482/files/patch-source_ramlib_ram.c
index ea89f1717897..c1609f723ea0 100644
--- a/games/openbor3482/files/patch-source_ramlib_ram.c
+++ b/games/openbor3482/files/patch-source_ramlib_ram.c
@@ -71,7 +71,7 @@ Implement Linux-like memory stats for BSDs
  
  /////////////////////////////////////////////////////////////////////////////
  //  Functions
-@@ -101,6 +136,49 @@ u64 getFreeRam(int byte_size)
+@@ -101,6 +136,48 @@ u64 getFreeRam(int byte_size)
  	if(host_page_size(hostPort, &size) != KERN_SUCCESS) return 0;
  	if(host_statistics(hostPort, HOST_VM_INFO, (host_info_t)&vms, &count) != KERN_SUCCESS) return 0;
  	return (u64)(((vms.inactive_count+vms.free_count)*size)/byte_size);
@@ -85,9 +85,8 @@ Implement Linux-like memory stats for BSDs
 +	return (u64)((vms.v_free_count + vms.v_inactive_count
 +				  + vms.v_cache_count) * getpagesize()) / byte_size;
 +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+	u_int v_free_count, v_inactive_count, v_cache_count;
++	u_int v_free_count = 0, v_inactive_count = 0, v_cache_count = 0;
 +	size_t sz = sizeof(u_int);
-+	v_free_count = v_inactive_count = v_cache_count = 0;
 +	sysctlbyname("vm.stats.vm.v_free_count",
 +				 &v_free_count, &sz, NULL, 0);
 +	sysctlbyname("vm.stats.vm.v_inactive_count",
diff --git a/games/openbor3979/files/patch-source_ramlib_ram.c b/games/openbor3979/files/patch-source_ramlib_ram.c
index 7fadd8587473..9485b7bd1906 100644
--- a/games/openbor3979/files/patch-source_ramlib_ram.c
+++ b/games/openbor3979/files/patch-source_ramlib_ram.c
@@ -71,7 +71,7 @@ Implement Linux-like memory stats for BSDs
  
  /////////////////////////////////////////////////////////////////////////////
  //  Functions
-@@ -107,6 +142,49 @@ u64 getFreeRam(int byte_size)
+@@ -107,6 +142,48 @@ u64 getFreeRam(int byte_size)
          return 0;
      }
      return (u64)(((vms.inactive_count + vms.free_count) * size) / byte_size);
@@ -85,9 +85,8 @@ Implement Linux-like memory stats for BSDs
 +    return (u64)((vms.v_free_count + vms.v_inactive_count
 +                  + vms.v_cache_count) * getpagesize()) / byte_size;
 +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+    u_int v_free_count, v_inactive_count, v_cache_count;
++    u_int v_free_count = 0, v_inactive_count = 0, v_cache_count = 0;
 +    size_t sz = sizeof(u_int);
-+    v_free_count = v_inactive_count = v_cache_count = 0;
 +    sysctlbyname("vm.stats.vm.v_free_count",
 +                 &v_free_count, &sz, NULL, 0);
 +    sysctlbyname("vm.stats.vm.v_inactive_count",
diff --git a/games/openbor4432/files/patch-source_ramlib_ram.c b/games/openbor4432/files/patch-source_ramlib_ram.c
index 5a32a492ed5c..c88e7fda3724 100644
--- a/games/openbor4432/files/patch-source_ramlib_ram.c
+++ b/games/openbor4432/files/patch-source_ramlib_ram.c
@@ -48,7 +48,7 @@ Implement Linux-like memory stats for BSDs
  #if (__GNUC__ > 3)
  extern unsigned long _end;
  extern unsigned long _start;
-@@ -93,6 +114,49 @@ u64 getFreeRam(int byte_size)
+@@ -93,6 +114,48 @@ u64 getFreeRam(int byte_size)
          return 0;
      }
      return (u64)(((vms.inactive_count + vms.free_count) * size) / byte_size);
@@ -62,9 +62,8 @@ Implement Linux-like memory stats for BSDs
 +    return (u64)((vms.v_free_count + vms.v_inactive_count
 +                  + vms.v_cache_count) * getpagesize()) / byte_size;
 +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+    u_int v_free_count, v_inactive_count, v_cache_count;
++    u_int v_free_count = 0, v_inactive_count = 0, v_cache_count = 0;
 +    size_t sz = sizeof(u_int);
-+    v_free_count = v_inactive_count = v_cache_count = 0;
 +    sysctlbyname("vm.stats.vm.v_free_count",
 +                 &v_free_count, &sz, NULL, 0);
 +    sysctlbyname("vm.stats.vm.v_inactive_count",
diff --git a/games/openclonk/Makefile b/games/openclonk/Makefile
index 80bab738d3dd..b5e74b698daf 100644
--- a/games/openclonk/Makefile
+++ b/games/openclonk/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	openclonk
 PORTVERSION=	7.0
 DISTVERSIONSUFFIX=	-src
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games
 MASTER_SITES=	http://www.openclonk.org/builds/release/${DISTVERSION}/
 
diff --git a/games/openmw/Makefile b/games/openmw/Makefile
index 87c521dd865c..c9b72a56e394 100644
--- a/games/openmw/Makefile
+++ b/games/openmw/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	openmw
 PORTVERSION=	0.42.0
+PORTREVISION=	1
 DISTVERSIONPREFIX=	openmw-
 CATEGORIES=	games
 
diff --git a/games/openomf/Makefile b/games/openomf/Makefile
index 9a1cc7391eb8..57769fb70ea5 100644
--- a/games/openomf/Makefile
+++ b/games/openomf/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	openomf
 PORTVERSION=	0.6.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://www.omf2097.com/pub/files/omf/:data
 DISTFILES+=	omf2097.rar:data
diff --git a/games/openrct2/Makefile b/games/openrct2/Makefile
index ea297b78f7de..9f9b180af352 100644
--- a/games/openrct2/Makefile
+++ b/games/openrct2/Makefile
@@ -4,6 +4,7 @@
 PORTNAME=	openrct2
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.1.1
+PORTREVISION=	1
 CATEGORIES=	games
 EXTRACT_ONLY=	${PORTNAME}-${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}_GH0${EXTRACT_SUFX}
 
diff --git a/games/openspades/Makefile b/games/openspades/Makefile
index 7dec74d694fc..05ca22333d92 100644
--- a/games/openspades/Makefile
+++ b/games/openspades/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	openspades
 PORTVERSION=	0.0.12
 DISTVERSIONPREFIX=	v
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	http://yvt.jp/files/programs/osppaks/:data
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} DevPaks27.zip:data
diff --git a/games/opensurge/Makefile b/games/opensurge/Makefile
index 8ad45e4ede65..485e514177ef 100644
--- a/games/opensurge/Makefile
+++ b/games/opensurge/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	opensurge
 PORTVERSION=	0.1.r${SVN_REV}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	http://www.ime.usp.br/~alemart/opensurge_nightly/ \
 		SF/nemysisfreebsdp/${CATEGORIES}/${PORTNAME}/
diff --git a/games/openxcom/Makefile b/games/openxcom/Makefile
index d1b6e443af12..6f2523c12872 100644
--- a/games/openxcom/Makefile
+++ b/games/openxcom/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	openxcom
 PORTVERSION=	1.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
diff --git a/games/openyahtzee/Makefile b/games/openyahtzee/Makefile
index b369b225d101..7dbcef1ee316 100644
--- a/games/openyahtzee/Makefile
+++ b/games/openyahtzee/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	openyahtzee
 PORTVERSION=	1.9.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/Open%20Yahtzee/Open%20Yahtzee%20${PORTVERSION}
 
diff --git a/games/peg-e/Makefile b/games/peg-e/Makefile
index 2da1c1b6876f..3a13c7fabf7c 100644
--- a/games/peg-e/Makefile
+++ b/games/peg-e/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	peg-e
 PORTVERSION=	1.2.3
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://gottcode.org/peg-e/ \
 		http://mirror.amdmi3.ru/distfiles/
diff --git a/games/pingus/Makefile b/games/pingus/Makefile
index 4a4f68364ab4..25b6a37a0438 100644
--- a/games/pingus/Makefile
+++ b/games/pingus/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pingus
 PORTVERSION=	0.7.6
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	games
 MASTER_SITES=	http://mirror.amdmi3.ru/distfiles/
 
diff --git a/games/pink-pony/Makefile b/games/pink-pony/Makefile
index a8ce0494f718..47bd01178e5f 100644
--- a/games/pink-pony/Makefile
+++ b/games/pink-pony/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pink-pony
 PORTVERSION=	1.4.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
diff --git a/games/pioneer/Makefile b/games/pioneer/Makefile
index 6eccc6d25dab..40cdbf2d7903 100644
--- a/games/pioneer/Makefile
+++ b/games/pioneer/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pioneer
 PORTVERSION=	0.0.${GH_TAGNAME}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
diff --git a/games/polypuzzle/Makefile b/games/polypuzzle/Makefile
index 59641e103f7e..b37a9d5e7e91 100644
--- a/games/polypuzzle/Makefile
+++ b/games/polypuzzle/Makefile
@@ -9,6 +9,10 @@ MASTER_SITES=	SF/tkgames/${PORTNAME}/main
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tessellation puzzle game
 
+DEPRECATED=		This port depends on Tcl/Tk 8.4 , which is no longer\
+			maintained. Please port it to 8.5+
+EXPIRATION_DATE=	2017-10-15
+
 USES= 		tar:tgz tk:84,run
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
diff --git a/games/py-mnemosyne/Makefile b/games/py-mnemosyne/Makefile
index b84f31714769..093f2625d87f 100644
--- a/games/py-mnemosyne/Makefile
+++ b/games/py-mnemosyne/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mnemosyne
 PORTVERSION=	2.3.6
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	games python
 MASTER_SITES=	SF/mnemosyne-proj/${PORTNAME}/${PORTNAME}-${DISTVERSION}
diff --git a/games/quackle/Makefile b/games/quackle/Makefile
index a2e1e758e269..02a7a0a3ecce 100644
--- a/games/quackle/Makefile
+++ b/games/quackle/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	quackle
 PORTVERSION=	1.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	games
 
diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile
index ac6d7fe026be..be7ef56339a6 100644
--- a/games/quakeforge/Makefile
+++ b/games/quakeforge/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	quakeforge
 PORTVERSION=	0.7.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	SF/quake/quake/${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
diff --git a/games/retroarch/Makefile b/games/retroarch/Makefile
index 1a5f80f4c5c7..f322509383eb 100644
--- a/games/retroarch/Makefile
+++ b/games/retroarch/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	RetroArch
 PORTVERSION=	1.3.6
 DISTVERSIONPREFIX=	v
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	games
 
 MAINTAINER=	yuri@rawbw.com
diff --git a/games/rubix/Makefile b/games/rubix/Makefile
index 10f120011f50..b9ac20634789 100644
--- a/games/rubix/Makefile
+++ b/games/rubix/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	rubix
 PORTVERSION=	1.0.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://sed.free.fr/rubix/ \
 		http://mirror.mcx2.org/
diff --git a/games/scid/Makefile b/games/scid/Makefile
index 00e8c2336b08..cb42810c9649 100644
--- a/games/scid/Makefile
+++ b/games/scid/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	scid
 PORTVERSION=	4.6.4
+PORTREVISION=	1
 CATEGORIES=	games databases
 MASTER_SITES=	SF/${PORTNAME}/Scid/Scid%204.6/
 
@@ -10,7 +11,7 @@ MAINTAINER=	bsd@volki.at
 COMMENT=	Free chess database application
 
 HAS_CONFIGURE=	yes
-USES=		gmake python shebangfix tk:84,85,86 zip
+USES=		gmake python shebangfix tk:85+ zip
 SHEBANG_FILES=	tcl/lang/checklangs.tcl \
 		tcl/lang/propagatelang.tcl \
 		tcl/lang/removetoken.tcl
diff --git a/games/sdl_scavenger/Makefile b/games/sdl_scavenger/Makefile
index 4c9144bc61a6..94900ec84897 100644
--- a/games/sdl_scavenger/Makefile
+++ b/games/sdl_scavenger/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	sdl_scavenger
 PORTVERSION=	145.2015.01.05
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	games
 MASTER_SITES=	SF/sdlscavenger/
diff --git a/games/sdlpop/Makefile b/games/sdlpop/Makefile
new file mode 100644
index 000000000000..99d9dfbc2af7
--- /dev/null
+++ b/games/sdlpop/Makefile
@@ -0,0 +1,42 @@
+# Created by: Piotr Kubaj <pkubaj@anongoth.pl>
+# $FreeBSD$
+
+PORTNAME=	sdlpop
+DISTVERSIONPREFIX=	v
+DISTVERSION=	1.17
+CATEGORIES=	games
+
+MAINTAINER=	pkubaj@anongoth.pl
+COMMENT=	Open-source port of Prince of Persia
+
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/../doc/gpl-3.0.txt
+
+USES=		cmake localbase:ldflags
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	NagyD
+
+WRKSRC=		${WRKDIR}/SDLPoP-${PORTVERSION}/src
+USE_SDL=	sdl2 image2 mixer2
+PORTDOCS=	*
+
+DESKTOP_ENTRIES=	"Prince" "Open-Source port of Prince of Persia" \
+		"${DATADIR}/icon.png" "prince"  "Game;" false
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|' ${WRKSRC}/seg009.c
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/../prince ${STAGEDIR}/${PREFIX}/bin/
+	${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${DATADIR}
+	cd ${WRKSRC}/../data ; ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} \
+		${WRKSRC}/../doc/bugs.txt \
+		${WRKSRC}/../doc/ChangeLog.txt \
+		${WRKSRC}/../doc/mod.ini \
+		${WRKSRC}/../doc/Readme.txt \
+		${WRKSRC}/../SDLPoP.ini \
+		${STAGEDIR}${DOCSDIR}
+
+.include <bsd.port.mk>
diff --git a/games/sdlpop/distinfo b/games/sdlpop/distinfo
new file mode 100644
index 000000000000..46f253e3c7db
--- /dev/null
+++ b/games/sdlpop/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1502897183
+SHA256 (NagyD-sdlpop-v1.17_GH0.tar.gz) = aa4b254ab80b889a6db491b41c4f83467124d932cc0836e5979fa73b6c49a94d
+SIZE (NagyD-sdlpop-v1.17_GH0.tar.gz) = 3713129
diff --git a/games/sdlpop/files/patch-seg009.c b/games/sdlpop/files/patch-seg009.c
new file mode 100644
index 000000000000..bc7253735f10
--- /dev/null
+++ b/games/sdlpop/files/patch-seg009.c
@@ -0,0 +1,56 @@
+--- seg009.c.orig	2017-02-05 07:38:56 UTC
++++ seg009.c
+@@ -152,7 +152,7 @@ static FILE* open_dat_from_root_or_data_dir(const char
+ 	// if failed, try if the DAT file can be opened in the data/ directory, instead of the main folder
+ 	if (fp == NULL) {
+ 		char data_path[POP_MAX_PATH];
+-		snprintf(data_path, sizeof(data_path), "data/%s", filename);
++		snprintf(data_path, sizeof(data_path), "%%DATADIR%%/%s", filename);
+ 
+ 		// verify that this is a regular file and not a directory (otherwise, don't open)
+ 		struct stat path_stat;
+@@ -1644,7 +1644,7 @@ const int max_sound_id = 58;
+ char** sound_names = NULL;
+ 
+ void load_sound_names() {
+-	const char* names_path = "data/music/names.txt";
++	const char* names_path = "%%DATADIR%%/music/names.txt";
+ 	if (sound_names != NULL) return;
+ 	FILE* fp = fopen(names_path,"rt");
+ 	if (fp==NULL) return;
+@@ -1692,7 +1692,7 @@ sound_buffer_type* load_sound(int index) {
+ 				const char* ext=exts[i];
+ 				struct stat info;
+ 
+-				snprintf(filename, sizeof(filename), "data/music/%s.%s", sound_name(index), ext);
++				snprintf(filename, sizeof(filename), "%%DATADIR%%/music/%s.%s", sound_name(index), ext);
+ 				// Skip nonexistent files:
+ 				if (stat(filename, &info))
+ 					continue;
+@@ -1933,7 +1933,7 @@ int __pascal far check_sound_playing() {
+ // seg009:38ED
+ void __pascal far set_gr_mode(byte grmode) {
+ 	if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER | SDL_INIT_NOPARACHUTE |
+-				 SDL_INIT_GAMECONTROLLER | SDL_INIT_HAPTIC ) != 0) {
++				 SDL_INIT_GAMECONTROLLER) != 0) {
+ 		sdlperror("SDL_Init");
+ 		quit(1);
+ 	}
+@@ -1957,7 +1957,7 @@ void __pascal far set_gr_mode(byte grmode) {
+ 										  pop_window_width, pop_window_height, flags);
+ 	renderer_ = SDL_CreateRenderer(window_, -1 , SDL_RENDERER_ACCELERATED );
+ 
+-	SDL_Surface* icon = IMG_Load("data/icon.png");
++	SDL_Surface* icon = IMG_Load("%%DATADIR%%/icon.png");
+ 	if (icon == NULL) {
+ 		sdlperror("Could not load icon");
+ 	} else {
+@@ -2109,7 +2109,7 @@ void load_from_opendats_metadata(int resource_id, cons
+ 			if (len >= 5 && filename_no_ext[len-4] == '.') {
+ 				filename_no_ext[len-4] = '\0'; // terminate, so ".DAT" is deleted from the filename
+ 			}
+-			snprintf(image_filename,sizeof(image_filename),"data/%s/res%d.%s",filename_no_ext, resource_id, extension);
++			snprintf(image_filename,sizeof(image_filename),"%%DATADIR%%/%s/res%d.%s",filename_no_ext, resource_id, extension);
+ 			if (!use_custom_levelset) {
+ 				//printf("loading (binary) %s",image_filename);
+ 				fp = fopen(image_filename, "rb");
diff --git a/games/sdlpop/pkg-descr b/games/sdlpop/pkg-descr
new file mode 100644
index 000000000000..4fe18e82cffe
--- /dev/null
+++ b/games/sdlpop/pkg-descr
@@ -0,0 +1,4 @@
+An open-source port of Prince of Persia, based on the disassembly of the DOS
+version.
+
+WWW: https://github.com/NagyD/SDLPoP
diff --git a/games/sdlpop/pkg-plist b/games/sdlpop/pkg-plist
new file mode 100644
index 000000000000..46e1f77624ca
--- /dev/null
+++ b/games/sdlpop/pkg-plist
@@ -0,0 +1,1071 @@
+bin/prince
+%%DATADIR%%/DIGISND1.DAT
+%%DATADIR%%/DIGISND2.DAT
+%%DATADIR%%/DIGISND3.DAT
+%%DATADIR%%/FAT/res750.pal
+%%DATADIR%%/FAT/res751.png
+%%DATADIR%%/FAT/res752.png
+%%DATADIR%%/FAT/res753.png
+%%DATADIR%%/FAT/res754.png
+%%DATADIR%%/FAT/res755.png
+%%DATADIR%%/FAT/res756.png
+%%DATADIR%%/FAT/res757.png
+%%DATADIR%%/FAT/res758.png
+%%DATADIR%%/FAT/res759.png
+%%DATADIR%%/FAT/res760.png
+%%DATADIR%%/FAT/res761.png
+%%DATADIR%%/FAT/res762.png
+%%DATADIR%%/FAT/res763.png
+%%DATADIR%%/FAT/res764.png
+%%DATADIR%%/FAT/res765.png
+%%DATADIR%%/FAT/res766.png
+%%DATADIR%%/FAT/res767.png
+%%DATADIR%%/FAT/res768.png
+%%DATADIR%%/FAT/res769.png
+%%DATADIR%%/FAT/res770.png
+%%DATADIR%%/FAT/res771.png
+%%DATADIR%%/FAT/res772.png
+%%DATADIR%%/FAT/res773.png
+%%DATADIR%%/FAT/res774.png
+%%DATADIR%%/FAT/res775.png
+%%DATADIR%%/FAT/res776.png
+%%DATADIR%%/FAT/res777.png
+%%DATADIR%%/FAT/res778.png
+%%DATADIR%%/FAT/res779.png
+%%DATADIR%%/FAT/res780.png
+%%DATADIR%%/FAT/res781.png
+%%DATADIR%%/FAT/res782.png
+%%DATADIR%%/FAT/res783.png
+%%DATADIR%%/FAT/res784.png
+%%DATADIR%%/GUARD.DAT
+%%DATADIR%%/GUARD/res751.png
+%%DATADIR%%/GUARD/res752.png
+%%DATADIR%%/GUARD/res753.png
+%%DATADIR%%/GUARD/res754.png
+%%DATADIR%%/GUARD/res755.png
+%%DATADIR%%/GUARD/res756.png
+%%DATADIR%%/GUARD/res757.png
+%%DATADIR%%/GUARD/res758.png
+%%DATADIR%%/GUARD/res759.png
+%%DATADIR%%/GUARD/res760.png
+%%DATADIR%%/GUARD/res761.png
+%%DATADIR%%/GUARD/res762.png
+%%DATADIR%%/GUARD/res763.png
+%%DATADIR%%/GUARD/res764.png
+%%DATADIR%%/GUARD/res765.png
+%%DATADIR%%/GUARD/res766.png
+%%DATADIR%%/GUARD/res767.png
+%%DATADIR%%/GUARD/res768.png
+%%DATADIR%%/GUARD/res769.png
+%%DATADIR%%/GUARD/res770.png
+%%DATADIR%%/GUARD/res771.png
+%%DATADIR%%/GUARD/res772.png
+%%DATADIR%%/GUARD/res773.png
+%%DATADIR%%/GUARD/res774.png
+%%DATADIR%%/GUARD/res775.png
+%%DATADIR%%/GUARD/res776.png
+%%DATADIR%%/GUARD/res777.png
+%%DATADIR%%/GUARD/res778.png
+%%DATADIR%%/GUARD/res779.png
+%%DATADIR%%/GUARD/res780.png
+%%DATADIR%%/GUARD/res781.png
+%%DATADIR%%/GUARD/res782.png
+%%DATADIR%%/GUARD/res783.png
+%%DATADIR%%/GUARD/res784.png
+%%DATADIR%%/GUARD1.DAT
+%%DATADIR%%/GUARD1/res750.pal
+%%DATADIR%%/GUARD2.DAT
+%%DATADIR%%/GUARD2/res750.pal
+%%DATADIR%%/IBM_SND1/res10000.bin
+%%DATADIR%%/IBM_SND1/res10001.bin
+%%DATADIR%%/IBM_SND1/res10002.bin
+%%DATADIR%%/IBM_SND1/res10003.bin
+%%DATADIR%%/IBM_SND1/res10004.bin
+%%DATADIR%%/IBM_SND1/res10005.bin
+%%DATADIR%%/IBM_SND1/res10006.bin
+%%DATADIR%%/IBM_SND1/res10007.bin
+%%DATADIR%%/IBM_SND1/res10008.bin
+%%DATADIR%%/IBM_SND1/res10009.bin
+%%DATADIR%%/IBM_SND1/res10010.bin
+%%DATADIR%%/IBM_SND1/res10011.bin
+%%DATADIR%%/IBM_SND1/res10012.bin
+%%DATADIR%%/IBM_SND1/res10013.bin
+%%DATADIR%%/IBM_SND1/res10014.bin
+%%DATADIR%%/IBM_SND1/res10015.bin
+%%DATADIR%%/IBM_SND1/res10016.bin
+%%DATADIR%%/IBM_SND1/res10017.bin
+%%DATADIR%%/IBM_SND1/res10018.bin
+%%DATADIR%%/IBM_SND1/res10019.bin
+%%DATADIR%%/IBM_SND1/res10020.bin
+%%DATADIR%%/IBM_SND1/res10021.bin
+%%DATADIR%%/IBM_SND1/res10022.bin
+%%DATADIR%%/IBM_SND1/res10023.bin
+%%DATADIR%%/IBM_SND1/res10024.bin
+%%DATADIR%%/IBM_SND1/res10025.bin
+%%DATADIR%%/IBM_SND1/res10026.bin
+%%DATADIR%%/IBM_SND1/res10027.bin
+%%DATADIR%%/IBM_SND1/res10028.bin
+%%DATADIR%%/IBM_SND1/res10029.bin
+%%DATADIR%%/IBM_SND1/res10030.bin
+%%DATADIR%%/IBM_SND1/res10031.bin
+%%DATADIR%%/IBM_SND1/res10032.bin
+%%DATADIR%%/IBM_SND1/res10033.bin
+%%DATADIR%%/IBM_SND1/res10034.bin
+%%DATADIR%%/IBM_SND1/res10035.bin
+%%DATADIR%%/IBM_SND1/res10036.bin
+%%DATADIR%%/IBM_SND1/res10037.bin
+%%DATADIR%%/IBM_SND1/res10038.bin
+%%DATADIR%%/IBM_SND1/res10039.bin
+%%DATADIR%%/IBM_SND1/res10040.bin
+%%DATADIR%%/IBM_SND1/res10041.bin
+%%DATADIR%%/IBM_SND1/res10042.bin
+%%DATADIR%%/IBM_SND1/res10043.bin
+%%DATADIR%%/IBM_SND2/res10044.bin
+%%DATADIR%%/IBM_SND2/res10045.bin
+%%DATADIR%%/IBM_SND2/res10046.bin
+%%DATADIR%%/IBM_SND2/res10047.bin
+%%DATADIR%%/IBM_SND2/res10048.bin
+%%DATADIR%%/IBM_SND2/res10049.bin
+%%DATADIR%%/IBM_SND2/res10050.bin
+%%DATADIR%%/IBM_SND2/res10051.bin
+%%DATADIR%%/IBM_SND2/res10052.bin
+%%DATADIR%%/IBM_SND2/res10053.bin
+%%DATADIR%%/IBM_SND2/res10054.bin
+%%DATADIR%%/IBM_SND2/res10055.bin
+%%DATADIR%%/IBM_SND2/res10056.bin
+%%DATADIR%%/KID/res400.pal
+%%DATADIR%%/KID/res401.png
+%%DATADIR%%/KID/res402.png
+%%DATADIR%%/KID/res403.png
+%%DATADIR%%/KID/res404.png
+%%DATADIR%%/KID/res405.png
+%%DATADIR%%/KID/res406.png
+%%DATADIR%%/KID/res407.png
+%%DATADIR%%/KID/res408.png
+%%DATADIR%%/KID/res409.png
+%%DATADIR%%/KID/res410.png
+%%DATADIR%%/KID/res411.png
+%%DATADIR%%/KID/res412.png
+%%DATADIR%%/KID/res413.png
+%%DATADIR%%/KID/res414.png
+%%DATADIR%%/KID/res415.png
+%%DATADIR%%/KID/res416.png
+%%DATADIR%%/KID/res417.png
+%%DATADIR%%/KID/res418.png
+%%DATADIR%%/KID/res419.png
+%%DATADIR%%/KID/res420.png
+%%DATADIR%%/KID/res421.png
+%%DATADIR%%/KID/res422.png
+%%DATADIR%%/KID/res423.png
+%%DATADIR%%/KID/res424.png
+%%DATADIR%%/KID/res425.png
+%%DATADIR%%/KID/res426.png
+%%DATADIR%%/KID/res427.png
+%%DATADIR%%/KID/res428.png
+%%DATADIR%%/KID/res429.png
+%%DATADIR%%/KID/res430.png
+%%DATADIR%%/KID/res431.png
+%%DATADIR%%/KID/res432.png
+%%DATADIR%%/KID/res433.png
+%%DATADIR%%/KID/res434.png
+%%DATADIR%%/KID/res435.png
+%%DATADIR%%/KID/res436.png
+%%DATADIR%%/KID/res437.png
+%%DATADIR%%/KID/res438.png
+%%DATADIR%%/KID/res439.png
+%%DATADIR%%/KID/res440.png
+%%DATADIR%%/KID/res441.png
+%%DATADIR%%/KID/res442.png
+%%DATADIR%%/KID/res443.png
+%%DATADIR%%/KID/res444.png
+%%DATADIR%%/KID/res445.png
+%%DATADIR%%/KID/res446.png
+%%DATADIR%%/KID/res447.png
+%%DATADIR%%/KID/res448.png
+%%DATADIR%%/KID/res449.png
+%%DATADIR%%/KID/res450.png
+%%DATADIR%%/KID/res451.png
+%%DATADIR%%/KID/res452.png
+%%DATADIR%%/KID/res453.png
+%%DATADIR%%/KID/res454.png
+%%DATADIR%%/KID/res455.png
+%%DATADIR%%/KID/res456.png
+%%DATADIR%%/KID/res457.png
+%%DATADIR%%/KID/res458.png
+%%DATADIR%%/KID/res459.png
+%%DATADIR%%/KID/res460.png
+%%DATADIR%%/KID/res461.png
+%%DATADIR%%/KID/res462.png
+%%DATADIR%%/KID/res463.png
+%%DATADIR%%/KID/res464.png
+%%DATADIR%%/KID/res465.png
+%%DATADIR%%/KID/res466.png
+%%DATADIR%%/KID/res467.png
+%%DATADIR%%/KID/res468.png
+%%DATADIR%%/KID/res469.png
+%%DATADIR%%/KID/res470.png
+%%DATADIR%%/KID/res471.png
+%%DATADIR%%/KID/res472.png
+%%DATADIR%%/KID/res473.png
+%%DATADIR%%/KID/res474.png
+%%DATADIR%%/KID/res475.png
+%%DATADIR%%/KID/res476.png
+%%DATADIR%%/KID/res477.png
+%%DATADIR%%/KID/res478.png
+%%DATADIR%%/KID/res479.png
+%%DATADIR%%/KID/res480.png
+%%DATADIR%%/KID/res481.png
+%%DATADIR%%/KID/res482.png
+%%DATADIR%%/KID/res483.png
+%%DATADIR%%/KID/res484.png
+%%DATADIR%%/KID/res485.png
+%%DATADIR%%/KID/res486.png
+%%DATADIR%%/KID/res487.png
+%%DATADIR%%/KID/res488.png
+%%DATADIR%%/KID/res489.png
+%%DATADIR%%/KID/res490.png
+%%DATADIR%%/KID/res491.png
+%%DATADIR%%/KID/res492.png
+%%DATADIR%%/KID/res493.png
+%%DATADIR%%/KID/res494.png
+%%DATADIR%%/KID/res495.png
+%%DATADIR%%/KID/res496.png
+%%DATADIR%%/KID/res497.png
+%%DATADIR%%/KID/res498.png
+%%DATADIR%%/KID/res499.png
+%%DATADIR%%/KID/res500.png
+%%DATADIR%%/KID/res501.png
+%%DATADIR%%/KID/res502.png
+%%DATADIR%%/KID/res503.png
+%%DATADIR%%/KID/res504.png
+%%DATADIR%%/KID/res505.png
+%%DATADIR%%/KID/res506.png
+%%DATADIR%%/KID/res507.png
+%%DATADIR%%/KID/res508.png
+%%DATADIR%%/KID/res509.png
+%%DATADIR%%/KID/res510.png
+%%DATADIR%%/KID/res511.png
+%%DATADIR%%/KID/res512.png
+%%DATADIR%%/KID/res513.png
+%%DATADIR%%/KID/res514.png
+%%DATADIR%%/KID/res515.png
+%%DATADIR%%/KID/res516.png
+%%DATADIR%%/KID/res517.png
+%%DATADIR%%/KID/res518.png
+%%DATADIR%%/KID/res519.png
+%%DATADIR%%/KID/res520.png
+%%DATADIR%%/KID/res521.png
+%%DATADIR%%/KID/res522.png
+%%DATADIR%%/KID/res523.png
+%%DATADIR%%/KID/res524.png
+%%DATADIR%%/KID/res525.png
+%%DATADIR%%/KID/res526.png
+%%DATADIR%%/KID/res527.png
+%%DATADIR%%/KID/res528.png
+%%DATADIR%%/KID/res529.png
+%%DATADIR%%/KID/res530.png
+%%DATADIR%%/KID/res531.png
+%%DATADIR%%/KID/res532.png
+%%DATADIR%%/KID/res533.png
+%%DATADIR%%/KID/res534.png
+%%DATADIR%%/KID/res535.png
+%%DATADIR%%/KID/res536.png
+%%DATADIR%%/KID/res537.png
+%%DATADIR%%/KID/res538.png
+%%DATADIR%%/KID/res539.png
+%%DATADIR%%/KID/res540.png
+%%DATADIR%%/KID/res541.png
+%%DATADIR%%/KID/res542.png
+%%DATADIR%%/KID/res543.png
+%%DATADIR%%/KID/res544.png
+%%DATADIR%%/KID/res545.png
+%%DATADIR%%/KID/res546.png
+%%DATADIR%%/KID/res547.png
+%%DATADIR%%/KID/res548.png
+%%DATADIR%%/KID/res549.png
+%%DATADIR%%/KID/res550.png
+%%DATADIR%%/KID/res551.png
+%%DATADIR%%/KID/res552.png
+%%DATADIR%%/KID/res553.png
+%%DATADIR%%/KID/res554.png
+%%DATADIR%%/KID/res555.png
+%%DATADIR%%/KID/res556.png
+%%DATADIR%%/KID/res557.png
+%%DATADIR%%/KID/res558.png
+%%DATADIR%%/KID/res559.png
+%%DATADIR%%/KID/res560.png
+%%DATADIR%%/KID/res561.png
+%%DATADIR%%/KID/res562.png
+%%DATADIR%%/KID/res563.png
+%%DATADIR%%/KID/res564.png
+%%DATADIR%%/KID/res565.png
+%%DATADIR%%/KID/res566.png
+%%DATADIR%%/KID/res567.png
+%%DATADIR%%/KID/res568.png
+%%DATADIR%%/KID/res569.png
+%%DATADIR%%/KID/res570.png
+%%DATADIR%%/KID/res571.png
+%%DATADIR%%/KID/res572.png
+%%DATADIR%%/KID/res573.png
+%%DATADIR%%/KID/res574.png
+%%DATADIR%%/KID/res575.png
+%%DATADIR%%/KID/res576.png
+%%DATADIR%%/KID/res577.png
+%%DATADIR%%/KID/res578.png
+%%DATADIR%%/KID/res579.png
+%%DATADIR%%/KID/res580.png
+%%DATADIR%%/KID/res581.png
+%%DATADIR%%/KID/res582.png
+%%DATADIR%%/KID/res583.png
+%%DATADIR%%/KID/res584.png
+%%DATADIR%%/KID/res585.png
+%%DATADIR%%/KID/res586.png
+%%DATADIR%%/KID/res587.png
+%%DATADIR%%/KID/res588.png
+%%DATADIR%%/KID/res589.png
+%%DATADIR%%/KID/res590.png
+%%DATADIR%%/KID/res591.png
+%%DATADIR%%/KID/res592.png
+%%DATADIR%%/KID/res593.png
+%%DATADIR%%/KID/res594.png
+%%DATADIR%%/KID/res595.png
+%%DATADIR%%/KID/res596.png
+%%DATADIR%%/KID/res597.png
+%%DATADIR%%/KID/res598.png
+%%DATADIR%%/KID/res599.png
+%%DATADIR%%/KID/res600.png
+%%DATADIR%%/KID/res601.png
+%%DATADIR%%/KID/res602.png
+%%DATADIR%%/KID/res603.png
+%%DATADIR%%/KID/res604.png
+%%DATADIR%%/KID/res605.png
+%%DATADIR%%/KID/res606.png
+%%DATADIR%%/KID/res607.png
+%%DATADIR%%/KID/res608.png
+%%DATADIR%%/KID/res609.png
+%%DATADIR%%/KID/res610.png
+%%DATADIR%%/KID/res611.png
+%%DATADIR%%/KID/res612.png
+%%DATADIR%%/KID/res613.png
+%%DATADIR%%/KID/res614.png
+%%DATADIR%%/KID/res615.png
+%%DATADIR%%/KID/res616.png
+%%DATADIR%%/KID/res617.png
+%%DATADIR%%/KID/res618.png
+%%DATADIR%%/KID/res619.png
+%%DATADIR%%/LEVELS/res2000.bin
+%%DATADIR%%/LEVELS/res2001.bin
+%%DATADIR%%/LEVELS/res2002.bin
+%%DATADIR%%/LEVELS/res2003.bin
+%%DATADIR%%/LEVELS/res2004.bin
+%%DATADIR%%/LEVELS/res2005.bin
+%%DATADIR%%/LEVELS/res2006.bin
+%%DATADIR%%/LEVELS/res2007.bin
+%%DATADIR%%/LEVELS/res2008.bin
+%%DATADIR%%/LEVELS/res2009.bin
+%%DATADIR%%/LEVELS/res2010.bin
+%%DATADIR%%/LEVELS/res2011.bin
+%%DATADIR%%/LEVELS/res2012.bin
+%%DATADIR%%/LEVELS/res2013.bin
+%%DATADIR%%/LEVELS/res2014.bin
+%%DATADIR%%/LEVELS/res2015.bin
+%%DATADIR%%/PRINCE/res10.bin
+%%DATADIR%%/PRINCE/res150.pal
+%%DATADIR%%/PRINCE/res151.png
+%%DATADIR%%/PRINCE/res152.png
+%%DATADIR%%/PRINCE/res153.png
+%%DATADIR%%/PRINCE/res154.png
+%%DATADIR%%/PRINCE/res155.png
+%%DATADIR%%/PRINCE/res156.png
+%%DATADIR%%/PRINCE/res157.png
+%%DATADIR%%/PRINCE/res158.png
+%%DATADIR%%/PRINCE/res159.png
+%%DATADIR%%/PRINCE/res160.png
+%%DATADIR%%/PRINCE/res161.png
+%%DATADIR%%/PRINCE/res162.png
+%%DATADIR%%/PRINCE/res163.png
+%%DATADIR%%/PRINCE/res164.png
+%%DATADIR%%/PRINCE/res165.png
+%%DATADIR%%/PRINCE/res166.png
+%%DATADIR%%/PRINCE/res167.png
+%%DATADIR%%/PRINCE/res168.png
+%%DATADIR%%/PRINCE/res169.png
+%%DATADIR%%/PRINCE/res170.png
+%%DATADIR%%/PRINCE/res171.png
+%%DATADIR%%/PRINCE/res172.png
+%%DATADIR%%/PRINCE/res173.png
+%%DATADIR%%/PRINCE/res700.pal
+%%DATADIR%%/PRINCE/res701.png
+%%DATADIR%%/PRINCE/res702.png
+%%DATADIR%%/PRINCE/res703.png
+%%DATADIR%%/PRINCE/res704.png
+%%DATADIR%%/PRINCE/res705.png
+%%DATADIR%%/PRINCE/res706.png
+%%DATADIR%%/PRINCE/res707.png
+%%DATADIR%%/PRINCE/res708.png
+%%DATADIR%%/PRINCE/res709.png
+%%DATADIR%%/PRINCE/res710.png
+%%DATADIR%%/PRINCE/res711.png
+%%DATADIR%%/PRINCE/res712.png
+%%DATADIR%%/PRINCE/res713.png
+%%DATADIR%%/PRINCE/res714.png
+%%DATADIR%%/PRINCE/res715.png
+%%DATADIR%%/PRINCE/res716.png
+%%DATADIR%%/PRINCE/res717.png
+%%DATADIR%%/PRINCE/res718.png
+%%DATADIR%%/PRINCE/res719.png
+%%DATADIR%%/PRINCE/res720.png
+%%DATADIR%%/PRINCE/res721.png
+%%DATADIR%%/PRINCE/res722.png
+%%DATADIR%%/PRINCE/res723.png
+%%DATADIR%%/PRINCE/res724.png
+%%DATADIR%%/PRINCE/res725.png
+%%DATADIR%%/PRINCE/res726.png
+%%DATADIR%%/PRINCE/res727.png
+%%DATADIR%%/PRINCE/res728.png
+%%DATADIR%%/PRINCE/res729.png
+%%DATADIR%%/PRINCE/res730.png
+%%DATADIR%%/PRINCE/res731.png
+%%DATADIR%%/PRINCE/res732.png
+%%DATADIR%%/PRINCE/res733.png
+%%DATADIR%%/PRINCE/res734.png
+%%DATADIR%%/PV/res800.pal
+%%DATADIR%%/PV/res801.png
+%%DATADIR%%/PV/res802.png
+%%DATADIR%%/PV/res803.png
+%%DATADIR%%/PV/res804.png
+%%DATADIR%%/PV/res805.png
+%%DATADIR%%/PV/res806.png
+%%DATADIR%%/PV/res807.png
+%%DATADIR%%/PV/res808.png
+%%DATADIR%%/PV/res809.png
+%%DATADIR%%/PV/res810.png
+%%DATADIR%%/PV/res811.png
+%%DATADIR%%/PV/res812.png
+%%DATADIR%%/PV/res813.png
+%%DATADIR%%/PV/res814.png
+%%DATADIR%%/PV/res815.png
+%%DATADIR%%/PV/res816.png
+%%DATADIR%%/PV/res817.png
+%%DATADIR%%/PV/res850.pal
+%%DATADIR%%/PV/res851.png
+%%DATADIR%%/PV/res852.png
+%%DATADIR%%/PV/res853.png
+%%DATADIR%%/PV/res854.png
+%%DATADIR%%/PV/res855.png
+%%DATADIR%%/PV/res856.png
+%%DATADIR%%/PV/res857.png
+%%DATADIR%%/PV/res858.png
+%%DATADIR%%/PV/res859.png
+%%DATADIR%%/PV/res860.png
+%%DATADIR%%/PV/res861.png
+%%DATADIR%%/PV/res862.png
+%%DATADIR%%/PV/res863.png
+%%DATADIR%%/PV/res864.png
+%%DATADIR%%/PV/res865.png
+%%DATADIR%%/PV/res866.png
+%%DATADIR%%/PV/res867.png
+%%DATADIR%%/PV/res868.png
+%%DATADIR%%/PV/res869.png
+%%DATADIR%%/PV/res870.png
+%%DATADIR%%/PV/res871.png
+%%DATADIR%%/PV/res872.png
+%%DATADIR%%/PV/res873.png
+%%DATADIR%%/PV/res874.png
+%%DATADIR%%/PV/res875.png
+%%DATADIR%%/PV/res876.png
+%%DATADIR%%/PV/res877.png
+%%DATADIR%%/PV/res878.png
+%%DATADIR%%/PV/res879.png
+%%DATADIR%%/PV/res880.png
+%%DATADIR%%/PV/res881.png
+%%DATADIR%%/PV/res882.png
+%%DATADIR%%/PV/res883.png
+%%DATADIR%%/PV/res884.png
+%%DATADIR%%/PV/res885.png
+%%DATADIR%%/PV/res886.png
+%%DATADIR%%/PV/res887.png
+%%DATADIR%%/PV/res888.png
+%%DATADIR%%/PV/res900.pal
+%%DATADIR%%/PV/res901.png
+%%DATADIR%%/PV/res902.png
+%%DATADIR%%/PV/res903.png
+%%DATADIR%%/PV/res904.png
+%%DATADIR%%/PV/res905.png
+%%DATADIR%%/PV/res906.png
+%%DATADIR%%/PV/res907.png
+%%DATADIR%%/PV/res908.png
+%%DATADIR%%/PV/res909.png
+%%DATADIR%%/PV/res910.png
+%%DATADIR%%/PV/res911.png
+%%DATADIR%%/PV/res912.png
+%%DATADIR%%/PV/res913.png
+%%DATADIR%%/PV/res914.png
+%%DATADIR%%/PV/res915.png
+%%DATADIR%%/PV/res916.png
+%%DATADIR%%/PV/res917.png
+%%DATADIR%%/PV/res918.png
+%%DATADIR%%/PV/res919.png
+%%DATADIR%%/PV/res920.png
+%%DATADIR%%/PV/res921.png
+%%DATADIR%%/PV/res922.png
+%%DATADIR%%/PV/res923.png
+%%DATADIR%%/PV/res924.png
+%%DATADIR%%/PV/res925.png
+%%DATADIR%%/PV/res926.png
+%%DATADIR%%/PV/res927.png
+%%DATADIR%%/PV/res928.png
+%%DATADIR%%/PV/res929.png
+%%DATADIR%%/PV/res930.png
+%%DATADIR%%/PV/res950.pal
+%%DATADIR%%/PV/res951.png
+%%DATADIR%%/PV/res952.png
+%%DATADIR%%/PV/res953.png
+%%DATADIR%%/PV/res954.png
+%%DATADIR%%/PV/res955.png
+%%DATADIR%%/PV/res956.png
+%%DATADIR%%/PV/res957.png
+%%DATADIR%%/PV/res958.png
+%%DATADIR%%/PV/res959.png
+%%DATADIR%%/PV/res960.png
+%%DATADIR%%/PV/res961.png
+%%DATADIR%%/PV/res962.png
+%%DATADIR%%/PV/res980.pal
+%%DATADIR%%/PV/res981.png
+%%DATADIR%%/SHADOW/res750.pal
+%%DATADIR%%/SHADOW/res751.png
+%%DATADIR%%/SHADOW/res752.png
+%%DATADIR%%/SHADOW/res753.png
+%%DATADIR%%/SHADOW/res754.png
+%%DATADIR%%/SHADOW/res755.png
+%%DATADIR%%/SHADOW/res756.png
+%%DATADIR%%/SHADOW/res757.png
+%%DATADIR%%/SHADOW/res758.png
+%%DATADIR%%/SHADOW/res759.png
+%%DATADIR%%/SHADOW/res760.png
+%%DATADIR%%/SHADOW/res761.png
+%%DATADIR%%/SHADOW/res762.png
+%%DATADIR%%/SHADOW/res763.png
+%%DATADIR%%/SHADOW/res764.png
+%%DATADIR%%/SHADOW/res765.png
+%%DATADIR%%/SHADOW/res766.png
+%%DATADIR%%/SHADOW/res767.png
+%%DATADIR%%/SHADOW/res768.png
+%%DATADIR%%/SHADOW/res769.png
+%%DATADIR%%/SHADOW/res770.png
+%%DATADIR%%/SHADOW/res771.png
+%%DATADIR%%/SHADOW/res772.png
+%%DATADIR%%/SHADOW/res773.png
+%%DATADIR%%/SHADOW/res774.png
+%%DATADIR%%/SHADOW/res775.png
+%%DATADIR%%/SHADOW/res776.png
+%%DATADIR%%/SHADOW/res777.png
+%%DATADIR%%/SHADOW/res778.png
+%%DATADIR%%/SHADOW/res779.png
+%%DATADIR%%/SHADOW/res780.png
+%%DATADIR%%/SHADOW/res781.png
+%%DATADIR%%/SHADOW/res782.png
+%%DATADIR%%/SKEL/res750.pal
+%%DATADIR%%/SKEL/res751.png
+%%DATADIR%%/SKEL/res752.png
+%%DATADIR%%/SKEL/res753.png
+%%DATADIR%%/SKEL/res754.png
+%%DATADIR%%/SKEL/res755.png
+%%DATADIR%%/SKEL/res756.png
+%%DATADIR%%/SKEL/res757.png
+%%DATADIR%%/SKEL/res758.png
+%%DATADIR%%/SKEL/res759.png
+%%DATADIR%%/SKEL/res760.png
+%%DATADIR%%/SKEL/res761.png
+%%DATADIR%%/SKEL/res762.png
+%%DATADIR%%/SKEL/res763.png
+%%DATADIR%%/SKEL/res764.png
+%%DATADIR%%/SKEL/res765.png
+%%DATADIR%%/SKEL/res766.png
+%%DATADIR%%/SKEL/res767.png
+%%DATADIR%%/SKEL/res768.png
+%%DATADIR%%/SKEL/res769.png
+%%DATADIR%%/SKEL/res770.png
+%%DATADIR%%/SKEL/res771.png
+%%DATADIR%%/SKEL/res772.png
+%%DATADIR%%/SKEL/res773.png
+%%DATADIR%%/SKEL/res774.png
+%%DATADIR%%/SKEL/res775.png
+%%DATADIR%%/SKEL/res776.png
+%%DATADIR%%/SKEL/res777.png
+%%DATADIR%%/SKEL/res778.png
+%%DATADIR%%/TITLE/res40.pal
+%%DATADIR%%/TITLE/res41.png
+%%DATADIR%%/TITLE/res42.png
+%%DATADIR%%/TITLE/res43.png
+%%DATADIR%%/TITLE/res44.png
+%%DATADIR%%/TITLE/res45.png
+%%DATADIR%%/TITLE/res50.pal
+%%DATADIR%%/TITLE/res51.png
+%%DATADIR%%/TITLE/res52.png
+%%DATADIR%%/TITLE/res53.png
+%%DATADIR%%/TITLE/res54.png
+%%DATADIR%%/TITLE/res55.png
+%%DATADIR%%/VDUNGEON/res200.pal
+%%DATADIR%%/VDUNGEON/res230.png
+%%DATADIR%%/VDUNGEON/res231.png
+%%DATADIR%%/VDUNGEON/res232.png
+%%DATADIR%%/VDUNGEON/res233.png
+%%DATADIR%%/VDUNGEON/res234.png
+%%DATADIR%%/VDUNGEON/res235.png
+%%DATADIR%%/VDUNGEON/res236.png
+%%DATADIR%%/VDUNGEON/res237.png
+%%DATADIR%%/VDUNGEON/res238.png
+%%DATADIR%%/VDUNGEON/res239.png
+%%DATADIR%%/VDUNGEON/res240.png
+%%DATADIR%%/VDUNGEON/res241.png
+%%DATADIR%%/VDUNGEON/res242.png
+%%DATADIR%%/VDUNGEON/res243.png
+%%DATADIR%%/VDUNGEON/res244.png
+%%DATADIR%%/VDUNGEON/res245.png
+%%DATADIR%%/VDUNGEON/res246.png
+%%DATADIR%%/VDUNGEON/res247.png
+%%DATADIR%%/VDUNGEON/res248.png
+%%DATADIR%%/VDUNGEON/res249.png
+%%DATADIR%%/VDUNGEON/res250.png
+%%DATADIR%%/VDUNGEON/res251.png
+%%DATADIR%%/VDUNGEON/res252.png
+%%DATADIR%%/VDUNGEON/res253.png
+%%DATADIR%%/VDUNGEON/res254.png
+%%DATADIR%%/VDUNGEON/res255.png
+%%DATADIR%%/VDUNGEON/res256.png
+%%DATADIR%%/VDUNGEON/res257.png
+%%DATADIR%%/VDUNGEON/res258.png
+%%DATADIR%%/VDUNGEON/res259.png
+%%DATADIR%%/VDUNGEON/res260.png
+%%DATADIR%%/VDUNGEON/res261.png
+%%DATADIR%%/VDUNGEON/res262.png
+%%DATADIR%%/VDUNGEON/res263.png
+%%DATADIR%%/VDUNGEON/res264.png
+%%DATADIR%%/VDUNGEON/res265.png
+%%DATADIR%%/VDUNGEON/res266.png
+%%DATADIR%%/VDUNGEON/res267.png
+%%DATADIR%%/VDUNGEON/res268.png
+%%DATADIR%%/VDUNGEON/res269.png
+%%DATADIR%%/VDUNGEON/res270.png
+%%DATADIR%%/VDUNGEON/res271.png
+%%DATADIR%%/VDUNGEON/res272.png
+%%DATADIR%%/VDUNGEON/res273.png
+%%DATADIR%%/VDUNGEON/res274.png
+%%DATADIR%%/VDUNGEON/res285.png
+%%DATADIR%%/VDUNGEON/res286.png
+%%DATADIR%%/VDUNGEON/res287.png
+%%DATADIR%%/VDUNGEON/res288.png
+%%DATADIR%%/VDUNGEON/res289.png
+%%DATADIR%%/VDUNGEON/res290.png
+%%DATADIR%%/VDUNGEON/res291.png
+%%DATADIR%%/VDUNGEON/res292.png
+%%DATADIR%%/VDUNGEON/res293.png
+%%DATADIR%%/VDUNGEON/res294.png
+%%DATADIR%%/VDUNGEON/res295.png
+%%DATADIR%%/VDUNGEON/res296.png
+%%DATADIR%%/VDUNGEON/res297.png
+%%DATADIR%%/VDUNGEON/res298.png
+%%DATADIR%%/VDUNGEON/res299.png
+%%DATADIR%%/VDUNGEON/res300.png
+%%DATADIR%%/VDUNGEON/res301.png
+%%DATADIR%%/VDUNGEON/res302.png
+%%DATADIR%%/VDUNGEON/res303.png
+%%DATADIR%%/VDUNGEON/res304.png
+%%DATADIR%%/VDUNGEON/res305.png
+%%DATADIR%%/VDUNGEON/res306.png
+%%DATADIR%%/VDUNGEON/res307.png
+%%DATADIR%%/VDUNGEON/res308.png
+%%DATADIR%%/VDUNGEON/res309.png
+%%DATADIR%%/VDUNGEON/res310.png
+%%DATADIR%%/VDUNGEON/res311.png
+%%DATADIR%%/VDUNGEON/res312.png
+%%DATADIR%%/VDUNGEON/res313.png
+%%DATADIR%%/VDUNGEON/res314.png
+%%DATADIR%%/VDUNGEON/res315.png
+%%DATADIR%%/VDUNGEON/res316.png
+%%DATADIR%%/VDUNGEON/res317.png
+%%DATADIR%%/VDUNGEON/res318.png
+%%DATADIR%%/VDUNGEON/res319.png
+%%DATADIR%%/VDUNGEON/res320.png
+%%DATADIR%%/VDUNGEON/res321.png
+%%DATADIR%%/VDUNGEON/res322.png
+%%DATADIR%%/VDUNGEON/res323.png
+%%DATADIR%%/VDUNGEON/res324.png
+%%DATADIR%%/VDUNGEON/res325.png
+%%DATADIR%%/VDUNGEON/res326.png
+%%DATADIR%%/VDUNGEON/res327.png
+%%DATADIR%%/VDUNGEON/res328.png
+%%DATADIR%%/VDUNGEON/res329.png
+%%DATADIR%%/VDUNGEON/res330.png
+%%DATADIR%%/VDUNGEON/res331.png
+%%DATADIR%%/VDUNGEON/res332.png
+%%DATADIR%%/VDUNGEON/res333.png
+%%DATADIR%%/VDUNGEON/res334.png
+%%DATADIR%%/VDUNGEON/res335.png
+%%DATADIR%%/VDUNGEON/res336.png
+%%DATADIR%%/VDUNGEON/res337.png
+%%DATADIR%%/VDUNGEON/res338.png
+%%DATADIR%%/VDUNGEON/res339.png
+%%DATADIR%%/VDUNGEON/res340.png
+%%DATADIR%%/VDUNGEON/res341.png
+%%DATADIR%%/VDUNGEON/res342.png
+%%DATADIR%%/VDUNGEON/res343.png
+%%DATADIR%%/VDUNGEON/res344.png
+%%DATADIR%%/VDUNGEON/res346.png
+%%DATADIR%%/VDUNGEON/res347.png
+%%DATADIR%%/VDUNGEON/res348.png
+%%DATADIR%%/VDUNGEON/res349.png
+%%DATADIR%%/VDUNGEON/res350.png
+%%DATADIR%%/VDUNGEON/res351.png
+%%DATADIR%%/VDUNGEON/res360.pal
+%%DATADIR%%/VDUNGEON/res361.png
+%%DATADIR%%/VDUNGEON/res362.png
+%%DATADIR%%/VDUNGEON/res363.png
+%%DATADIR%%/VDUNGEON/res364.png
+%%DATADIR%%/VDUNGEON/res365.png
+%%DATADIR%%/VDUNGEON/res366.png
+%%DATADIR%%/VDUNGEON/res367.png
+%%DATADIR%%/VDUNGEON/res368.png
+%%DATADIR%%/VDUNGEON/res369.png
+%%DATADIR%%/VDUNGEON/res370.png
+%%DATADIR%%/VDUNGEON/res371.png
+%%DATADIR%%/VDUNGEON/res372.png
+%%DATADIR%%/VDUNGEON/res373.png
+%%DATADIR%%/VDUNGEON/res374.png
+%%DATADIR%%/VDUNGEON/res375.png
+%%DATADIR%%/VDUNGEON/res376.png
+%%DATADIR%%/VDUNGEON/res377.png
+%%DATADIR%%/VIZIER/res750.pal
+%%DATADIR%%/VIZIER/res751.png
+%%DATADIR%%/VIZIER/res752.png
+%%DATADIR%%/VIZIER/res753.png
+%%DATADIR%%/VIZIER/res754.png
+%%DATADIR%%/VIZIER/res755.png
+%%DATADIR%%/VIZIER/res756.png
+%%DATADIR%%/VIZIER/res757.png
+%%DATADIR%%/VIZIER/res758.png
+%%DATADIR%%/VIZIER/res759.png
+%%DATADIR%%/VIZIER/res760.png
+%%DATADIR%%/VIZIER/res761.png
+%%DATADIR%%/VIZIER/res762.png
+%%DATADIR%%/VIZIER/res763.png
+%%DATADIR%%/VIZIER/res764.png
+%%DATADIR%%/VIZIER/res765.png
+%%DATADIR%%/VIZIER/res766.png
+%%DATADIR%%/VIZIER/res767.png
+%%DATADIR%%/VIZIER/res768.png
+%%DATADIR%%/VIZIER/res769.png
+%%DATADIR%%/VIZIER/res770.png
+%%DATADIR%%/VIZIER/res771.png
+%%DATADIR%%/VIZIER/res772.png
+%%DATADIR%%/VIZIER/res773.png
+%%DATADIR%%/VIZIER/res774.png
+%%DATADIR%%/VIZIER/res775.png
+%%DATADIR%%/VIZIER/res776.png
+%%DATADIR%%/VIZIER/res777.png
+%%DATADIR%%/VIZIER/res778.png
+%%DATADIR%%/VIZIER/res779.png
+%%DATADIR%%/VIZIER/res780.png
+%%DATADIR%%/VIZIER/res781.png
+%%DATADIR%%/VIZIER/res782.png
+%%DATADIR%%/VIZIER/res783.png
+%%DATADIR%%/VIZIER/res784.png
+%%DATADIR%%/VPALACE/res200.pal
+%%DATADIR%%/VPALACE/res201.png
+%%DATADIR%%/VPALACE/res202.png
+%%DATADIR%%/VPALACE/res203.png
+%%DATADIR%%/VPALACE/res204.png
+%%DATADIR%%/VPALACE/res205.png
+%%DATADIR%%/VPALACE/res206.png
+%%DATADIR%%/VPALACE/res209.png
+%%DATADIR%%/VPALACE/res210.png
+%%DATADIR%%/VPALACE/res211.png
+%%DATADIR%%/VPALACE/res212.png
+%%DATADIR%%/VPALACE/res213.png
+%%DATADIR%%/VPALACE/res232.png
+%%DATADIR%%/VPALACE/res233.png
+%%DATADIR%%/VPALACE/res234.png
+%%DATADIR%%/VPALACE/res235.png
+%%DATADIR%%/VPALACE/res236.png
+%%DATADIR%%/VPALACE/res237.png
+%%DATADIR%%/VPALACE/res238.png
+%%DATADIR%%/VPALACE/res239.png
+%%DATADIR%%/VPALACE/res240.png
+%%DATADIR%%/VPALACE/res241.png
+%%DATADIR%%/VPALACE/res242.png
+%%DATADIR%%/VPALACE/res243.png
+%%DATADIR%%/VPALACE/res244.png
+%%DATADIR%%/VPALACE/res245.png
+%%DATADIR%%/VPALACE/res246.png
+%%DATADIR%%/VPALACE/res247.png
+%%DATADIR%%/VPALACE/res248.png
+%%DATADIR%%/VPALACE/res249.png
+%%DATADIR%%/VPALACE/res250.png
+%%DATADIR%%/VPALACE/res251.png
+%%DATADIR%%/VPALACE/res252.png
+%%DATADIR%%/VPALACE/res253.png
+%%DATADIR%%/VPALACE/res254.png
+%%DATADIR%%/VPALACE/res255.png
+%%DATADIR%%/VPALACE/res256.png
+%%DATADIR%%/VPALACE/res257.png
+%%DATADIR%%/VPALACE/res258.png
+%%DATADIR%%/VPALACE/res259.png
+%%DATADIR%%/VPALACE/res260.png
+%%DATADIR%%/VPALACE/res261.png
+%%DATADIR%%/VPALACE/res262.png
+%%DATADIR%%/VPALACE/res263.png
+%%DATADIR%%/VPALACE/res264.png
+%%DATADIR%%/VPALACE/res265.png
+%%DATADIR%%/VPALACE/res266.png
+%%DATADIR%%/VPALACE/res267.png
+%%DATADIR%%/VPALACE/res268.png
+%%DATADIR%%/VPALACE/res269.png
+%%DATADIR%%/VPALACE/res270.png
+%%DATADIR%%/VPALACE/res271.png
+%%DATADIR%%/VPALACE/res272.png
+%%DATADIR%%/VPALACE/res273.png
+%%DATADIR%%/VPALACE/res274.png
+%%DATADIR%%/VPALACE/res275.png
+%%DATADIR%%/VPALACE/res277.png
+%%DATADIR%%/VPALACE/res278.png
+%%DATADIR%%/VPALACE/res280.png
+%%DATADIR%%/VPALACE/res281.png
+%%DATADIR%%/VPALACE/res282.png
+%%DATADIR%%/VPALACE/res283.png
+%%DATADIR%%/VPALACE/res284.png
+%%DATADIR%%/VPALACE/res285.png
+%%DATADIR%%/VPALACE/res286.png
+%%DATADIR%%/VPALACE/res287.png
+%%DATADIR%%/VPALACE/res288.png
+%%DATADIR%%/VPALACE/res289.png
+%%DATADIR%%/VPALACE/res290.png
+%%DATADIR%%/VPALACE/res291.png
+%%DATADIR%%/VPALACE/res292.png
+%%DATADIR%%/VPALACE/res293.png
+%%DATADIR%%/VPALACE/res294.png
+%%DATADIR%%/VPALACE/res295.png
+%%DATADIR%%/VPALACE/res296.png
+%%DATADIR%%/VPALACE/res297.png
+%%DATADIR%%/VPALACE/res298.png
+%%DATADIR%%/VPALACE/res299.png
+%%DATADIR%%/VPALACE/res300.png
+%%DATADIR%%/VPALACE/res301.png
+%%DATADIR%%/VPALACE/res302.png
+%%DATADIR%%/VPALACE/res303.png
+%%DATADIR%%/VPALACE/res304.png
+%%DATADIR%%/VPALACE/res305.png
+%%DATADIR%%/VPALACE/res306.png
+%%DATADIR%%/VPALACE/res307.png
+%%DATADIR%%/VPALACE/res308.png
+%%DATADIR%%/VPALACE/res309.png
+%%DATADIR%%/VPALACE/res310.png
+%%DATADIR%%/VPALACE/res311.png
+%%DATADIR%%/VPALACE/res312.png
+%%DATADIR%%/VPALACE/res313.png
+%%DATADIR%%/VPALACE/res314.png
+%%DATADIR%%/VPALACE/res315.png
+%%DATADIR%%/VPALACE/res316.png
+%%DATADIR%%/VPALACE/res317.png
+%%DATADIR%%/VPALACE/res318.png
+%%DATADIR%%/VPALACE/res319.png
+%%DATADIR%%/VPALACE/res320.png
+%%DATADIR%%/VPALACE/res321.png
+%%DATADIR%%/VPALACE/res322.png
+%%DATADIR%%/VPALACE/res323.png
+%%DATADIR%%/VPALACE/res324.png
+%%DATADIR%%/VPALACE/res325.png
+%%DATADIR%%/VPALACE/res326.png
+%%DATADIR%%/VPALACE/res327.png
+%%DATADIR%%/VPALACE/res328.png
+%%DATADIR%%/VPALACE/res329.png
+%%DATADIR%%/VPALACE/res330.png
+%%DATADIR%%/VPALACE/res331.png
+%%DATADIR%%/VPALACE/res332.png
+%%DATADIR%%/VPALACE/res333.png
+%%DATADIR%%/VPALACE/res334.png
+%%DATADIR%%/VPALACE/res335.png
+%%DATADIR%%/VPALACE/res336.png
+%%DATADIR%%/VPALACE/res337.png
+%%DATADIR%%/VPALACE/res338.png
+%%DATADIR%%/VPALACE/res339.png
+%%DATADIR%%/VPALACE/res340.png
+%%DATADIR%%/VPALACE/res341.png
+%%DATADIR%%/VPALACE/res342.png
+%%DATADIR%%/VPALACE/res343.png
+%%DATADIR%%/VPALACE/res344.png
+%%DATADIR%%/VPALACE/res345.png
+%%DATADIR%%/VPALACE/res346.png
+%%DATADIR%%/VPALACE/res347.png
+%%DATADIR%%/VPALACE/res349.png
+%%DATADIR%%/VPALACE/res350.png
+%%DATADIR%%/VPALACE/res351.png
+%%DATADIR%%/VPALACE/res360.pal
+%%DATADIR%%/VPALACE/res361.png
+%%DATADIR%%/VPALACE/res362.png
+%%DATADIR%%/VPALACE/res363.png
+%%DATADIR%%/VPALACE/res364.png
+%%DATADIR%%/VPALACE/res365.png
+%%DATADIR%%/VPALACE/res366.png
+%%DATADIR%%/VPALACE/res367.png
+%%DATADIR%%/VPALACE/res368.png
+%%DATADIR%%/VPALACE/res369.png
+%%DATADIR%%/VPALACE/res370.png
+%%DATADIR%%/VPALACE/res371.png
+%%DATADIR%%/VPALACE/res372.png
+%%DATADIR%%/VPALACE/res373.png
+%%DATADIR%%/VPALACE/res374.png
+%%DATADIR%%/VPALACE/res375.png
+%%DATADIR%%/VPALACE/res376.png
+%%DATADIR%%/VPALACE/res377.png
+%%DATADIR%%/font/res1000.pal
+%%DATADIR%%/font/res1032.png
+%%DATADIR%%/font/res1033.png
+%%DATADIR%%/font/res1034.png
+%%DATADIR%%/font/res1035.png
+%%DATADIR%%/font/res1036.png
+%%DATADIR%%/font/res1037.png
+%%DATADIR%%/font/res1038.png
+%%DATADIR%%/font/res1039.png
+%%DATADIR%%/font/res1040.png
+%%DATADIR%%/font/res1041.png
+%%DATADIR%%/font/res1042.png
+%%DATADIR%%/font/res1043.png
+%%DATADIR%%/font/res1044.png
+%%DATADIR%%/font/res1045.png
+%%DATADIR%%/font/res1046.png
+%%DATADIR%%/font/res1047.png
+%%DATADIR%%/font/res1048.png
+%%DATADIR%%/font/res1049.png
+%%DATADIR%%/font/res1050.png
+%%DATADIR%%/font/res1051.png
+%%DATADIR%%/font/res1052.png
+%%DATADIR%%/font/res1053.png
+%%DATADIR%%/font/res1054.png
+%%DATADIR%%/font/res1055.png
+%%DATADIR%%/font/res1056.png
+%%DATADIR%%/font/res1057.png
+%%DATADIR%%/font/res1058.png
+%%DATADIR%%/font/res1059.png
+%%DATADIR%%/font/res1060.png
+%%DATADIR%%/font/res1061.png
+%%DATADIR%%/font/res1062.png
+%%DATADIR%%/font/res1063.png
+%%DATADIR%%/font/res1064.png
+%%DATADIR%%/font/res1065.png
+%%DATADIR%%/font/res1066.png
+%%DATADIR%%/font/res1067.png
+%%DATADIR%%/font/res1068.png
+%%DATADIR%%/font/res1069.png
+%%DATADIR%%/font/res1070.png
+%%DATADIR%%/font/res1071.png
+%%DATADIR%%/font/res1072.png
+%%DATADIR%%/font/res1073.png
+%%DATADIR%%/font/res1074.png
+%%DATADIR%%/font/res1075.png
+%%DATADIR%%/font/res1076.png
+%%DATADIR%%/font/res1077.png
+%%DATADIR%%/font/res1078.png
+%%DATADIR%%/font/res1079.png
+%%DATADIR%%/font/res1080.png
+%%DATADIR%%/font/res1081.png
+%%DATADIR%%/font/res1082.png
+%%DATADIR%%/font/res1083.png
+%%DATADIR%%/font/res1084.png
+%%DATADIR%%/font/res1085.png
+%%DATADIR%%/font/res1086.png
+%%DATADIR%%/font/res1087.png
+%%DATADIR%%/font/res1088.png
+%%DATADIR%%/font/res1089.png
+%%DATADIR%%/font/res1090.png
+%%DATADIR%%/font/res1091.png
+%%DATADIR%%/font/res1092.png
+%%DATADIR%%/font/res1093.png
+%%DATADIR%%/font/res1094.png
+%%DATADIR%%/font/res1095.png
+%%DATADIR%%/font/res1096.png
+%%DATADIR%%/font/res1097.png
+%%DATADIR%%/font/res1098.png
+%%DATADIR%%/font/res1099.png
+%%DATADIR%%/font/res1100.png
+%%DATADIR%%/font/res1101.png
+%%DATADIR%%/font/res1102.png
+%%DATADIR%%/font/res1103.png
+%%DATADIR%%/font/res1104.png
+%%DATADIR%%/font/res1105.png
+%%DATADIR%%/font/res1106.png
+%%DATADIR%%/font/res1107.png
+%%DATADIR%%/font/res1108.png
+%%DATADIR%%/font/res1109.png
+%%DATADIR%%/font/res1110.png
+%%DATADIR%%/font/res1111.png
+%%DATADIR%%/font/res1112.png
+%%DATADIR%%/font/res1113.png
+%%DATADIR%%/font/res1114.png
+%%DATADIR%%/font/res1115.png
+%%DATADIR%%/font/res1116.png
+%%DATADIR%%/font/res1117.png
+%%DATADIR%%/font/res1118.png
+%%DATADIR%%/font/res1119.png
+%%DATADIR%%/font/res1120.png
+%%DATADIR%%/font/res1121.png
+%%DATADIR%%/font/res1122.png
+%%DATADIR%%/font/res1123.png
+%%DATADIR%%/font/res1124.png
+%%DATADIR%%/font/res1125.png
+%%DATADIR%%/font/res1126.png
+%%DATADIR%%/font/res1127.png
+%%DATADIR%%/font/res1128.png
+%%DATADIR%%/font/res1129.png
+%%DATADIR%%/font/res1130.png
+%%DATADIR%%/font/res1131.png
+%%DATADIR%%/icon.png
+%%DATADIR%%/levels-original/res2000.bin
+%%DATADIR%%/levels-original/res2001.bin
+%%DATADIR%%/levels-original/res2002.bin
+%%DATADIR%%/levels-original/res2003.bin
+%%DATADIR%%/levels-original/res2004.bin
+%%DATADIR%%/levels-original/res2005.bin
+%%DATADIR%%/levels-original/res2006.bin
+%%DATADIR%%/levels-original/res2007.bin
+%%DATADIR%%/levels-original/res2008.bin
+%%DATADIR%%/levels-original/res2009.bin
+%%DATADIR%%/levels-original/res2010.bin
+%%DATADIR%%/levels-original/res2011.bin
+%%DATADIR%%/levels-original/res2012.bin
+%%DATADIR%%/levels-original/res2013.bin
+%%DATADIR%%/levels-original/res2014.bin
+%%DATADIR%%/levels-original/res2015.bin
+%%DATADIR%%/levels-test/01-micro-room-change
+%%DATADIR%%/levels-test/01-weird-room-change
+%%DATADIR%%/levels-test/02-bigpillar-climb
+%%DATADIR%%/levels-test/02-guard-following
+%%DATADIR%%/levels-test/02-random-broken
+%%DATADIR%%/levels-test/02-walls
+%%DATADIR%%/levels-test/04-through-tapestry
+%%DATADIR%%/levels-test/05-stacked-gates
+%%DATADIR%%/levels-test/07-jump
+%%DATADIR%%/levels-test/12-shadow
+%%DATADIR%%/music/cutscene_before_2_4_6_12.ogg
+%%DATADIR%%/music/cutscene_before_8_9.ogg
+%%DATADIR%%/music/cutscene_not_much_time_left.ogg
+%%DATADIR%%/music/embrace.ogg
+%%DATADIR%%/music/end_level_4_and_killed_by_shadow.ogg
+%%DATADIR%%/music/fight_death.ogg
+%%DATADIR%%/music/find_mirror_and_find_shadow.ogg
+%%DATADIR%%/music/floating.ogg
+%%DATADIR%%/music/guard_death_and_obtaining_the_sword.ogg
+%%DATADIR%%/music/intro_theme.ogg
+%%DATADIR%%/music/killed_Jaffar.ogg
+%%DATADIR%%/music/life_potion.ogg
+%%DATADIR%%/music/meet_Jaffar.ogg
+%%DATADIR%%/music/names.txt
+%%DATADIR%%/music/out_of_time.ogg
+%%DATADIR%%/music/potion.ogg
+%%DATADIR%%/music/regular_death.ogg
+%%DATADIR%%/music/story_1_absence.ogg
+%%DATADIR%%/music/story_2_princess.ogg
+%%DATADIR%%/music/story_3_Jaffar_enters.ogg
+%%DATADIR%%/music/story_4_Jaffar_leaves.ogg
+%%DATADIR%%/music/story_5_level_end_and_merge_with_shadow.ogg
+%%DATADIR%%/music/won.ogg
diff --git a/games/sdlroids/Makefile b/games/sdlroids/Makefile
index e9fd884bf9ff..6f400880b91d 100644
--- a/games/sdlroids/Makefile
+++ b/games/sdlroids/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	sdlroids
 PORTVERSION=	1.3.4
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	games
 MASTER_SITES=	SF \
 		SF/nemysisfreebsdp/${CATEGORIES}/:icons
diff --git a/games/shaaft/Makefile b/games/shaaft/Makefile
index 1a762daebcb8..34a5495377ea 100644
--- a/games/shaaft/Makefile
+++ b/games/shaaft/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	shaaft
 PORTVERSION=	0.5.0
-PORTREVISION=	19
+PORTREVISION=	20
 CATEGORIES=	games
 MASTER_SITES=	SF/criticalmass/OldFiles
 DISTNAME=	Shaaft-${PORTVERSION}
diff --git a/games/simsu/Makefile b/games/simsu/Makefile
index 392918c78270..395deb8e7626 100644
--- a/games/simsu/Makefile
+++ b/games/simsu/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	simsu
 PORTVERSION=	1.3.4
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-src
 CATEGORIES=	games
 MASTER_SITES=	https://gottcode.org/${PORTNAME}/ \
diff --git a/games/slade/Makefile b/games/slade/Makefile
index 4cdc438241f1..c64db480b744 100644
--- a/games/slade/Makefile
+++ b/games/slade/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	slade
 PORTVERSION=	3.1.1.5
+PORTREVISION=	1
 CATEGORIES=	games
 
 MAINTAINER=	danfe@FreeBSD.org
diff --git a/games/solarus-quest-editor/Makefile b/games/solarus-quest-editor/Makefile
index 146e33a65a01..89670f2b744d 100644
--- a/games/solarus-quest-editor/Makefile
+++ b/games/solarus-quest-editor/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	solarus-quest-editor
 PORTVERSION=	1.5.3
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	games
 
diff --git a/games/solarus/Makefile b/games/solarus/Makefile
index 407fc99c80e0..8847976b0745 100644
--- a/games/solarus/Makefile
+++ b/games/solarus/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	solarus
 PORTVERSION=	1.5.3
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.solarus-games.org/downloads/solarus/
 DISTNAME=	solarus-${PORTVERSION}-src
diff --git a/games/spring/Makefile b/games/spring/Makefile
index 512a9b13134a..46a68b505b3e 100644
--- a/games/spring/Makefile
+++ b/games/spring/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	spring
 PORTVERSION=	98.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games
 MASTER_SITES=	SF/springrts/springrts/${PORTNAME}-${PORTVERSION} \
 		http://springrts.com/dl/
diff --git a/games/springlobby/Makefile b/games/springlobby/Makefile
index 122171fbe7cd..53b97e0169c1 100644
--- a/games/springlobby/Makefile
+++ b/games/springlobby/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	springlobby
 PORTVERSION=	0.180
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	games net
 MASTER_SITES=	http://www.springlobby.info/tarballs/ \
 		http://mirror.amdmi3.ru/distfiles/
diff --git a/games/stonesoup/Makefile b/games/stonesoup/Makefile
index 713918ffce30..7d6921dec25d 100644
--- a/games/stonesoup/Makefile
+++ b/games/stonesoup/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	stonesoup
 PORTVERSION=	0.20.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	https://crawl.develz.org/release/%SUBDIR%/ \
 		http://crawl.develz.org/release/%SUBDIR%/
diff --git a/games/supertux2/Makefile b/games/supertux2/Makefile
index e420c07c9dc1..8b5b1dfc12dd 100644
--- a/games/supertux2/Makefile
+++ b/games/supertux2/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	supertux
 PORTVERSION=	0.4.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games
 MASTER_SITES=	https://github.com/SuperTux/supertux/releases/download/v${PORTVERSION}/
 PKGNAMESUFFIX=	2
diff --git a/games/supertuxkart/Makefile b/games/supertuxkart/Makefile
index dd8e5f60319d..11cecd4be10d 100644
--- a/games/supertuxkart/Makefile
+++ b/games/supertuxkart/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	supertuxkart
 PORTVERSION=	0.9.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	SF/supertuxkart/SuperTuxKart/${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
diff --git a/games/syobon/Makefile b/games/syobon/Makefile
index 019410c703b4..469157a47586 100644
--- a/games/syobon/Makefile
+++ b/games/syobon/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	syobon
 PORTVERSION=	1.0.1
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	games
 MASTER_SITES=	http://zapek.com/wp-content/uploads/2010/09/ \
 		SF/nemysisfreebsdp/${CATEGORIES}/:icons
diff --git a/games/tanglet/Makefile b/games/tanglet/Makefile
index a425ef951ba2..c676fd3b008c 100644
--- a/games/tanglet/Makefile
+++ b/games/tanglet/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	tanglet
 PORTVERSION=	1.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONSUFFIX=	-src
 CATEGORIES=	games
 MASTER_SITES=	http://gottcode.org/tanglet/
diff --git a/games/tbe/Makefile b/games/tbe/Makefile
index f121cec3e1b1..92a9e86ab33a 100644
--- a/games/tbe/Makefile
+++ b/games/tbe/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	tbe
 PORTVERSION=	0.9.2.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	games
 
diff --git a/games/teeworlds/Makefile b/games/teeworlds/Makefile
index 388ed3d54128..79e80710c7e7 100644
--- a/games/teeworlds/Makefile
+++ b/games/teeworlds/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	teeworlds
 PORTVERSION=	0.6.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	https://downloads.teeworlds.com/ \
 		http://mirror.amdmi3.ru/distfiles/
diff --git a/games/tetzle/Makefile b/games/tetzle/Makefile
index 97b842b72a67..2ddcd0aad8ee 100644
--- a/games/tetzle/Makefile
+++ b/games/tetzle/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	tetzle
 PORTVERSION=	2.1.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://gottcode.org/tetzle/ \
 		http://mirror.amdmi3.ru/distfiles/
diff --git a/games/traingame/Makefile b/games/traingame/Makefile
index 6a1930252906..568a892f35f1 100644
--- a/games/traingame/Makefile
+++ b/games/traingame/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	traingame
 PORTVERSION=	0.3
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	games
 
 MAINTAINER=	nemysis@FreeBSD.org
diff --git a/games/trenchbroom/Makefile b/games/trenchbroom/Makefile
index c414a7c80299..fac20355d340 100644
--- a/games/trenchbroom/Makefile
+++ b/games/trenchbroom/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	trenchbroom
 PORTVERSION=	2.0.0.b
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games cad
 
 MAINTAINER=	danfe@FreeBSD.org
diff --git a/games/ufoai/Makefile b/games/ufoai/Makefile
index 8a538657ba6a..f41bdbc5bce8 100644
--- a/games/ufoai/Makefile
+++ b/games/ufoai/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ufoai
 PORTVERSION=	2.5
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/UFO_AI%202.x/${PORTVERSION}
 DISTNAME=	${PORTNAME:S/$/-/}${PORTVERSION}-source
diff --git a/games/warsow/Makefile b/games/warsow/Makefile
index 8140063cf366..113ca6555f3f 100644
--- a/games/warsow/Makefile
+++ b/games/warsow/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	warsow
 PORTVERSION=	1.51
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	http://update.warsow.net/mirror/ \
 		http://mirror.amdmi3.ru/distfiles/
diff --git a/games/warzone2100/Makefile b/games/warzone2100/Makefile
index d730debb6c93..3e1d86293cc0 100644
--- a/games/warzone2100/Makefile
+++ b/games/warzone2100/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	warzone2100
 PORTVERSION=	3.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/releases/${PORTVERSION}/
 
diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile
index 0aa2cdd523aa..0c8a9ca5785d 100644
--- a/games/wesnoth/Makefile
+++ b/games/wesnoth/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	wesnoth
 PORTVERSION=	1.12.6
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTNAME}-${PORTVERSION} \
diff --git a/games/widelands/Makefile b/games/widelands/Makefile
index 249e5395bea8..ae89ac956d08 100644
--- a/games/widelands/Makefile
+++ b/games/widelands/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	widelands
 DISTVERSION=	build19
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	https://launchpad.net/widelands/${DISTVERSION}/${DISTVERSION}/+download/ \
 		http://mirror.amdmi3.ru/distfiles/
diff --git a/games/wxlauncher/Makefile b/games/wxlauncher/Makefile
index 5620964315b8..2e10fa56f46a 100644
--- a/games/wxlauncher/Makefile
+++ b/games/wxlauncher/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	wxlauncher
 PORTVERSION=	0.10.0
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	release-
 CATEGORIES=	games
 
diff --git a/games/wyrmgus/Makefile b/games/wyrmgus/Makefile
index d51480bdd35e..95adbb0b8ec7 100644
--- a/games/wyrmgus/Makefile
+++ b/games/wyrmgus/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	wyrmgus
 PORTVERSION=	1.9.9
-PORTREVISION=	2
+PORTREVISION=	3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	games devel
 
diff --git a/games/xbat/Makefile b/games/xbat/Makefile
index 9cc87bbc8538..a72221ca4da9 100644
--- a/games/xbat/Makefile
+++ b/games/xbat/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xbat
 PORTVERSION=	1.11
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games
 MASTER_SITES=	LOCAL/hrs
 DISTNAME=	xev111
diff --git a/german/mythes/Makefile b/german/mythes/Makefile
index ddf04ace074f..92488d76eb26 100644
--- a/german/mythes/Makefile
+++ b/german/mythes/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	mythes
-PORTVERSION=	2017.09.03
+PORTVERSION=	2017.09.10
 CATEGORIES=	german textproc
 MASTER_SITES=	LOCAL/sunpoet/${PORTNAME}/
 DISTNAME=	Deutscher-Thesaurus-${PORTVERSION:C/\.//g}
diff --git a/german/mythes/distinfo b/german/mythes/distinfo
index d83a6b06a67f..b5e332c86488 100644
--- a/german/mythes/distinfo
+++ b/german/mythes/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504488268
-SHA256 (mythes/Deutscher-Thesaurus-20170903.oxt) = d1a40e06906c9008f493928c0ead5fd031037bac9bd0ec2a0dc404abb79267e4
-SIZE (mythes/Deutscher-Thesaurus-20170903.oxt) = 8691129
+TIMESTAMP = 1505092050
+SHA256 (mythes/Deutscher-Thesaurus-20170910.oxt) = c8e5d5c8723c4d1c6fd9fbdbbb8b537523ba735cd923dd90069151e2807ad36b
+SIZE (mythes/Deutscher-Thesaurus-20170910.oxt) = 8717157
diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile
index 163ed4e68f37..d02ecab25b66 100644
--- a/graphics/GraphicsMagick/Makefile
+++ b/graphics/GraphicsMagick/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	GraphicsMagick
 PORTVERSION=	1.3.26
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF \
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 8558d106ddbf..ff63db7f5cb2 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	ImageMagick
 DISTVERSION=	6.9.8-9
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	http://www.imagemagick.org/download/ \
diff --git a/graphics/ImageMagick7/Makefile b/graphics/ImageMagick7/Makefile
index 401d9efe4587..53cef4a6694a 100644
--- a/graphics/ImageMagick7/Makefile
+++ b/graphics/ImageMagick7/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	ImageMagick
 DISTVERSION=	7.0.5-10
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	http://www.imagemagick.org/download/ \
 		http://www.imagemagick.org/download/legacy/ \
diff --git a/graphics/Makefile b/graphics/Makefile
index 2fce8a30ebc5..dc745b2744f3 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1095,6 +1095,8 @@
     SUBDIR += xournal
     SUBDIR += xpaint
     SUBDIR += xpdf
+    SUBDIR += xpdf3
+    SUBDIR += xpdf4
     SUBDIR += xpeps
     SUBDIR += xpx
     SUBDIR += xsane
diff --git a/graphics/OpenEXR/Makefile b/graphics/OpenEXR/Makefile
index 46274079d3dd..7b36008fb3bd 100644
--- a/graphics/OpenEXR/Makefile
+++ b/graphics/OpenEXR/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	OpenEXR
 PORTVERSION=	2.2.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	graphics devel
 MASTER_SITES=	SAVANNAH/openexr/:dist \
 		LOCAL/mandree/:test
diff --git a/graphics/R-cran-gridExtra/Makefile b/graphics/R-cran-gridExtra/Makefile
index 2236e3933775..88345d9d38ee 100644
--- a/graphics/R-cran-gridExtra/Makefile
+++ b/graphics/R-cran-gridExtra/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gridExtra
-PORTVERSION=	2.2.1
+PORTVERSION=	2.3
 CATEGORIES=	graphics
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
diff --git a/graphics/R-cran-gridExtra/distinfo b/graphics/R-cran-gridExtra/distinfo
index 539c8b92193e..8b6edd5b68fa 100644
--- a/graphics/R-cran-gridExtra/distinfo
+++ b/graphics/R-cran-gridExtra/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1494231721
-SHA256 (gridExtra_2.2.1.tar.gz) = 44fe455a5bcdf48a4ece7a542f83e7749cf251dc1df6ae7634470240398c6818
-SIZE (gridExtra_2.2.1.tar.gz) = 459488
+TIMESTAMP = 1505083128
+SHA256 (gridExtra_2.3.tar.gz) = 81b60ce6f237ec308555471ae0119158b115463df696d2eca9b177ded8988e3b
+SIZE (gridExtra_2.3.tar.gz) = 1062844
diff --git a/graphics/aaphoto/Makefile b/graphics/aaphoto/Makefile
index 3b26ef2ddbbd..51dbce91016f 100644
--- a/graphics/aaphoto/Makefile
+++ b/graphics/aaphoto/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	aaphoto
 PORTVERSION=	0.43.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics
 
 MAINTAINER=	mail@log69.com
diff --git a/graphics/aeskulap/Makefile b/graphics/aeskulap/Makefile
index 5fdf8c146c78..4460929fb4ba 100644
--- a/graphics/aeskulap/Makefile
+++ b/graphics/aeskulap/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	aeskulap
 PORTVERSION=	0.2.2.20140119
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/graphics/agave/Makefile b/graphics/agave/Makefile
index e35ebfbf65c8..c04b0c2ea7c4 100644
--- a/graphics/agave/Makefile
+++ b/graphics/agave/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	agave
 PORTVERSION=	0.4.7
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics gnome
 MASTER_SITES=	http://download.gna.org/colorscheme/releases/
 
diff --git a/graphics/alembic/Makefile b/graphics/alembic/Makefile
index 4aa5ad89e461..0572f9b9a848 100644
--- a/graphics/alembic/Makefile
+++ b/graphics/alembic/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	alembic
 PORTVERSION=	1.7.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 
 MAINTAINER=	danfe@FreeBSD.org
diff --git a/graphics/animorph/Makefile b/graphics/animorph/Makefile
index 3f42af44fefc..b68fcc78993c 100644
--- a/graphics/animorph/Makefile
+++ b/graphics/animorph/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	animorph
 PORTVERSION=	0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	SF/makehuman/MakeHuman%20Source/MakeHuman_091
 
diff --git a/graphics/appleseed/Makefile b/graphics/appleseed/Makefile
index cbbf8f0c468b..dc1caa9ec60c 100644
--- a/graphics/appleseed/Makefile
+++ b/graphics/appleseed/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	appleseed
 DISTVERSION=	1.5.2-beta
-PORTREVISION=	5
+PORTREVISION=	7
 CATEGORIES=	graphics
 
 MAINTAINER=	danfe@FreeBSD.org
@@ -43,7 +43,7 @@ SUB_FILES=	pkg-message
 SUB_LIST:=	${PLIST_SUB}
 
 OPTIONS_DEFINE=	EXAMPLES OSL DISNEY
-OPTIONS_DEFAULT=	OSL DISNEY
+OPTIONS_DEFAULT=	DISNEY
 OPTIONS_SUB=	yes
 
 OSL_DESC=	Open Shading Language support
@@ -53,6 +53,8 @@ EXAMPLES_CMAKE_OFF=	-DWITH_SAMPLES:BOOL=OFF
 
 OSL_CMAKE_ON=	-DWITH_OSL:BOOL=ON
 OSL_LIB_DEPENDS=	liboslexec.so:graphics/openshadinglanguage
+# src/appleseed/libappleseed.so: undefined reference to `typeinfo for OSL::RendererServices'
+OSL_BROKEN=	fails to build against openshadinglanguage-1.8.10
 
 DISNEY_CMAKE_ON=	-DWITH_DISNEY_MATERIAL:BOOL=ON
 DISNEY_LIB_DEPENDS=	libOpenImageIO.so:graphics/openimageio \
diff --git a/graphics/argyllcms/Makefile b/graphics/argyllcms/Makefile
index b2027a7e99db..c9668b1c99f1 100644
--- a/graphics/argyllcms/Makefile
+++ b/graphics/argyllcms/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	argyllcms
 PORTVERSION=	1.9.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.argyllcms.com/
 DISTNAME=	Argyll_V${PORTVERSION}_src
diff --git a/graphics/aseprite/Makefile b/graphics/aseprite/Makefile
index 1f3db8dff0bf..ef40e3ae8fea 100644
--- a/graphics/aseprite/Makefile
+++ b/graphics/aseprite/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=		aseprite
 PORTVERSION=		1.1.13
 DISTVERSIONPREFIX=	v
-PORTREVISION=		2
+PORTREVISION=		3
 CATEGORIES=		graphics
 
 MAINTAINER=		yuri@rawbw.com
diff --git a/graphics/atril-lite/Makefile b/graphics/atril-lite/Makefile
index e7e4f19ee8ec..5928a4a1fe51 100644
--- a/graphics/atril-lite/Makefile
+++ b/graphics/atril-lite/Makefile
@@ -1,16 +1,16 @@
 # Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	1
+PORTREVISION?=	0
 PKGNAMESUFFIX=	-lite
 
 COMMENT=	MATE multi-format document viewer
 
 OPTIONS_EXCLUDE=	CAJA DBUS
 
-MASTERDIR=      ${.CURDIR}/../../graphics/atril
-SLAVEPORT=      lite
+MASTERDIR=	${.CURDIR}/../../graphics/atril
+SLAVEPORT=	lite
 DESCR=		${.CURDIR}/pkg-descr
-PLIST=          ${.CURDIR}/pkg-plist
+PLIST=		${.CURDIR}/pkg-plist
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/atril/Makefile b/graphics/atril/Makefile
index 737f9f746814..1f4fd0f6d13e 100644
--- a/graphics/atril/Makefile
+++ b/graphics/atril/Makefile
@@ -4,17 +4,19 @@
 # Please update update atril-lite also
 
 PORTNAME=	atril
-PORTVERSION=	1.18.0
-PORTREVISION?=	1
+PORTVERSION=	1.18.1
+PORTREVISION?=	0
 CATEGORIES=	graphics print mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT?=	MATE multi-format document viewer
+COMMENT=	MATE multi-format document viewer
 
-BUILD_DEPENDS=	itstool:textproc/itstool
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
+BUILD_DEPENDS=	itstool:textproc/itstool
 LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib \
 		libsoup-2.4.so:devel/libsoup \
 		libfontconfig.so:x11-fonts/fontconfig \
diff --git a/graphics/atril/distinfo b/graphics/atril/distinfo
index 7da88437f355..98d375ec7e81 100644
--- a/graphics/atril/distinfo
+++ b/graphics/atril/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1491698614
-SHA256 (mate/atril-1.18.0.tar.xz) = c2284f17f7b683efa22615f00cf2768ea07667981d8304566e49c3d863de80fd
-SIZE (mate/atril-1.18.0.tar.xz) = 1688144
+TIMESTAMP = 1503851121
+SHA256 (mate/atril-1.18.1.tar.xz) = 8504c0164faf9a0763118d444007dd2bc655dd0dcd0c6ecfff163080b61883f2
+SIZE (mate/atril-1.18.1.tar.xz) = 1695280
diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index 79a1ed1e09ae..dadf12a3c759 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	blender
 PORTVERSION=	2.78c
-PORTREVISION=	3
+PORTREVISION=	7
 CATEGORIES=	graphics games
 MASTER_SITES=	http://download.blender.org/source/ \
 		http://mirror.cs.umn.edu/blender.org/source/ \
diff --git a/graphics/bugle/Makefile b/graphics/bugle/Makefile
index bf998ada8ee5..62a1fc4ed552 100644
--- a/graphics/bugle/Makefile
+++ b/graphics/bugle/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	bugle
 PORTVERSION=	0.0.20100508
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
diff --git a/graphics/caffe/Makefile b/graphics/caffe/Makefile
index 2ef06a4aeff4..ec501bdf386d 100644
--- a/graphics/caffe/Makefile
+++ b/graphics/caffe/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	caffe
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 
 MAINTAINER=	eric@camachat.org
diff --git a/graphics/cairo/pkg-descr b/graphics/cairo/pkg-descr
index ee8f61404111..a2737cc6d1f4 100644
--- a/graphics/cairo/pkg-descr
+++ b/graphics/cairo/pkg-descr
@@ -10,4 +10,4 @@ the PDF 1.4 imaging model. Cairo provides operations including stroking
 and filling Bezier cubic splines, transforming and compositing translucent
 images, and antialiased text rendering.
 
-WWW: http://www.cairographics.org
+WWW: https://www.cairographics.org/
diff --git a/graphics/cairomm/Makefile b/graphics/cairomm/Makefile
index 481fbbc41488..3568a428b160 100644
--- a/graphics/cairomm/Makefile
+++ b/graphics/cairomm/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	cairomm
 PORTVERSION=	1.12.2
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://cairographics.org/releases/
 
diff --git a/graphics/cegui/Makefile b/graphics/cegui/Makefile
index f22102fad8e8..68d25b4a9653 100644
--- a/graphics/cegui/Makefile
+++ b/graphics/cegui/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cegui
 PORTVERSION=	0.8.4
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	graphics devel
 MASTER_SITES=	SF/crayzedsgui/CEGUI%20Mk-2/0.8
 
diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile
index 77226204ae86..a8fa65b84431 100644
--- a/graphics/cimg/Makefile
+++ b/graphics/cimg/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	cimg
 DISTVERSION=	2.0.3
+PORTREVISION=	1
 PORTEPOCH=	3
 CATEGORIES=	graphics devel
 
diff --git a/graphics/code-eli/Makefile b/graphics/code-eli/Makefile
index 8606ff838bc3..3a2c6bc60e89 100644
--- a/graphics/code-eli/Makefile
+++ b/graphics/code-eli/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	code-eli
 PORTVERSION=	0.3.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 
 MAINTAINER=	fernando.apesteguia@gmail.com
diff --git a/graphics/colmap/Makefile b/graphics/colmap/Makefile
index de947707ccfe..fdbfd267c49a 100644
--- a/graphics/colmap/Makefile
+++ b/graphics/colmap/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	colmap
 DISTVERSION=	3.2
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/graphics/converseen/Makefile b/graphics/converseen/Makefile
index d0f9a878178d..9f433a034061 100644
--- a/graphics/converseen/Makefile
+++ b/graphics/converseen/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	converseen
 PORTVERSION=	0.9.6.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/Converseen/Converseen%20${PORTVERSION:R:R}/
 
diff --git a/graphics/copperspice/Makefile b/graphics/copperspice/Makefile
index 67125cb8c607..6cd3c38ba15f 100644
--- a/graphics/copperspice/Makefile
+++ b/graphics/copperspice/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	copperspice
 PORTVERSION=	1.3.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	http://download.copperspice.com/copperspice/source/
 
diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile
index 2521501ee931..833c1813ef05 100644
--- a/graphics/darktable/Makefile
+++ b/graphics/darktable/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	darktable
 PORTVERSION=	2.2.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	https://github.com/darktable-org/${PORTNAME}/releases/download/release-${PORTVERSION:C/\.rc/rc/}/
 
diff --git a/graphics/dataplot/Makefile b/graphics/dataplot/Makefile
index d75748f5be65..100bf23c4f11 100644
--- a/graphics/dataplot/Makefile
+++ b/graphics/dataplot/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dataplot
 PORTVERSION=	20132012
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.nist.gov/pub/dataplot/unix/:source \
 		LOCAL/beech:source \
diff --git a/graphics/dcp2icc/Makefile b/graphics/dcp2icc/Makefile
index 6ad6e83fd346..65a623369ed8 100644
--- a/graphics/dcp2icc/Makefile
+++ b/graphics/dcp2icc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dcp2icc
 PORTVERSION=	0.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics converters
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Version%20${PORTVERSION}
 
diff --git a/graphics/delaboratory/Makefile b/graphics/delaboratory/Makefile
index 665fb4154849..f73992e45fa5 100644
--- a/graphics/delaboratory/Makefile
+++ b/graphics/delaboratory/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	delaboratory
 PORTVERSION=	0.8
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	http://BSDforge.com/projects/source/graphics/delaboratory/
 
diff --git a/graphics/dilay/Makefile b/graphics/dilay/Makefile
index 7efce5a452b2..0f2a269c3d4d 100644
--- a/graphics/dilay/Makefile
+++ b/graphics/dilay/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dilay
 PORTVERSION=	1.5.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 
 MAINTAINER=	yuri@rawbw.com
diff --git a/graphics/drm-next-kmod/Makefile b/graphics/drm-next-kmod/Makefile
index 8a8322b89ebd..3931f0eb62f7 100644
--- a/graphics/drm-next-kmod/Makefile
+++ b/graphics/drm-next-kmod/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	drm-next-kmod
-PORTVERSION=	g20170829
+PORTVERSION=	g20170912
 CATEGORIES=	graphics
 
 MAINTAINER=	jmd@FreeBSD.org
@@ -23,11 +23,11 @@ USES=		kmod uidfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	FreeBSDDesktop
 GH_PROJECT=	kms-drm
-GH_TAGNAME=	fc90953
+GH_TAGNAME=	5b5d651
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200039
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200043
 IGNORE=		not supported on 11.x or older, no kernel support
 .endif
 .if ${OPSYS} != FreeBSD
diff --git a/graphics/drm-next-kmod/distinfo b/graphics/drm-next-kmod/distinfo
index d19bb3cd47b6..333571bbfdee 100644
--- a/graphics/drm-next-kmod/distinfo
+++ b/graphics/drm-next-kmod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504057443
-SHA256 (FreeBSDDesktop-kms-drm-g20170829-fc90953_GH0.tar.gz) = 81ab0b075727f824fafea5e61a868cedbce2f8003819dd65811e3ad363c3d729
-SIZE (FreeBSDDesktop-kms-drm-g20170829-fc90953_GH0.tar.gz) = 6678672
+TIMESTAMP = 1505271981
+SHA256 (FreeBSDDesktop-kms-drm-g20170912-5b5d651_GH0.tar.gz) = 97a4a54db9b276f430aee956d59ed667cf8968fdde9eb12bd3a502ea28035bb3
+SIZE (FreeBSDDesktop-kms-drm-g20170912-5b5d651_GH0.tar.gz) = 6678618
diff --git a/graphics/drm-next-kmod/pkg-descr b/graphics/drm-next-kmod/pkg-descr
index 5ac130d1e325..b03ccc34052e 100644
--- a/graphics/drm-next-kmod/pkg-descr
+++ b/graphics/drm-next-kmod/pkg-descr
@@ -1,4 +1,5 @@
 amdgpu, i915, and radeon DRM modules for the linuxkpi-based KMS components.
-Currently corresponding to Linux 4.9 DRM.
+Currently corresponding to Linux 4.9 DRM. Experimental state. amdgpu and
+radeonkms are known to fail with EFI boot.
 
 WWW: https://github.com/FreeBSDDesktop/kms-drm
diff --git a/graphics/drm-next-kmod/pkg-message b/graphics/drm-next-kmod/pkg-message
index 5553f495df39..88023d035271 100644
--- a/graphics/drm-next-kmod/pkg-message
+++ b/graphics/drm-next-kmod/pkg-message
@@ -1,10 +1,15 @@
-The drm-next-kmod port requires explicit loading of its drm.ko kernel
-module prior to loading either amdgpu (for AMD GPUs starting with 
-the HD7000 series / Tahiti) or i915kms (for Intel APUs starting with
-HD3000 / Sandy Bridge) through kld_list in /etc/rc.conf.
+The experimental drm-next-kmod port can be enabled for amdgpu (for AMD
+GPUs starting with the HD7000 series / Tahiti) or i915kms (for Intel
+APUs starting with HD3000 / Sandy Bridge) through kld_list in
+/etc/rc.conf. radeomkms for older AMD GPUs can be loaded and there are
+some positive reports if EFI boot is NOT enabled (similar to amdgpu).
 
-For example: kld_list="/boot/modules/drm.ko /boot/modules/amdgpu.ko"
-or kld_list="/boot/modules/drm.ko /boot/modules/i915kms.ko"
+For amdgpu: kld_list="amdgpu"
+For Intel: kld_list="/boot/modules/i915kms.ko"
+For radeonkms: kld_list="/boot/modules/radeonkms.ko"
 
-Older generations are supported by the kms modules (radeonkms / 
+Please ensure that all users requiring graphics are members of the
+"video" group.
+
+Older generations are supported by the stable kms modules (radeonkms / 
 i915kms) in base.
diff --git a/graphics/enblend/Makefile b/graphics/enblend/Makefile
index df1a6d00e395..78d83433858b 100644
--- a/graphics/enblend/Makefile
+++ b/graphics/enblend/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	enblend
 PORTVERSION=	4.1.4
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	graphics
 MASTER_SITES=	SF/enblend/enblend-enfuse/enblend-enfuse-${PORTVERSION:R}
 DISTNAME=	enblend-enfuse-${PORTVERSION}
diff --git a/graphics/freeimage/Makefile b/graphics/freeimage/Makefile
index e1dd6a5fe068..0256a7f23672 100644
--- a/graphics/freeimage/Makefile
+++ b/graphics/freeimage/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	freeimage
 PORTVERSION=	3.16.0
-PORTREVISION=	2
+PORTREVISION=	3
 # Version 3.17.0 is available, but does not build on i386 (and probably
 # other 32-bit arches) without some not-quite-trivial patching.  If one
 # decides to update the port, please make sure 32-bit builds are tested!
diff --git a/graphics/gdtclft/Makefile b/graphics/gdtclft/Makefile
index b1ac60441c4e..5d6355cb8199 100644
--- a/graphics/gdtclft/Makefile
+++ b/graphics/gdtclft/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Gdtclft
 PORTVERSION=	2.2.5
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	graphics tcl
 MASTER_SITES=	http://BSDforge.com/projects/source/graphics/gdtclft/
 DISTNAME=	${PORTNAME}${PORTVERSION}
@@ -13,7 +13,7 @@ COMMENT=	TCL interface to the Thomas Boutell's Gd library
 
 LIB_DEPENDS=	libgd.so:graphics/gd
 
-USES=		tcl:84+ uidfix
+USES=		tcl:85+ uidfix
 
 MAKEFILE=	${FILESDIR}/Makefile.bsd
 MAKE_ENV=	TCL_VER=${TCL_VER} MKDIR="${MKDIR}" \
diff --git a/graphics/generic_image_decoder/pkg-descr b/graphics/generic_image_decoder/pkg-descr
index da3f8a917777..187b1ffc8168 100644
--- a/graphics/generic_image_decoder/pkg-descr
+++ b/graphics/generic_image_decoder/pkg-descr
@@ -1,6 +1,6 @@
 The Generic Image Decoder (GID) is an Ada package for decoding a broad
 variety on image formats from any data stream to any kind of medium.
-Examples include in-memory bitmap, a GUI objecct, another stream, floating
+Examples include in-memory bitmap, a GUI object, another stream, floating
 point data for scientific calculations, a browser element or a device.
 Animations are also supported.  GID features:
 
diff --git a/graphics/geomorph/Makefile b/graphics/geomorph/Makefile
index 8609f0f32c2d..3a5ad8791e3c 100644
--- a/graphics/geomorph/Makefile
+++ b/graphics/geomorph/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	geomorph
 PORTVERSION=	0.60.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/0.60/
 
diff --git a/graphics/gimp-beautify-plugin/Makefile b/graphics/gimp-beautify-plugin/Makefile
index 9e66f13de40f..212f557b9b16 100644
--- a/graphics/gimp-beautify-plugin/Makefile
+++ b/graphics/gimp-beautify-plugin/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	beautify
 PORTVERSION=	2012.08.12.00
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 PKGNAMEPREFIX=	gimp-
 PKGNAMESUFFIX=	-plugin
diff --git a/graphics/gimp-gmic-plugin/Makefile b/graphics/gimp-gmic-plugin/Makefile
index e92a43b61ed7..09c4373cf823 100644
--- a/graphics/gimp-gmic-plugin/Makefile
+++ b/graphics/gimp-gmic-plugin/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	gmic
 PORTVERSION=	1.6.9
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	graphics
 MASTER_SITES=	http://gmic.eu/files/source/
 PKGNAMEPREFIX=	gimp-
diff --git a/graphics/gimp-refocus-plugin/Makefile b/graphics/gimp-refocus-plugin/Makefile
index 489cc2b9e92c..e8e4967263ba 100644
--- a/graphics/gimp-refocus-plugin/Makefile
+++ b/graphics/gimp-refocus-plugin/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	refocus
 PORTVERSION=	0.9.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 PKGNAMEPREFIX=	gimp-
diff --git a/graphics/gimp-resynthesizer/Makefile b/graphics/gimp-resynthesizer/Makefile
index f359b6d164da..446031e58005 100644
--- a/graphics/gimp-resynthesizer/Makefile
+++ b/graphics/gimp-resynthesizer/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	resynthesizer
 PORTVERSION=	2.0.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 PKGNAMEPREFIX=	gimp-
 
diff --git a/graphics/goocanvasmm2/Makefile b/graphics/goocanvasmm2/Makefile
index 4cd81b955a8b..b50d1fe3c8be 100644
--- a/graphics/goocanvasmm2/Makefile
+++ b/graphics/goocanvasmm2/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	goocanvasmm
 PORTVERSION=	1.90.9
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics
 MASTER_SITES=	GNOME
 PKGNAMESUFFIX=	2
diff --git a/graphics/gource/Makefile b/graphics/gource/Makefile
index f8fb202aa076..60f558219df7 100644
--- a/graphics/gource/Makefile
+++ b/graphics/gource/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gource
 PORTVERSION=	0.43
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics
 MASTER_SITES=	https://github.com/acaudwell/Gource/releases/download/${PORTNAME}-${PORTVERSION}/
 
diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile
index 2fcabea29f8a..6c5bc23a0413 100644
--- a/graphics/gthumb/Makefile
+++ b/graphics/gthumb/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	gthumb
 PORTVERSION=	3.4.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
diff --git a/graphics/gtimelapse/Makefile b/graphics/gtimelapse/Makefile
index 189a6b0d4fc6..587f451cda15 100644
--- a/graphics/gtimelapse/Makefile
+++ b/graphics/gtimelapse/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gtimelapse
 DISTVERSION=	0.1
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/Relase	# yes, this is not a typo (here)
 
diff --git a/graphics/guetzli/Makefile b/graphics/guetzli/Makefile
index 9d66a2d7f571..b52593520aeb 100644
--- a/graphics/guetzli/Makefile
+++ b/graphics/guetzli/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	guetzli
 PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	graphics
 
diff --git a/graphics/gx/Makefile b/graphics/gx/Makefile
index dfa712fe9825..0fb09353a077 100644
--- a/graphics/gx/Makefile
+++ b/graphics/gx/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gx
 PORTVERSION=	0.4.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	graphics
 MASTER_SITES=	http://BSDforge.com/projects/source/graphics/gx/
 
diff --git a/graphics/hiptext/Makefile b/graphics/hiptext/Makefile
index 6a35d9e9608c..d5322d2655d5 100644
--- a/graphics/hiptext/Makefile
+++ b/graphics/hiptext/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	hiptext
 PORTVERSION=	0.0.s20160621
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 
 MAINTAINER=	yuri@rawbw.com
diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile
index 9fce5bd831a0..b9fb6f6a117f 100644
--- a/graphics/hugin/Makefile
+++ b/graphics/hugin/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	hugin
 PORTVERSION=	2017.0.0
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}
 
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index 9eb2b7d56651..c709d360a5c1 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	inkscape
 PORTVERSION=	0.92.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics gnome
 MASTER_SITES=	https://launchpadlibrarian.net/306309537/ \
 		LOCAL/kwm
diff --git a/graphics/intel-backlight/Makefile b/graphics/intel-backlight/Makefile
index b189e706f63e..8e6afeb6330e 100644
--- a/graphics/intel-backlight/Makefile
+++ b/graphics/intel-backlight/Makefile
@@ -2,19 +2,19 @@
 # $FreeBSD$
 
 PORTNAME=		intel-backlight
-PORTVERSION=		20150706
+PORTVERSION=		20170831
 CATEGORIES=		graphics
 
-MAINTAINER=		freebsd@grem.de
+MAINTAINER=		jmd@freebsd.org
 COMMENT=		Control backlight on various modern Intel(R) GPUs
 
 LIB_DEPENDS=		libdrm.so:graphics/libdrm \
 			libpciaccess.so:devel/libpciaccess
 
 USE_GITHUB=		yes
-GH_ACCOUNT=		grembo
+GH_ACCOUNT=		FreeBSDDesktop
 GH_PROJECT=		intel_backlight_fbsd
-GH_TAGNAME=		93e1fe4
+GH_TAGNAME=		baba3e6
 
 PLIST_FILES=		bin/intel_backlight
 PORTEXAMPLES=		isl_backlight.sh
diff --git a/graphics/intel-backlight/distinfo b/graphics/intel-backlight/distinfo
index b1b68ffb5122..f66ed42584f6 100644
--- a/graphics/intel-backlight/distinfo
+++ b/graphics/intel-backlight/distinfo
@@ -1,2 +1,3 @@
-SHA256 (grembo-intel_backlight_fbsd-20150706-93e1fe4_GH0.tar.gz) = bf2d8d082edbdaf8f89913532cd2620ba49a6dfebbc276fa86d806b63993c852
-SIZE (grembo-intel_backlight_fbsd-20150706-93e1fe4_GH0.tar.gz) = 40402
+TIMESTAMP = 1504227150
+SHA256 (FreeBSDDesktop-intel_backlight_fbsd-20170831-baba3e6_GH0.tar.gz) = 909bcd0ad981ad3e198ea2ae8fb59f5fd0a42f18cf47eb80cd23a4bcf6639092
+SIZE (FreeBSDDesktop-intel_backlight_fbsd-20170831-baba3e6_GH0.tar.gz) = 41192
diff --git a/graphics/ipe/Makefile b/graphics/ipe/Makefile
index 9481f584c205..146f23f51680 100644
--- a/graphics/ipe/Makefile
+++ b/graphics/ipe/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ipe
 PORTVERSION=	7.2.7
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONSUFFIX=	-src
 CATEGORIES=	graphics
 MASTER_SITES=	https://dl.bintray.com/otfried/generic/ipe/${PORTVERSION:R}/
diff --git a/graphics/jogamp-jogl/Makefile b/graphics/jogamp-jogl/Makefile
index dd17efc3e061..8b19ce43cc5c 100644
--- a/graphics/jogamp-jogl/Makefile
+++ b/graphics/jogamp-jogl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	jogamp-jogl
 PORTVERSION=	2.2.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics devel java
 MASTER_SITES=	http://jogamp.org/deployment/jogamp-current/archive/Sources/ \
 		http://jogamp.org/deployment/v${PORTVERSION}/archive/Sources/
diff --git a/graphics/kf5-kimageformats/Makefile b/graphics/kf5-kimageformats/Makefile
index a5194ea3ff87..ab8b5fb59c04 100644
--- a/graphics/kf5-kimageformats/Makefile
+++ b/graphics/kf5-kimageformats/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	kimageformats
 PORTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	graphics kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/graphics/kf5-kplotting/Makefile b/graphics/kf5-kplotting/Makefile
index 0b50240c87e2..a689ca786eb0 100644
--- a/graphics/kf5-kplotting/Makefile
+++ b/graphics/kf5-kplotting/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	kplotting
 PORTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	graphics kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/graphics/kf5-prison/Makefile b/graphics/kf5-prison/Makefile
index 9a9a79930b8a..926d4fc0a0b8 100644
--- a/graphics/kf5-prison/Makefile
+++ b/graphics/kf5-prison/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	prison
 PORTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	graphics kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/graphics/krita/Makefile b/graphics/krita/Makefile
index 17f5bbdc72c6..8a0817d43096 100644
--- a/graphics/krita/Makefile
+++ b/graphics/krita/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	krita
 PORTVERSION=	3.1.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/3.1.2
 DIST_SUBDIR=	KDE/${PORTNAME}
diff --git a/graphics/libbpg/Makefile b/graphics/libbpg/Makefile
index a37fce095fd1..735660cbd5bc 100644
--- a/graphics/libbpg/Makefile
+++ b/graphics/libbpg/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libbpg
 PORTVERSION=	0.9.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://bellard.org/bpg/
 
diff --git a/graphics/libcdr01/Makefile b/graphics/libcdr01/Makefile
index 0d2fa9905b26..8cd819ce6a2b 100644
--- a/graphics/libcdr01/Makefile
+++ b/graphics/libcdr01/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	libcdr
 PORTVERSION=	0.1.3
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	graphics devel
 MASTER_SITES=	LODEV
 PKGNAMESUFFIX=	01
diff --git a/graphics/libetonyek01/Makefile b/graphics/libetonyek01/Makefile
index 4d43c63d1772..64de2f83cd8e 100644
--- a/graphics/libetonyek01/Makefile
+++ b/graphics/libetonyek01/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	libetonyek
 PORTVERSION=	0.1.6
-PORTREVISION=	5
+PORTREVISION=	6
 PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://dev-www.libreoffice.org/src/${PORTNAME}/
diff --git a/graphics/libfreehand/Makefile b/graphics/libfreehand/Makefile
index 0d38c7ebd4c5..bae7c61b3ad7 100644
--- a/graphics/libfreehand/Makefile
+++ b/graphics/libfreehand/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	libfreehand
 PORTVERSION=	0.1.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics
 MASTER_SITES=	LODEV
 
diff --git a/graphics/libgltf/Makefile b/graphics/libgltf/Makefile
index 96feaaba2043..6fc52746c4d6 100644
--- a/graphics/libgltf/Makefile
+++ b/graphics/libgltf/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	libgltf
 PORTVERSION=	0.0.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics devel
 MASTER_SITES=	LODEV
 
diff --git a/graphics/libgnomecanvasmm26/Makefile b/graphics/libgnomecanvasmm26/Makefile
index 8952fa916ea7..a3f2e58b1d19 100644
--- a/graphics/libgnomecanvasmm26/Makefile
+++ b/graphics/libgnomecanvasmm26/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	libgnomecanvasmm
 PORTVERSION=	2.26.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	graphics gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/graphics/libopenraw/Makefile b/graphics/libopenraw/Makefile
index f5a7615039c0..c4cd5fb70e5d 100644
--- a/graphics/libopenraw/Makefile
+++ b/graphics/libopenraw/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libopenraw
 PORTVERSION=	0.1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	http://libopenraw.freedesktop.org/download/
 
diff --git a/graphics/libraw/Makefile b/graphics/libraw/Makefile
index 442f91ad4c30..f74f50ede0f6 100644
--- a/graphics/libraw/Makefile
+++ b/graphics/libraw/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libraw
 PORTVERSION=	0.18.2
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.libraw.org/data/
 DISTNAME=	LibRaw-${PORTVERSION}
diff --git a/graphics/libzmf/Makefile b/graphics/libzmf/Makefile
index 9bf304c8096e..627af0cf0040 100644
--- a/graphics/libzmf/Makefile
+++ b/graphics/libzmf/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	libzmf
 PORTVERSION=	0.0.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	LODEV
 
diff --git a/graphics/lightzone/Makefile b/graphics/lightzone/Makefile
index 0b6906977d53..c5e210813dbf 100644
--- a/graphics/lightzone/Makefile
+++ b/graphics/lightzone/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	lightzone
 PORTVERSION=	4.1.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics java
 DIST_SUBDIR=	${PORTNAME}
 
diff --git a/graphics/luxrender/Makefile b/graphics/luxrender/Makefile
index 84e0967d4e6a..eda390a5a7df 100644
--- a/graphics/luxrender/Makefile
+++ b/graphics/luxrender/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	luxrender
 DISTVERSION?=	1.6
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	https://bitbucket.org/luxrender/lux/get/ \
 		https://bitbucket.org/luxrender/luxrays/get/:lr
diff --git a/graphics/lximage-qt/Makefile b/graphics/lximage-qt/Makefile
index 7e95900af73f..0b32eaf3acae 100644
--- a/graphics/lximage-qt/Makefile
+++ b/graphics/lximage-qt/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	lximage-qt
 PORTVERSION=	0.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	LXQT/${PORTNAME}
 
diff --git a/graphics/mahotas/Makefile b/graphics/mahotas/Makefile
index 9aac13447575..f4682d43b80f 100644
--- a/graphics/mahotas/Makefile
+++ b/graphics/mahotas/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mahotas
 PORTVERSION=	0.9.6
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/graphics/makehuman/Makefile b/graphics/makehuman/Makefile
index ed22287edcb3..6b20e1589049 100644
--- a/graphics/makehuman/Makefile
+++ b/graphics/makehuman/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	makehuman
 DISTVERSION=	0.9.1-rc1a
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/MakeHuman%20Source/MakeHuman_091
 
diff --git a/graphics/mapnik/Makefile b/graphics/mapnik/Makefile
index 9c850cedf150..3e709a703c52 100644
--- a/graphics/mapnik/Makefile
+++ b/graphics/mapnik/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	mapnik
 PORTVERSION=	3.0.9
 DISTVERSIONPREFIX=	v
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	graphics geography
 MASTER_SITES=	http://mapnik.s3.amazonaws.com/dist/v${PORTVERSION}/
 
diff --git a/graphics/mapnik/files/patch-icu59 b/graphics/mapnik/files/patch-icu59
new file mode 100644
index 000000000000..01bcdd6d76d0
--- /dev/null
+++ b/graphics/mapnik/files/patch-icu59
@@ -0,0 +1,39 @@
+https://github.com/mapnik/mapnik/commit/9e58c890430d
+https://github.com/mapnik/mapnik/commit/093fcee6d1ba
+
+--- include/mapnik/text/harfbuzz_shaper.hpp.orig	2015-11-26 14:32:15 UTC
++++ include/mapnik/text/harfbuzz_shaper.hpp
+@@ -41,6 +41,7 @@
+ #include <harfbuzz/hb-ft.h>
+ 
+ // icu
++#include <unicode/uvernum.h>
+ #include <unicode/uscript.h>
+ 
+ namespace mapnik
+@@ -55,7 +56,8 @@ static inline hb_script_t _icu_script_to_script(UScrip
+ static inline const uint16_t * uchar_to_utf16(const UChar* src)
+ {
+    static_assert(sizeof(UChar) == sizeof(uint16_t),"UChar is eq size to uint16_t");
+-#if defined(_MSC_VER)
++#if defined(_MSC_VER) || (U_ICU_VERSION_MAJOR_NUM >= 59)
++   // ^^ http://site.icu-project.org/download/59#TOC-ICU4C-char16_t1
+    return reinterpret_cast<const uint16_t *>(src);
+ #else
+    return src;
+--- include/mapnik/unicode.hpp.orig	2015-11-26 14:32:15 UTC
++++ include/mapnik/unicode.hpp
+@@ -31,6 +31,13 @@
+ // std
+ #include <cstdint>
+ #include <string>
++// icu
++#if (U_ICU_VERSION_MAJOR_NUM >= 59)
++#pragma GCC diagnostic push
++#include <mapnik/warning_ignore.hpp>
++#include <unicode/unistr.h>
++#pragma GCC diagnostic pop
++#endif
+ 
+ struct UConverter;
+ 
diff --git a/graphics/mhgui/Makefile b/graphics/mhgui/Makefile
index 50f4f84ca636..27c65a33abf3 100644
--- a/graphics/mhgui/Makefile
+++ b/graphics/mhgui/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mhgui
 PORTVERSION=	0.2
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	graphics
 MASTER_SITES=	SF/makehuman/MakeHuman%20Source/MakeHuman_091
 
diff --git a/graphics/mupdf/Makefile b/graphics/mupdf/Makefile
index 99cd1a357be0..dd382f995216 100644
--- a/graphics/mupdf/Makefile
+++ b/graphics/mupdf/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mupdf
 PORTVERSION=	1.11
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONSUFFIX=	-source
 PORTEPOCH=	1
 CATEGORIES=	graphics
diff --git a/graphics/mypaint/Makefile b/graphics/mypaint/Makefile
index 8be3c11ac534..b942c940c8d4 100644
--- a/graphics/mypaint/Makefile
+++ b/graphics/mypaint/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mypaint
 PORTVERSION=	1.2.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	https://github.com/mypaint/mypaint/releases/download/${PORTVERSION:S/^/v/}/
 
diff --git a/graphics/nomacs/Makefile b/graphics/nomacs/Makefile
index fea42002e970..63882e1c7f9a 100644
--- a/graphics/nomacs/Makefile
+++ b/graphics/nomacs/Makefile
@@ -12,6 +12,8 @@ COMMENT=	Small, fast, and free image viewer
 
 LICENSE=	GPLv3
 
+BROKEN=		Does not build with CMake 3.9, needs update
+
 LIB_DEPENDS=	libexiv2.so:graphics/exiv2 \
 		libsysinfo.so:devel/libsysinfo \
 		libopencv_core.so:graphics/opencv-core
diff --git a/graphics/nurbs++/Makefile b/graphics/nurbs++/Makefile
index 9637ee446255..069a970beb6d 100644
--- a/graphics/nurbs++/Makefile
+++ b/graphics/nurbs++/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	nurbs++
 PORTVERSION=	3.0.11
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	SF/libnurbs/nurbs%2B%2B/${PORTVERSION}
 
diff --git a/graphics/ocaml-lablgl/Makefile b/graphics/ocaml-lablgl/Makefile
index f99521440b33..2c3880bc3663 100644
--- a/graphics/ocaml-lablgl/Makefile
+++ b/graphics/ocaml-lablgl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	lablgl
 PORTVERSION=	1.05
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/ \
@@ -17,7 +17,7 @@ LICENSE=	BSD3CLAUSE
 
 CONFLICTS=	ocaml-nox11-[0-9]*
 
-USES=		gmake tk:84,85
+USES=		gmake tk:85
 USE_XORG=	x11 xext xmu
 USE_GL=		glut
 USE_OCAML=	yes
diff --git a/graphics/ogre3d/Makefile b/graphics/ogre3d/Makefile
index fea878127dea..f297e0a55632 100644
--- a/graphics/ogre3d/Makefile
+++ b/graphics/ogre3d/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ogre3d
 PORTVERSION=	1.9.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	graphics devel
 MASTER_SITES=   https://bitbucket.org/sinbad/ogre/get/
 DISTNAME=	v1-9-0
diff --git a/graphics/opencolorio/Makefile b/graphics/opencolorio/Makefile
index a76d4b374650..31be0fa48efd 100644
--- a/graphics/opencolorio/Makefile
+++ b/graphics/opencolorio/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	opencolorio
 PORTVERSION=	1.0.9
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	graphics multimedia
 
 MAINTAINER?=	FreeBSD@Shaneware.biz
diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile
index 939c392391a3..617fdca7f055 100644
--- a/graphics/openimageio/Makefile
+++ b/graphics/openimageio/Makefile
@@ -2,7 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	openimageio
-PORTVERSION=	1.7.10
+PORTVERSION=	1.7.17
+PORTREVISION=	1
 DISTVERSIONPREFIX=	Release-
 CATEGORIES?=	graphics multimedia
 
@@ -107,9 +108,9 @@ post-patch:
 
 post-install:
 .if ${SLAVE_PORT} == no
-	${LN} -sf libOpenImageIO.so.1.6 \
+	${LN} -sf libOpenImageIO.so.1.7 \
 		${STAGEDIR}${PREFIX}/lib/libOpenImageIO.so.1
-	${LN} -sf libOpenImageIO_Util.so.1.6 \
+	${LN} -sf libOpenImageIO_Util.so.1.7 \
 		${STAGEDIR}${PREFIX}/lib/libOpenImageIO_Util.so.1
 .endif
 
diff --git a/graphics/openimageio/distinfo b/graphics/openimageio/distinfo
index 38ccf08cb739..1ca55c82c9a2 100644
--- a/graphics/openimageio/distinfo
+++ b/graphics/openimageio/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1484843803
-SHA256 (OpenImageIO-oiio-Release-1.7.10_GH0.tar.gz) = ec5c567b6b4078d17df22262b764ebb7c09ce5b69f0bc2095b51e56c7070f5b7
-SIZE (OpenImageIO-oiio-Release-1.7.10_GH0.tar.gz) = 26188475
+TIMESTAMP = 1504403179
+SHA256 (OpenImageIO-oiio-Release-1.7.17_GH0.tar.gz) = 669c59d06399dd882c3e2469bb3a4b33d537db150f6fe056495c3429b5c3838f
+SIZE (OpenImageIO-oiio-Release-1.7.17_GH0.tar.gz) = 27164765
diff --git a/graphics/openshadinglanguage/Makefile b/graphics/openshadinglanguage/Makefile
index 911d84ea4ebd..c1629171d611 100644
--- a/graphics/openshadinglanguage/Makefile
+++ b/graphics/openshadinglanguage/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	openshadinglanguage
-PORTVERSION=	1.7.5
+PORTVERSION=	1.8.10
+PORTREVISION=	1
 DISTVERSIONPREFIX=	Release-
-PORTREVISION=	2
 CATEGORIES=	graphics devel
 
 MAINTAINER=	FreeBSD@Shaneware.biz
@@ -12,21 +12,20 @@ COMMENT=	Advanced shading language for production GI renderers
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	llvm-config34:devel/llvm34 \
-		clang34>=3.4_1:lang/clang34
+BUILD_DEPENDS=	llvm-config40:devel/llvm40
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
 		libIlmImf.so:graphics/OpenEXR \
 		libImath.so:graphics/ilmbase \
 		libOpenImageIO.so:graphics/openimageio
-RUN_DEPENDS=	llvm-config34:devel/llvm34
+RUN_DEPENDS=	llvm-config40:devel/llvm40
 
-USES=		bison cmake:outsource compiler:c++11-lib ncurses
+USES=		bison cmake:outsource compiler:c++11-lang ncurses
 USE_GITHUB=	yes
 GH_ACCOUNT=	imageworks
 GH_PROJECT=	OpenShadingLanguage
 
-CMAKE_ARGS=	-DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config34" \
-		-DENABLERTTI:BOOL=ON
+CMAKE_ARGS=	-DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config40" \
+		-DENABLERTTI:BOOL=OFF -DUSE_BOOST_WAVE:BOOL=OFF
 USE_LDCONFIG=	yes
 
 post-patch:
diff --git a/graphics/openshadinglanguage/distinfo b/graphics/openshadinglanguage/distinfo
index cd713a89871a..a15fbfcbb141 100644
--- a/graphics/openshadinglanguage/distinfo
+++ b/graphics/openshadinglanguage/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1478806482
-SHA256 (imageworks-OpenShadingLanguage-Release-1.7.5_GH0.tar.gz) = 46226af0592297172e856635eac50327255f1a307244162c1feb47581e72a109
-SIZE (imageworks-OpenShadingLanguage-Release-1.7.5_GH0.tar.gz) = 13739852
+TIMESTAMP = 1503300284
+SHA256 (imageworks-OpenShadingLanguage-Release-1.8.10_GH0.tar.gz) = 5b9ad6814fd55e68f4ac50e4214120629ab9175142dc93aac350d0f54bea745a
+SIZE (imageworks-OpenShadingLanguage-Release-1.8.10_GH0.tar.gz) = 14572479
diff --git a/graphics/openshadinglanguage/files/patch-src_doc_CMakeLists.txt b/graphics/openshadinglanguage/files/patch-src_doc_CMakeLists.txt
index f8c0de05658e..2838db711e47 100644
--- a/graphics/openshadinglanguage/files/patch-src_doc_CMakeLists.txt
+++ b/graphics/openshadinglanguage/files/patch-src_doc_CMakeLists.txt
@@ -1,16 +1,21 @@
---- src/doc/CMakeLists.txt.orig	2015-03-10 21:57:05 UTC
+--- src/doc/CMakeLists.txt.orig	2017-07-01 03:52:54 UTC
 +++ src/doc/CMakeLists.txt
-@@ -1,11 +1,11 @@
- set (public_docs osl-languagespec.pdf)
- # Some day: CLA-INDIVIDUAL CLA-CORPORATE
+@@ -3,15 +3,15 @@ set (public_docs osl-languagespec.pdf
+                  markdeep.min.js
+                  )
  
 -install (FILES ${public_docs} DESTINATION doc COMPONENT documentation)
 +install (FILES ${public_docs} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/openshadinglanguage COMPONENT documentation)
  
  install ( FILES "${PROJECT_SOURCE_DIR}/LICENSE"
-                 "${PROJECT_SOURCE_DIR}/INSTALL"
-                 "${PROJECT_SOURCE_DIR}/CHANGES"
+                 "${PROJECT_SOURCE_DIR}/INSTALL.md"
+                 "${PROJECT_SOURCE_DIR}/CHANGES.md"
                  "${PROJECT_SOURCE_DIR}/README.md"
--          DESTINATION . )
+-          DESTINATION doc )
 +          DESTINATION ${CMAKE_INSTALL_PREFIX}/share/openshadinglanguage )
  
+ 
+ file (GLOB testshade_figures "Figures/testshade/*.jpg")
+ install (FILES ${testshade_figures}
+-         DESTINATION doc/Figures/testshade )
++         DESTINATION ${CMAKE_INSTALL_PREFIX}/share/openshadinglanguage/Figures/testshade )
diff --git a/graphics/openshadinglanguage/pkg-plist b/graphics/openshadinglanguage/pkg-plist
index abeddf8d70f2..8c0ce53e1e70 100644
--- a/graphics/openshadinglanguage/pkg-plist
+++ b/graphics/openshadinglanguage/pkg-plist
@@ -16,20 +16,31 @@ include/OSL/oslclosure.h
 include/OSL/oslcomp.h
 include/OSL/oslconfig.h
 include/OSL/oslexec.h
+include/OSL/oslnoise.h
 include/OSL/oslquery.h
 include/OSL/oslversion.h
 include/OSL/rendererservices.h
 include/OSL/shaderglobals.h
 lib/liboslcomp.so
 lib/liboslexec.so
+lib/liboslnoise.so
 lib/liboslquery.so
 lib/libtestshade.so
 lib/osl.imageio.so
-%%DATADIR%%/CHANGES
-%%DATADIR%%/INSTALL
+%%DATADIR%%/CHANGES.md
+%%DATADIR%%/Figures/testshade/fBm_default.jpg
+%%DATADIR%%/Figures/testshade/fBm_freq.jpg
+%%DATADIR%%/Figures/testshade/fBm_gain.jpg
+%%DATADIR%%/Figures/testshade/fBm_lac.jpg
+%%DATADIR%%/Figures/testshade/fBm_octaves.jpg
+%%DATADIR%%/Figures/testshade/makenoise.jpg
+%%DATADIR%%/Figures/testshade/noisetex.jpg
+%%DATADIR%%/Figures/testshade/show_uv.jpg
+%%DATADIR%%/INSTALL.md
 %%DATADIR%%/LICENSE
-%%DATADIR%%/README.md
+%%DATADIR%%/markdeep.min.js
 %%DATADIR%%/osl-languagespec.pdf
+%%DATADIR%%/README.md
 %%DATADIR%%/shaders/emitter.osl
 %%DATADIR%%/shaders/emitter.oso
 %%DATADIR%%/shaders/glass.osl
@@ -44,3 +55,4 @@ lib/osl.imageio.so
 %%DATADIR%%/shaders/stdosl.h
 %%DATADIR%%/shaders/ubersurface.osl
 %%DATADIR%%/shaders/ubersurface.oso
+%%DATADIR%%/testshade.md.html
diff --git a/graphics/oyranos/Makefile b/graphics/oyranos/Makefile
index fc6e26810cdf..1dda81ebf646 100644
--- a/graphics/oyranos/Makefile
+++ b/graphics/oyranos/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	oyranos
 PORTVERSION=	0.9.6
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	graphics
 
 MAINTAINER=	bsam@FreeBSD.org
diff --git a/graphics/p5-PGPLOT/Makefile b/graphics/p5-PGPLOT/Makefile
index 16113366bc0a..4860335f4363 100644
--- a/graphics/p5-PGPLOT/Makefile
+++ b/graphics/p5-PGPLOT/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	PGPLOT
 PORTVERSION=	2.21
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:KGB
diff --git a/graphics/pfstmo/Makefile b/graphics/pfstmo/Makefile
index bea494a63bb5..6451dbc23132 100644
--- a/graphics/pfstmo/Makefile
+++ b/graphics/pfstmo/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pfstmo
 PORTVERSION=	1.5
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=	graphics
 MASTER_SITES=	SF/pfstools/${PORTNAME}_depreciated/${PORTVERSION}
 
diff --git a/graphics/pgplot/Makefile b/graphics/pgplot/Makefile
index dff7005b12fa..ebc4ebf0ba0a 100644
--- a/graphics/pgplot/Makefile
+++ b/graphics/pgplot/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pgplot
 PORTVERSION=	5.2.2
-PORTREVISION=	19
+PORTREVISION=	20
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.astro.caltech.edu/pub/pgplot/
 DISTNAME=	${PORTNAME}${PORTVERSION:R}
diff --git a/graphics/photivo/Makefile b/graphics/photivo/Makefile
index 0d3063ec5912..68ce7d30088d 100644
--- a/graphics/photivo/Makefile
+++ b/graphics/photivo/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	photivo
 PORTVERSION=	0.0.2015.03.21
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/${PORTNAME}/
 DISTNAME=	source-archive
diff --git a/graphics/piglit/Makefile b/graphics/piglit/Makefile
index bf7e1d4b7670..1ce6955ac80e 100644
--- a/graphics/piglit/Makefile
+++ b/graphics/piglit/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	piglit
 PORTVERSION=	20160809
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/graphics/pixie/Makefile b/graphics/pixie/Makefile
index 48645836948f..2360cece4ddf 100644
--- a/graphics/pixie/Makefile
+++ b/graphics/pixie/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pixie
 PORTVERSION=	2.2.6
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Pixie%20${PORTVERSION}
 DISTNAME=	Pixie-src-${PORTVERSION}
diff --git a/graphics/py-gdal/Makefile b/graphics/py-gdal/Makefile
index df6bc117c8af..563f2010887f 100644
--- a/graphics/py-gdal/Makefile
+++ b/graphics/py-gdal/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gdal
 PORTVERSION=	2.2.1
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	http://download.osgeo.org/gdal/${PORTVERSION}/ \
 		ftp://ftp.remotesensing.org/pub/gdal/${PORTVERSION}/ \
diff --git a/graphics/raster3d/Makefile b/graphics/raster3d/Makefile
index 6914576a541f..74e7ef27e95b 100644
--- a/graphics/raster3d/Makefile
+++ b/graphics/raster3d/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	raster3d
 PORTVERSION=	3.0.2
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	graphics biology
 MASTER_SITES=	http://skuld.bmsc.washington.edu/${PORTNAME}/
 DISTNAME=	Raster3D_${PORTVERSION:R}-${PORTVERSION:E}
diff --git a/graphics/rawtherapee/Makefile b/graphics/rawtherapee/Makefile
index 66c636f8703a..a3215ab04306 100644
--- a/graphics/rawtherapee/Makefile
+++ b/graphics/rawtherapee/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	rawtherapee
 PORTVERSION=	5.2
+PORTREVISION=	1
 #DISTNAME=	${PORTNAME}-${PORTVERSION:R}-r${PORTVERSION:E}${DISTVERSIONSUFFIX}
 CATEGORIES=	graphics
 MASTER_SITES=	http://rawtherapee.com/shared/source/
diff --git a/graphics/rubygem-exifr/Makefile b/graphics/rubygem-exifr/Makefile
index d24c0c35744e..f88a3a6b4c18 100644
--- a/graphics/rubygem-exifr/Makefile
+++ b/graphics/rubygem-exifr/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	exifr
-PORTVERSION=	1.3.1
+PORTVERSION=	1.3.2
 CATEGORIES=	graphics rubygems
 MASTER_SITES=	RG
 
diff --git a/graphics/rubygem-exifr/distinfo b/graphics/rubygem-exifr/distinfo
index 10f6f88e2060..3cdc80b50967 100644
--- a/graphics/rubygem-exifr/distinfo
+++ b/graphics/rubygem-exifr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499518813
-SHA256 (rubygem/exifr-1.3.1.gem) = 7c88679c8b3b9075fa696ce70e4e9fbaa2c991f63590981c5771bffb14f3c08b
-SIZE (rubygem/exifr-1.3.1.gem) = 226304
+TIMESTAMP = 1505229709
+SHA256 (rubygem/exifr-1.3.2.gem) = 69a1d3cc84917166d8289eee285546d0ee331e60fc0e33361256e45cd49ba17a
+SIZE (rubygem/exifr-1.3.2.gem) = 226304
diff --git a/graphics/seexpr/Makefile b/graphics/seexpr/Makefile
index df4d029792e2..9f9c7722e04b 100644
--- a/graphics/seexpr/Makefile
+++ b/graphics/seexpr/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	seexpr
 DISTVERSIONPREFIX=	v
 PORTVERSION=	2.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics math
 
 MAINTAINER=	danfe@FreeBSD.org
diff --git a/graphics/sekrit-twc-zimg/Makefile b/graphics/sekrit-twc-zimg/Makefile
index 33a548f31e11..2664ed46c644 100644
--- a/graphics/sekrit-twc-zimg/Makefile
+++ b/graphics/sekrit-twc-zimg/Makefile
@@ -1,7 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	zimg
-PORTVERSION=	2.5.1
+PORTVERSION=	2.6.1
+PORTREVISION=	1
 DISTVERSIONPREFIX=	release-
 CATEGORIES=	graphics
 PKGNAMEPREFIX=	${GH_ACCOUNT}-
diff --git a/graphics/sekrit-twc-zimg/distinfo b/graphics/sekrit-twc-zimg/distinfo
index 4ebf42b5f6ff..ad95dc5da2e6 100644
--- a/graphics/sekrit-twc-zimg/distinfo
+++ b/graphics/sekrit-twc-zimg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1492296140
-SHA256 (sekrit-twc-zimg-release-2.5.1_GH0.tar.gz) = deb85887081cab7fa9c492b588900d60d6466e61ee8ea51a84ca280688d93de9
-SIZE (sekrit-twc-zimg-release-2.5.1_GH0.tar.gz) = 213083
+TIMESTAMP = 1504621137
+SHA256 (sekrit-twc-zimg-release-2.6.1_GH0.tar.gz) = 3f380898b4bf71c20cfedf9b2f87ba30612520c28b57c344c538dd56b1a5ea62
+SIZE (sekrit-twc-zimg-release-2.6.1_GH0.tar.gz) = 238285
diff --git a/graphics/sekrit-twc-zimg/files/patch-no-extra-deps b/graphics/sekrit-twc-zimg/files/patch-no-extra-deps
index 3a6402523ecc..b7c8f501217e 100644
--- a/graphics/sekrit-twc-zimg/files/patch-no-extra-deps
+++ b/graphics/sekrit-twc-zimg/files/patch-no-extra-deps
@@ -1,13 +1,13 @@
---- Makefile.am.orig	2016-08-17 04:57:11 UTC
+--- Makefile.am.orig	2017-09-05 14:18:57 UTC
 +++ Makefile.am
-@@ -250,30 +250,12 @@ endif # TESTAPP
+@@ -280,31 +280,13 @@ endif # TESTAPP
  if UNIT_TEST
  TESTS = test/unit_test
  
 -check_LTLIBRARIES = test/libmusl_m.la
  check_PROGRAMS = test/unit_test
  
--test_libmusl_m_la_CFLAGS = $(AM_CFLAGS) -Wno-sign-compare -Wno-unused-variable -Wno-unused-but-set-variable
+-test_libmusl_m_la_CFLAGS = $(AM_CFLAGS) -std=c99 -Wno-sign-compare -Wno-unused-variable -Wno-unused-but-set-variable
 -
 -test_libmusl_m_la_SOURCES = \
 -	test/extra/musl-libm/__cos.c \
@@ -24,6 +24,7 @@
 -	test/extra/musl-libm/sin.c
 -
  test_unit_test_CPPFLAGS = \
+ 	$(AM_CPPFLAGS) \
  	-I$(srcdir)/src/zimg \
  	-I$(srcdir)/test \
 -	-I$(srcdir)/test/extra \
@@ -32,8 +33,8 @@
  
  test_unit_test_SOURCES = \
  	test/main.cpp \
-@@ -272,9 +255,6 @@ test_unit_test_SOURCES = \
- 	test/colorspace/colorspace_test.cpp \
+@@ -313,9 +295,6 @@ test_unit_test_SOURCES = \
+ 	test/colorspace/gamma_test.cpp \
  	test/depth/depth_convert_test.cpp \
  	test/depth/dither_test.cpp \
 -	test/extra/sha1/config.h \
@@ -42,8 +43,8 @@
  	test/graph/audit_buffer.cpp \
  	test/graph/audit_buffer.h \
  	test/graph/basic_filter_test.cpp \
-@@ -302,7 +282,6 @@ test_unit_test_SOURCES += \
- endif #X86SIMD
+@@ -355,7 +334,6 @@ test_unit_test_SOURCES += \
+ endif # X86SIMD_AVX512
  
  test_unit_test_LDADD = \
 -	test/extra/googletest/googletest/lib/libgtest.la \
diff --git a/graphics/sharpconstruct/Makefile b/graphics/sharpconstruct/Makefile
index 7ff069ac4a6c..a37f161dbf98 100644
--- a/graphics/sharpconstruct/Makefile
+++ b/graphics/sharpconstruct/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	sharpconstruct
 PORTVERSION=	0.11
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	graphics
 MASTER_SITES=	SF/sharp3d/SharpConstruct/${PORTVERSION}
 
diff --git a/graphics/shotwell/Makefile b/graphics/shotwell/Makefile
index 1baf10f7e066..e7bbf4a30f79 100644
--- a/graphics/shotwell/Makefile
+++ b/graphics/shotwell/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	shotwell
 PORTVERSION=	0.26.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics gnome
 MASTER_SITES=	GNOME/sources/shotwell/${PORTVERSION:R}
 
diff --git a/graphics/simpleviewer/Makefile b/graphics/simpleviewer/Makefile
index 8edfe6462162..02c865b13be3 100644
--- a/graphics/simpleviewer/Makefile
+++ b/graphics/simpleviewer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	simpleviewer
 PORTVERSION=	2.92
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	https://bitbucket.org/andreyu/simple-viewer-gl/get/
 DISTNAME=	v${PORTVERSION}	# version tag, thus no embedded ${PORTNAME}
diff --git a/graphics/synfigstudio/Makefile b/graphics/synfigstudio/Makefile
index 7cd6252ef1b2..a34679234946 100644
--- a/graphics/synfigstudio/Makefile
+++ b/graphics/synfigstudio/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	synfigstudio
 PORTVERSION=	1.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics multimedia
 MASTER_SITES=	SF/synfig/releases/${PORTVERSION}/source
 
diff --git a/graphics/tesseract/Makefile b/graphics/tesseract/Makefile
index f6ffe2eb6674..4fa4851613fb 100644
--- a/graphics/tesseract/Makefile
+++ b/graphics/tesseract/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	tesseract
 PORTVERSION=	3.05.01
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 MAINTAINER=	pkubaj@anongoth.pl
diff --git a/graphics/tiled/Makefile b/graphics/tiled/Makefile
index f48aed90696f..48fe0445580a 100644
--- a/graphics/tiled/Makefile
+++ b/graphics/tiled/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	tiled
 PORTVERSION=	1.0.3
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	graphics editors games
 
diff --git a/graphics/tulip/Makefile b/graphics/tulip/Makefile
index 842af168689e..e28e0aa56780 100644
--- a/graphics/tulip/Makefile
+++ b/graphics/tulip/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	tulip
 PORTVERSION=	4.10.0
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONSUFFIX=	_src
 CATEGORIES=	graphics
 MASTER_SITES=	SF/auber/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/graphics/vapoursynth-fmtconv/Makefile b/graphics/vapoursynth-fmtconv/Makefile
index 11c8b863a6e9..f3f54ef6ad12 100644
--- a/graphics/vapoursynth-fmtconv/Makefile
+++ b/graphics/vapoursynth-fmtconv/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	fmtconv
 PORTVERSION=	r20
+PORTREVISION=	1
 CATEGORIES=	graphics
 PKGNAMEPREFIX=	vapoursynth-
 
diff --git a/graphics/vapoursynth-waifu2x-w2xc/Makefile b/graphics/vapoursynth-waifu2x-w2xc/Makefile
index 54e1643cb7f9..b4b5acac7294 100644
--- a/graphics/vapoursynth-waifu2x-w2xc/Makefile
+++ b/graphics/vapoursynth-waifu2x-w2xc/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	waifu2x-w2xc
 DISTVERSION=	r6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 PKGNAMEPREFIX=	vapoursynth-
 
diff --git a/graphics/vigra/Makefile b/graphics/vigra/Makefile
index f73ea8316248..1a14723c9557 100644
--- a/graphics/vigra/Makefile
+++ b/graphics/vigra/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	vigra
 DISTVERSION=	1.11.0
-PORTREVISION=	11
+PORTREVISION=	13
 CATEGORIES=	graphics
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/graphics/waffle/Makefile b/graphics/waffle/Makefile
index 53faa759d2e5..0dc19da4c3a7 100644
--- a/graphics/waffle/Makefile
+++ b/graphics/waffle/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	waffle
 PORTVERSION=	1.5.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.waffle-gl.org/files/release/waffle-${PORTVERSION}/
 
diff --git a/graphics/waifu2x-converter-cpp/Makefile b/graphics/waifu2x-converter-cpp/Makefile
index 28d598159c1f..55ceca19da96 100644
--- a/graphics/waifu2x-converter-cpp/Makefile
+++ b/graphics/waifu2x-converter-cpp/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	waifu2x-converter-cpp
 DISTVERSION=	1.0.0-410
 DISTVERSIONSUFFIX=	-g5e5ac35
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	https://aur.archlinux.org/cgit/aur.git/plain/${PORTNAME:C/-.*//}.1.gz?h=${PORTNAME:C/-.*//}-git&id=5c150a5&/:manpage
 DISTFILES=	${PORTNAME:C/-.*//}.1.gz:manpage
diff --git a/graphics/wayland-protocols/Makefile b/graphics/wayland-protocols/Makefile
index b2f102c5fa3c..d6f9e3304dca 100644
--- a/graphics/wayland-protocols/Makefile
+++ b/graphics/wayland-protocols/Makefile
@@ -1,23 +1,21 @@
 # $FreeBSD$
 
 PORTNAME=	wayland-protocols
-PORTVERSION=	1.7
+PORTVERSION=	1.10
 CATEGORIES=	graphics wayland
 MASTER_SITES=	https://wayland.freedesktop.org/releases/
 
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	Wayland protocols
 
-BUILD_DEPENDS=	wayland-scanner:graphics/wayland
-
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		tar:xz pathfix
-GNU_CONFIGURE=	yes
+BUILD_DEPENDS=	wayland-scanner:graphics/wayland
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|$${datadir}/pkgconfig|$${prefix}/libdata/pkgconfig|g' \
-		${WRKSRC}/configure
+USES=		tar:xz
+NO_ARCH=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-noarch-pkgconfigdir='$${prefix}/libdata/pkgconfig'
 
 .include <bsd.port.mk>
diff --git a/graphics/wayland-protocols/distinfo b/graphics/wayland-protocols/distinfo
index b65aa5fb1e19..446d7c805aa9 100644
--- a/graphics/wayland-protocols/distinfo
+++ b/graphics/wayland-protocols/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1486828668
-SHA256 (wayland-protocols-1.7.tar.xz) = 635f2a937d318f1fecb97b54074ca211486e38af943868dd0fa82ea38d091c1f
-SIZE (wayland-protocols-1.7.tar.xz) = 113220
+TIMESTAMP = 1499756006
+SHA256 (wayland-protocols-1.10.tar.xz) = 5719c51d7354864983171c5083e93a72ac99229e2b460c4bb10513de08839c0a
+SIZE (wayland-protocols-1.10.tar.xz) = 117652
diff --git a/graphics/wayland-protocols/pkg-plist b/graphics/wayland-protocols/pkg-plist
index afd9c3c92eba..0449e8354bd9 100644
--- a/graphics/wayland-protocols/pkg-plist
+++ b/graphics/wayland-protocols/pkg-plist
@@ -4,6 +4,7 @@ libdata/pkgconfig/wayland-protocols.pc
 %%DATADIR%%/unstable/fullscreen-shell/fullscreen-shell-unstable-v1.xml
 %%DATADIR%%/unstable/idle-inhibit/idle-inhibit-unstable-v1.xml
 %%DATADIR%%/unstable/input-method/input-method-unstable-v1.xml
+%%DATADIR%%/unstable/keyboard-shortcuts-inhibit/keyboard-shortcuts-inhibit-unstable-v1.xml
 %%DATADIR%%/unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml
 %%DATADIR%%/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml
 %%DATADIR%%/unstable/pointer-gestures/pointer-gestures-unstable-v1.xml
@@ -12,5 +13,7 @@ libdata/pkgconfig/wayland-protocols.pc
 %%DATADIR%%/unstable/tablet/tablet-unstable-v2.xml
 %%DATADIR%%/unstable/text-input/text-input-unstable-v1.xml
 %%DATADIR%%/unstable/xdg-foreign/xdg-foreign-unstable-v1.xml
+%%DATADIR%%/unstable/xdg-output/xdg-output-unstable-v1.xml
 %%DATADIR%%/unstable/xdg-shell/xdg-shell-unstable-v5.xml
 %%DATADIR%%/unstable/xdg-shell/xdg-shell-unstable-v6.xml
+%%DATADIR%%/unstable/xwayland-keyboard-grab/xwayland-keyboard-grab-unstable-v1.xml
diff --git a/graphics/webp/Makefile b/graphics/webp/Makefile
index c33550f64ced..e195e1024eb2 100644
--- a/graphics/webp/Makefile
+++ b/graphics/webp/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	webp
 PORTVERSION=	0.6.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	http://downloads.webmproject.org/releases/webp/
 DISTNAME=	lib${PORTNAME}-${PORTVERSION}
diff --git a/graphics/wxsvg/Makefile b/graphics/wxsvg/Makefile
index 5184f533d235..5faf8a05f3b3 100644
--- a/graphics/wxsvg/Makefile
+++ b/graphics/wxsvg/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	wxsvg
 PORTVERSION=	1.5.12
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
diff --git a/graphics/xd3d/Makefile b/graphics/xd3d/Makefile
index 833534d7f26b..72ec1eae237a 100644
--- a/graphics/xd3d/Makefile
+++ b/graphics/xd3d/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xd3d
 PORTVERSION=	8.3.1
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	graphics math
 MASTER_SITES=	http://www.cmap.polytechnique.fr/~jouve/xd3d/
 
diff --git a/graphics/xface.el/Makefile b/graphics/xface.el/Makefile
index 381d0db80af5..80e806286f8e 100644
--- a/graphics/xface.el/Makefile
+++ b/graphics/xface.el/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xface.el
 PORTVERSION=	1.3.6.24
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	graphics elisp
 MASTER_SITES=	http://www.jpl.org/ftp/pub/elisp/ \
 		ftp://ftp.jpl.org/pub/elisp/
diff --git a/graphics/xournal/Makefile b/graphics/xournal/Makefile
index d2fbc717a78a..20b7d115d99c 100644
--- a/graphics/xournal/Makefile
+++ b/graphics/xournal/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
-USES=		pkgconfig
+USES=		pkgconfig desktop-file-utils shared-mime-info
 USE_GNOME=	cairo libgnomecanvas
 USE_XORG=	x11
 GNU_CONFIGURE=	yes
@@ -29,6 +29,7 @@ GHOSTSCRIPT_DESC=	Install ghostscript (PS/PDF as bitmap bg)
 OPTIONS_DEFAULT=	GHOSTSCRIPT
 
 GHOSTSCRIPT_USES=	ghostscript:run
+MAKE_ENV+=		DATADIR=${DATADIR}
 
 PORTDOCS_MAIN=	AUTHORS \
 		ChangeLog \
@@ -68,11 +69,6 @@ PORTDOCS=	${PORTDOCS_MAIN} \
 		html-doc/pixmaps/black.png \
 		html-doc/pixmaps/text-tool.png
 
-post-patch:
-	@${REINPLACE_CMD} \
-		-e 's|$$(DESTDIR)/usr/share/|$$(DESTDIR)$$$$desktopdir/|g' \
-		${WRKSRC}/Makefile.in
-
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS_MAIN:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
diff --git a/graphics/xournal/files/patch-Makefile.in b/graphics/xournal/files/patch-Makefile.in
index 69fd92721e57..bf675f78355b 100644
--- a/graphics/xournal/files/patch-Makefile.in
+++ b/graphics/xournal/files/patch-Makefile.in
@@ -1,6 +1,15 @@
---- Makefile.in.orig	2014-06-29 08:53:20.000000000 +0200
-+++ Makefile.in	2015-02-23 22:51:49.000000000 +0100
-@@ -796,31 +796,29 @@
+--- Makefile.in.orig	2017-07-20 18:30:27 UTC
++++ Makefile.in
+@@ -809,38 +809,36 @@ uninstall-am:
+ install-data-local:
+ 	@$(NORMAL_INSTALL)
+ 	if test -d $(srcdir)/pixmaps; then \
+-	  $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/pixmaps; \
++	  $(mkinstalldirs) $(DESTDIR)$(DATADIR)/pixmaps; \
+ 	  for pixmap in $(srcdir)/pixmaps/*; do \
+ 	    if test -f $$pixmap; then \
+-	      $(INSTALL_DATA) $$pixmap $(DESTDIR)$(pkgdatadir)/pixmaps; \
++	      $(INSTALL_DATA) $$pixmap $(DESTDIR)$(DATADIR)/pixmaps; \
  	    fi \
  	  done \
  	fi; \
@@ -33,7 +42,7 @@
 -	else \
 -	  desktopdir=/usr/local/share; \
 -	fi; \
-+	desktopdir=$(pkgdatadir); \
++	desktopdir=$(DATADIR); \
  	$(mkinstalldirs) $(DESTDIR)$$desktopdir/icons/hicolor/scalable/apps; \
  	$(mkinstalldirs) $(DESTDIR)$$desktopdir/icons/hicolor/scalable/mimetypes; \
  	$(mkinstalldirs) $(DESTDIR)$$desktopdir/mime/packages; \
@@ -43,7 +52,7 @@
  	$(INSTALL_DATA) $(srcdir)/pixmaps/xournal.svg $(DESTDIR)$$desktopdir/icons/hicolor/scalable/apps; \
  	$(INSTALL_DATA) $(srcdir)/pixmaps/xoj.svg $(DESTDIR)$$desktopdir/icons/hicolor/scalable/mimetypes; \
  	if test ! -e $(DESTDIR)$$desktopdir/icons/hicolor/scalable/mimetypes/gnome-mime-application-x-xoj.svg; then \
-@@ -828,7 +826,7 @@
+@@ -851,7 +849,7 @@ desktop-install:
  	fi; \
  	$(INSTALL_DATA) $(srcdir)/xournal.xml $(DESTDIR)$$desktopdir/mime/packages; \
  	$(INSTALL_DATA) $(srcdir)/xournal.desktop $(DESTDIR)$$desktopdir/applications; \
diff --git a/graphics/xournal/files/patch-configure b/graphics/xournal/files/patch-configure
index 25d8b47efd97..9b2b3e4b3c48 100644
--- a/graphics/xournal/files/patch-configure
+++ b/graphics/xournal/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2017-07-20 18:30:25.000000000 +0000
-+++ configure	2017-08-01 14:05:24.637135000 +0000
-@@ -5605,6 +5605,8 @@
+--- configure.orig	2017-07-20 18:30:25 UTC
++++ configure
+@@ -5605,6 +5605,8 @@ fi
  case "$host" in
   *-*-linux*)
     os_linux=yes;;
diff --git a/graphics/xournal/files/patch-src_Makefile.in b/graphics/xournal/files/patch-src_Makefile.in
new file mode 100644
index 000000000000..aaeb25339077
--- /dev/null
+++ b/graphics/xournal/files/patch-src_Makefile.in
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig	2017-08-20 23:55:48 UTC
++++ src/Makefile.in
+@@ -342,7 +342,7 @@ top_srcdir = @top_srcdir@
+ @WIN32_FALSE@SUBDIRS = ttsubset
+ @WIN32_TRUE@SUBDIRS = ttsubset win32
+ INCLUDES = \
+-	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
++	-DPACKAGE_DATA_DIR=\""$(DATADIR)/pixmaps"\" \
+ 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+ 	@PACKAGE_CFLAGS@
+ 
diff --git a/graphics/xournal/files/patch-src_main.c b/graphics/xournal/files/patch-src_main.c
new file mode 100644
index 000000000000..cfaac9b4a744
--- /dev/null
+++ b/graphics/xournal/files/patch-src_main.c
@@ -0,0 +1,11 @@
+--- src/main.c.orig	2015-10-25 04:26:29 UTC
++++ src/main.c
+@@ -360,7 +360,7 @@ main (int argc, char *argv[])
+   g_free(path);
+   g_free(path1);
+   g_free(path2);
+-  add_pixmap_directory (PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps");
++  add_pixmap_directory (PACKAGE_DATA_DIR);
+ 
+   /*
+    * The following code was added by Glade to create one of each component
diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile
index 715d0de23eba..33919e0c5e59 100644
--- a/graphics/xpdf/Makefile
+++ b/graphics/xpdf/Makefile
@@ -1,66 +1,8 @@
 # $FreeBSD$
 
-PORTNAME=	xpdf
-PORTVERSION=	3.04
-PORTREVISION=	7
-CATEGORIES=	graphics print
-MASTER_SITES=	http://mirrors.rit.edu/zi/ \
-		ftp://ftp.foolabs.com/pub/xpdf/ \
-		TEX_CTAN/support/xpdf \
-		http://komquats.com/distfiles/
+VERSIONS=		3 4
+XPDF_VERSION?=		4
 
-MAINTAINER=	cy@FreeBSD.org
-COMMENT=	Display PDF files and convert them to other formats
+MASTERDIR=		${.CURDIR}/../xpdf${XPDF_VERSION}
 
-LICENSE=	GPLv2
-
-LIB_DEPENDS=	libfreetype.so:print/freetype2 \
-		libpng.so:graphics/png
-
-GNU_CONFIGURE=	yes
-USES=		gmake cpe localbase
-CPE_VENDOR=	foolabs
-CONFIGURE_ARGS=	--enable-opi \
-		--with-freetype2-library="${LOCALBASE}/lib" \
-		--with-freetype2-includes="${LOCALBASE}/include/freetype2" \
-		--bindir="${PREFIX}/libexec/xpdf" \
-		--mandir="${PREFIX}/share/xpdf/man"
-
-MANPREFIX=	${PREFIX}/share/xpdf
-
-OPTIONS_DEFINE=	LIBPAPER TYPE1 X11 DOCS
-LIBPAPER_DESC=	Enable libpaper
-TYPE1_DESC=	Ghostscript type1 fonts
-OPTIONS_DEFAULT=	TYPE1 X11
-OPTIONS_SUB=		yes
-
-SUB_FILES=	xpdf-man.conf
-
-TYPE1_RUN_DEPENDS=	${LOCALBASE}/share/ghostscript/fonts/n021003l.pfb:print/gsfonts
-
-LIBPAPER_LIB_DEPENDS=	libpaper.so:print/libpaper
-LIBPAPER_CONFIGURE_ON=--with-libpaper-library="${LOCALBASE}/lib" \
-		--with-libpaper-includes="${LOCALBASE}/include"
-LIBPAPER_CONFIGURE_OFF=--without-libpaper-library
-
-.if defined(A4)
-CONFIGURE_ARGS+=	--enable-a4-paper
-.endif
-
-X11_CONFIGURE_WITH=	x
-X11_USES=		motif
-
-post-patch:
-	${REINPLACE_CMD} -e 's|undef USE_COMBO_BOX|define USE_COMBO_BOX 1|' \
-		${WRKSRC}/xpdf/XPDFViewer.h
-
-post-install:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for file in ANNOUNCE CHANGES README misc/hello.pdf
-	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
-.endfor
-	${LN} -sf ${PREFIX}/libexec/xpdf/xpdf ${STAGEDIR}${PREFIX}/bin/xpdf
-	${INSTALL_DATA} ${WRKDIR}/xpdf-man.conf \
-		${STAGEDIR}${PREFIX}/etc/man.d/xpdf.conf
-
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/graphics/xpdf3/Makefile b/graphics/xpdf3/Makefile
new file mode 100644
index 000000000000..2eb5789619fa
--- /dev/null
+++ b/graphics/xpdf3/Makefile
@@ -0,0 +1,70 @@
+# $FreeBSD$
+
+PORTNAME=	xpdf
+PORTVERSION=	3.04
+PORTREVISION=	9
+CATEGORIES=	graphics print
+MASTER_SITES=	http://mirrors.rit.edu/zi/ \
+		ftp://ftp.foolabs.com/pub/xpdf/ \
+		TEX_CTAN/support/xpdf \
+		http://komquats.com/distfiles/
+.if !defined(MASTERDIR)
+PKGNAMESUFFIX=  3
+.endif
+
+MAINTAINER=	cy@FreeBSD.org
+COMMENT=	Display PDF files and convert them to other formats
+
+LICENSE=	GPLv2
+
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libpng.so:graphics/png
+
+GNU_CONFIGURE=	yes
+USES=		gmake cpe localbase
+CPE_VENDOR=	foolabs
+CONFIGURE_ARGS=	--enable-opi \
+		--with-freetype2-library="${LOCALBASE}/lib" \
+		--with-freetype2-includes="${LOCALBASE}/include/freetype2" \
+		--bindir="${PREFIX}/libexec/xpdf" \
+		--mandir="${PREFIX}/share/xpdf/man"
+
+MANPREFIX=	${PREFIX}/share/xpdf
+
+OPTIONS_DEFINE=	LIBPAPER TYPE1 X11 DOCS
+LIBPAPER_DESC=	Enable libpaper
+TYPE1_DESC=	Ghostscript type1 fonts
+OPTIONS_DEFAULT=	TYPE1 X11
+OPTIONS_SUB=		yes
+
+SUB_FILES=	xpdf-man.conf
+
+TYPE1_RUN_DEPENDS=	${LOCALBASE}/share/ghostscript/fonts/n021003l.pfb:print/gsfonts
+
+LIBPAPER_LIB_DEPENDS=	libpaper.so:print/libpaper
+LIBPAPER_CONFIGURE_ON=--with-libpaper-library="${LOCALBASE}/lib" \
+		--with-libpaper-includes="${LOCALBASE}/include"
+LIBPAPER_CONFIGURE_OFF=--without-libpaper-library
+
+.if defined(A4)
+CONFIGURE_ARGS+=	--enable-a4-paper
+.endif
+
+X11_CONFIGURE_WITH=	x
+X11_USES=		motif
+
+post-patch:
+	${REINPLACE_CMD} -e 's|undef USE_COMBO_BOX|define USE_COMBO_BOX 1|' \
+		${WRKSRC}/xpdf/XPDFViewer.h
+
+post-install:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for file in ANNOUNCE CHANGES README misc/hello.pdf
+	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
+.endfor
+	@cd ${STAGEDIR}${PREFIX}; \
+	${LN} -sf ../libexec/xpdf/xpdf bin/xpdf
+	${INSTALL_DATA} ${WRKDIR}/xpdf-man.conf \
+		${STAGEDIR}${PREFIX}/etc/man.d/xpdf.conf
+
+.include <bsd.port.mk>
diff --git a/graphics/xpdf/distinfo b/graphics/xpdf3/distinfo
index 8e5c949df70a..8e5c949df70a 100644
--- a/graphics/xpdf/distinfo
+++ b/graphics/xpdf3/distinfo
diff --git a/graphics/xpdf/files/patch-Makefile.in b/graphics/xpdf3/files/patch-Makefile.in
index 6df513c49f4d..6df513c49f4d 100644
--- a/graphics/xpdf/files/patch-Makefile.in
+++ b/graphics/xpdf3/files/patch-Makefile.in
diff --git a/graphics/xpdf/files/patch-splash_Makefile.in b/graphics/xpdf3/files/patch-splash_Makefile.in
index 280cadcca468..280cadcca468 100644
--- a/graphics/xpdf/files/patch-splash_Makefile.in
+++ b/graphics/xpdf3/files/patch-splash_Makefile.in
diff --git a/graphics/xpdf/files/patch-splash_SplashFTFont.cc b/graphics/xpdf3/files/patch-splash_SplashFTFont.cc
index 48049df5edc6..48049df5edc6 100644
--- a/graphics/xpdf/files/patch-splash_SplashFTFont.cc
+++ b/graphics/xpdf3/files/patch-splash_SplashFTFont.cc
diff --git a/graphics/xpdf/files/patch-xfont b/graphics/xpdf3/files/patch-xfont
index 57a127450f3a..57a127450f3a 100644
--- a/graphics/xpdf/files/patch-xfont
+++ b/graphics/xpdf3/files/patch-xfont
diff --git a/graphics/xpdf/files/patch-xpdf_GlobalParams.cc b/graphics/xpdf3/files/patch-xpdf_GlobalParams.cc
index ceab23673ba1..ceab23673ba1 100644
--- a/graphics/xpdf/files/patch-xpdf_GlobalParams.cc
+++ b/graphics/xpdf3/files/patch-xpdf_GlobalParams.cc
diff --git a/graphics/xpdf/files/patch-xpdf_GlobalParams.h b/graphics/xpdf3/files/patch-xpdf_GlobalParams.h
index 9d6349e4d487..9d6349e4d487 100644
--- a/graphics/xpdf/files/patch-xpdf_GlobalParams.h
+++ b/graphics/xpdf3/files/patch-xpdf_GlobalParams.h
diff --git a/graphics/xpdf/files/patch-xpdf_Stream.cc b/graphics/xpdf3/files/patch-xpdf_Stream.cc
index 0804c26b55bc..0804c26b55bc 100644
--- a/graphics/xpdf/files/patch-xpdf_Stream.cc
+++ b/graphics/xpdf3/files/patch-xpdf_Stream.cc
diff --git a/graphics/xpdf/files/patch-xpdf_XPDFViewer.cc b/graphics/xpdf3/files/patch-xpdf_XPDFViewer.cc
index 65c3faca7da6..65c3faca7da6 100644
--- a/graphics/xpdf/files/patch-xpdf_XPDFViewer.cc
+++ b/graphics/xpdf3/files/patch-xpdf_XPDFViewer.cc
diff --git a/graphics/xpdf/files/patch-xpdf__Makefile.in b/graphics/xpdf3/files/patch-xpdf__Makefile.in
index 756c8da6e991..756c8da6e991 100644
--- a/graphics/xpdf/files/patch-xpdf__Makefile.in
+++ b/graphics/xpdf3/files/patch-xpdf__Makefile.in
diff --git a/graphics/xpdf/files/xpdf-man.conf.in b/graphics/xpdf3/files/xpdf-man.conf.in
index a7e2ad6b6dca..a7e2ad6b6dca 100644
--- a/graphics/xpdf/files/xpdf-man.conf.in
+++ b/graphics/xpdf3/files/xpdf-man.conf.in
diff --git a/graphics/xpdf/pkg-descr b/graphics/xpdf3/pkg-descr
index b6a0b3056a0b..b6a0b3056a0b 100644
--- a/graphics/xpdf/pkg-descr
+++ b/graphics/xpdf3/pkg-descr
diff --git a/graphics/xpdf/pkg-message b/graphics/xpdf3/pkg-message
index e8baf67674ee..e8baf67674ee 100644
--- a/graphics/xpdf/pkg-message
+++ b/graphics/xpdf3/pkg-message
diff --git a/graphics/xpdf/pkg-plist b/graphics/xpdf3/pkg-plist
index 724f3f9360bc..724f3f9360bc 100644
--- a/graphics/xpdf/pkg-plist
+++ b/graphics/xpdf3/pkg-plist
diff --git a/graphics/xpdf4/Makefile b/graphics/xpdf4/Makefile
new file mode 100644
index 000000000000..75b745a5496e
--- /dev/null
+++ b/graphics/xpdf4/Makefile
@@ -0,0 +1,54 @@
+# $FreeBSD$
+
+PORTNAME=	xpdf
+PORTVERSION=	4.02
+CATEGORIES=	graphics print
+MASTER_SITES=	http://www.xpdfreader.com/dl/
+.if !defined(MASTERDIR)
+PKGNAMESUFFIX=	4
+.endif
+
+MAINTAINER=	cy@FreeBSD.org
+COMMENT=	Display PDF files and convert them to other formats
+WRKSRC=		${WRKDIR}/${PORTNAME}-4.00
+
+LICENSE=	GPLv2
+
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libpng.so:graphics/png
+
+CONFLICTS_INSTALL=	xpdf
+
+MANPREFIX=	${PREFIX}/share/xpdf
+SUB_FILES=	xpdf-man.conf
+
+USES=		cmake:outsource localbase
+CMAKE_ARGS+=	-DOPI_SUPPORT:BOOL=ON -DCMAKE_DISABLE_FIND_PACKAGE_Qt4:BOOL=ON \
+		-DUSE_LCMS:BOOL=OFF -DSYSTEM_XPDFRC=${PREFIX}/etc/xpdfrc
+
+OPTIONS_DEFINE=		TYPE1 LIBPAPER GUI
+OPTIONS_DEFAULT=	TYPE1 GUI
+OPTIONS_SUB=		yes
+
+TYPE1_CMAKE_BOOL=	TYPE1
+TYPE1_DESC=		Ghostscript type1 fonts
+TYPE1_RUN_DEPENDS=	${LOCALBASE}/share/ghostscript/fonts/d050000l.pfb:print/gsfonts
+
+LIBPAPER_CMAKE_BOOL=	USE_LIBPAPER
+LIBPAPER_LIB_DEPENDS=	libpaper.so:print/libpaper
+
+GUI_CMAKE_ON=		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets:BOOL=FALSE
+GUI_CMAKE_OFF=		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets:BOOL=TRUE
+GUI_DESC=		QT5 interface
+GUI_CMAKE_ARGS+=	-DNO_TEXT_SELECT:BOOL=OFF
+GUI_USE=		QT5=buildtools_build,qmake_build,concurrent,core,gui,widgets,printsupport
+
+post-install:
+		@cd ${STAGEDIR}${PREFIX}; \
+		${LN} -sf ../libexec/xpdf/xpdf bin/xpdf
+
+		${INSTALL_DATA} ${WRKSRC}/doc/sample-xpdfrc ${STAGEDIR}${PREFIX}/etc/xpdfrc.sample
+		${INSTALL_DATA} ${WRKDIR}/xpdf-man.conf \
+			${STAGEDIR}${PREFIX}/etc/man.d/xpdf.conf
+
+.include <bsd.port.mk>
diff --git a/graphics/xpdf4/distinfo b/graphics/xpdf4/distinfo
new file mode 100644
index 000000000000..70113e77772f
--- /dev/null
+++ b/graphics/xpdf4/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1505380050
+SHA256 (xpdf-4.02.tar.gz) = ff3d92c42166e35b1ba6aec9b5f0adffb5fc05a3eb95dc49505b6e344e4216d6
+SIZE (xpdf-4.02.tar.gz) = 854175
diff --git a/graphics/xpdf4/files/patch-cmake-config.txt b/graphics/xpdf4/files/patch-cmake-config.txt
new file mode 100644
index 000000000000..ece77c523e1d
--- /dev/null
+++ b/graphics/xpdf4/files/patch-cmake-config.txt
@@ -0,0 +1,49 @@
+--- cmake-config.txt.orig	2017-09-02 20:30:45 UTC
++++ cmake-config.txt
+@@ -79,6 +79,7 @@ option(USE_EXCEPTIONS "use C++ exception
+ option(USE_FIXEDPOINT "use fixed point (instead of floating point) arithmetic" OFF)
+ option(SPLASH_CMYK "include support for CMYK rasterization" OFF)
+ option(SPLASH_DEVICEN "include support for DeviceN rasterization" OFF)
++option(USE_LIBPAPER "use libpaper" OFF)
+ if (SPLASH_DEVICEN)
+   set(SPLASH_CMYK ON)
+ endif ()
+@@ -278,10 +279,34 @@ else()
+ endif()
+ 
+ #--- look for libpaper
+-find_library(HAVE_PAPER_H
+-             NAMES paper libpaper
+-             PATH_SUFFIXES lib64 lib
+-)
++if(USE_LIBPAPER)
++  find_library(PAPER_LIBRARY
++    NAMES paper libpaper
++    HINTS
++    ${PAPER_DIR}
++    PATHS
++    /usr/local
++    /usr/freeware
++  )
++  find_path(PAPER_INCLUDE_DIR .h
++    HINTS
++    ${PAPER_DIR}
++    PATHS
++    /usr/local/include
++    /usr/freeware/include
++    PATH_SUFFIXES include
++  )
++endif()
++
++if (USE_LIBPAPER)
++ if (PAPER_INCLUDE_DIR AND PAPER_LIBRARY)
++   set(HAVE_PAPER_H TRUE)
++   message(STATUS "Found libpaper: ${PAPER_LIBRARY}")
++ else ()
++  set(HAVE_PAPER_H FALSE)
++  message(STATUS "libpaper not found")
++ endif ()
++endif ()
+ 
+ #--- look for pthreads
+ find_package(Threads)
diff --git a/graphics/xpdf4/files/patch-xpdf-qt_CMakeLists.txt b/graphics/xpdf4/files/patch-xpdf-qt_CMakeLists.txt
new file mode 100644
index 000000000000..d7e91fe26916
--- /dev/null
+++ b/graphics/xpdf4/files/patch-xpdf-qt_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- xpdf-qt/CMakeLists.txt.orig	2017-08-08 23:22:50 UTC
++++ xpdf-qt/CMakeLists.txt
+@@ -86,6 +86,6 @@ if ((QT4_FOUND OR Qt5Widgets_FOUND)
+                         ${CMAKE_THREAD_LIBS_INIT})
+   set_property(TARGET xpdf PROPERTY WIN32_EXECUTABLE 1)
+ 
+-  install(TARGETS xpdf RUNTIME DESTINATION bin)
+-  install(FILES ${PROJECT_SOURCE_DIR}/doc/xpdf.1 DESTINATION man/man1)
++  install(TARGETS xpdf RUNTIME DESTINATION libexec/xpdf)
++  install(FILES ${PROJECT_SOURCE_DIR}/doc/xpdf.1 DESTINATION share/xpdf/man/man1)
+ endif ()
diff --git a/graphics/xpdf4/files/patch-xpdf_CMakeLists.txt b/graphics/xpdf4/files/patch-xpdf_CMakeLists.txt
new file mode 100644
index 000000000000..dc31866fc386
--- /dev/null
+++ b/graphics/xpdf4/files/patch-xpdf_CMakeLists.txt
@@ -0,0 +1,143 @@
+--- xpdf/CMakeLists.txt.orig	2017-08-08 23:22:50 UTC
++++ xpdf/CMakeLists.txt
+@@ -23,6 +23,9 @@ if (HAVE_LCMS)
+ else ()
+   set(COLOR_MANAGER_SOURCE "")
+ endif ()
++if (HAVE_PAPER_H)
++ include_directories("${PAPER_INCLUDE_DIR}")
++endif ()
+ 
+ add_library(xpdf_objs OBJECT
+   AcroForm.cc
+@@ -108,7 +111,7 @@ if (HAVE_SPLASH)
+   target_link_libraries(pdftops goo fofi splash
+                         ${FREETYPE_LIBRARY} ${FREETYPE_OTHER_LIBS}
+                         ${DTYPE_LIBRARY}
+-                        ${LCMS_LIBRARY})
++                        ${LCMS_LIBRARY} ${PAPER_LIBRARY})
+ else ()
+   add_executable(pdftops
+     $<TARGET_OBJECTS:xpdf_objs>
+@@ -116,10 +119,10 @@ else ()
+     PSOutputDev.cc
+     pdftops.cc
+   )
+-  target_link_libraries(pdftops goo fofi ${LCMS_LIBRARY})
++  target_link_libraries(pdftops goo fofi ${LCMS_LIBRARY} ${PAPER_LIBRARY})
+ endif ()
+-install(TARGETS pdftops RUNTIME DESTINATION bin)
+-install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftops.1 DESTINATION man/man1)
++install(TARGETS pdftops RUNTIME DESTINATION libexec/xpdf)
++install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftops.1 DESTINATION share/xpdf/man/man1)
+ 
+ #--- pdftotext
+ 
+@@ -128,9 +131,9 @@ add_executable(pdftotext
+   TextOutputDev.cc
+   pdftotext.cc
+ )
+-target_link_libraries(pdftotext goo fofi ${LCMS_LIBRARY})
+-install(TARGETS pdftotext RUNTIME DESTINATION bin)
+-install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftotext.1 DESTINATION man/man1)
++target_link_libraries(pdftotext goo fofi ${LCMS_LIBRARY} ${PAPER_LIBRARY})
++install(TARGETS pdftotext RUNTIME DESTINATION libexec/xpdf)
++install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftotext.1 DESTINATION share/xpdf/man/man1)
+ 
+ #--- pdftohtml
+ 
+@@ -145,9 +148,9 @@ if (HAVE_SPLASH AND PNG_FOUND)
+   target_link_libraries(pdftohtml goo fofi splash
+                         ${FREETYPE_LIBRARY} ${FREETYPE_OTHER_LIBS}
+                         ${DTYPE_LIBRARY}
+-                        ${LCMS_LIBRARY} ${PNG_LIBRARIES})
+-  install(TARGETS pdftohtml RUNTIME DESTINATION bin)
+-  install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftohtml.1 DESTINATION man/man1)
++                        ${LCMS_LIBRARY} ${PNG_LIBRARIES} ${PAPER_LIBRARY})
++  install(TARGETS pdftohtml RUNTIME DESTINATION libexec/xpdf)
++  install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftohtml.1 DESTINATION share/xpdf/man/man1)
+ endif ()
+ 
+ #--- pdfinfo
+@@ -156,9 +159,9 @@ add_executable(pdfinfo
+   $<TARGET_OBJECTS:xpdf_objs>
+   pdfinfo.cc
+ )
+-target_link_libraries(pdfinfo goo fofi ${LCMS_LIBRARY})
+-install(TARGETS pdfinfo RUNTIME DESTINATION bin)
+-install(FILES ${PROJECT_SOURCE_DIR}/doc/pdfinfo.1 DESTINATION man/man1)
++target_link_libraries(pdfinfo goo fofi ${LCMS_LIBRARY} ${PAPER_LIBRARY})
++install(TARGETS pdfinfo RUNTIME DESTINATION libexec/xpdf)
++install(FILES ${PROJECT_SOURCE_DIR}/doc/pdfinfo.1 DESTINATION share/xpdf/man/man1)
+ 
+ #--- pdffonts
+ 
+@@ -166,9 +169,9 @@ add_executable(pdffonts
+   $<TARGET_OBJECTS:xpdf_objs>
+   pdffonts.cc
+ )
+-target_link_libraries(pdffonts goo fofi ${LCMS_LIBRARY})
+-install(TARGETS pdffonts RUNTIME DESTINATION bin)
+-install(FILES ${PROJECT_SOURCE_DIR}/doc/pdffonts.1 DESTINATION man/man1)
++target_link_libraries(pdffonts goo fofi ${LCMS_LIBRARY} ${PAPER_LIBRARY})
++install(TARGETS pdffonts RUNTIME DESTINATION libexec/xpdf)
++install(FILES ${PROJECT_SOURCE_DIR}/doc/pdffonts.1 DESTINATION share/xpdf/man/man1)
+ 
+ #--- pdfdetach
+ 
+@@ -176,9 +179,9 @@ add_executable(pdfdetach
+   $<TARGET_OBJECTS:xpdf_objs>
+   pdfdetach.cc
+ )
+-target_link_libraries(pdfdetach goo fofi ${LCMS_LIBRARY})
+-install(TARGETS pdfdetach RUNTIME DESTINATION bin)
+-install(FILES ${PROJECT_SOURCE_DIR}/doc/pdfdetach.1 DESTINATION man/man1)
++target_link_libraries(pdfdetach goo fofi ${LCMS_LIBRARY} ${PAPER_LIBRARY})
++install(TARGETS pdfdetach RUNTIME DESTINATION libexec/xpdf)
++install(FILES ${PROJECT_SOURCE_DIR}/doc/pdfdetach.1 DESTINATION share/xpdf/man/man1)
+ 
+ #--- pdftoppm
+ 
+@@ -190,10 +193,10 @@ if (HAVE_SPLASH)
+   )
+   target_link_libraries(pdftoppm goo fofi splash
+                         ${FREETYPE_LIBRARY} ${FREETYPE_OTHER_LIBS}
+-                        ${DTYPE_LIBRARY}
++                        ${DTYPE_LIBRARY} ${PAPER_LIBRARY}
+                         ${LCMS_LIBRARY})
+-  install(TARGETS pdftoppm RUNTIME DESTINATION bin)
+-  install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftoppm.1 DESTINATION man/man1)
++  install(TARGETS pdftoppm RUNTIME DESTINATION libexec/xpdf)
++  install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftoppm.1 DESTINATION share/xpdf/man/man1)
+ endif ()
+ 
+ #--- pdftopng
+@@ -206,10 +209,10 @@ if (HAVE_SPLASH AND PNG_FOUND)
+   )
+   target_link_libraries(pdftopng goo fofi splash
+                         ${FREETYPE_LIBRARY} ${FREETYPE_OTHER_LIBS}
+-                        ${DTYPE_LIBRARY}
++                        ${DTYPE_LIBRARY} ${PAPER_LIBRARY}
+                         ${LCMS_LIBRARY} ${PNG_LIBRARIES})
+-  install(TARGETS pdftopng RUNTIME DESTINATION bin)
+-  install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftopng.1 DESTINATION man/man1)
++  install(TARGETS pdftopng RUNTIME DESTINATION libexec/xpdf)
++  install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftopng.1 DESTINATION share/xpdf/man/man1)
+ endif ()
+ 
+ #--- pdfimages
+@@ -219,10 +222,10 @@ add_executable(pdfimages
+   ImageOutputDev.cc
+   pdfimages.cc
+ )
+-target_link_libraries(pdfimages goo fofi ${LCMS_LIBRARY})
+-install(TARGETS pdfimages RUNTIME DESTINATION bin)
+-install(FILES ${PROJECT_SOURCE_DIR}/doc/pdfimages.1 DESTINATION man/man1)
++target_link_libraries(pdfimages goo fofi ${LCMS_LIBRARY} ${PAPER_LIBRARY})
++install(TARGETS pdfimages RUNTIME DESTINATION libexec/xpdf)
++install(FILES ${PROJECT_SOURCE_DIR}/doc/pdfimages.1 DESTINATION share/xpdf/man/man1)
+ 
+ #--- xpdfrc man page
+ 
+-install(FILES ${PROJECT_SOURCE_DIR}/doc/xpdfrc.5 DESTINATION man/man5)
++install(FILES ${PROJECT_SOURCE_DIR}/doc/xpdfrc.5 DESTINATION share/xpdf/man/man5)
diff --git a/graphics/xpdf4/files/xpdf-man.conf.in b/graphics/xpdf4/files/xpdf-man.conf.in
new file mode 100644
index 000000000000..2fd81b7bd6d1
--- /dev/null
+++ b/graphics/xpdf4/files/xpdf-man.conf.in
@@ -0,0 +1,2 @@
+MANPATH %%PREFIX%%/share/xpdf/man
+
diff --git a/graphics/xpdf4/pkg-descr b/graphics/xpdf4/pkg-descr
new file mode 100644
index 000000000000..a09c117e2541
--- /dev/null
+++ b/graphics/xpdf4/pkg-descr
@@ -0,0 +1,8 @@
+Xpdf is a viewer for Portable Document Format (PDF) files.  These are
+also sometimes also called 'Acrobat' files, from the name of Adobe's
+PDF software.
+
+It can also convert PDF input to ps, text, and info formats; and
+split out fonts and images.
+
+WWW: http://www.xpdfreader.com/
diff --git a/graphics/xpdf4/pkg-message b/graphics/xpdf4/pkg-message
new file mode 100644
index 000000000000..e8baf67674ee
--- /dev/null
+++ b/graphics/xpdf4/pkg-message
@@ -0,0 +1,8 @@
+Please note: The binaries in this package -- pdffonts, pdfimages, pdfinfo,
+pdfdetach, pdftohtml, pdftopng, pdftoppm, pdftops, pdftotext -- are
+installed in ${LOCALBASE}/libexec/xpdf. The reason for this is to not
+conflict with the poppler-utils package, which is a prerequisite of many
+other packages. If you need to use any of these utilites,
+
+a) create symlinks in ${LOCALBASE}/bin or some other directory in $PATH, or
+b) install graphics/poppler-utils.
diff --git a/graphics/xpdf4/pkg-plist b/graphics/xpdf4/pkg-plist
new file mode 100644
index 000000000000..664c9f1b270e
--- /dev/null
+++ b/graphics/xpdf4/pkg-plist
@@ -0,0 +1,24 @@
+libexec/xpdf/pdffonts
+libexec/xpdf/pdfimages
+libexec/xpdf/pdfinfo
+libexec/xpdf/pdfdetach
+libexec/xpdf/pdftohtml
+libexec/xpdf/pdftopng
+libexec/xpdf/pdftoppm
+libexec/xpdf/pdftops
+libexec/xpdf/pdftotext
+%%GUI%%libexec/xpdf/xpdf
+%%GUI%%bin/xpdf
+etc/man.d/xpdf.conf
+%%DATADIR%%/man/man1/pdfdetach.1.gz
+%%DATADIR%%/man/man1/pdffonts.1.gz
+%%DATADIR%%/man/man1/pdfimages.1.gz
+%%DATADIR%%/man/man1/pdfinfo.1.gz
+%%DATADIR%%/man/man1/pdftohtml.1.gz
+%%DATADIR%%/man/man1/pdftopng.1.gz
+%%DATADIR%%/man/man1/pdftoppm.1.gz
+%%DATADIR%%/man/man1/pdftops.1.gz
+%%DATADIR%%/man/man1/pdftotext.1.gz
+%%GUI%%%%DATADIR%%/man/man1/xpdf.1.gz
+%%DATADIR%%/man/man5/xpdfrc.5.gz
+@sample etc/xpdfrc.sample
diff --git a/graphics/zathura-cb/Makefile b/graphics/zathura-cb/Makefile
index b83a6e495df9..ade97f78a061 100644
--- a/graphics/zathura-cb/Makefile
+++ b/graphics/zathura-cb/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	zathura-cb
 PORTVERSION=	0.1.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	https://pwmt.org/projects/zathura-cb/download/ \
 		http://www.madpilot.net/~mad/pwmt.org/
diff --git a/graphics/zathura-djvu/Makefile b/graphics/zathura-djvu/Makefile
index 75041cc3b636..4a9bd56a59b2 100644
--- a/graphics/zathura-djvu/Makefile
+++ b/graphics/zathura-djvu/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	zathura-djvu
 PORTVERSION=	0.2.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	https://pwmt.org/projects/zathura/plugins/download/ \
 		http://www.madpilot.net/~mad/pwmt.org/
diff --git a/graphics/zathura-pdf-mupdf/Makefile b/graphics/zathura-pdf-mupdf/Makefile
index 803f6756901c..b474d6ca77a5 100644
--- a/graphics/zathura-pdf-mupdf/Makefile
+++ b/graphics/zathura-pdf-mupdf/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	zathura-pdf-mupdf
 PORTVERSION=	0.3.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	https://pwmt.org/projects/zathura-pdf-mupdf/download/ \
 		http://www.madpilot.net/~mad/pwmt.org/
diff --git a/graphics/zathura-pdf-poppler/Makefile b/graphics/zathura-pdf-poppler/Makefile
index 8f8b785e7863..492d23319714 100644
--- a/graphics/zathura-pdf-poppler/Makefile
+++ b/graphics/zathura-pdf-poppler/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	zathura-pdf-poppler
 PORTVERSION=	0.2.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	https://pwmt.org/projects/zathura/plugins/download/ \
 		http://www.madpilot.net/~mad/pwmt.org/
diff --git a/graphics/zathura-ps/Makefile b/graphics/zathura-ps/Makefile
index e2916af5988b..d281e348726a 100644
--- a/graphics/zathura-ps/Makefile
+++ b/graphics/zathura-ps/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	zathura-ps
 PORTVERSION=	0.2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	https://pwmt.org/projects/zathura-ps/download/ \
 		http://www.madpilot.net/~mad/pwmt.org/
diff --git a/graphics/zathura/Makefile b/graphics/zathura/Makefile
index 885bb1f3f77c..47ef47ef5cc9 100644
--- a/graphics/zathura/Makefile
+++ b/graphics/zathura/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	zathura
 PORTVERSION=	0.3.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics print
 MASTER_SITES=	https://pwmt.org/projects/zathura/download/ \
 		http://www.madpilot.net/~mad/pwmt.org/
diff --git a/irc/bitlbee/pkg-descr b/irc/bitlbee/pkg-descr
index ba68f5386e5a..14ec217f1043 100644
--- a/irc/bitlbee/pkg-descr
+++ b/irc/bitlbee/pkg-descr
@@ -2,4 +2,4 @@ An IRC to other chat networks gateway. This program can be used
 as an IRC server which forwards everything you say to people on
 other chat networks like MSN/ICQ/Jabber.
 
-WWW: http://www.bitlbee.org/
+WWW: https://www.bitlbee.org/
diff --git a/irc/epic5/pkg-descr b/irc/epic5/pkg-descr
index 4fe5cd73dc45..4119fbd445a5 100644
--- a/irc/epic5/pkg-descr
+++ b/irc/epic5/pkg-descr
@@ -7,7 +7,7 @@ added to make EPIC one of the best ircII clients available.
 EPIC no longer shares any file names with ircII, so they should happily
 co-exist.
 
-Due to it's minimalist approach it is highly recommended you use a script
+Due to its minimalist approach it is highly recommended you use a script
 with EPIC.
 
 WWW: http://www.epicsol.org/
diff --git a/irc/ezbounce/Makefile b/irc/ezbounce/Makefile
index ea05bd579387..5babb2e18556 100644
--- a/irc/ezbounce/Makefile
+++ b/irc/ezbounce/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ezbounce
 PORTVERSION=	1.99.15
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	irc
 MASTER_SITES=	http://BSDforge.com/projects/source/irc/ezbounce/
 
diff --git a/irc/ii/Makefile b/irc/ii/Makefile
index 215e328c0629..9b10220e31b7 100644
--- a/irc/ii/Makefile
+++ b/irc/ii/Makefile
@@ -11,6 +11,7 @@ MAINTAINER=	sbz@FreeBSD.org
 COMMENT=	Minimalist FIFO and filesystem-based IRC client
 
 LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PLIST_FILES=	bin/ii man/man1/ii.1.gz
 PORTDOCS=	CHANGES FAQ README
@@ -19,11 +20,15 @@ PORTEXAMPLES=	query.sh
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-	@${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
+
+do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/irc/ircd-ratbox/Makefile b/irc/ircd-ratbox/Makefile
index 030f2554497f..23c22c371cc3 100644
--- a/irc/ircd-ratbox/Makefile
+++ b/irc/ircd-ratbox/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ircd-ratbox
 PORTVERSION=	3.0.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	irc ipv6
 MASTER_SITES=	http://www.ratbox.org/download/				\
 		http://www.ratbox.org/download/old/
diff --git a/irc/ircservices/Makefile b/irc/ircservices/Makefile
index 58b983a5d3ae..8148a36e1431 100644
--- a/irc/ircservices/Makefile
+++ b/irc/ircservices/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ircservices
 PORTVERSION=	5.1.18
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	irc
 MASTER_SITES=	http://www.ircservices.za.net/download/ \
 		http://banana.irc.gr/ircservices/ \
diff --git a/irc/lostirc/Makefile b/irc/lostirc/Makefile
index 7e7c25616d02..3f7684accf93 100644
--- a/irc/lostirc/Makefile
+++ b/irc/lostirc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	lostirc
 PORTVERSION=	0.4.6
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	irc
 MASTER_SITES=	SF
 
diff --git a/irc/p5-POE-Component-IRC/Makefile b/irc/p5-POE-Component-IRC/Makefile
index 33268508d6a9..e30b6e66db22 100644
--- a/irc/p5-POE-Component-IRC/Makefile
+++ b/irc/p5-POE-Component-IRC/Makefile
@@ -2,11 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	POE-Component-IRC
-PORTVERSION=	6.88
-PORTREVISION=	1
+PORTVERSION=	6.90
 CATEGORIES=	irc devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	CPAN:BINGOS
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
@@ -14,23 +12,26 @@ COMMENT=	Fully event-driven IRC client module
 
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	p5-POE>=1.311:devel/p5-POE \
-		p5-POE-Component-Syndicator>=0.01:devel/p5-POE-Component-Syndicator \
-		p5-POE-Filter-IRCD>=2.42:irc/p5-POE-Filter-IRCD \
+BUILD_DEPENDS=	p5-IRC-Utils>=0.12:irc/p5-IRC-Utils \
+		p5-POE>=1.311:devel/p5-POE \
 		p5-POE-Component-Client-DNS>=0.99:dns/p5-POE-Component-Client-DNS \
-		p5-POE-Component-SSLify>0:security/p5-POE-Component-SSLify \
-		p5-IRC-Utils>=0.12:irc/p5-IRC-Utils \
-		p5-List-MoreUtils>0:lang/p5-List-MoreUtils
-BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Differences>=0:devel/p5-Test-Differences
+		p5-POE-Component-SSLify>=0:security/p5-POE-Component-SSLify \
+		p5-POE-Component-Syndicator>=0.01:devel/p5-POE-Component-Syndicator \
+		p5-POE-Filter-IRCD>=2.42:irc/p5-POE-Filter-IRCD
+RUN_DEPENDS:=	${BUILD_DEPENDS}
+TEST_DEPENDS=	p5-Test-Differences>=0.610:devel/p5-Test-Differences
+
+OPTIONS_DEFINE=	EXAMPLES
 
+NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure
 
 PORTEXAMPLES=	*
 
-post-install:
+post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
 
diff --git a/irc/p5-POE-Component-IRC/distinfo b/irc/p5-POE-Component-IRC/distinfo
index a413f66282a0..032582eb9ea1 100644
--- a/irc/p5-POE-Component-IRC/distinfo
+++ b/irc/p5-POE-Component-IRC/distinfo
@@ -1,2 +1,3 @@
-SHA256 (POE-Component-IRC-6.88.tar.gz) = 5d7f2168383c93e54b00d06695cc52f514a921e1ee4f45a05950700f50075a8f
-SIZE (POE-Component-IRC-6.88.tar.gz) = 394374
+TIMESTAMP = 1504718711
+SHA256 (POE-Component-IRC-6.90.tar.gz) = 84b9fa13e952db0f53605a57c9f09fd4469d3d2c0dad2549102aa0bc3bf923d3
+SIZE (POE-Component-IRC-6.90.tar.gz) = 375501
diff --git a/irc/quassel/Makefile b/irc/quassel/Makefile
index 84f35c95d2b1..3dd9e643b4db 100644
--- a/irc/quassel/Makefile
+++ b/irc/quassel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	quassel
 PORTVERSION=	0.12.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	irc
 MASTER_SITES=	http://www.quassel-irc.org/pub/
 
diff --git a/irc/riece/Makefile b/irc/riece/Makefile
index 0343e33769da..7f403c2e4fe0 100644
--- a/irc/riece/Makefile
+++ b/irc/riece/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	riece
 PORTVERSION=	9.0.0
-PORTREVISION=	5
+PORTREVISION=	6
 PORTEPOCH=	1
 CATEGORIES=	irc elisp
 MASTER_SITES=	SAVANNAH
diff --git a/irc/znc/Makefile b/irc/znc/Makefile
index 4aae77fd440a..e3cc1b0fa754 100644
--- a/irc/znc/Makefile
+++ b/irc/znc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	znc
 PORTVERSION=	1.6.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	irc ipv6
 MASTER_SITES=	http://znc.in/releases/ \
 		http://znc.in/releases/archive/
diff --git a/japanese/ajaxzip2-data/Makefile b/japanese/ajaxzip2-data/Makefile
index 72c078504c0b..4c7c6d111691 100644
--- a/japanese/ajaxzip2-data/Makefile
+++ b/japanese/ajaxzip2-data/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	ajaxzip2
-PORTVERSION=	20170630
+PORTVERSION=	20170831
 CATEGORIES=	japanese
 MASTER_SITES=	LOCAL/kuriyama
 PKGNAMESUFFIX=	-data
diff --git a/japanese/ajaxzip2-data/distinfo b/japanese/ajaxzip2-data/distinfo
index b89f7cc1fd58..f68db106eb1d 100644
--- a/japanese/ajaxzip2-data/distinfo
+++ b/japanese/ajaxzip2-data/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1499468838
-SHA256 (ken_all-20170630.zip) = 4f011125c3858be43984339507c387fb3128ca82eca88b6b4298050603c81513
-SIZE (ken_all-20170630.zip) = 1685486
-SHA256 (jigyosyo-20170630.zip) = c97770f181344cd07acec7c3d91ef2c62e6ce29c75fda01beedd6d436fc851cd
-SIZE (jigyosyo-20170630.zip) = 757266
+TIMESTAMP = 1505048912
+SHA256 (ken_all-20170831.zip) = 872cbaf8294d0260ed0f093ff041d4489c55869669e3964d0c89d291d066329e
+SIZE (ken_all-20170831.zip) = 1685767
+SHA256 (jigyosyo-20170831.zip) = 30a8b941aa67b3dff99e9ae210dd31f0a9c9db542f83075dc2759f55e70d5966
+SIZE (jigyosyo-20170831.zip) = 758015
diff --git a/japanese/boiled-mozc/Makefile b/japanese/boiled-mozc/Makefile
index a2d0ed1d1d95..c9541ad4702c 100644
--- a/japanese/boiled-mozc/Makefile
+++ b/japanese/boiled-mozc/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	boiled-mozc
 PORTVERSION=	0.7
-PORTREVISION=	2
+PORTREVISION=	3
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 DISTVERSIONPREFIX=v
 CATEGORIES=	japanese editors elisp
diff --git a/japanese/csrd/files/patch-csrd.c b/japanese/csrd/files/patch-csrd.c
index fbc635187aa5..a92353393009 100644
--- a/japanese/csrd/files/patch-csrd.c
+++ b/japanese/csrd/files/patch-csrd.c
@@ -1,6 +1,6 @@
---- csrd.c.orig	2013-10-20 17:18:39.000000000 +0900
-+++ csrd.c	2013-10-20 17:21:09.000000000 +0900
-@@ -4111,7 +4111,7 @@
+--- csrd.c.orig	2017-09-13 17:02:10 UTC
++++ csrd.c
+@@ -4111,7 +4111,7 @@ onintr()
  int
  main(ac, av)
  int	ac;
diff --git a/japanese/csrd/files/patch-makefile.unx b/japanese/csrd/files/patch-makefile.unx
index 18505e97cb82..8be8b3650493 100644
--- a/japanese/csrd/files/patch-makefile.unx
+++ b/japanese/csrd/files/patch-makefile.unx
@@ -1,5 +1,5 @@
---- makefile.unx.~1~	Mon Jul 19 02:15:40 1999
-+++ makefile.unx	Wed Aug 18 14:59:32 1999
+--- makefile.unx.orig	1999-07-18 17:15:40 UTC
++++ makefile.unx
 @@ -1,6 +1,6 @@
  # Makefile for CSRD
  
diff --git a/japanese/ddskk/Makefile b/japanese/ddskk/Makefile
index 4758e97c73d7..bfa5921c788e 100644
--- a/japanese/ddskk/Makefile
+++ b/japanese/ddskk/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ddskk
 PORTVERSION=	15.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	japanese elisp
 MASTER_SITES=	http://openlab.ring.gr.jp/skk/maintrunk/ \
 		ftp://ftp.ring.gr.jp/pub/elisp/skk/maintrunk/ \
diff --git a/japanese/eb/Makefile b/japanese/eb/Makefile
index 74bdd3d77634..0ef7efcb6ba9 100644
--- a/japanese/eb/Makefile
+++ b/japanese/eb/Makefile
@@ -9,12 +9,14 @@ MASTER_SITES=	ftp://ftp.sra.co.jp/pub/misc/eb/ \
 		ftp://ftp.sra.co.jp/pub/misc/eb/old/eb-${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}/
 DISTFILES=	${EBFILES} \
 		${APPENDIXFILES}
+DIST_SUBDIR=	eb
 EXTRACT_ONLY=	${EBFILES}
 
 MAINTAINER=	yasu@utahime.org
 COMMENT=	C library for accessing EB, EBG, EBXA, and EPWING CD-ROM dictionaries
 
 LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 EBFILES=	${DISTNAME}${EXTRACT_SUFX}
 APPENDIXFILES=	appendix/cencro-1.0.tar.gz \
@@ -49,8 +51,6 @@ APPENDIXFILES=	appendix/cencro-1.0.tar.gz \
 		appendix/ruigigo-1.0.tar.gz \
 		appendix/superdic98-1.0.tar.gz
 
-DIST_SUBDIR=	eb
-
 PORTDOCS=	eb-01.html eb-02.html eb-03.html eb-04.html eb-05.html eb-06.html \
 		eb-07.html eb-08.html eb-09.html eb-10.html eb-11.html eb-12.html \
 		eb-13.html eb-14.html eb.html ebappendix-01.html ebappendix-02.html \
diff --git a/japanese/eb/pkg-descr b/japanese/eb/pkg-descr
index b2735138d5f7..daf4001507cc 100644
--- a/japanese/eb/pkg-descr
+++ b/japanese/eb/pkg-descr
@@ -1,5 +1,3 @@
 EB Library is a C library for accessing CD-ROM books.  EB Library
 supports to access CD-ROM books of EB, EBG, EBXA and EPWING formats.
 CD-ROM books of those formats are popular in Japan.
-
-WWW: http://www.sra.co.jp/people/m-kasahr/eb/
diff --git a/japanese/eblook/Makefile b/japanese/eblook/Makefile
index fb270d1ebf52..220e5e2e9458 100644
--- a/japanese/eblook/Makefile
+++ b/japanese/eblook/Makefile
@@ -11,7 +11,8 @@ DIST_SUBDIR=	eb
 MAINTAINER=	yasu@utahime.org
 COMMENT=	Command to lookup words in EB format dictionaries
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libeb.so:japanese/eb
 
@@ -33,7 +34,7 @@ OPTIONS_DEFINE=	DOCS
 CONFIGURE_ARGS+=ac_cv_func_iconv=yes
 .endif
 
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
diff --git a/japanese/eblook/pkg-descr b/japanese/eblook/pkg-descr
index 9e97f6e43b92..31c0dc4ad370 100644
--- a/japanese/eblook/pkg-descr
+++ b/japanese/eblook/pkg-descr
@@ -1,4 +1,4 @@
-Interactive EB interface command for seraching words in CD-ROM books.
+Interactive EB interface command for searching words in CD-ROM books.
 
 Eblook supports to access CD-ROM books of EB, EBG, EBXA and EPWING formats
 directly.  CD-ROM books of those formats are popular in Japan.
@@ -7,4 +7,4 @@ you can mount the discs by the same way as other ISO 9660 discs.
 
 You can get more information from ja-eblook.info.
 
-WWW: http://openlab.ring.gr.jp/lookup/eblook/
+WWW: http://openlab.ring.gr.jp/edict/eblook/index.html.ja
diff --git a/japanese/ebnetd/Makefile b/japanese/ebnetd/Makefile
index 2f7da944d084..a3d171c4526c 100644
--- a/japanese/ebnetd/Makefile
+++ b/japanese/ebnetd/Makefile
@@ -10,7 +10,8 @@ MASTER_SITES=	ftp://ftp.sra.co.jp/pub/misc/eb/
 MAINTAINER=	yasu@utahime.org
 COMMENT=	Servers for accessing CD-ROM books via TCP/IP
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libeb.so:japanese/eb
 
diff --git a/japanese/ebnetd/files/patch-configure b/japanese/ebnetd/files/patch-configure
index fd14d8daf331..cff4519f7fcf 100644
--- a/japanese/ebnetd/files/patch-configure
+++ b/japanese/ebnetd/files/patch-configure
@@ -1,8 +1,8 @@
 	here is a new patch file in order not to use sed;
 % cat files/patch-configure
---- configure.orig      2003-12-28 17:53:30.000000000 +0900
-+++ configure   2012-01-29 11:25:20.000000000 +0900
-@@ -3874,11 +3874,6 @@
+--- configure.orig	2003-12-28 08:53:30 UTC
++++ configure
+@@ -3874,11 +3874,6 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xp
    cat /dev/null > conftest.in
    lt_ac_count=0
    echo $ECHO_N "0123456789$ECHO_C" >conftest.in
@@ -14,7 +14,3 @@
    while true; do
      cat conftest.in conftest.in >conftest.tmp
      mv conftest.tmp conftest.in
-
-	
-
-
diff --git a/japanese/ebnetd/files/patch-doc-ja_ebnetd-ja.texi b/japanese/ebnetd/files/patch-doc-ja_ebnetd-ja.texi
index 1c6445021712..e616523cbd5d 100644
--- a/japanese/ebnetd/files/patch-doc-ja_ebnetd-ja.texi
+++ b/japanese/ebnetd/files/patch-doc-ja_ebnetd-ja.texi
@@ -1,5 +1,5 @@
---- ../ebnetd-1.0-dist/doc-ja/ebnetd-ja.texi	Wed Sep  3 20:26:39 2003
-+++ doc-ja/ebnetd-ja.texi	Sat Oct  2 23:50:34 2004
+--- doc-ja/ebnetd-ja.texi.orig	2003-09-03 11:26:39 UTC
++++ doc-ja/ebnetd-ja.texi
 @@ -8,9 +8,7 @@
  
  @dircategory CD-ROM Book Utilities
diff --git a/japanese/ebnetd/files/patch-doc_ebnetd.texi b/japanese/ebnetd/files/patch-doc_ebnetd.texi
index db2059c5ba28..644be6699472 100644
--- a/japanese/ebnetd/files/patch-doc_ebnetd.texi
+++ b/japanese/ebnetd/files/patch-doc_ebnetd.texi
@@ -1,5 +1,5 @@
---- ../ebnetd-1.0-dist/doc/ebnetd.texi	Wed Sep  3 20:26:39 2003
-+++ doc/ebnetd.texi	Sat Oct  2 23:46:15 2004
+--- doc/ebnetd.texi.orig	2003-09-03 11:26:39 UTC
++++ doc/ebnetd.texi
 @@ -8,9 +8,7 @@
  
  @dircategory CD-ROM Book Utilities
diff --git a/japanese/ebnetd/files/patch-ebnetd.conf.sample.in b/japanese/ebnetd/files/patch-ebnetd.conf.sample.in
index 86c63a6bdc45..1f9d62a0c14c 100644
--- a/japanese/ebnetd/files/patch-ebnetd.conf.sample.in
+++ b/japanese/ebnetd/files/patch-ebnetd.conf.sample.in
@@ -1,5 +1,5 @@
---- ebnetd.conf.sample.in.orig	2003-06-15 20:39:55.000000000 +0900
-+++ ebnetd.conf.sample.in	2014-11-30 18:17:51.227415186 +0900
+--- ebnetd.conf.sample.in.orig	2003-06-15 11:39:55 UTC
++++ ebnetd.conf.sample.in
 @@ -17,11 +17,11 @@
  
  ### Owner of the server process.
diff --git a/japanese/egg-canna/Makefile b/japanese/egg-canna/Makefile
index 5a5fe748205c..e9ff20f195f7 100644
--- a/japanese/egg-canna/Makefile
+++ b/japanese/egg-canna/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	egg-canna
 PORTVERSION=	20011110
-PORTREVISION=	17
+PORTREVISION=	18
 CATEGORIES=	japanese editors elisp
 MASTER_SITES=	http://cgi18.plala.or.jp/nyy/canna/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/japanese/fcitx-skk/Makefile b/japanese/fcitx-skk/Makefile
index fb1a565a6405..8cb4c07027b8 100644
--- a/japanese/fcitx-skk/Makefile
+++ b/japanese/fcitx-skk/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	fcitx-skk
 PORTVERSION=	0.1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese
 MASTER_SITES=	http://download.fcitx-im.org/${PORTNAME}/
 DIST_SUBDIR=	fcitx
diff --git a/japanese/lookup/Makefile b/japanese/lookup/Makefile
index af95d16eec79..807c14f870d5 100644
--- a/japanese/lookup/Makefile
+++ b/japanese/lookup/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	lookup
 PORTVERSION=	1.4.1
-PORTREVISION=	18
+PORTREVISION=	19
 CATEGORIES=	japanese elisp
 MASTER_SITES=	http://openlab.ring.gr.jp/edict/lookup/dist/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/japanese/migemo-emacs23/Makefile b/japanese/migemo-emacs23/Makefile
index 9d63370bce91..6a0be81efd45 100644
--- a/japanese/migemo-emacs23/Makefile
+++ b/japanese/migemo-emacs23/Makefile
@@ -1,6 +1,7 @@
 # Created by: MANTANI Nobutaka <nobutaka@FreeBSD.org>
 # $FreeBSD$
 
+PORTREVISION=	1
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 COMMENT=	Japanese incremental search tool for emacs
 MASTERDIR=	${.CURDIR}/../../japanese/migemo
diff --git a/japanese/migemo.el/Makefile b/japanese/migemo.el/Makefile
index e80e05f2b8ea..e0a1f23d2f32 100644
--- a/japanese/migemo.el/Makefile
+++ b/japanese/migemo.el/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	migemo.el
 PORTVERSION=	1.9.1
+PORTREVISION=	1
 CATEGORIES=	japanese elisp
 
 MAINTAINER=	nobutaka@FreeBSD.org
diff --git a/japanese/mozc-el/Makefile b/japanese/mozc-el/Makefile
index 43c416f3e2c4..50df45cac44b 100644
--- a/japanese/mozc-el/Makefile
+++ b/japanese/mozc-el/Makefile
@@ -1,6 +1,7 @@
 # Created by: TAKANO, Yuji
 # $FreeBSD$
 
+PORTREVISION=	1
 PKGNAMESUFFIX=	-el-${EMACS_PORT_NAME}
 
 COMMENT=	Emacs input method for Mozc
diff --git a/japanese/mozc-server/Makefile b/japanese/mozc-server/Makefile
index 7589b3a81378..fe82744debf1 100644
--- a/japanese/mozc-server/Makefile
+++ b/japanese/mozc-server/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	mozc
 PORTVERSION=	2.20.2677.102.02
 DISTVERSIONPREFIX=	v
-PORTREVISION=	5
+PORTREVISION=	7
 CATEGORIES=	japanese
 
 MAINTAINER=	hrs@FreeBSD.org
diff --git a/japanese/navi2ch/Makefile b/japanese/navi2ch/Makefile
index 97ee8b5b5ac1..eafd2ab6c372 100644
--- a/japanese/navi2ch/Makefile
+++ b/japanese/navi2ch/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	navi2ch
 PORTVERSION=	2.0.0.d
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	japanese www elisp
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/japanese/skkinput3/Makefile b/japanese/skkinput3/Makefile
index 95fe925927cd..d268abb51bc9 100644
--- a/japanese/skkinput3/Makefile
+++ b/japanese/skkinput3/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	skkinput3
 PORTVERSION=	3.0.6
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	japanese x11
 MASTER_SITES=	SFJP/${PORTNAME}/2222
 DISTNAME=	skkinput-${PORTVERSION}
diff --git a/japanese/xdtp/Makefile b/japanese/xdtp/Makefile
index 7c04fbbbaeb6..46f37be4a836 100644
--- a/japanese/xdtp/Makefile
+++ b/japanese/xdtp/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xdtp
 PORTVERSION=	1.5.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	japanese
 MASTER_SITES=	http://www.ongs.co.jp/software/xdtp/
 
diff --git a/japanese/xtr/Makefile b/japanese/xtr/Makefile
index f8da38e8a49d..9fe529141e52 100644
--- a/japanese/xtr/Makefile
+++ b/japanese/xtr/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xtr
 PORTVERSION=	1.50e.0.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	japanese textproc
 MASTER_SITES=	ftp://ftp.abk.nu/pub/redist/xtr/
 DISTNAME=	${PORTNAME}1.50e-0.2
diff --git a/japanese/yc.el/Makefile b/japanese/yc.el/Makefile
index 594bde684f0d..07779a3fe6dc 100644
--- a/japanese/yc.el/Makefile
+++ b/japanese/yc.el/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	yc.el
 PORTVERSION=	5.2.1
-PORTREVISION=	11
+PORTREVISION=	12
 PORTEPOCH=	1
 CATEGORIES=	japanese elisp
 MASTER_SITES=	http://www.ceres.dti.ne.jp/~knak/
diff --git a/japanese/zipcodes/Makefile b/japanese/zipcodes/Makefile
index f4ba51a3eb20..59c21c4ce12d 100644
--- a/japanese/zipcodes/Makefile
+++ b/japanese/zipcodes/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	zipcodes
-PORTVERSION=	20170630
+PORTVERSION=	20170831
 CATEGORIES=	japanese
 MASTER_SITES=	LOCAL/kuriyama
 DISTFILES=	ken_all-${PORTVERSION_K}.zip jigyosyo-${PORTVERSION_J}.zip
diff --git a/japanese/zipcodes/distinfo b/japanese/zipcodes/distinfo
index 8caaa82a1e51..4c39a7a148e1 100644
--- a/japanese/zipcodes/distinfo
+++ b/japanese/zipcodes/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1499468775
-SHA256 (ken_all-20170630.zip) = 4f011125c3858be43984339507c387fb3128ca82eca88b6b4298050603c81513
-SIZE (ken_all-20170630.zip) = 1685486
-SHA256 (jigyosyo-20170630.zip) = c97770f181344cd07acec7c3d91ef2c62e6ce29c75fda01beedd6d436fc851cd
-SIZE (jigyosyo-20170630.zip) = 757266
+TIMESTAMP = 1505048918
+SHA256 (ken_all-20170831.zip) = 872cbaf8294d0260ed0f093ff041d4489c55869669e3964d0c89d291d066329e
+SIZE (ken_all-20170831.zip) = 1685767
+SHA256 (jigyosyo-20170831.zip) = 30a8b941aa67b3dff99e9ae210dd31f0a9c9db542f83075dc2759f55e70d5966
+SIZE (jigyosyo-20170831.zip) = 758015
diff --git a/java/classpath/Makefile b/java/classpath/Makefile
index fcfdae65cd4a..7cb9bb707f12 100644
--- a/java/classpath/Makefile
+++ b/java/classpath/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	classpath
 PORTVERSION=	0.99
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	java devel
 MASTER_SITES=	GNU \
 		SAVANNAH
diff --git a/java/intellij-fsnotifier/Makefile b/java/intellij-fsnotifier/Makefile
index 1a831b854a87..2d038bf7e9e2 100644
--- a/java/intellij-fsnotifier/Makefile
+++ b/java/intellij-fsnotifier/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	intellij-fsnotifier
 PORTVERSION=	20160221
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	java devel
 
 MAINTAINER=	tobik@FreeBSD.org
diff --git a/java/intellij/Makefile b/java/intellij/Makefile
index ea9dc10cfdf6..d003f41520c1 100644
--- a/java/intellij/Makefile
+++ b/java/intellij/Makefile
@@ -5,7 +5,7 @@
 # Vadim Zhukov <zhuk@openbsd.org>
 
 PORTNAME=	intellij
-PORTVERSION=	2017.2.3
+PORTVERSION=	2017.2.4
 CATEGORIES=	java devel
 MASTER_SITES=	https://download.jetbrains.com/idea/ \
 		http://download.jetbrains.com/idea/
@@ -28,7 +28,7 @@ NO_ARCH=	yes
 NO_BUILD=	yes
 INSTALL_TARGET=	install-strip
 
-WRKSRC=		${WRKDIR}/idea-IC-172.3968.16
+WRKSRC=		${WRKDIR}/idea-IC-172.4155.36
 
 .include "common.mk"
 
diff --git a/java/intellij/distinfo b/java/intellij/distinfo
index 0393763e1e33..27993fd3487c 100644
--- a/java/intellij/distinfo
+++ b/java/intellij/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504085199
-SHA256 (ideaIC-2017.2.3-no-jdk.tar.gz) = 5230e2656c13112d89bc5417ab1d521188e842fa58d1c89a05326223efce0e05
-SIZE (ideaIC-2017.2.3-no-jdk.tar.gz) = 369480843
+TIMESTAMP = 1505340474
+SHA256 (ideaIC-2017.2.4-no-jdk.tar.gz) = 6440b4fa92794614799f6a3a3da4a84f532721aba7b5460402f741025ef94dc8
+SIZE (ideaIC-2017.2.4-no-jdk.tar.gz) = 369518668
diff --git a/java/intellij/pkg-plist b/java/intellij/pkg-plist
index fb686267e41d..93579135d248 100644
--- a/java/intellij/pkg-plist
+++ b/java/intellij/pkg-plist
@@ -9814,17 +9814,17 @@ share/applications/idea.desktop
 %%IDEA_HOME%%/plugins/javaFX/lib/javaFX.jar
 %%IDEA_HOME%%/plugins/javaFX/lib/resources_en.jar
 %%IDEA_HOME%%/plugins/junit/lib/idea-junit.jar
-%%IDEA_HOME%%/plugins/junit/lib/junit-jupiter-api-5.0.0-RC2.jar
-%%IDEA_HOME%%/plugins/junit/lib/junit-jupiter-engine-5.0.0-RC2.jar
-%%IDEA_HOME%%/plugins/junit/lib/junit-platform-commons-1.0.0-RC2.jar
-%%IDEA_HOME%%/plugins/junit/lib/junit-platform-engine-1.0.0-RC2.jar
-%%IDEA_HOME%%/plugins/junit/lib/junit-platform-launcher-1.0.0-RC2.jar
-%%IDEA_HOME%%/plugins/junit/lib/junit-platform-runner-1.0.0-RC2.jar
-%%IDEA_HOME%%/plugins/junit/lib/junit-platform-suite-api-1.0.0-RC2.jar
+%%IDEA_HOME%%/plugins/junit/lib/junit-jupiter-api-5.0.0.jar
+%%IDEA_HOME%%/plugins/junit/lib/junit-jupiter-engine-5.0.0.jar
+%%IDEA_HOME%%/plugins/junit/lib/junit-platform-commons-1.0.0.jar
+%%IDEA_HOME%%/plugins/junit/lib/junit-platform-engine-1.0.0.jar
+%%IDEA_HOME%%/plugins/junit/lib/junit-platform-launcher-1.0.0.jar
+%%IDEA_HOME%%/plugins/junit/lib/junit-platform-runner-1.0.0.jar
+%%IDEA_HOME%%/plugins/junit/lib/junit-platform-suite-api-1.0.0.jar
 %%IDEA_HOME%%/plugins/junit/lib/junit-rt.jar
-%%IDEA_HOME%%/plugins/junit/lib/junit-vintage-engine-4.12.0-RC2.jar
+%%IDEA_HOME%%/plugins/junit/lib/junit-vintage-engine-4.12.0.jar
 %%IDEA_HOME%%/plugins/junit/lib/junit5-rt.jar
-%%IDEA_HOME%%/plugins/junit/lib/opentest4j-1.0.0-RC1.jar
+%%IDEA_HOME%%/plugins/junit/lib/opentest4j-1.0.0.jar
 %%IDEA_HOME%%/plugins/junit/lib/resources_en.jar
 %%IDEA_HOME%%/plugins/maven/lib/artifact-resolver-m2.jar
 %%IDEA_HOME%%/plugins/maven/lib/artifact-resolver-m3.jar
diff --git a/java/openjdk6/files/patch-set b/java/openjdk6/files/patch-set
index 3d393e7add99..ff8da85aea11 100644
--- a/java/openjdk6/files/patch-set
+++ b/java/openjdk6/files/patch-set
@@ -1140,14 +1140,16 @@
  const char * os::Bsd::_glibc_version = NULL;
  const char * os::Bsd::_libpthread_version = NULL;
  #endif
-@@ -205,6 +224,28 @@
+@@ -205,6 +224,30 @@
  
  julong os::Bsd::available_memory() {
  #ifdef _ALLBSD_SOURCE
 +#ifdef __FreeBSD__
 +  static const char *vm_stats[] = {
 +    "vm.stats.vm.v_free_count",
++#if __FreeBSD_version < 1200016
 +    "vm.stats.vm.v_cache_count",
++#endif
 +    "vm.stats.vm.v_inactive_count"
 +  };
 +  size_t size;
@@ -1169,7 +1171,7 @@
    // XXXBSD: this is just a stopgap implementation
    return physical_memory() >> 2;
  #else
-@@ -221,6 +262,17 @@
+@@ -221,6 +264,17 @@
  }
  
  julong os::allocatable_physical_memory(julong size) {
@@ -1187,7 +1189,7 @@
  #ifdef _LP64
    return size;
  #else
-@@ -308,16 +360,22 @@
+@@ -308,16 +362,22 @@
  #define COMPILER_VARIANT "client"
  #endif
  
@@ -1214,7 +1216,7 @@
    int rslt = syscall(SYS_gettid);
    if (rslt == -1) {
       // old kernel, no NPTL support
-@@ -325,6 +383,7 @@
+@@ -325,6 +385,7 @@
    } else {
       return (pid_t)rslt;
    }
@@ -1222,7 +1224,7 @@
  }
  
  // Most versions of bsd have a bug where the number of processors are
-@@ -337,7 +396,35 @@
+@@ -337,7 +398,35 @@
                       "environment on Bsd when /proc filesystem is not mounted.";
  #endif
  
@@ -1259,7 +1261,7 @@
  void os::Bsd::initialize_system_info() {
    int mib[2];
    size_t len;
-@@ -452,7 +539,7 @@
+@@ -452,7 +541,7 @@
   *        7: The default directories, normally /lib and /usr/lib.
   */
  #ifndef DEFAULT_LIBPATH
@@ -1268,7 +1270,7 @@
  #endif
  
  #define EXTENSIONS_DIR  "/lib/ext"
-@@ -997,7 +1084,7 @@
+@@ -997,7 +1086,7 @@
      return NULL;
    }
  
@@ -1277,7 +1279,7 @@
  #ifdef __APPLE__
    // thread_id is mach thread on macos
    osthread->set_thread_id(::mach_thread_self());
-@@ -1009,6 +1096,7 @@
+@@ -1009,6 +1098,7 @@
    // thread_id is kernel thread id (similar to Solaris LWP id)
    osthread->set_thread_id(os::Bsd::gettid());
  
@@ -1285,7 +1287,7 @@
    if (UseNUMA) {
      int lgrp_id = os::numa_get_group_id();
      if (lgrp_id != -1) {
-@@ -1016,6 +1104,7 @@
+@@ -1016,6 +1106,7 @@
      }
    }
  #endif
@@ -1293,7 +1295,7 @@
    // initialize signal mask for this thread
    os::Bsd::hotspot_sigmask(thread);
  
-@@ -1105,7 +1194,7 @@
+@@ -1105,7 +1196,7 @@
      // let pthread_create() pick the default value.
    }
  
@@ -1302,7 +1304,7 @@
    // glibc guard page
    pthread_attr_setguardsize(&attr, os::Bsd::default_guard_size(thr_type));
  #endif
-@@ -1194,7 +1283,7 @@
+@@ -1194,7 +1285,7 @@
    }
  
    // Store pthread info into the OSThread
@@ -1311,7 +1313,7 @@
  #ifdef __APPLE__
    osthread->set_thread_id(::mach_thread_self());
  #else
-@@ -1630,7 +1719,10 @@
+@@ -1630,7 +1721,10 @@
  }
  #endif
  
@@ -1323,7 +1325,7 @@
  #ifndef SYS_clock_getres
  
  #if defined(IA32) || defined(AMD64)
-@@ -1644,6 +1736,7 @@
+@@ -1644,6 +1738,7 @@
  #else
  #define sys_clock_getres(x,y)  ::syscall(SYS_clock_getres, x, y)
  #endif
@@ -1331,7 +1333,7 @@
  
  void os::Bsd::fast_thread_clock_init() {
    if (!UseBsdPosixThreadCPUClocks) {
-@@ -1814,8 +1907,10 @@
+@@ -1814,8 +1909,10 @@
  }
  
  intx os::current_thread_id() {
@@ -1343,7 +1345,7 @@
  #else
    return (intx)::pthread_self();
  #endif
-@@ -2338,14 +2433,16 @@
+@@ -2338,14 +2435,16 @@
  }
  
  void os::print_os_info_brief(outputStream* st) {
@@ -1362,7 +1364,7 @@
  
    os::Posix::print_uname_info(st);
  
-@@ -2363,7 +2460,23 @@
+@@ -2363,7 +2462,23 @@
    st->print("Memory:");
    st->print(" %dk page", os::vm_page_size()>>10);
  
@@ -1387,7 +1389,7 @@
    // values in struct sysinfo are "unsigned long"
    struct sysinfo si;
    sysinfo(&si);
-@@ -2373,17 +2486,22 @@
+@@ -2373,17 +2488,22 @@
              os::physical_memory() >> 10);
    st->print("(" UINT64_FORMAT "k free)",
              os::available_memory() >> 10);
@@ -1412,7 +1414,7 @@
    st->cr();
  }
  
-@@ -2396,7 +2514,7 @@
+@@ -2396,7 +2516,7 @@
  
  const char *fpe_names[] = { "FPE0", "FPE_INTDIV", "FPE_INTOVF", "FPE_FLTDIV",
                            "FPE_FLTOVF", "FPE_FLTUND", "FPE_FLTRES",
@@ -1421,7 +1423,7 @@
  
  const char *segv_names[] = { "SEGV0", "SEGV_MAPERR", "SEGV_ACCERR" };
  
-@@ -2422,7 +2540,7 @@
+@@ -2422,7 +2542,7 @@
      st->print(", si_addr=" PTR_FORMAT, si->si_addr);
      break;
    case SIGFPE:
@@ -1430,7 +1432,7 @@
      st->print(", si_addr=" PTR_FORMAT, si->si_addr);
      break;
    case SIGSEGV:
-@@ -2531,10 +2649,17 @@
+@@ -2531,10 +2651,17 @@
          jrelib_p = buf + len;
  
          // Add the appropriate library subdir
@@ -1448,7 +1450,7 @@
  
          // Add the appropriate client or server subdir
          len = strlen(buf);
-@@ -2752,7 +2877,7 @@
+@@ -2752,7 +2879,7 @@
        if (::write(fd, "", 1) == 1) {
          mmap(base, size,
               PROT_READ|PROT_WRITE|PROT_EXEC,
@@ -1457,7 +1459,7 @@
        }
      }
      ::close(fd);
-@@ -2815,7 +2940,7 @@
+@@ -2815,7 +2942,7 @@
  }
  
  void os::free_memory(char *addr, size_t bytes, size_t alignment_hint) {
@@ -1466,7 +1468,7 @@
  }
  
  void os::numa_make_global(char *addr, size_t bytes) {
-@@ -2962,7 +3087,7 @@
+@@ -2962,7 +3089,7 @@
    return ::mprotect(addr, size, PROT_NONE) == 0;
  #else
    uintptr_t res = (uintptr_t) ::mmap(addr, size, PROT_NONE,
@@ -1475,7 +1477,7 @@
    return res  != (uintptr_t) MAP_FAILED;
  #endif
  }
-@@ -2989,15 +3114,16 @@
+@@ -2989,15 +3116,16 @@
    char * addr;
    int flags;
  
@@ -1496,7 +1498,7 @@
                         flags, -1, 0);
  
    if (addr != MAP_FAILED) {
-@@ -3242,9 +3368,11 @@
+@@ -3242,9 +3370,11 @@
  #endif
  
  char* os::reserve_memory_special(size_t bytes, char* req_addr, bool exec) {
@@ -1508,7 +1510,7 @@
  
    key_t key = IPC_PRIVATE;
    char *addr;
-@@ -3319,11 +3447,19 @@
+@@ -3319,11 +3449,19 @@
  // with SysV SHM the entire memory region must be allocated as shared
  // memory.
  bool os::can_commit_large_page_memory() {
@@ -1528,7 +1530,7 @@
  }
  
  // Reserve memory at an arbitrary address, only if that area is
-@@ -3652,8 +3788,8 @@
+@@ -3652,8 +3790,8 @@
    return OS_OK;
  #else
    int ret = setpriority(PRIO_PROCESS, thread->osthread()->thread_id(), newpri);
@@ -1538,7 +1540,7 @@
  }
  
  OSReturn os::get_native_priority(const Thread* const thread, int *priority_ptr) {
-@@ -4169,7 +4305,7 @@
+@@ -4169,7 +4307,7 @@
    }
  }
  
@@ -1547,7 +1549,7 @@
  // This is the fastest way to get thread cpu time on Bsd.
  // Returns cpu time (user+sys) for any thread, not only for current.
  // POSIX compliant clocks are implemented in the kernels 2.6.16+.
-@@ -4186,6 +4322,7 @@
+@@ -4186,6 +4324,7 @@
  }
  #endif
  
@@ -1555,7 +1557,7 @@
  /////
  // glibc on Bsd platform uses non-documented flag
  // to indicate, that some special sort of signal
-@@ -4196,6 +4333,7 @@
+@@ -4196,6 +4335,7 @@
  #undef SIGNIFICANT_SIGNAL_MASK
  #endif
  #define SIGNIFICANT_SIGNAL_MASK (~0x04000000)
@@ -1563,7 +1565,7 @@
  
  static const char* get_signal_handler_name(address handler,
                                             char* buf, int buflen) {
-@@ -4220,8 +4358,10 @@
+@@ -4220,8 +4360,10 @@
  
    sigaction(sig, NULL, &sa);
  
@@ -1574,7 +1576,7 @@
  
    st->print("%s: ", os::exception_name(sig, buf, buflen));
  
-@@ -4243,7 +4383,11 @@
+@@ -4243,7 +4385,11 @@
    // May be, handler was resetted by VMError?
    if(rh != NULL) {
      handler = rh;
@@ -1586,7 +1588,7 @@
    }
  
    st->print(", sa_flags="   PTR32_FORMAT, sa.sa_flags);
-@@ -4318,7 +4462,9 @@
+@@ -4318,7 +4464,9 @@
    os_sigaction(sig, (struct sigaction*)NULL, &act);
  
  
@@ -1596,7 +1598,7 @@
  
    address thisHandler = (act.sa_flags & SA_SIGINFO)
      ? CAST_FROM_FN_PTR(address, act.sa_sigaction)
-@@ -4379,6 +4525,14 @@
+@@ -4379,6 +4527,14 @@
  
  extern bool signal_name(int signo, char* buf, size_t len);
  
@@ -1611,7 +1613,7 @@
  const char* os::exception_name(int exception_code, char* buf, size_t size) {
    if (0 < exception_code && exception_code <= SIGRTMAX) {
      // signal
-@@ -4448,7 +4602,7 @@
+@@ -4448,7 +4604,7 @@
  // this is called _after_ the global arguments have been parsed
  jint os::init_2(void)
  {
@@ -1620,7 +1622,7 @@
    Bsd::fast_thread_clock_init();
  #endif
  
-@@ -4632,6 +4786,20 @@
+@@ -4632,6 +4788,20 @@
  
  int os::active_processor_count() {
  #ifdef _ALLBSD_SOURCE
@@ -1641,7 +1643,7 @@
    return _processor_count;
  #else
    // Bsd doesn't yet have a (official) notion of processor sets,
-@@ -5031,7 +5199,7 @@
+@@ -5031,7 +5201,7 @@
    return munmap(addr, bytes) == 0;
  }
  
@@ -1650,7 +1652,7 @@
  static jlong slow_thread_cpu_time(Thread *thread, bool user_sys_cpu_time);
  
  static clockid_t thread_cpu_clockid(Thread* thread) {
-@@ -5055,7 +5223,7 @@
+@@ -5055,7 +5225,7 @@
  jlong os::current_thread_cpu_time() {
  #ifdef __APPLE__
    return os::thread_cpu_time(Thread::current(), true /* user + sys */);
@@ -1659,7 +1661,7 @@
    if (os::Bsd::supports_fast_thread_cpu_time()) {
      return os::Bsd::fast_thread_cpu_time(CLOCK_THREAD_CPUTIME_ID);
    } else {
-@@ -5066,7 +5234,7 @@
+@@ -5066,7 +5236,7 @@
  }
  
  jlong os::thread_cpu_time(Thread* thread) {
@@ -1668,7 +1670,7 @@
    // consistent with what current_thread_cpu_time() returns
    if (os::Bsd::supports_fast_thread_cpu_time()) {
      return os::Bsd::fast_thread_cpu_time(thread_cpu_clockid(thread));
-@@ -5079,7 +5247,7 @@
+@@ -5079,7 +5249,7 @@
  jlong os::current_thread_cpu_time(bool user_sys_cpu_time) {
  #ifdef __APPLE__
    return os::thread_cpu_time(Thread::current(), user_sys_cpu_time);
@@ -1677,7 +1679,7 @@
    if (user_sys_cpu_time && os::Bsd::supports_fast_thread_cpu_time()) {
      return os::Bsd::fast_thread_cpu_time(CLOCK_THREAD_CPUTIME_ID);
    } else {
-@@ -5108,7 +5276,7 @@
+@@ -5108,7 +5278,7 @@
    } else {
      return ((jlong)tinfo.user_time.seconds * 1000000000) + ((jlong)tinfo.user_time.microseconds * (jlong)1000);
    }
@@ -1686,7 +1688,7 @@
    if (user_sys_cpu_time && os::Bsd::supports_fast_thread_cpu_time()) {
      return os::Bsd::fast_thread_cpu_time(thread_cpu_clockid(thread));
    } else {
-@@ -5117,12 +5285,15 @@
+@@ -5117,12 +5287,15 @@
  #endif
  }
  
@@ -1703,7 +1705,7 @@
    static bool proc_pid_cpu_avail = true;
    static bool proc_task_unchecked = true;
    static const char *proc_stat_path = "/proc/%d/stat";
-@@ -5206,6 +5377,7 @@
+@@ -5206,6 +5379,7 @@
    } else {
      return (jlong)user_time * (1000000000 / clock_tics_per_sec);
    }
@@ -1711,7 +1713,7 @@
  }
  #endif
  
-@@ -5224,7 +5396,7 @@
+@@ -5224,7 +5398,7 @@
  }
  
  bool os::is_thread_cpu_time_supported() {
@@ -1720,7 +1722,7 @@
    return true;
  #elif defined(_ALLBSD_SOURCE)
    return false;
-@@ -5799,3 +5971,30 @@
+@@ -5799,3 +5973,30 @@
  
      return true;
  }
@@ -10993,14 +10995,16 @@
      clk_tck = 100;
  #endif
      if (clk_tck == -1) {
-@@ -244,32 +310,79 @@
+@@ -244,32 +310,81 @@
  Java_com_sun_management_UnixOperatingSystem_getFreePhysicalMemorySize
    (JNIEnv *env, jobject mbean)
  {
 +#if defined (__FreeBSD__)
 +    static const char *vm_stats[] = {
 +	"vm.stats.vm.v_free_count",
++#if __FreeBSD_version < 1200016
 +	"vm.stats.vm.v_cache_count",
++#endif
 +	/* "vm.stats.vm.v_inactive_count", */
 +	NULL
 +    };
@@ -11073,7 +11077,7 @@
  
      // iterate through directory entries, skipping '.' and '..'
      // each entry represents an open file descriptor.
-@@ -282,6 +395,7 @@
+@@ -282,6 +397,7 @@
      closedir(dirp);
      // subtract by 1 which was the fd open for this implementation
      return (fds - 1);
diff --git a/java/openjdk7/Makefile b/java/openjdk7/Makefile
index 6e8208377f34..15b6e1b57154 100644
--- a/java/openjdk7/Makefile
+++ b/java/openjdk7/Makefile
@@ -33,7 +33,8 @@ PATCHFILES=	patch-7u45-b30.xz \
 		patch-7u111-b01.xz \
 		patch-7u121-b00.xz \
 		patch-7u131-b00.xz \
-		patch-7u141-b02.xz
+		patch-7u141-b02.xz \
+		patch-7u151-b01.xz
 
 MAINTAINER?=	glewis@FreeBSD.org
 COMMENT?=	Java Development Kit 7
@@ -76,8 +77,8 @@ JAVAVMS_COMMENT+=	JRE
 INSTALLDIR=	${PREFIX}/${PORTNAME}${JDK_MAJOR_VERSION}-jre
 .endif
 
-PORT_MINOR_VERSION=	141
-PORT_BUILD_NUMBER=	02
+PORT_MINOR_VERSION=	151
+PORT_BUILD_NUMBER=	01
 JDK_MAJOR_VERSION=	7
 JDK_MINOR_VERSION=	40
 JDK_BUILD_NUMBER=	43
diff --git a/java/openjdk7/distinfo b/java/openjdk7/distinfo
index 9acae7ea1337..dc8184a6e472 100644
--- a/java/openjdk7/distinfo
+++ b/java/openjdk7/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1496080874
+TIMESTAMP = 1504889826
 SHA256 (openjdk-7u40-fcs-src-b43-26_aug_2013.zip) = 00f8ea561876cbcad174ba3ca7a9ae10b50df46a782ac64c2ac57ac357b50596
 SIZE (openjdk-7u40-fcs-src-b43-26_aug_2013.zip) = 104575196
 SHA256 (apache-ant-1.9.7-bin.zip) = b28c5ea0b5ea90bb4ad6bab229b6a56ac4461760a251a12567803a69259cd9de
@@ -35,3 +35,5 @@ SHA256 (patch-7u131-b00.xz) = 5c7b4f9be1d7bc3336ba19c288c882ff5cbd1b1b0ee403f842
 SIZE (patch-7u131-b00.xz) = 769172
 SHA256 (patch-7u141-b02.xz) = 721db525f519417c30d37bcfa80ff715a1e2858e0882e75759b4eaedd6a20510
 SIZE (patch-7u141-b02.xz) = 165488
+SHA256 (patch-7u151-b01.xz) = 90f1f83528825290f2183f4122e8cef8e1bac4814a826f449271cc7635ca197c
+SIZE (patch-7u151-b01.xz) = 217872
diff --git a/java/openjdk7/files/patch-bsd b/java/openjdk7/files/patch-bsd
index 30a9423e4b7d..a597f7ce16e8 100644
--- a/java/openjdk7/files/patch-bsd
+++ b/java/openjdk7/files/patch-bsd
@@ -1,5 +1,5 @@
---- ./.hgtags	Thu Apr 27 06:11:36 2017 +0100
-+++ ./.hgtags	Sun May 28 21:31:34 2017 -0700
+--- ./.hgtags	Tue Aug 01 14:12:25 2017 +0100
++++ ./.hgtags	Thu Sep 07 23:37:08 2017 -0700
 @@ -123,6 +123,7 @@
  2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146
  3ac30b3852876ccad6bd61697b5f9efa91ca7bc6 jdk7u1-b01
@@ -8,13 +8,13 @@
  34451dc0580d5c95d97b95a564e6198f36545d68 jdk7u1-b02
  bf735d852f79bdbb3373c777eec3ff27e035e7ba jdk7u1-b03
  f66a2bada589f4157789e6f66472954d2f1c114e jdk7u1-b04
-@@ -610,3 +611,4 @@
- 259e6ca7faf17e2b96fb0733f30e62327a7acdfa jdk7u131-b00
- e3b3add63d287cd07398949308308135ded4197e jdk7u141-b00
+@@ -612,3 +613,4 @@
  b21d7bc25e0f96c6ed9b19e1ea0ea6253c34d7fe jdk7u141-b01
-+db8fe12e5e508b18dd0aeb166099406a774b0d04 jdk7u141-b02
---- ./corba/.hgtags	Thu Apr 27 06:11:37 2017 +0100
-+++ ./corba/.hgtags	Sun May 28 21:31:35 2017 -0700
+ db8fe12e5e508b18dd0aeb166099406a774b0d04 jdk7u141-b02
+ ae6c3762cdc9b1610211cd1ad1a29ed1a7f8471e jdk7u151-b00
++c63b09823b9fa0ddeb37c1ac534569a9227c5bf6 jdk7u151-b01
+--- ./corba/.hgtags	Tue Aug 01 14:12:26 2017 +0100
++++ ./corba/.hgtags	Thu Sep 07 23:37:09 2017 -0700
 @@ -123,6 +123,7 @@
  770227a4087e4e401fe87ccd19738440111c3948 jdk7-b146
  36f0efbc66ef8ace3cca8aa8d0c88f3334080f8a jdk7u1-b01
@@ -23,13 +23,13 @@
  9515a2d034b4727c11aeea36354a549fbc469c4f jdk7u1-b02
  dd71cb354c573c1addcda269a7dd9144bfce9587 jdk7u1-b03
  eaee830124aa453627591d8f9eccb39d7e040876 jdk7u1-b04
-@@ -612,3 +613,4 @@
- d93d13bcb01d7b635d0e021877e1102e34bae8fb jdk7u131-b00
- 61c10a1eaa7b6f77e63f90e624a82a664a451d42 jdk7u141-b00
+@@ -614,3 +615,4 @@
  caa46a309b1195a0301956e7416633b717553925 jdk7u141-b01
-+39240de9d27767c8bad74e34f83f0a4902a9ef85 jdk7u141-b02
---- ./hotspot/.hgtags	Thu Apr 27 06:11:42 2017 +0100
-+++ ./hotspot/.hgtags	Sun May 28 21:31:42 2017 -0700
+ 39240de9d27767c8bad74e34f83f0a4902a9ef85 jdk7u141-b02
+ d232281a177cd3f80d48eca3f1bbc3919f720a1e jdk7u151-b00
++f74af33b4963a7c484ffa605f11e41efd92966e3 jdk7u151-b01
+--- ./hotspot/.hgtags	Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/.hgtags	Fri Sep 08 09:32:12 2017 -0700
 @@ -182,6 +182,7 @@
  38fa55e5e79232d48f1bb8cf27d88bc094c9375a hs21-b16
  81d815b05abb564aa1f4100ae13491c949b9a07e jdk7-b147
@@ -38,13 +38,13 @@
  9b0ca45cd756d538c4c30afab280a91868eee1a5 jdk7u2-b01
  0cc8a70952c368e06de2adab1f2649a408f5e577 jdk8-b01
  31e253c1da429124bb87570ab095d9bc89850d0a jdk8-b02
-@@ -844,3 +845,4 @@
- 95e4ea3d479ebdab9d78725776b6b11d4add6b0e jdk7u131-b00
- be8da42894af5f7d11b4bad83e166186f01ce1b4 jdk7u141-b00
+@@ -846,3 +847,4 @@
  22c5a6ca09e35b63baf51bad4cb3d8f0cf326705 jdk7u141-b01
-+56ad25be7d88c2c2da562fe1e8879c8723d01da1 jdk7u141-b02
---- ./hotspot/agent/src/os/bsd/ps_proc.c	Thu Apr 27 06:11:42 2017 +0100
-+++ ./hotspot/agent/src/os/bsd/ps_proc.c	Sun May 28 21:31:42 2017 -0700
+ 56ad25be7d88c2c2da562fe1e8879c8723d01da1 jdk7u141-b02
+ 75662a7ec1719b3133636d09bd078968579a55ab jdk7u151-b00
++d0c7cea0660f7a8188a7b8c1f6d1a6c8d6388fb0 jdk7u151-b01
+--- ./hotspot/agent/src/os/bsd/ps_proc.c	Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/agent/src/os/bsd/ps_proc.c	Fri Sep 08 09:32:12 2017 -0700
 @@ -131,7 +131,7 @@
  
  static bool ptrace_continue(pid_t pid, int signal) {
@@ -54,8 +54,8 @@
      print_debug("ptrace(PTRACE_CONT, ..) failed for %d\n", pid);
      return false;
    }
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java	Thu Apr 27 06:11:42 2017 +0100
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java	Sun May 28 21:31:42 2017 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java	Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java	Fri Sep 08 09:32:12 2017 -0700
 @@ -33,6 +33,7 @@
  import sun.jvm.hotspot.debugger.remote.*;
  import sun.jvm.hotspot.debugger.windbg.*;
@@ -64,8 +64,8 @@
  import sun.jvm.hotspot.memory.*;
  import sun.jvm.hotspot.oops.*;
  import sun.jvm.hotspot.runtime.*;
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java	Thu Apr 27 06:11:42 2017 +0100
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java	Sun May 28 21:31:42 2017 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java	Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java	Fri Sep 08 09:32:12 2017 -0700
 @@ -35,6 +35,7 @@
  import sun.jvm.hotspot.debugger.windbg.*;
  import sun.jvm.hotspot.debugger.linux.*;
@@ -74,8 +74,8 @@
  import sun.jvm.hotspot.debugger.remote.*;
  import sun.jvm.hotspot.livejvm.*;
  import sun.jvm.hotspot.memory.*;
---- ./hotspot/make/bsd/Makefile	Thu Apr 27 06:11:42 2017 +0100
-+++ ./hotspot/make/bsd/Makefile	Sun May 28 21:31:42 2017 -0700
+--- ./hotspot/make/bsd/Makefile	Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/make/bsd/Makefile	Fri Sep 08 09:32:12 2017 -0700
 @@ -1,5 +1,5 @@
  #
 -# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -105,8 +105,8 @@
  
  # Synonyms for win32-like targets.
  compiler2:  jvmg product
---- ./hotspot/make/bsd/makefiles/build_vm_def.sh	Thu Apr 27 06:11:42 2017 +0100
-+++ ./hotspot/make/bsd/makefiles/build_vm_def.sh	Sun May 28 21:31:42 2017 -0700
+--- ./hotspot/make/bsd/makefiles/build_vm_def.sh	Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/make/bsd/makefiles/build_vm_def.sh	Fri Sep 08 09:32:12 2017 -0700
 @@ -1,12 +1,28 @@
  #!/bin/sh
  
@@ -142,8 +142,8 @@
 +        if ($3 ~ /^_ZN9Arguments17SharedArchivePathE$/) print "\t" $3 ";"
 +    }' | sort -u ;;
 +esac
---- ./hotspot/make/bsd/makefiles/buildtree.make	Thu Apr 27 06:11:42 2017 +0100
-+++ ./hotspot/make/bsd/makefiles/buildtree.make	Sun May 28 21:31:42 2017 -0700
+--- ./hotspot/make/bsd/makefiles/buildtree.make	Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/make/bsd/makefiles/buildtree.make	Fri Sep 08 09:32:12 2017 -0700
 @@ -255,6 +255,16 @@
  	echo "$(call gamma-path,commonsrc,os/posix/vm)"; \
  	[ -n "$(CFLAGS_BROWSE)" ] && \
@@ -170,8 +170,8 @@
  
  .dbxrc:  $(BUILDTREE_MAKE)
  	@echo Creating $@ ...
---- ./hotspot/make/bsd/makefiles/gcc.make	Thu Apr 27 06:11:42 2017 +0100
-+++ ./hotspot/make/bsd/makefiles/gcc.make	Sun May 28 21:31:42 2017 -0700
+--- ./hotspot/make/bsd/makefiles/gcc.make	Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/make/bsd/makefiles/gcc.make	Fri Sep 08 09:32:12 2017 -0700
 @@ -117,7 +117,10 @@
  CFLAGS += -fno-rtti
  CFLAGS += -fno-exceptions
@@ -184,7 +184,15 @@
  # version 4 and above support fvisibility=hidden (matches jni_x86.h file)
  # except 4.1.2 gives pointless warnings that can't be disabled (afaik)
  ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 3 \) \))" "0"
-@@ -215,7 +218,11 @@
+@@ -178,6 +181,7 @@
+ else
+ ACCEPTABLE_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare
+ endif
++ACCEPTABLE_WARNINGS += -Wno-deprecated-declarations
+ 
+ CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS)
+ # Special cases
+@@ -215,7 +219,11 @@
  
  # Flags for generating make dependency flags.
  ifneq ("${CC_VER_MAJOR}", "2")
@@ -197,8 +205,8 @@
  endif
  
  # -DDONT_USE_PRECOMPILED_HEADER will exclude all includes in precompiled.hpp.
---- ./hotspot/make/bsd/makefiles/jsig.make	Thu Apr 27 06:11:42 2017 +0100
-+++ ./hotspot/make/bsd/makefiles/jsig.make	Sun May 28 21:31:42 2017 -0700
+--- ./hotspot/make/bsd/makefiles/jsig.make	Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/make/bsd/makefiles/jsig.make	Fri Sep 08 09:32:12 2017 -0700
 @@ -36,9 +36,16 @@
    LIBJSIG_G = lib$(JSIG_G).so
  endif
@@ -251,8 +259,8 @@
  	$(QUIETLY) cp -f $(LIBJSIG) $(DEST_JSIG) && echo "Done"
  
  .PHONY: install_jsig
---- ./hotspot/make/bsd/makefiles/launcher.make	Thu Apr 27 06:11:42 2017 +0100
-+++ ./hotspot/make/bsd/makefiles/launcher.make	Sun May 28 21:31:42 2017 -0700
+--- ./hotspot/make/bsd/makefiles/launcher.make	Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/make/bsd/makefiles/launcher.make	Fri Sep 08 09:32:12 2017 -0700
 @@ -50,7 +50,7 @@
    LIBS_LAUNCHER             += $(STATIC_STDCXX) $(LIBS)
  else
@@ -262,8 +270,8 @@
  
    # The gamma launcher runs the JDK from $JAVA_HOME, overriding the JVM with a
    # freshly built JVM at ./libjvm.{so|dylib}.  This is accomplished by setting 
---- ./hotspot/make/bsd/makefiles/mapfile-vers-product	Thu Apr 27 06:11:42 2017 +0100
-+++ ./hotspot/make/bsd/makefiles/mapfile-vers-product	Sun May 28 21:31:42 2017 -0700
+--- ./hotspot/make/bsd/makefiles/mapfile-vers-product	Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/make/bsd/makefiles/mapfile-vers-product	Fri Sep 08 09:32:12 2017 -0700
 @@ -19,237 +19,248 @@
  # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  # or visit www.oracle.com if you need additional information or have any
@@ -738,8 +746,8 @@
 +        local:
 +                *;
 +};
---- ./hotspot/make/bsd/makefiles/ppc.make	Thu Apr 27 06:11:42 2017 +0100
-+++ ./hotspot/make/bsd/makefiles/ppc.make	Sun May 28 21:31:42 2017 -0700
+--- ./hotspot/make/bsd/makefiles/ppc.make	Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/make/bsd/makefiles/ppc.make	Fri Sep 08 09:32:12 2017 -0700
 @@ -28,3 +28,6 @@
  # Must also specify if CPU is big endian
  CFLAGS += -DVM_BIG_ENDIAN
@@ -747,8 +755,8 @@
 +ifdef E500V2
 +ASFLAGS += -Wa,-mspe -Wa,--defsym -Wa,E500V2=1 
 +endif
---- ./hotspot/make/bsd/makefiles/saproc.make	Thu Apr 27 06:11:42 2017 +0100
-+++ ./hotspot/make/bsd/makefiles/saproc.make	Sun May 28 21:31:42 2017 -0700
+--- ./hotspot/make/bsd/makefiles/saproc.make	Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/make/bsd/makefiles/saproc.make	Fri Sep 08 09:32:12 2017 -0700
 @@ -36,6 +36,11 @@
    LIBSAPROC_G = lib$(SAPROC_G).so
  endif
@@ -805,8 +813,8 @@
  	  cp -f $(LIBSAPROC) $(DEST_SAPROC) && echo "Done";  \
  	fi
  
---- ./hotspot/make/solaris/makefiles/defs.make	Thu Apr 27 06:11:42 2017 +0100
-+++ ./hotspot/make/solaris/makefiles/defs.make	Sun May 28 21:31:42 2017 -0700
+--- ./hotspot/make/solaris/makefiles/defs.make	Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/make/solaris/makefiles/defs.make	Fri Sep 08 09:32:12 2017 -0700
 @@ -221,8 +221,8 @@
  endif
  ifeq ($(JVM_VARIANT_CLIENT),true)
@@ -818,8 +826,8 @@
    EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.$(LIBRARY_SUFFIX)
    ifeq ($(ARCH_DATA_MODEL),32)
      EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX)
---- ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp	Thu Apr 27 06:11:42 2017 +0100
-+++ ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp	Sun May 28 21:31:42 2017 -0700
+--- ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp	Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp	Fri Sep 08 09:32:12 2017 -0700
 @@ -71,7 +71,11 @@
  define_pd_global(bool, RewriteBytecodes,     true);
  define_pd_global(bool, RewriteFrequentPairs, true);
@@ -833,7 +841,7 @@
  // GC Ergo Flags
  define_pd_global(intx, CMSYoungGenPerWorker, 16*M);  // default max size of CMS young gen, per GC worker thread
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/src/os/bsd/vm/decoder_bsd.cpp	Sun May 28 21:31:42 2017 -0700
++++ ./hotspot/src/os/bsd/vm/decoder_bsd.cpp	Fri Sep 08 09:32:12 2017 -0700
 @@ -0,0 +1,46 @@
 +/*
 + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -881,8 +889,8 @@
 +  return false;
 +}
 +
---- ./hotspot/src/os/bsd/vm/os_bsd.cpp	Thu Apr 27 06:11:42 2017 +0100
-+++ ./hotspot/src/os/bsd/vm/os_bsd.cpp	Sun May 28 21:31:42 2017 -0700
+--- ./hotspot/src/os/bsd/vm/os_bsd.cpp	Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/src/os/bsd/vm/os_bsd.cpp	Fri Sep 08 09:32:12 2017 -0700
 @@ -163,6 +163,7 @@
  #endif
  pthread_t os::Bsd::_main_thread;
@@ -1302,8 +1310,8 @@
    } else {
      pthread_mutex_unlock(_mutex);
      assert (status == 0, "invariant") ;
---- ./hotspot/src/os/bsd/vm/os_bsd.hpp	Thu Apr 27 06:11:42 2017 +0100
-+++ ./hotspot/src/os/bsd/vm/os_bsd.hpp	Sun May 28 21:31:42 2017 -0700
+--- ./hotspot/src/os/bsd/vm/os_bsd.hpp	Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/src/os/bsd/vm/os_bsd.hpp	Fri Sep 08 09:32:12 2017 -0700
 @@ -106,6 +106,12 @@
  
    static bool hugetlbfs_sanity_check(bool warn, size_t page_size);
@@ -1378,8 +1386,8 @@
      }
  };
  
---- ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp	Thu Apr 27 06:11:42 2017 +0100
-+++ ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp	Sun May 28 21:31:42 2017 -0700
+--- ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp	Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp	Fri Sep 08 09:32:12 2017 -0700
 @@ -31,10 +31,22 @@
  # include "atomic_bsd_x86.inline.hpp"
  # include "orderAccess_bsd_x86.inline.hpp"
@@ -1403,8 +1411,8 @@
  
  // System includes
  
---- ./hotspot/src/os/bsd/vm/thread_bsd.inline.hpp	Thu Apr 27 06:11:42 2017 +0100
-+++ ./hotspot/src/os/bsd/vm/thread_bsd.inline.hpp	Sun May 28 21:31:42 2017 -0700
+--- ./hotspot/src/os/bsd/vm/thread_bsd.inline.hpp	Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/src/os/bsd/vm/thread_bsd.inline.hpp	Fri Sep 08 09:32:12 2017 -0700
 @@ -34,11 +34,26 @@
  # include "orderAccess_bsd_x86.inline.hpp"
  # include "prefetch_bsd_x86.inline.hpp"
@@ -1432,8 +1440,8 @@
  
  // Contains inlined functions for class Thread and ThreadLocalStorage
  
---- ./hotspot/src/os/posix/vm/os_posix.cpp	Thu Apr 27 06:11:42 2017 +0100
-+++ ./hotspot/src/os/posix/vm/os_posix.cpp	Sun May 28 21:31:42 2017 -0700
+--- ./hotspot/src/os/posix/vm/os_posix.cpp	Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/src/os/posix/vm/os_posix.cpp	Fri Sep 08 09:32:12 2017 -0700
 @@ -183,11 +183,19 @@
    if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity");
    else st->print("%d", rlim.rlim_cur);
@@ -1454,8 +1462,8 @@
  }
  
  void os::Posix::print_uname_info(outputStream* st) {
---- ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp	Thu Apr 27 06:11:42 2017 +0100
-+++ ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp	Sun May 28 21:31:42 2017 -0700
+--- ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp	Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp	Fri Sep 08 09:32:12 2017 -0700
 @@ -945,7 +945,7 @@
    if (rslt != 0)
      fatal(err_msg("pthread_stackseg_np failed with err = %d", rslt));
@@ -1465,8 +1473,8 @@
    *size   = ss.ss_size;
  #elif defined(_ALLBSD_SOURCE)
    pthread_attr_t attr;
---- ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp	Thu Apr 27 06:11:42 2017 +0100
-+++ ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp	Sun May 28 21:31:42 2017 -0700
+--- ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp	Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp	Fri Sep 08 09:32:12 2017 -0700
 @@ -24,7 +24,7 @@
   */
  
@@ -1476,8 +1484,8 @@
  # include <pthread_np.h> /* For pthread_attr_get_np */
  #endif
  
---- ./hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp	Thu Apr 27 06:11:42 2017 +0100
-+++ ./hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp	Sun May 28 21:31:42 2017 -0700
+--- ./hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp	Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp	Fri Sep 08 09:32:12 2017 -0700
 @@ -111,7 +111,7 @@
    if (e.should_commit()) {
      e.set_gcId(_shared_gc_info.id());
@@ -1487,8 +1495,19 @@
      e.commit();
    }
  }
---- ./hotspot/src/share/vm/runtime/atomic.cpp	Thu Apr 27 06:11:42 2017 +0100
-+++ ./hotspot/src/share/vm/runtime/atomic.cpp	Sun May 28 21:31:42 2017 -0700
+--- ./hotspot/src/share/vm/opto/lcm.cpp	Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/src/share/vm/opto/lcm.cpp	Fri Sep 08 09:32:12 2017 -0700
+@@ -57,7 +57,7 @@
+ // Check whether val is not-null-decoded compressed oop,
+ // i.e. will grab into the base of the heap if it represents NULL.
+ static bool accesses_heap_base_zone(Node *val) {
+-  if (Universe::narrow_oop_base() > 0) { // Implies UseCompressedOops.
++  if (Universe::narrow_oop_base() != NULL) { // Implies UseCompressedOops.
+     if (val && val->is_Mach()) {
+       if (val->as_Mach()->ideal_Opcode() == Op_DecodeN) {
+         // This assumes all Decodes with TypePtr::NotNull are matched to nodes that
+--- ./hotspot/src/share/vm/runtime/atomic.cpp	Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/src/share/vm/runtime/atomic.cpp	Fri Sep 08 09:32:12 2017 -0700
 @@ -57,6 +57,12 @@
  #ifdef TARGET_OS_ARCH_windows_x86
  # include "atomic_windows_x86.inline.hpp"
@@ -1502,8 +1521,8 @@
  #ifdef TARGET_OS_ARCH_linux_arm
  # include "atomic_linux_arm.inline.hpp"
  #endif
---- ./hotspot/src/share/vm/runtime/objectMonitor.cpp	Thu Apr 27 06:11:42 2017 +0100
-+++ ./hotspot/src/share/vm/runtime/objectMonitor.cpp	Sun May 28 21:31:42 2017 -0700
+--- ./hotspot/src/share/vm/runtime/objectMonitor.cpp	Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/src/share/vm/runtime/objectMonitor.cpp	Fri Sep 08 09:32:12 2017 -0700
 @@ -1740,7 +1740,7 @@
       }
       iterator->_notified = 1 ;
@@ -1522,8 +1541,8 @@
       if (Policy != 4) {
          iterator->TState = ObjectWaiter::TS_ENTER ;
       }
---- ./hotspot/src/share/vm/runtime/os.cpp	Thu Apr 27 06:11:42 2017 +0100
-+++ ./hotspot/src/share/vm/runtime/os.cpp	Sun May 28 21:31:42 2017 -0700
+--- ./hotspot/src/share/vm/runtime/os.cpp	Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/src/share/vm/runtime/os.cpp	Fri Sep 08 09:32:12 2017 -0700
 @@ -410,13 +410,6 @@
      if (_native_java_library == NULL) {
        vm_exit_during_initialization("Unable to load native library", ebuf);
@@ -1538,8 +1557,8 @@
    }
    static jboolean onLoaded = JNI_FALSE;
    if (onLoaded) {
---- ./hotspot/src/share/vm/runtime/os.hpp	Thu Apr 27 06:11:42 2017 +0100
-+++ ./hotspot/src/share/vm/runtime/os.hpp	Sun May 28 21:31:42 2017 -0700
+--- ./hotspot/src/share/vm/runtime/os.hpp	Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/src/share/vm/runtime/os.hpp	Fri Sep 08 09:32:12 2017 -0700
 @@ -30,6 +30,9 @@
  #include "runtime/extendedPC.hpp"
  #include "runtime/handles.hpp"
@@ -1560,8 +1579,8 @@
  #endif
  #ifdef TARGET_OS_ARCH_linux_x86
  # include "os_linux_x86.hpp"
---- ./hotspot/src/share/vm/runtime/vmThread.cpp	Thu Apr 27 06:11:42 2017 +0100
-+++ ./hotspot/src/share/vm/runtime/vmThread.cpp	Sun May 28 21:31:42 2017 -0700
+--- ./hotspot/src/share/vm/runtime/vmThread.cpp	Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/src/share/vm/runtime/vmThread.cpp	Fri Sep 08 09:32:12 2017 -0700
 @@ -396,7 +396,7 @@
        // Only write caller thread information for non-concurrent vm operations.
        // For concurrent vm operations, the thread id is set to 0 indicating thread is unknown.
@@ -1571,8 +1590,8 @@
        event.commit();
      }
  
---- ./hotspot/src/share/vm/trace/tracetypes.xml	Thu Apr 27 06:11:42 2017 +0100
-+++ ./hotspot/src/share/vm/trace/tracetypes.xml	Sun May 28 21:31:42 2017 -0700
+--- ./hotspot/src/share/vm/trace/tracetypes.xml	Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/src/share/vm/trace/tracetypes.xml	Fri Sep 08 09:32:12 2017 -0700
 @@ -60,7 +60,7 @@
   <types>
    <content_types>
@@ -1593,8 +1612,8 @@
  
      <!-- VM Thread ID Note: changed from U2 to U8 for hotspot -->
      <primary_type symbol="VMTHREAD" datatype="U8" contenttype="VMTHREAD"
---- ./hotspot/test/compiler/5091921/Test7005594.sh	Thu Apr 27 06:11:42 2017 +0100
-+++ ./hotspot/test/compiler/5091921/Test7005594.sh	Sun May 28 21:31:42 2017 -0700
+--- ./hotspot/test/compiler/5091921/Test7005594.sh	Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/test/compiler/5091921/Test7005594.sh	Fri Sep 08 09:32:12 2017 -0700
 @@ -60,6 +60,9 @@
    # Windows/MKS
    MEM=`"$ROOTDIR/mksnt/sysinf" memory -v | grep "Total Physical Memory: " | sed 's/Total Physical Memory: *//g'`
@@ -1605,8 +1624,8 @@
  else
    echo "Unable to determine amount of physical memory on the machine"
  fi
---- ./hotspot/test/runtime/7110720/Test7110720.sh	Thu Apr 27 06:11:42 2017 +0100
-+++ ./hotspot/test/runtime/7110720/Test7110720.sh	Sun May 28 21:31:42 2017 -0700
+--- ./hotspot/test/runtime/7110720/Test7110720.sh	Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/test/runtime/7110720/Test7110720.sh	Fri Sep 08 09:32:12 2017 -0700
 @@ -28,7 +28,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -1617,7 +1636,7 @@
      RM=/bin/rm
      CP=/bin/cp
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/test/runtime/7158800/Test7158800.sh	Sun May 28 21:31:42 2017 -0700
++++ ./hotspot/test/runtime/7158800/Test7158800.sh	Fri Sep 08 09:32:12 2017 -0700
 @@ -0,0 +1,91 @@
 +#!/bin/sh
 +# 
@@ -1710,8 +1729,8 @@
 +    echo "Test Passed"
 +    exit 0
 +fi
---- ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java	Thu Apr 27 06:11:42 2017 +0100
-+++ ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java	Sun May 28 21:31:42 2017 -0700
+--- ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java	Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java	Fri Sep 08 09:32:12 2017 -0700
 @@ -36,8 +36,8 @@
      public static void main(String args[]) throws Throwable {
  
@@ -1723,8 +1742,8 @@
              return;
          }
  
---- ./jaxp/.hgtags	Thu Apr 27 06:11:38 2017 +0100
-+++ ./jaxp/.hgtags	Sun May 28 21:31:36 2017 -0700
+--- ./jaxp/.hgtags	Tue Aug 01 14:12:27 2017 +0100
++++ ./jaxp/.hgtags	Thu Sep 07 23:37:10 2017 -0700
 @@ -123,6 +123,7 @@
  bcd31fa1e3c6f51b4fdd427ef905188cdac57164 jdk7-b146
  067fb18071e3872698f6218724958bd0cebf30a3 jdk7u1-b01
@@ -1733,13 +1752,13 @@
  104ca42e1e7ca66b074a4619ce6420f15d8f454d jdk7u1-b02
  64e323faadf65018c1ffc8bb9c97f7b664e87347 jdk7u1-b03
  2256c20e66857f80cacda14ffdbc0979c929d7f8 jdk7u1-b04
-@@ -613,3 +614,4 @@
- 51ed13d07beb90ff71d8625d9d6409cc4add5cbc jdk7u131-b00
- f347b141975453f642ae1140a45aa7c6127551dd jdk7u141-b00
+@@ -615,3 +616,4 @@
  e096a279a1c226d7d3a4aa19d5beeba1fb0507cf jdk7u141-b01
-+b4b91a7beb185c0a8a14b83d2b05cfd7fc33c6fe jdk7u141-b02
---- ./jaxws/.hgtags	Thu Apr 27 06:11:39 2017 +0100
-+++ ./jaxws/.hgtags	Sun May 28 21:31:37 2017 -0700
+ b4b91a7beb185c0a8a14b83d2b05cfd7fc33c6fe jdk7u141-b02
+ 26391fa1d876e3bf563f21328d7ea24d5d657b21 jdk7u151-b00
++57fc772ac86ac6cbd297cd6f09a63f9c016c271c jdk7u151-b01
+--- ./jaxws/.hgtags	Tue Aug 01 14:12:28 2017 +0100
++++ ./jaxws/.hgtags	Thu Sep 07 23:37:12 2017 -0700
 @@ -123,6 +123,7 @@
  05469dd4c3662c454f8a019e492543add60795cc jdk7-b146
  c01bfd68d0528bc88348813c4d75d7f5c62bc4e2 jdk7u1-b01
@@ -1748,13 +1767,13 @@
  4c24f7019ce939a452154a83151294ad7da66a9d jdk7u1-b02
  272778f529d11081f548f37fcd6a7aec0b11a8dd jdk7u1-b03
  48b06a6e6f46e5bcd610f4bed57cd5067cf31f8c jdk7u1-b04
-@@ -612,3 +613,4 @@
- edcc7c1e297588b30daaf61e3cdf25203f829cd4 jdk7u131-b00
- 90c86962aa2e81ecd8d5d79a282f2492447e4c6e jdk7u141-b00
+@@ -614,3 +615,4 @@
  506e24eee4e1887fbfdd77512f830b75e14c5759 jdk7u141-b01
-+1af82a2d3d16626b8d2f5e633d23c027975406b8 jdk7u141-b02
---- ./jdk/.hgtags	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/.hgtags	Sun May 28 23:44:03 2017 -0700
+ 1af82a2d3d16626b8d2f5e633d23c027975406b8 jdk7u141-b02
+ 1f0dd7a7e0ccaa340db533da400bb83ca1ad3cf2 jdk7u151-b00
++3233576db658552e8933b1cd86f5586507564f44 jdk7u151-b01
+--- ./jdk/.hgtags	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/.hgtags	Thu Sep 07 23:37:21 2017 -0700
 @@ -123,6 +123,7 @@
  539e576793a8e64aaf160e0d6ab0b9723cd0bef0 jdk7-b146
  69e973991866c948cf1808b06884ef2d28b64fcb jdk7u1-b01
@@ -1763,13 +1782,13 @@
  2baf612764d215e6f3a5b48533f74c6924ac98d7 jdk7u1-b02
  a4781b6d9cfb6901452579adee17c9a17c1b584c jdk7u1-b03
  b223ed9a5fdf8ce3af42adfa8815975811d70eae jdk7u1-b04
-@@ -599,3 +600,4 @@
- 86d0df91308912e45e1b00f8699e0b157a8857af jdk7u131-b00
- e890a6aef6223d428376aac846c1d1f3e40dbda7 jdk7u141-b00
+@@ -601,3 +602,4 @@
  a319566e15f5611bae9cfda2696e8217020a9269 jdk7u141-b01
-+19a085e656145471455d7fbd648717f94281a729 jdk7u141-b02
---- ./jdk/make/com/sun/nio/sctp/Exportedfiles.gmk	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/com/sun/nio/sctp/Exportedfiles.gmk	Sun May 28 23:44:03 2017 -0700
+ 19a085e656145471455d7fbd648717f94281a729 jdk7u141-b02
+ 871e3350966f67b95768a94c1854f1515cfa56ca jdk7u151-b00
++da1c09ab9b742fa77c0e667c2218b8d626432656 jdk7u151-b01
+--- ./jdk/make/com/sun/nio/sctp/Exportedfiles.gmk	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/com/sun/nio/sctp/Exportedfiles.gmk	Thu Sep 07 23:37:21 2017 -0700
 @@ -29,6 +29,7 @@
  
  ifneq ($(PLATFORM), windows)
@@ -1783,8 +1802,8 @@
  endif
  endif
 +endif
---- ./jdk/make/com/sun/nio/sctp/FILES_c.gmk	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/com/sun/nio/sctp/FILES_c.gmk	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/com/sun/nio/sctp/FILES_c.gmk	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/com/sun/nio/sctp/FILES_c.gmk	Thu Sep 07 23:37:21 2017 -0700
 @@ -25,9 +25,13 @@
  
  ifneq ($(PLATFORM),windows)
@@ -1799,8 +1818,8 @@
  endif	
 +endif
 +endif
---- ./jdk/make/com/sun/nio/sctp/FILES_java.gmk	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/com/sun/nio/sctp/FILES_java.gmk	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/com/sun/nio/sctp/FILES_java.gmk	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/com/sun/nio/sctp/FILES_java.gmk	Thu Sep 07 23:37:21 2017 -0700
 @@ -50,6 +50,8 @@
  
  ifneq ($(PLATFORM), windows)
@@ -1816,8 +1835,8 @@
  endif
 +endif
 +endif
---- ./jdk/make/com/sun/nio/sctp/Makefile	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/com/sun/nio/sctp/Makefile	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/com/sun/nio/sctp/Makefile	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/com/sun/nio/sctp/Makefile	Thu Sep 07 23:37:21 2017 -0700
 @@ -47,9 +47,13 @@
  ifeq ($(PLATFORM), macosx)
  include $(BUILDDIR)/common/Classes.gmk
@@ -1840,8 +1859,8 @@
  endif # macosx
  endif # windows
  
---- ./jdk/make/com/sun/security/auth/module/Makefile	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/com/sun/security/auth/module/Makefile	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/com/sun/security/auth/module/Makefile	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/com/sun/security/auth/module/Makefile	Thu Sep 07 23:37:21 2017 -0700
 @@ -67,7 +67,7 @@
    include FILES_c_solaris.gmk
  endif # solaris
@@ -1851,8 +1870,8 @@
    LIBRARY = jaas_unix
    include FILES_export_unix.gmk
    include FILES_c_unix.gmk
---- ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk	Thu Sep 07 23:37:21 2017 -0700
 @@ -43,7 +43,7 @@
  	sun/tools/attach/LinuxVirtualMachine.java
  endif
@@ -1862,8 +1881,8 @@
  FILES_export = \
  	sun/tools/attach/BsdVirtualMachine.java
  endif
---- ./jdk/make/com/sun/tools/attach/FILES_c.gmk	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/com/sun/tools/attach/FILES_c.gmk	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/com/sun/tools/attach/FILES_c.gmk	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/com/sun/tools/attach/FILES_c.gmk	Thu Sep 07 23:37:21 2017 -0700
 @@ -39,7 +39,7 @@
  	LinuxVirtualMachine.c
  endif
@@ -1873,8 +1892,8 @@
  FILES_c = \
  	BsdVirtualMachine.c
  endif
---- ./jdk/make/com/sun/tools/attach/FILES_java.gmk	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/com/sun/tools/attach/FILES_java.gmk	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/com/sun/tools/attach/FILES_java.gmk	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/com/sun/tools/attach/FILES_java.gmk	Thu Sep 07 23:37:21 2017 -0700
 @@ -43,7 +43,7 @@
  	sun/tools/attach/LinuxAttachProvider.java
  endif
@@ -1884,8 +1903,8 @@
  FILES_java += \
  	sun/tools/attach/BsdAttachProvider.java
  endif
---- ./jdk/make/com/sun/tools/attach/Makefile	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/com/sun/tools/attach/Makefile	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/com/sun/tools/attach/Makefile	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/com/sun/tools/attach/Makefile	Thu Sep 07 23:37:21 2017 -0700
 @@ -38,7 +38,7 @@
  ifeq ($(PLATFORM), linux)
  FILES_m = mapfile-linux
@@ -1904,8 +1923,8 @@
    vpath %.c $(call NativeSrcDirList,,native/sun/tools/attach)
  else
    vpath %.c $(PLATFORM_SRC)/native/sun/tools/attach
---- ./jdk/make/com/sun/tools/attach/mapfile-bsd	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/com/sun/tools/attach/mapfile-bsd	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/com/sun/tools/attach/mapfile-bsd	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/com/sun/tools/attach/mapfile-bsd	Thu Sep 07 23:37:21 2017 -0700
 @@ -30,6 +30,7 @@
  	    Java_sun_tools_attach_BsdVirtualMachine_checkPermissions;
  	    Java_sun_tools_attach_BsdVirtualMachine_close;
@@ -1915,7 +1934,7 @@
  	    Java_sun_tools_attach_BsdVirtualMachine_sendQuitTo;
  	    Java_sun_tools_attach_BsdVirtualMachine_socket;
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/make/common/Defs-bsd.gmk	Sun May 28 23:44:03 2017 -0700
++++ ./jdk/make/common/Defs-bsd.gmk	Thu Sep 07 23:37:21 2017 -0700
 @@ -0,0 +1,482 @@
 +#
 +# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -2399,8 +2418,8 @@
 +  OTHER_CXXFLAGS += -I$(OPENWIN_HOME)/include
 +  OTHER_CPPFLAGS += -I$(OPENWIN_HOME)/include
 +endif
---- ./jdk/make/common/Defs-linux.gmk	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/common/Defs-linux.gmk	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/common/Defs-linux.gmk	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/common/Defs-linux.gmk	Thu Sep 07 23:37:21 2017 -0700
 @@ -445,6 +445,7 @@
  override LIBDL                   = -ldl
  override MOOT_PRIORITIES         = true
@@ -2409,8 +2428,8 @@
  ifeq ($(ARCH), $(findstring $(ARCH), amd64 ppc64))
  override OPENWIN_LIB             = $(OPENWIN_HOME)/lib64
  else
---- ./jdk/make/common/Defs-solaris.gmk	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/common/Defs-solaris.gmk	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/common/Defs-solaris.gmk	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/common/Defs-solaris.gmk	Thu Sep 07 23:37:21 2017 -0700
 @@ -753,6 +753,9 @@
  # Network Services library
  LIBNSL = -lnsl
@@ -2421,8 +2440,8 @@
  # service configuration facility library
  LIBSCF = -lscf
  
---- ./jdk/make/common/Defs.gmk	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/common/Defs.gmk	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/common/Defs.gmk	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/common/Defs.gmk	Thu Sep 07 23:37:21 2017 -0700
 @@ -179,7 +179,7 @@
  
    ifdef ALT_FREETYPE_LIB_PATH
@@ -2474,8 +2493,8 @@
    VPATH0.java = $(subst $(ONESPACE),:,$(GENSRCDIR) $(call JavaSrcDirList,,classes))
  else
    VPATH0.java = $(GENSRCDIR)$(CLASSPATH_SEPARATOR)$(PLATFORM_SRC)/classes$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/classes
---- ./jdk/make/common/Library.gmk	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/common/Library.gmk	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/common/Library.gmk	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/common/Library.gmk	Thu Sep 07 23:37:21 2017 -0700
 @@ -299,8 +299,12 @@
              ifeq ($(PLATFORM), solaris)
  	      $(STRIP) -x $@
@@ -2491,8 +2510,8 @@
              endif
            # implied else here is no stripping at all
            endif
---- ./jdk/make/common/Mapfile-vers.gmk	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/common/Mapfile-vers.gmk	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/common/Mapfile-vers.gmk	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/common/Mapfile-vers.gmk	Thu Sep 07 23:37:21 2017 -0700
 @@ -76,7 +76,7 @@
  
  endif # PLATFORM
@@ -2502,8 +2521,8 @@
  
  ifeq ($(VARIANT), OPT)
    # OPT build MUST have a mapfile?
---- ./jdk/make/common/Program.gmk	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/common/Program.gmk	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/common/Program.gmk	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/common/Program.gmk	Thu Sep 07 23:37:21 2017 -0700
 @@ -95,6 +95,17 @@
    endif # SYSTEM_ZLIB
  endif # PLATFORM
@@ -2576,8 +2595,8 @@
  
  OTHER_CPPFLAGS  += -DPROGNAME='"$(PROGRAM)"'
  VERSION_DEFINES += -DFULL_VERSION='"$(FULL_VERSION)"'
---- ./jdk/make/common/Release.gmk	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/common/Release.gmk	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/common/Release.gmk	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/common/Release.gmk	Thu Sep 07 23:37:21 2017 -0700
 @@ -180,6 +180,12 @@
    JA_DIRNAME=ja_JP.UTF-8
  endif # linux
@@ -2622,8 +2641,8 @@
  	       | ($(CD) $(JDK_IMAGE_DIR)/src && $(TAR) xf -); \
  	  fi; \
  	done
---- ./jdk/make/common/Rules.gmk	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/common/Rules.gmk	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/common/Rules.gmk	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/common/Rules.gmk	Thu Sep 07 23:37:21 2017 -0700
 @@ -51,7 +51,7 @@
  #
  # All source tree areas for java/properties files (a few may be closed)
@@ -2642,8 +2661,8 @@
  # TODO(cpc): need to document why this is necessary...
  $(CLASSDESTDIR)/%.class: $(JDK_TOPDIR)/src/macosx/classes/%.java
  	@$(add-java-file)
---- ./jdk/make/common/shared/Compiler-gcc.gmk	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/common/shared/Compiler-gcc.gmk	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/common/shared/Compiler-gcc.gmk	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/common/shared/Compiler-gcc.gmk	Thu Sep 07 23:37:21 2017 -0700
 @@ -72,6 +72,21 @@
  
  endif
@@ -2667,7 +2686,7 @@
  
    # Settings specific to Solaris
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/make/common/shared/Defs-bsd.gmk	Sun May 28 23:44:03 2017 -0700
++++ ./jdk/make/common/shared/Defs-bsd.gmk	Thu Sep 07 23:37:21 2017 -0700
 @@ -0,0 +1,267 @@
 +#
 +# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -2936,8 +2955,8 @@
 +endef
 +endif
 +
---- ./jdk/make/common/shared/Defs-utils.gmk	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/common/shared/Defs-utils.gmk	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/common/shared/Defs-utils.gmk	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/common/shared/Defs-utils.gmk	Thu Sep 07 23:37:21 2017 -0700
 @@ -74,6 +74,13 @@
    UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH)
  endif
@@ -2988,8 +3007,8 @@
 +    UNZIP      = $(UTILS_DEVTOOL_PATH)unzip
 +  endif
 +endif
---- ./jdk/make/common/shared/Defs-versions.gmk	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/common/shared/Defs-versions.gmk	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/common/shared/Defs-versions.gmk	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/common/shared/Defs-versions.gmk	Thu Sep 07 23:37:21 2017 -0700
 @@ -44,6 +44,11 @@
    override CC_VERSION = gcc
  endif
@@ -3016,8 +3035,8 @@
  # Mac specific
  ifeq ($(PLATFORM), macosx)
    REQUIRED_OS_NAME            = Darwin
---- ./jdk/make/common/shared/Defs.gmk	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/common/shared/Defs.gmk	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/common/shared/Defs.gmk	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/common/shared/Defs.gmk	Thu Sep 07 23:37:21 2017 -0700
 @@ -181,7 +181,7 @@
  # platform and shared sources/headers.  This is mainly useful for the
  # Mac OS X build, which pulls its platform sources from the solaris and/or
@@ -3027,8 +3046,8 @@
    define JavaSrcDirList
    $(JAVA_SRCDIR_LIST:%=$1$(JDK_TOPDIR)/%/$2)
    endef
---- ./jdk/make/common/shared/Platform.gmk	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/common/shared/Platform.gmk	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/common/shared/Platform.gmk	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/common/shared/Platform.gmk	Thu Sep 07 23:37:21 2017 -0700
 @@ -315,6 +315,85 @@
    # How much RAM does this machine have:
  endif
@@ -3115,8 +3134,8 @@
  # Windows with and without CYGWIN will be slightly different
  ifeq ($(SYSTEM_UNAME), Windows_NT)
    PLATFORM = windows
---- ./jdk/make/java/Makefile	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/java/Makefile	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/java/Makefile	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/java/Makefile	Thu Sep 07 23:37:21 2017 -0700
 @@ -53,7 +53,7 @@
    endif
  endif # PLATFORM
@@ -3126,8 +3145,8 @@
    SUBDIRS += jexec
  endif # PLATFORM
  
---- ./jdk/make/java/instrument/Makefile	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/java/instrument/Makefile	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/java/instrument/Makefile	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/java/instrument/Makefile	Thu Sep 07 23:37:21 2017 -0700
 @@ -104,12 +104,24 @@
    # equivalent of strcasecmp is stricmp on Windows
    CPPFLAGS_COMMON += -Dstrcasecmp=stricmp
@@ -3158,8 +3177,8 @@
    ifeq ($(SYSTEM_ZLIB), true)
      OTHER_LDLIBS += -lz
    endif
---- ./jdk/make/java/java/Makefile	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/java/java/Makefile	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/java/java/Makefile	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/java/java/Makefile	Thu Sep 07 23:37:21 2017 -0700
 @@ -177,9 +177,11 @@
  #
  ifneq ($(PLATFORM), windows)
@@ -3182,8 +3201,8 @@
  
  ARCHFLAG = 
  ifeq ($(ARCH_DATA_MODEL), 64)
---- ./jdk/make/java/java/genlocales.gmk	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/java/java/genlocales.gmk	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/java/java/genlocales.gmk	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/java/java/genlocales.gmk	Thu Sep 07 23:37:21 2017 -0700
 @@ -93,17 +93,65 @@
  
  else
@@ -3254,8 +3273,8 @@
  endif
  	
  genlocales : $(LocaleDataMetaInfo_Dest)  
---- ./jdk/make/java/jli/Makefile	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/java/jli/Makefile	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/java/jli/Makefile	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/java/jli/Makefile	Thu Sep 07 23:37:21 2017 -0700
 @@ -119,9 +119,9 @@
    LIBARCH_DEFINES += -DLIBARCH64NAME='"$(LIBARCH64)"'
  endif # PLATFORM
@@ -3299,8 +3318,8 @@
  vpath %.c $(LAUNCHER_SHARE_SRC) $(LAUNCHER_PLATFORM_SRC)
  ifneq ($(SYSTEM_ZLIB),true)
    vpath %.c $(ZIP_SRC)
---- ./jdk/make/java/net/FILES_c.gmk	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/java/net/FILES_c.gmk	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/java/net/FILES_c.gmk	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/java/net/FILES_c.gmk	Thu Sep 07 23:37:21 2017 -0700
 @@ -54,6 +54,10 @@
      FILES_c += bsd_close.c
  endif
@@ -3312,8 +3331,8 @@
  ifeq ($(PLATFORM), windows)
      FILES_c += TwoStacksPlainSocketImpl.c
      FILES_c += DualStackPlainSocketImpl.c
---- ./jdk/make/java/net/Makefile	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/java/net/Makefile	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/java/net/Makefile	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/java/net/Makefile	Thu Sep 07 23:37:21 2017 -0700
 @@ -95,7 +95,7 @@
  
  include $(BUILDDIR)/common/Library.gmk
@@ -3323,8 +3342,8 @@
  ifdef DONT_ENABLE_IPV6
    OTHER_CFLAGS += -DDONT_ENABLE_IPV6
  endif
---- ./jdk/make/java/nio/Makefile	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/java/nio/Makefile	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/java/nio/Makefile	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/java/nio/Makefile	Thu Sep 07 23:37:21 2017 -0700
 @@ -263,13 +263,89 @@
  	sun/nio/fs/UnixConstants.java
  endif # PLATFORM = linux
@@ -3476,8 +3495,8 @@
  FILES_m = mapfile-bsd
  endif
  include $(BUILDDIR)/common/Mapfile-vers.gmk
---- ./jdk/make/java/nio/mapfile-bsd	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/java/nio/mapfile-bsd	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/java/nio/mapfile-bsd	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/java/nio/mapfile-bsd	Thu Sep 07 23:37:21 2017 -0700
 @@ -70,6 +70,7 @@
                  Java_sun_nio_ch_IOUtil_drain;
                  Java_sun_nio_ch_IOUtil_fdVal;
@@ -3498,8 +3517,8 @@
  		Java_sun_nio_ch_KQueuePort_socketpair;
  		Java_sun_nio_ch_KQueuePort_interrupt;
  		Java_sun_nio_ch_KQueuePort_drain1;
---- ./jdk/make/java/npt/Makefile	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/java/npt/Makefile	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/java/npt/Makefile	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/java/npt/Makefile	Thu Sep 07 23:37:21 2017 -0700
 @@ -74,6 +74,14 @@
    OTHER_LDLIBS += -liconv
  endif
@@ -3515,8 +3534,8 @@
  #
  # Add to ambient vpath so we pick up the library files
  #
---- ./jdk/make/java/redist/fonts/Makefile	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/java/redist/fonts/Makefile	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/java/redist/fonts/Makefile	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/java/redist/fonts/Makefile	Thu Sep 07 23:37:21 2017 -0700
 @@ -42,7 +42,7 @@
  	$(LIBDIR)/fonts/LucidaSansRegular.ttf       	\
  	$(LIBDIR)/fonts/LucidaSansDemiBold.ttf       	\
@@ -3544,8 +3563,8 @@
  
  all build : $(INTERNAL_IMPORT_LIST)
  
---- ./jdk/make/javax/sound/Makefile	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/javax/sound/Makefile	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/javax/sound/Makefile	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/javax/sound/Makefile	Thu Sep 07 23:37:21 2017 -0700
 @@ -111,6 +111,21 @@
    #MXSPP_ADD = $(PLATFORM)-$(ARCH)/
  endif # PLATFORM linux
@@ -3568,8 +3587,8 @@
  ifeq ($(PLATFORM), macosx)
    CPPFLAGS += -DUSE_PORTS=TRUE \
                -DUSE_DAUDIO=TRUE \
---- ./jdk/make/javax/sound/SoundDefs.gmk	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/javax/sound/SoundDefs.gmk	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/javax/sound/SoundDefs.gmk	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/javax/sound/SoundDefs.gmk	Thu Sep 07 23:37:21 2017 -0700
 @@ -40,6 +40,10 @@
    CPPFLAGS += -DX_PLATFORM=X_LINUX
  endif # PLATFORM linux
@@ -3581,8 +3600,8 @@
  ifeq ($(PLATFORM), macosx)
    CPPFLAGS += -DX_PLATFORM=X_MACOSX
  endif # PLATFORM macosx
---- ./jdk/make/javax/sound/jsoundalsa/Makefile	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/javax/sound/jsoundalsa/Makefile	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/javax/sound/jsoundalsa/Makefile	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/javax/sound/jsoundalsa/Makefile	Thu Sep 07 23:37:21 2017 -0700
 @@ -51,6 +51,7 @@
  	$(PORTFILES_c)
  
@@ -3633,8 +3652,8 @@
  
  #
  # Add to the ambient VPATH.
---- ./jdk/make/jpda/transport/socket/Makefile	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/jpda/transport/socket/Makefile	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/jpda/transport/socket/Makefile	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/jpda/transport/socket/Makefile	Thu Sep 07 23:37:21 2017 -0700
 @@ -38,6 +38,11 @@
  
  include $(BUILDDIR)/common/Defs.gmk
@@ -3647,8 +3666,8 @@
  ifeq ($(PLATFORM), linux)
    OTHER_LDLIBS += $(LIBNSL) $(LIBSOCKET) -lpthread
  endif
---- ./jdk/make/sun/awt/Makefile	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/sun/awt/Makefile	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/sun/awt/Makefile	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/sun/awt/Makefile	Thu Sep 07 23:37:21 2017 -0700
 @@ -127,6 +127,13 @@
  OTHER_LDLIBS = $(JVMLIB) $(LIBM) $(LIBDL)
  endif
@@ -3724,8 +3743,8 @@
  LDFLAGS += -L$(OPENWIN_LIB)
  endif
  
---- ./jdk/make/sun/awt/mawt.gmk	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/sun/awt/mawt.gmk	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/sun/awt/mawt.gmk	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/sun/awt/mawt.gmk	Thu Sep 07 23:37:21 2017 -0700
 @@ -169,7 +169,7 @@
  OTHER_LDLIBS = -lXt -lXext $(LIBXTST) $(LIBXMU) -lX11 -lXi
  endif
@@ -3782,8 +3801,8 @@
  ifeq ($(PLATFORM), macosx)
    CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
                -I$(OPENWIN_HOME)/include 
---- ./jdk/make/sun/font/Makefile	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/sun/font/Makefile	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/sun/font/Makefile	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/sun/font/Makefile	Thu Sep 07 23:37:21 2017 -0700
 @@ -97,7 +97,7 @@
  # Turn off aliasing with GCC for ExtensionSubtables.cpp (and others on GCC < 4.3)
  # Turn off strict overflow with GCC for IndicRearrangementProcessor.cpp on GCC >= 4.3
@@ -3802,8 +3821,8 @@
  OTHER_INCLUDES += -I$(X11_PATH)/include
  OTHER_LDLIBS  += -lawt $(LIBM) $(LIBCXX)
   ifeq ($(OS_VENDOR),Apple)
---- ./jdk/make/sun/jawt/Makefile	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/sun/jawt/Makefile	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/sun/jawt/Makefile	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/sun/jawt/Makefile	Thu Sep 07 23:37:21 2017 -0700
 @@ -99,8 +99,7 @@
  #
  # Other extra flags needed for compiling.
@@ -3831,9 +3850,9 @@
    ifndef BUILD_HEADLESS_ONLY
      OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -lawt -L$(LIBDIR)/$(LIBARCH)/xawt -lmawt
    else
---- ./jdk/make/sun/rmi/rmi/Makefile	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/sun/rmi/rmi/Makefile	Sun May 28 23:44:03 2017 -0700
-@@ -70,6 +70,9 @@
+--- ./jdk/make/sun/rmi/rmi/Makefile	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/sun/rmi/rmi/Makefile	Thu Sep 07 23:37:21 2017 -0700
+@@ -63,6 +63,9 @@
      BUILD_TARGETS += bin
    endif
  endif
@@ -3843,8 +3862,8 @@
  
  build: $(BUILD_TARGETS)
  
---- ./jdk/make/sun/splashscreen/Makefile	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/sun/splashscreen/Makefile	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/sun/splashscreen/Makefile	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/sun/splashscreen/Makefile	Thu Sep 07 23:37:21 2017 -0700
 @@ -61,6 +61,12 @@
  
  CFLAGS += -DSPLASHSCREEN
@@ -3903,8 +3922,8 @@
    OTHER_CFLAGS += $(ZLIB_CFLAGS)
    OTHER_LDLIBS += $(ZLIB_LIBS)
  endif
---- ./jdk/make/sun/xawt/Makefile	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/sun/xawt/Makefile	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/sun/xawt/Makefile	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/sun/xawt/Makefile	Thu Sep 07 23:37:21 2017 -0700
 @@ -52,6 +52,9 @@
  AUTO_JAVA_PRUNE = WrapperGenerator.java
  
@@ -3957,8 +3976,8 @@
  ifeq ($(PLATFORM), macosx)
    CPPFLAGS += -DX11_PATH=\"$(X11_PATH)\" -DPACKAGE_PATH=\"$(PACKAGE_PATH)\"
  endif
---- ./jdk/make/tools/freetypecheck/Makefile	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/tools/freetypecheck/Makefile	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/tools/freetypecheck/Makefile	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/tools/freetypecheck/Makefile	Thu Sep 07 23:37:21 2017 -0700
 @@ -52,8 +52,15 @@
    else 
      ifeq ($(PLATFORM), macosx)
@@ -3978,7 +3997,7 @@
    endif
  endif
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/make/tools/sharing/classlist.bsd	Sun May 28 23:44:03 2017 -0700
++++ ./jdk/make/tools/sharing/classlist.bsd	Thu Sep 07 23:37:21 2017 -0700
 @@ -0,0 +1,2327 @@
 +java/lang/Object
 +java/lang/String
@@ -6307,8 +6326,8 @@
 +sun/applet/AppletPanel$6
 +javax/swing/BufferStrategyPaintManager$1
 +# f3ac8b467e7f8c49
---- ./jdk/src/bsd/doc/man/appletviewer.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/appletviewer.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/appletviewer.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/appletviewer.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -6361,8 +6380,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/apt.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/apt.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/apt.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/apt.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -6515,8 +6534,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/extcheck.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/extcheck.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/extcheck.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/extcheck.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -6548,8 +6567,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/idlj.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/idlj.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/idlj.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/idlj.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,13 +19,13 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -6872,8 +6891,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/ja/appletviewer.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/ja/appletviewer.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/appletviewer.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/ja/appletviewer.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,6 +19,51 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -6927,8 +6946,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/apt.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/ja/apt.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/apt.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/ja/apt.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,9 +19,135 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -7067,8 +7086,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/extcheck.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/ja/extcheck.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/extcheck.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/ja/extcheck.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,6 +19,55 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -7126,8 +7145,8 @@
 +jar(1)
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/idlj.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/ja/idlj.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/idlj.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/ja/idlj.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,6 +19,720 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -7850,8 +7869,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/jar.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/ja/jar.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/jar.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/ja/jar.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,6 +19,583 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -8437,8 +8456,8 @@
 +pack200(1)
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/jarsigner.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/ja/jarsigner.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/jarsigner.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/ja/jarsigner.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,6 +19,1655 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -10096,8 +10115,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/java.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/ja/java.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/java.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/ja/java.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -1,4 +1,4 @@
 -." Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
 +." Copyright (c) 1994, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -10738,8 +10757,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/javac.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/ja/javac.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/javac.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/ja/javac.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,6 +19,1222 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -11964,8 +11983,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/javadoc.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/ja/javadoc.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/javadoc.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/ja/javadoc.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,4 +19,4179 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -16147,8 +16166,8 @@
 +http://docs.oracle.com/javase/7/docs/technotes/tools/findingclasses.html#srcfiles(tools.jar) 
 +.RE
 + 
---- ./jdk/src/bsd/doc/man/ja/javah.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/ja/javah.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/javah.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/ja/javah.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,6 +19,120 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -16271,8 +16290,8 @@
 +javac(1)��java(1)��jdb(1)��javap(1)��javadoc(1)
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/javap.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/ja/javap.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/javap.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/ja/javap.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,6 +19,299 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -16574,8 +16593,8 @@
 +javac(1)��java(1)��jdb(1)��javah(1)��javadoc(1)
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/javaws.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/ja/javaws.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/javaws.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/ja/javaws.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,6 +19,204 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -16783,7 +16802,7 @@
 +.LP
 + 
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/bsd/doc/man/ja/jcmd.1	Sun May 28 23:44:03 2017 -0700
++++ ./jdk/src/bsd/doc/man/ja/jcmd.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -0,0 +1,118 @@
 +." Copyright (c) 1994, 2012, Oracle and/or its affiliates. All rights reserved.
 +." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -16903,8 +16922,8 @@
 +jps(1)
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/jconsole.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/ja/jconsole.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/jconsole.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/ja/jconsole.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,6 +19,138 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -17045,8 +17064,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/jdb.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/ja/jdb.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/jdb.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/ja/jdb.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,6 +19,312 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -17361,8 +17380,8 @@
 +javac(1)��java(1)��javah(1)��javap(1)��javadoc(1)
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/jhat.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/ja/jhat.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/jhat.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/ja/jhat.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,6 +19,135 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -17500,8 +17519,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/jinfo.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/ja/jinfo.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/jinfo.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/ja/jinfo.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,6 +19,148 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -17652,8 +17671,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/jmap.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/ja/jmap.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/jmap.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/ja/jmap.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,6 +19,161 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -17817,8 +17836,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/jps.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/ja/jps.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/jps.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/ja/jps.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,6 +19,260 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -18081,8 +18100,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/jrunscript.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/ja/jrunscript.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/jrunscript.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/ja/jrunscript.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,6 +19,194 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -18279,8 +18298,8 @@
 +http://docs.oracle.com/javase/7/docs/technotes/tools/share/jsdocs/allclasses\-noframe.html�򻲾Ȥ��Ƥ���������
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/jsadebugd.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/ja/jsadebugd.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/jsadebugd.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/ja/jsadebugd.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,6 +19,107 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -18390,8 +18409,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/jstack.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/ja/jstack.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/jstack.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/ja/jstack.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,6 +19,154 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -18548,8 +18567,8 @@
 +����⡼�ɤΥ����å����ȥ졼��(\-m���ץ�������)�ϡ���⡼�ȡ��ǥХå��������С��Ǥϵ�ǽ���ޤ���
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/jstat.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/ja/jstat.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/jstat.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/ja/jstat.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,6 +19,5370 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -23922,8 +23941,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/jstatd.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/ja/jstatd.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/jstatd.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/ja/jstatd.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,6 +19,267 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -24193,8 +24212,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/keytool.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/ja/keytool.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/keytool.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/ja/keytool.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -1,4 +1,4 @@
 -." Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
 +." Copyright (c) 1998-2011 keytool tool, Oracle and/or its affiliates. All rights reserved.
@@ -26030,8 +26049,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/native2ascii.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/ja/native2ascii.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/native2ascii.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/ja/native2ascii.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,6 +19,54 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -26088,8 +26107,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/orbd.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/ja/orbd.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/orbd.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/ja/orbd.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,6 +19,350 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -26442,8 +26461,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/pack200.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/ja/pack200.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/pack200.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/ja/pack200.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,6 +19,344 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -26790,8 +26809,8 @@
 +JDK����°����Java SE API���ͤȤ���㤬���Ĥ��ä����ˤϡ����ͤ�ͥ�褷�Ƥ���������
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/policytool.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/ja/policytool.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/policytool.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/ja/policytool.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,6 +19,102 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -26896,8 +26915,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/rmic.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/ja/rmic.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/rmic.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/ja/rmic.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,6 +19,209 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -27109,8 +27128,8 @@
 +http://docs.oracle.com/javase/7/docs/technotes/tools/index.html#classpath
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/rmid.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/ja/rmid.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/rmid.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/ja/rmid.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,6 +19,310 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -27423,8 +27442,8 @@
 +http://docs.oracle.com/javase/7/docs/technotes/tools/index.html#classpath��java(1)
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/rmiregistry.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/ja/rmiregistry.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/rmiregistry.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/ja/rmiregistry.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,6 +19,65 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -27492,8 +27511,8 @@
 +\f2java.rmi.Naming\fP @
 +.fi
 +http://docs.oracle.com/javase/7/docs/api/java/rmi/Naming.html  
---- ./jdk/src/bsd/doc/man/ja/schemagen.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/ja/schemagen.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/schemagen.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/ja/schemagen.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,6 +19,109 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -27605,8 +27624,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/serialver.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/ja/serialver.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/serialver.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/ja/serialver.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,6 +19,79 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -27688,8 +27707,8 @@
 +http://docs.oracle.com/javase/7/docs/api/java/io/ObjectStreamClass.html
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/servertool.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/ja/servertool.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/servertool.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/ja/servertool.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,6 +19,95 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -27787,8 +27806,8 @@
 +.SH "��Ϣ����"
 +.LP
 +orbd(1)  
---- ./jdk/src/bsd/doc/man/ja/tnameserv.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/ja/tnameserv.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/tnameserv.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/ja/tnameserv.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,6 +19,476 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -28267,8 +28286,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/unpack200.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/ja/unpack200.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/unpack200.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/ja/unpack200.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,6 +19,160 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -28431,8 +28450,8 @@
 +JDK����°����Java SE API���ͤȤ���㤬���Ĥ��ä����ˤϡ����ͤ�ͥ�褷�Ƥ���������
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/wsgen.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/ja/wsgen.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/wsgen.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/ja/wsgen.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,4 +19,638 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -29073,8 +29092,8 @@
 +SOAP 1.2 WSDL����������ޤ���
 +.LP
 +�����ӥ���ǥץ�������Ȥ���JAXWS��󥿥���ˤ�äƼ�ưŪ��WSDL����������뤿�ᡢ��ȯ����WSDL����������ɬ�פϤ���ޤ��� 
---- ./jdk/src/bsd/doc/man/ja/wsimport.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/ja/wsimport.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/wsimport.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/ja/wsimport.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,4 +19,1048 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -30125,8 +30144,8 @@
 +Java�����ƥ��ե����Ȥ���������\f2http://stockquote.example.com/quote?wsdl\fP�򥤥�ݡ��Ȥ��Ƥ���Java�����ƥ��ե����Ȥ򥳥�ѥ��뤷�ޤ�
 +.br
 + 
---- ./jdk/src/bsd/doc/man/ja/xjc.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/ja/xjc.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/xjc.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/ja/xjc.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,7 +19,279 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -30409,8 +30428,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/jar.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/jar.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/jar.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/jar.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,31 +19,31 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -30859,8 +30878,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/javac.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/javac.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/javac.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/javac.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -31742,8 +31761,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/javadoc.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/javadoc.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/javadoc.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/javadoc.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -35058,8 +35077,8 @@
  .RE
 -
 + 
---- ./jdk/src/bsd/doc/man/javah.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/javah.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/javah.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/javah.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -35170,8 +35189,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/javap.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/javap.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/javap.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/javap.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -35403,8 +35422,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/javaws.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/javaws.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/javaws.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/javaws.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -35439,8 +35458,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/jconsole.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/jconsole.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/jconsole.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/jconsole.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -35558,8 +35577,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/jdb.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/jdb.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/jdb.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/jdb.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -35893,8 +35912,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/jhat.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/jhat.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/jhat.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/jhat.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -36029,8 +36048,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/jinfo.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/jinfo.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/jinfo.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/jinfo.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -36166,8 +36185,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/jmap.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/jmap.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/jmap.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/jmap.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -36303,8 +36322,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/jps.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/jps.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/jps.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/jps.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -36420,8 +36439,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/jrunscript.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/jrunscript.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/jrunscript.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/jrunscript.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -36568,8 +36587,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/jsadebugd.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/jsadebugd.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/jsadebugd.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/jsadebugd.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -36648,8 +36667,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/jstack.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/jstack.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/jstack.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/jstack.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -36759,8 +36778,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/jstat.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/jstat.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/jstat.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/jstat.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -38370,8 +38389,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/jstatd.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/jstatd.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/jstatd.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/jstatd.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -38494,8 +38513,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/keytool.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/keytool.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/keytool.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/keytool.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -1,4 +1,4 @@
 -." Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
 +." Copyright (c) 1998-2011 keytool tool, Oracle and/or its affiliates. All rights reserved.
@@ -39743,8 +39762,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/native2ascii.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/native2ascii.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/native2ascii.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/native2ascii.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -39785,8 +39804,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/orbd.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/orbd.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/orbd.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/orbd.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -40020,8 +40039,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/pack200.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/pack200.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/pack200.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/pack200.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -40186,8 +40205,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/policytool.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/policytool.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/policytool.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/policytool.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,71 +19,86 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -40305,8 +40324,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/rmic.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/rmic.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/rmic.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/rmic.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -40515,8 +40534,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/rmid.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/rmid.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/rmid.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/rmid.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -40796,8 +40815,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/rmiregistry.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/rmiregistry.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/rmiregistry.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/rmiregistry.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,14 +19,14 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -40840,8 +40859,8 @@
  .fi
 -http://download.oracle.com/javase/7/docs/api/java/rmi/Naming.html
 +http://docs.oracle.com/javase/7/docs/api/java/rmi/Naming.html  
---- ./jdk/src/bsd/doc/man/schemagen.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/schemagen.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/schemagen.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/schemagen.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -40908,8 +40927,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/serialver.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/serialver.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/serialver.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/serialver.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -40969,8 +40988,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/servertool.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/servertool.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/servertool.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/servertool.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,13 +19,13 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -41078,8 +41097,8 @@
  .LP
 -orbd(1)
 +orbd(1)  
---- ./jdk/src/bsd/doc/man/tnameserv.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/tnameserv.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/tnameserv.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/tnameserv.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,18 +19,18 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -41350,8 +41369,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/unpack200.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/unpack200.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/unpack200.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/unpack200.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -41418,8 +41437,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/wsgen.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/wsgen.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/wsgen.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/wsgen.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -41635,8 +41654,8 @@
  .LP
 -Note that you do not have to generate WSDL at the development time as JAXWS runtime will automatically generate a WSDL for you when you deploy your service.
 +Note that you do not have to generate WSDL at the development time as JAXWS runtime will automatically generate a WSDL for you when you deploy your service. 
---- ./jdk/src/bsd/doc/man/wsimport.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/wsimport.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/wsimport.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/wsimport.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -41933,8 +41952,8 @@
  .br
 -
 + 
---- ./jdk/src/bsd/doc/man/xjc.1	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/bsd/doc/man/xjc.1	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/bsd/doc/man/xjc.1	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/bsd/doc/man/xjc.1	Thu Sep 07 23:37:21 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -42203,8 +42222,8 @@
  .LP
 -
 + 
---- ./jdk/src/share/classes/java/util/TimeZone.java	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/share/classes/java/util/TimeZone.java	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/share/classes/java/util/TimeZone.java	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/share/classes/java/util/TimeZone.java	Thu Sep 07 23:37:21 2017 -0700
 @@ -917,15 +917,13 @@
          }
          int gmtOffset =  (hours * 60 + num) * 60 * 1000;
@@ -42222,8 +42241,8 @@
          }
          return zi;
      }
---- ./jdk/src/share/classes/sun/awt/FontConfiguration.java	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/share/classes/sun/awt/FontConfiguration.java	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/share/classes/sun/awt/FontConfiguration.java	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/share/classes/sun/awt/FontConfiguration.java	Thu Sep 07 23:37:21 2017 -0700
 @@ -1146,7 +1146,7 @@
       */
      HashMap<String, Boolean> existsMap;
@@ -42233,8 +42252,8 @@
              return false;
          } else if (existsMap == null) {
             existsMap = new HashMap<String, Boolean>();
---- ./jdk/src/share/classes/sun/awt/OSInfo.java	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/share/classes/sun/awt/OSInfo.java	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/share/classes/sun/awt/OSInfo.java	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/share/classes/sun/awt/OSInfo.java	Thu Sep 07 23:37:21 2017 -0700
 @@ -39,6 +39,7 @@
          WINDOWS,
          LINUX,
@@ -42254,8 +42273,8 @@
              if (osName.contains("OS X")) {
                  return MACOSX;
              }
---- ./jdk/src/share/classes/sun/font/FontUtilities.java	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/share/classes/sun/font/FontUtilities.java	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/share/classes/sun/font/FontUtilities.java	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/share/classes/sun/font/FontUtilities.java	Thu Sep 07 23:37:21 2017 -0700
 @@ -48,6 +48,8 @@
  
      public static boolean isLinux;
@@ -42277,8 +42296,8 @@
                  isMacOSX = osName.contains("OS X"); // TODO: MacOSX
  
                  String t2kStr = System.getProperty("sun.java2d.font.scaler");
---- ./jdk/src/share/classes/sun/font/SunFontManager.java	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/share/classes/sun/font/SunFontManager.java	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/share/classes/sun/font/SunFontManager.java	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/share/classes/sun/font/SunFontManager.java	Thu Sep 07 23:37:21 2017 -0700
 @@ -418,7 +418,7 @@
                           * registerFonts method as on-screen these JRE fonts
                           * always go through the T2K rasteriser.
@@ -42288,8 +42307,8 @@
                              /* Linux font configuration uses these fonts */
                              registerFontDir(jreFontDirName);
                          }
---- ./jdk/src/share/classes/sun/print/PSPrinterJob.java	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/share/classes/sun/print/PSPrinterJob.java	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/share/classes/sun/print/PSPrinterJob.java	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/share/classes/sun/print/PSPrinterJob.java	Thu Sep 07 23:37:21 2017 -0700
 @@ -1568,7 +1568,7 @@
          }
  
@@ -42299,8 +42318,8 @@
              execCmd = new String[ncomps];
              execCmd[n++] = "/usr/bin/lpr";
              if ((pFlags & PRINTER) != 0) {
---- ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java	Thu Sep 07 23:37:21 2017 -0700
 @@ -84,7 +84,8 @@
                              String osname = System.getProperty("os.name");
                              if (osname.startsWith("SunOS")) {
@@ -42311,8 +42330,8 @@
                                  gssLibs = new String[]{
                                      "libgssapi.so",
                                      "libgssapi_krb5.so",
---- ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider	Thu Sep 07 23:37:21 2017 -0700
 @@ -30,5 +30,6 @@
  #[solaris]sun.tools.attach.SolarisAttachProvider
  #[windows]sun.tools.attach.WindowsAttachProvider
@@ -42320,8 +42339,8 @@
 +#[bsd]sun.tools.attach.BsdAttachProvider
  #[macosx]sun.tools.attach.BsdAttachProvider
  #[aix]sun.tools.attach.AixAttachProvider
---- ./jdk/src/share/classes/sun/tools/jar/Main.java	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/share/classes/sun/tools/jar/Main.java	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/share/classes/sun/tools/jar/Main.java	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/share/classes/sun/tools/jar/Main.java	Thu Sep 07 23:37:21 2017 -0700
 @@ -51,6 +51,7 @@
      String zname = "";
      String[] files;
@@ -42381,8 +42400,8 @@
                  if (!d.exists() && !d.mkdirs() || !d.isDirectory()) {
                      throw new IOException(formatMsg(
                          "error.create.dir", d.getPath()));
---- ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties	Thu Sep 07 23:37:21 2017 -0700
 @@ -44,6 +44,8 @@
          {0} : could not create directory
  error.incorrect.length=\
@@ -42392,8 +42411,8 @@
  out.added.manifest=\
          added manifest
  out.update.manifest=\
---- ./jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt	Thu Sep 07 23:37:21 2017 -0700
 @@ -38,6 +38,7 @@
  #       gnumake JDK=<java_home> OSNAME=solaris [OPT=true] [LIBARCH=sparcv9]
  #       gnumake JDK=<java_home> OSNAME=linux   [OPT=true]
@@ -42432,8 +42451,8 @@
  # Common -I options
  CFLAGS += -I.
  CFLAGS += -I../agent_util
---- ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp	Thu Sep 07 23:37:21 2017 -0700
 @@ -33,6 +33,10 @@
  
  #include <stdlib.h>
@@ -42454,8 +42473,8 @@
  #define SWAP_BYTES(a) \
      ((((a) << 8) & 0xff00) | 0x00ff) & (((a) >> 8) | 0xff00)
  #else
---- ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h	Thu Sep 07 23:37:21 2017 -0700
 @@ -64,7 +64,7 @@
  
  
@@ -42465,8 +42484,8 @@
  #include <sys/types.h>
  #endif
  
---- ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h	Thu Sep 07 23:37:21 2017 -0700
 @@ -24,6 +24,9 @@
   * questions.
   */
@@ -42490,8 +42509,8 @@
  #ifdef __NEWVALID       /* special setup for Sun test regime */
  #if defined(i386) || defined(i486) || \
      defined(intel) || defined(x86) || defined(arm) || \
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c	Thu Sep 07 23:37:21 2017 -0700
 @@ -86,7 +86,7 @@
  #endif /* MLIB_USE_FTOI_CLAMPING */
  
@@ -42531,8 +42550,8 @@
  
  #endif /* _NO_LONGLONG */
  
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c	Thu Sep 07 23:37:21 2017 -0700
 @@ -126,7 +126,7 @@
  #define D2I(x) CLAMP_S32((x) SAT_OFF)
  
@@ -42572,8 +42591,8 @@
  #endif /* _NO_LONGLONG */
  
  /***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c	Thu Sep 07 23:37:21 2017 -0700
 @@ -94,7 +94,7 @@
  #define D2I(x) CLAMP_S32((x) SAT_OFF)
  
@@ -42613,8 +42632,8 @@
  #endif /* _NO_LONGLONG */
  
  /***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c	Thu Sep 07 23:37:21 2017 -0700
 @@ -126,7 +126,7 @@
  #define D2I(x) CLAMP_S32((x) SAT_OFF)
  
@@ -42654,8 +42673,8 @@
  #endif /* _NO_LONGLONG */
  
  /***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c	Thu Sep 07 23:37:21 2017 -0700
 @@ -95,7 +95,7 @@
  #define D2I(x) CLAMP_S32((x) SAT_OFF)
  
@@ -42695,8 +42714,8 @@
  #endif /* _NO_LONGLONG */
  
  /***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c	Thu Sep 07 23:37:21 2017 -0700
 @@ -126,7 +126,7 @@
  #define D2I(x) CLAMP_S32((x) SAT_OFF)
  
@@ -42736,8 +42755,8 @@
  #endif /* _NO_LONGLONG */
  
  /***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c	Thu Sep 07 23:37:21 2017 -0700
 @@ -94,7 +94,7 @@
  #define D2I(x) CLAMP_S32((x) SAT_OFF)
  
@@ -42777,8 +42796,8 @@
  #endif /* _NO_LONGLONG */
  
  /***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c	Thu Sep 07 23:37:21 2017 -0700
 @@ -95,7 +95,7 @@
      dst = dp[0];
      if (ld_offset + size < 32) {
@@ -42998,8 +43017,8 @@
    }
  
  #else  /* _LONGLONG */
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c	Thu Sep 07 23:37:21 2017 -0700
 @@ -168,7 +168,7 @@
  }
  
@@ -43280,8 +43299,8 @@
        dp[12] = t0;
        dp[13] = t1;
        dp[14] = t2;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c	Thu Sep 07 23:37:21 2017 -0700
 @@ -88,7 +88,7 @@
  } d64_2_f32;
  
@@ -43433,8 +43452,8 @@
  
    ((mlib_u32*)lh)[0] = l;  ((mlib_u32*)lh)[1] = l;
    ((mlib_u32*)lh)[2] = l;  ((mlib_u32*)lh)[3] = h;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c	Thu Sep 07 23:37:21 2017 -0700
 @@ -30,7 +30,7 @@
  typedef union {
    mlib_d64 db;
@@ -43444,8 +43463,8 @@
      mlib_s32 int1, int0;
  #else
      mlib_s32 int0, int1;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c	Thu Sep 07 23:37:21 2017 -0700
 @@ -275,11 +275,11 @@
        for (i = 0; j <= (b_size - 4); j += 4, i++) {
          src0 = src1;
@@ -43544,8 +43563,8 @@
          s0 = s1;
          dp += SIZE;
          sp += SIZE;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c	Thu Sep 07 23:37:21 2017 -0700
 @@ -120,7 +120,7 @@
    }                                                               \
  }
@@ -44778,8 +44797,8 @@
        dp[12] = t0;
        dp[13] = t1;
        dp[14] = t2;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_image.h	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_image.h	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_image.h	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_image.h	Thu Sep 07 23:37:21 2017 -0700
 @@ -27,9 +27,21 @@
  #ifndef MLIB_IMAGE_H
  #define MLIB_IMAGE_H
@@ -44803,8 +44822,8 @@
  #include <mlib_types.h>
  #include <mlib_status.h>
  #include <mlib_sys.h>
---- ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c	Thu Sep 07 23:37:21 2017 -0700
 @@ -26,7 +26,7 @@
  
  #include <stdlib.h>
@@ -44826,8 +44845,8 @@
    return valloc(size);
  #else
    return (void *) memalign(8, size);
---- ./jdk/src/share/native/sun/awt/medialib/mlib_types.h	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_types.h	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_types.h	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_types.h	Thu Sep 07 23:37:21 2017 -0700
 @@ -59,7 +59,7 @@
  
  #if defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(__GNUC__) || defined(AIX)
@@ -44837,8 +44856,8 @@
  #include <stddef.h>                     /* for ptrdiff_t */
  #include <stdint.h>                     /* for uintptr_t */
  #elif defined(__linux__)
---- ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h	Thu Sep 07 23:37:21 2017 -0700
 @@ -26,7 +26,7 @@
  #ifndef OGLFuncs_h_Included
  #define OGLFuncs_h_Included
@@ -44848,8 +44867,8 @@
  #include <dlfcn.h>
  #endif
  #include "jni.h"
---- ./jdk/src/solaris/back/util_md.h	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/solaris/back/util_md.h	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/solaris/back/util_md.h	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/solaris/back/util_md.h	Thu Sep 07 23:37:21 2017 -0700
 @@ -51,7 +51,7 @@
  
  /* On little endian machines, convert java big endian numbers. */
@@ -44859,8 +44878,8 @@
  
  #define HOST_TO_JAVA_CHAR(x) (((x & 0xff) << 8) | ((x >> 8) & (0xff)))
  #define HOST_TO_JAVA_SHORT(x) (((x & 0xff) << 8) | ((x >> 8) & (0xff)))
---- ./jdk/src/solaris/bin/ergo.c	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/solaris/bin/ergo.c	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/solaris/bin/ergo.c	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/solaris/bin/ergo.c	Thu Sep 07 23:37:21 2017 -0700
 @@ -100,6 +100,27 @@
  /* Compute physical memory by asking the OS */
  uint64_t
@@ -44895,8 +44914,8 @@
    return result;
 +#endif
  }
---- ./jdk/src/solaris/bin/ergo.h	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/solaris/bin/ergo.h	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/solaris/bin/ergo.h	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/solaris/bin/ergo.h	Thu Sep 07 23:37:21 2017 -0700
 @@ -33,6 +33,10 @@
  #include <sys/stat.h>
  #include <unistd.h>
@@ -44908,8 +44927,8 @@
  
  #include "java.h"
  
---- ./jdk/src/solaris/bin/ergo_i586.c	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/solaris/bin/ergo_i586.c	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/solaris/bin/ergo_i586.c	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/solaris/bin/ergo_i586.c	Thu Sep 07 23:37:21 2017 -0700
 @@ -106,7 +106,7 @@
  
  #endif /* __solaris__ */
@@ -44968,8 +44987,8 @@
    return result;
 +#endif
  }
---- ./jdk/src/solaris/bin/java_md_solinux.c	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/solaris/bin/java_md_solinux.c	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/solaris/bin/java_md_solinux.c	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/solaris/bin/java_md_solinux.c	Thu Sep 07 23:37:21 2017 -0700
 @@ -928,8 +928,9 @@
   * onwards the filename returned in DL_info structure from dladdr is
   * an absolute pathname so technically realpath isn't required.
@@ -45026,8 +45045,8 @@
  /* --- Splash Screen shared library support --- */
  static const char* SPLASHSCREEN_SO = JNI_LIB_NAME("splashscreen");
  static void* hSplashLib = NULL;
---- ./jdk/src/solaris/bin/java_md_solinux.h	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/solaris/bin/java_md_solinux.h	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/solaris/bin/java_md_solinux.h	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/solaris/bin/java_md_solinux.h	Thu Sep 07 23:37:21 2017 -0700
 @@ -33,6 +33,10 @@
  #include <sys/time.h>
  #define CounterGet()              (gethrtime()/1000)
@@ -45049,8 +45068,8 @@
  #else /* Solaris */
  static const char *system_dir   = "/usr/jdk";
  static const char *user_dir     = "/jdk";
---- ./jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd	Thu Sep 07 23:37:21 2017 -0700
 @@ -95,7 +95,14 @@
              public LaunchMechanism run() {
                  String javahome = System.getProperty("java.home");
@@ -45067,8 +45086,8 @@
                  String s = System.getProperty(
                      "jdk.lang.Process.launchMechanism", "posix_spawn");
  
---- ./jdk/src/solaris/classes/sun/awt/X11FontManager.java	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/solaris/classes/sun/awt/X11FontManager.java	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/solaris/classes/sun/awt/X11FontManager.java	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/solaris/classes/sun/awt/X11FontManager.java	Thu Sep 07 23:37:21 2017 -0700
 @@ -213,7 +213,7 @@
          if (fontID != null) {
              fileName = (String)fontNameMap.get(fontID);
@@ -45096,8 +45115,8 @@
               (!mFontConfig.foundOsSpecificFile() ||
                !mFontConfig.fontFilesArePresent()) ||
               (FontUtilities.isSolaris && !mFontConfig.fontFilesArePresent()))) {
---- ./jdk/src/solaris/classes/sun/net/PortConfig.java	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/solaris/classes/sun/net/PortConfig.java	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/solaris/classes/sun/net/PortConfig.java	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/solaris/classes/sun/net/PortConfig.java	Thu Sep 07 23:37:21 2017 -0700
 @@ -59,7 +59,7 @@
                      } else if (os.startsWith("AIX")) {
                          defaultLower = 32768;
@@ -45107,8 +45126,8 @@
                          defaultLower = 49152;
                          defaultUpper = 65535;
                      } else {
---- ./jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java	Thu Sep 07 23:37:21 2017 -0700
 @@ -50,7 +50,7 @@
              return new SolarisAsynchronousChannelProvider();
          if (osname.equals("Linux"))
@@ -45118,8 +45137,8 @@
              return new BsdAsynchronousChannelProvider();
          if (osname.equals("AIX"))
              return new AixAsynchronousChannelProvider();
---- ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java	Thu Sep 07 23:37:21 2017 -0700
 @@ -70,6 +70,8 @@
              return createProvider("sun.nio.fs.LinuxFileSystemProvider");
          if (osname.equals("Darwin") || osname.contains("OS X"))
@@ -45129,8 +45148,8 @@
          if (osname.equals("AIX") || osname.equals("OS400"))
              return createProvider("sun.nio.fs.AixFileSystemProvider");
          throw new AssertionError("Platform not recognized");
---- ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java	Thu Sep 07 23:37:21 2017 -0700
 @@ -170,6 +170,7 @@
  
      static boolean isBSD() {
@@ -45139,8 +45158,8 @@
                  osname.contains("OS X"));
      }
  
---- ./jdk/src/solaris/javavm/export/jvm_md.h	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/solaris/javavm/export/jvm_md.h	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/solaris/javavm/export/jvm_md.h	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/solaris/javavm/export/jvm_md.h	Thu Sep 07 23:37:21 2017 -0700
 @@ -75,7 +75,11 @@
  #define JVM_O_O_APPEND   O_APPEND
  #define JVM_O_EXCL       O_EXCL
@@ -45153,8 +45172,8 @@
  
  /* Signals */
  
---- ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c	Thu Sep 07 23:37:21 2017 -0700
 @@ -172,6 +172,9 @@
      /*
       * XXXBSD: there's no way available to get swap info in
@@ -45204,8 +45223,8 @@
       */
      // throw_internal_error(env, "Unimplemented in FreeBSD");
      return (100);
---- ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c	Thu Sep 07 23:37:21 2017 -0700
 @@ -151,7 +151,6 @@
      return rv;
  }
@@ -45214,8 +45233,8 @@
  JNIEXPORT jboolean JNICALL
  Java_java_io_UnixFileSystem_setPermission(JNIEnv *env, jobject this,
                                            jobject file,
---- ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c	Thu Sep 07 23:37:21 2017 -0700
 @@ -56,7 +56,7 @@
  
      for (i = 0; environ[i]; i++) {
@@ -45234,8 +45253,8 @@
              jbyteArray var, val;
              const char * valBeg = varEnd + 1;
              jsize varLength = varEnd - environ[i];
---- ./jdk/src/solaris/native/java/lang/childproc.c	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/solaris/native/java/lang/childproc.c	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/solaris/native/java/lang/childproc.c	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/solaris/native/java/lang/childproc.c	Thu Sep 07 23:37:21 2017 -0700
 @@ -62,6 +62,16 @@
    return c >= '0' && c <= '9';
  }
@@ -45261,8 +45280,8 @@
  
  int
  moveDescriptor(int fd_from, int fd_to)
---- ./jdk/src/solaris/native/java/lang/java_props_md.c	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/solaris/native/java/lang/java_props_md.c	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/solaris/native/java/lang/java_props_md.c	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/solaris/native/java/lang/java_props_md.c	Thu Sep 07 23:37:21 2017 -0700
 @@ -151,7 +151,7 @@
      lc = setlocale(cat, NULL);
  #endif
@@ -45292,8 +45311,8 @@
      } else {
          sprops.language = "en";
          sprops.encoding = "ISO8859-1";
---- ./jdk/src/solaris/native/java/net/NetworkInterface.c	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/solaris/native/java/net/NetworkInterface.c	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/solaris/native/java/net/NetworkInterface.c	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/solaris/native/java/net/NetworkInterface.c	Thu Sep 07 23:37:21 2017 -0700
 @@ -67,14 +67,19 @@
  #include <sys/param.h>
  #include <sys/ioctl.h>
@@ -45348,8 +45367,8 @@
    return 0;
  }
  
---- ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c	Thu Sep 07 23:37:21 2017 -0700
 @@ -23,12 +23,12 @@
   * questions.
   */
@@ -45387,8 +45406,8 @@
              len = sizeof(struct sockaddr_in);
          }
          JVM_Connect(fd, (struct sockaddr *)&addr, len);
---- ./jdk/src/solaris/native/java/net/bsd_close.c	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/solaris/native/java/net/bsd_close.c	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/solaris/native/java/net/bsd_close.c	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/solaris/native/java/net/bsd_close.c	Thu Sep 07 23:37:21 2017 -0700
 @@ -345,6 +345,76 @@
   * signal other than our wakeup signal.
   */
@@ -45472,8 +45491,8 @@
      }
 +#endif
  }
---- ./jdk/src/solaris/native/java/net/net_util_md.c	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/solaris/native/java/net/net_util_md.c	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/solaris/native/java/net/net_util_md.c	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/solaris/native/java/net/net_util_md.c	Thu Sep 07 23:37:21 2017 -0700
 @@ -45,6 +45,10 @@
  #endif
  #endif
@@ -45509,8 +45528,8 @@
  
      return setsockopt(fd, level, opt, arg, len);
  }
---- ./jdk/src/solaris/native/java/net/net_util_md.h	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/solaris/native/java/net/net_util_md.h	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/solaris/native/java/net/net_util_md.h	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/solaris/native/java/net/net_util_md.h	Thu Sep 07 23:37:21 2017 -0700
 @@ -46,7 +46,7 @@
     close subroutine does not return until the select call returns.
     ...
@@ -45520,8 +45539,8 @@
  extern int NET_Timeout(int s, long timeout);
  extern int NET_Read(int s, void* buf, size_t len);
  extern int NET_RecvFrom(int s, void *buf, int len, unsigned int flags,
---- ./jdk/src/solaris/native/java/util/TimeZone_md.c	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/solaris/native/java/util/TimeZone_md.c	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/solaris/native/java/util/TimeZone_md.c	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/solaris/native/java/util/TimeZone_md.c	Thu Sep 07 23:37:21 2017 -0700
 @@ -123,7 +123,7 @@
          return NULL;
      }
@@ -45555,8 +45574,8 @@
  }
 -#endif /* MACOSX */
 +#endif /* _ALLBSD_SOURCE */
---- ./jdk/src/solaris/native/sun/awt/awt_Font.c	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/solaris/native/sun/awt/awt_Font.c	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_Font.c	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/solaris/native/sun/awt/awt_Font.c	Thu Sep 07 23:37:21 2017 -0700
 @@ -334,7 +334,7 @@
              if (strcmp(style, "regular") == 0) {
                  altstyle = "roman";
@@ -45566,8 +45585,8 @@
              if (!strcmp(family, "lucidasans")) {
                  family = "lucida";
              }
---- ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c	Thu Sep 07 23:37:21 2017 -0700
 @@ -123,7 +123,7 @@
   */
  
@@ -45627,8 +45646,8 @@
  #endif /* HEADLESS */
      return point;
  }
---- ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c	Thu Sep 07 23:37:21 2017 -0700
 @@ -67,7 +67,7 @@
                                  XIMPreeditDrawCallbackStruct *);
  static void PreeditCaretCallback(XIC, XPointer,
@@ -45868,8 +45887,8 @@
      AWT_LOCK();
      adjustStatusWindow(window);
      AWT_UNLOCK();
---- ./jdk/src/solaris/native/sun/awt/awt_Robot.c	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/solaris/native/sun/awt/awt_Robot.c	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_Robot.c	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/solaris/native/sun/awt/awt_Robot.c	Thu Sep 07 23:37:21 2017 -0700
 @@ -46,7 +46,7 @@
  #include "wsutils.h"
  #include "list.h"
@@ -45879,8 +45898,8 @@
  #include <sys/socket.h>
  #endif
  
---- ./jdk/src/solaris/native/sun/awt/awt_util.h	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/solaris/native/sun/awt/awt_util.h	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_util.h	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/solaris/native/sun/awt/awt_util.h	Thu Sep 07 23:37:21 2017 -0700
 @@ -187,7 +187,7 @@
  #ifdef __solaris__
  extern Widget awt_util_getXICStatusAreaWindow(Widget w);
@@ -45899,8 +45918,8 @@
  typedef struct _XmImRefRec {
    Cardinal      num_refs;       /* Number of referencing widgets. */
    Cardinal      max_refs;       /* Maximum length of refs array. */
---- ./jdk/src/solaris/native/sun/awt/awt_wm.c	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/solaris/native/sun/awt/awt_wm.c	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_wm.c	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/solaris/native/sun/awt/awt_wm.c	Thu Sep 07 23:37:21 2017 -0700
 @@ -121,12 +121,19 @@
  static Atom XA_KWM_WIN_MAXIMIZED;
  
@@ -45998,8 +46017,8 @@
          awt_wmgr = OPENLOOK_WM;
      }
      else {
---- ./jdk/src/solaris/native/sun/awt/awt_wm.h	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/solaris/native/sun/awt/awt_wm.h	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_wm.h	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/solaris/native/sun/awt/awt_wm.h	Thu Sep 07 23:37:21 2017 -0700
 @@ -45,7 +45,10 @@
      KDE2_WM,
      SAWFISH_WM,
@@ -46012,8 +46031,8 @@
  };
  
  extern void awt_wm_init(void);
---- ./jdk/src/solaris/native/sun/awt/extutil.h	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/solaris/native/sun/awt/extutil.h	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/solaris/native/sun/awt/extutil.h	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/solaris/native/sun/awt/extutil.h	Thu Sep 07 23:37:21 2017 -0700
 @@ -58,7 +58,7 @@
   */
  /* $XFree86: xc/include/extensions/extutil.h,v 1.5 2001/01/17 17:53:20 dawes Exp $ */
@@ -46029,8 +46048,8 @@
  
 -#endif /* __linux__ || MACOSX */
 +#endif /* __linux__ || _ALLBSD_SOURCE */
---- ./jdk/src/solaris/native/sun/awt/fontpath.c	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/solaris/native/sun/awt/fontpath.c	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/solaris/native/sun/awt/fontpath.c	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/solaris/native/sun/awt/fontpath.c	Thu Sep 07 23:37:21 2017 -0700
 @@ -23,7 +23,7 @@
   * questions.
   */
@@ -46099,8 +46118,8 @@
      }
  #endif
  #endif /* !HEADLESS */
---- ./jdk/src/solaris/native/sun/awt/robot_common.c	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/solaris/native/sun/awt/robot_common.c	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/solaris/native/sun/awt/robot_common.c	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/solaris/native/sun/awt/robot_common.c	Thu Sep 07 23:37:21 2017 -0700
 @@ -27,7 +27,7 @@
      #error This file should not be included in headless library
  #endif
@@ -46110,8 +46129,8 @@
  #include <stdlib.h>
  #endif
  
---- ./jdk/src/solaris/native/sun/java2d/j2d_md.h	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/solaris/native/sun/java2d/j2d_md.h	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/solaris/native/sun/java2d/j2d_md.h	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/solaris/native/sun/java2d/j2d_md.h	Thu Sep 07 23:37:21 2017 -0700
 @@ -28,9 +28,9 @@
  #include <sys/types.h>
  
@@ -46124,8 +46143,8 @@
  #include <stdint.h>
  #endif /* __linux__ || MACOSX */
  
---- ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c	Thu Sep 07 23:37:21 2017 -0700
 @@ -804,7 +804,7 @@
  static int initialized;
  static int usevis = JNI_TRUE;
@@ -46135,8 +46154,8 @@
  #   define ULTRA_CHIP   "sparc64"
  #else
  #   define ULTRA_CHIP   "sun4u"
---- ./jdk/src/solaris/native/sun/net/portconfig.c	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/solaris/native/sun/net/portconfig.c	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/solaris/native/sun/net/portconfig.c	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/solaris/native/sun/net/portconfig.c	Thu Sep 07 23:37:21 2017 -0700
 @@ -66,6 +66,24 @@
          range->higher = net_getParam("/dev/tcp", "tcp_largest_anon_port");
          return 0;
@@ -46162,8 +46181,8 @@
  #elif defined(_ALLBSD_SOURCE)
      {
          int ret;
---- ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c	Thu Sep 07 23:37:21 2017 -0700
 @@ -204,7 +204,7 @@
          return IOS_THROWN;
      }
@@ -46182,8 +46201,8 @@
  #endif
  
      if (numBytes > 0)
---- ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c	Thu Sep 07 23:37:21 2017 -0700
 @@ -264,6 +264,21 @@
      fl.l_start = (off64_t)pos;
      fl.l_type = F_UNLCK;
@@ -46206,8 +46225,8 @@
      if (lockResult < 0) {
          JNU_ThrowIOExceptionWithLastError(env, "Release failed");
      }
---- ./jdk/src/solaris/native/sun/nio/ch/NativeThread.c	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/solaris/native/sun/nio/ch/NativeThread.c	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/NativeThread.c	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/solaris/native/sun/nio/ch/NativeThread.c	Thu Sep 07 23:37:21 2017 -0700
 @@ -33,12 +33,19 @@
  #include "nio_util.h"
  
@@ -46256,8 +46275,8 @@
      if (pthread_kill((pthread_t)thread, INTERRUPT_SIGNAL))
          JNU_ThrowIOExceptionWithLastError(env, "Thread signal failed");
  #endif
---- ./jdk/src/solaris/native/sun/nio/ch/Sctp.h	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/solaris/native/sun/nio/ch/Sctp.h	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/Sctp.h	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/solaris/native/sun/nio/ch/Sctp.h	Thu Sep 07 23:37:21 2017 -0700
 @@ -320,8 +320,20 @@
  typedef int sctp_peeloff_func(int sock, sctp_assoc_t id);
  
@@ -46297,8 +46316,8 @@
  jboolean loadSocketExtensionFuncs(JNIEnv* env);
  
  #endif /* !SUN_NIO_CH_SCTP_H */
---- ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c	Thu Sep 07 23:37:21 2017 -0700
 @@ -58,6 +58,7 @@
   */
  jboolean loadSocketExtensionFuncs
@@ -46315,8 +46334,8 @@
  
      funcsLoaded = JNI_TRUE;
      return JNI_TRUE;
---- ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c	Thu Sep 07 23:37:21 2017 -0700
 @@ -50,7 +50,7 @@
  {
      const char *libName = (*env)->GetStringUTFChars(env, jLibName, NULL);
@@ -46326,8 +46345,8 @@
      void *hModule = dlopen(libName, RTLD_LAZY);
  #else
      void *hModule = dlopen(libName, RTLD_NOLOAD);
---- ./jdk/src/solaris/native/sun/xawt/XWindow.c	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/src/solaris/native/sun/xawt/XWindow.c	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/src/solaris/native/sun/xawt/XWindow.c	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/src/solaris/native/sun/xawt/XWindow.c	Thu Sep 07 23:37:21 2017 -0700
 @@ -867,7 +867,7 @@
  {
      KeySym originalKeysym = *keysym;
@@ -46337,8 +46356,8 @@
      /* The following code on Linux will cause the keypad keys
       * not to echo on JTextField when the NumLock is on. The
       * keysyms will be 0, because the last parameter 2 is not defined.
---- ./jdk/test/Makefile	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/Makefile	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/Makefile	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/Makefile	Thu Sep 07 23:37:21 2017 -0700
 @@ -79,6 +79,11 @@
    endif
    OS_VERSION := $(shell $(UNAME) -r)
@@ -46351,8 +46370,8 @@
  ifeq ($(UNAME_S), Darwin)
    OS_NAME     = macosx
    OS_ARCH    := $(shell $(UNAME) -m)
---- ./jdk/test/com/sun/corba/5036554/TestCorbaBug.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/com/sun/corba/5036554/TestCorbaBug.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/com/sun/corba/5036554/TestCorbaBug.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/com/sun/corba/5036554/TestCorbaBug.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -48,7 +48,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -46362,8 +46381,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -56,7 +56,7 @@
  
  OS=`uname -s`
@@ -46373,8 +46392,8 @@
        PATHSEP=":"
        ;;
  
---- ./jdk/test/com/sun/jdi/JITDebug.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/com/sun/jdi/JITDebug.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/com/sun/jdi/JITDebug.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/com/sun/jdi/JITDebug.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -63,7 +63,7 @@
  OS=`uname -s`
  export TRANSPORT_METHOD
@@ -46384,8 +46403,8 @@
        PATHSEP=":"
        TRANSPORT_METHOD=dt_socket
        ;;
---- ./jdk/test/com/sun/jdi/PrivateTransportTest.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/com/sun/jdi/PrivateTransportTest.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/com/sun/jdi/PrivateTransportTest.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/com/sun/jdi/PrivateTransportTest.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -123,7 +123,7 @@
      esac
      libloc=${jreloc}/lib/${libarch}
@@ -46395,8 +46414,8 @@
      xx=`find ${jreloc}/lib -name libdt_socket.so`
      libloc=`dirname ${xx}`
      ;;
---- ./jdk/test/com/sun/jdi/ShellScaffold.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/com/sun/jdi/ShellScaffold.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/com/sun/jdi/ShellScaffold.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/com/sun/jdi/ShellScaffold.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -284,7 +284,7 @@
           psCmd=ps
           jstack=jstack.exe
@@ -46406,8 +46425,8 @@
           transport=dt_socket
           address=
           devnull=/dev/null
---- ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -112,7 +112,7 @@
        fi
        ;;
@@ -46417,8 +46436,8 @@
        pass "This test always passes on $OS"
        ;;
  
---- ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -45,7 +45,7 @@
  
  OS=`uname -s`
@@ -46428,8 +46447,8 @@
      PS=":"
      ;;
    Windows* | CYGWIN*)
---- ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -72,6 +72,16 @@
     done
  }
@@ -46457,8 +46476,8 @@
       Darwin )
         # $ sysctl -n vm.swapusage 
         # total = 8192.00M  used = 7471.11M  free = 720.89M  (encrypted)
---- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -48,7 +48,7 @@
  
  # Test GetMaxFileDescriptorCount if we are running on Unix
@@ -46468,8 +46487,8 @@
         runOne GetMaxFileDescriptorCount
         ;;
      * )
---- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -48,7 +48,7 @@
  
  # Test GetOpenFileDescriptorCount if we are running on Unix
@@ -46479,8 +46498,8 @@
         runOne GetOpenFileDescriptorCount
         ;;
      * )
---- ./jdk/test/java/awt/Focus/NPEInKFMOnButtonClickInDialogTest/NPEInKFMOnButtonClickInDialogTest.java	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/java/awt/Focus/NPEInKFMOnButtonClickInDialogTest/NPEInKFMOnButtonClickInDialogTest.java	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/java/awt/Focus/NPEInKFMOnButtonClickInDialogTest/NPEInKFMOnButtonClickInDialogTest.java	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/java/awt/Focus/NPEInKFMOnButtonClickInDialogTest/NPEInKFMOnButtonClickInDialogTest.java	Thu Sep 07 23:37:21 2017 -0700
 @@ -50,8 +50,8 @@
  
      public static void main(String[] args) {
@@ -46492,8 +46511,8 @@
              return;
          }
  
---- ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -25,10 +25,11 @@
  fi
  
@@ -46510,8 +46529,8 @@
  # Windows
  
  if [ -z "${TESTJAVA}" ] ; then
---- ./jdk/test/java/io/File/GetXSpace.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/java/io/File/GetXSpace.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/java/io/File/GetXSpace.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/java/io/File/GetXSpace.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -26,7 +26,7 @@
  # set platform-dependent variable
  OS=`uname -s`
@@ -46521,8 +46540,8 @@
    Windows_98 )    return    ;;
    Windows* )      SID=`sid`; TMP="c:/temp"  ;;
    * )
---- ./jdk/test/java/io/FileOutputStream/ManyFiles.java	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/java/io/FileOutputStream/ManyFiles.java	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/java/io/FileOutputStream/ManyFiles.java	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/java/io/FileOutputStream/ManyFiles.java	Thu Sep 07 23:37:21 2017 -0700
 @@ -43,7 +43,7 @@
          // Windows capability it is much simpler to only run it
          // on that platform.
@@ -46532,8 +46551,8 @@
              return;
  
          for (int n = 0; n < NUM_FILES; n++) {
---- ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -41,7 +41,7 @@
  # Need to determine the classpath separator and filepath separator based on the
  # operating system.
@@ -46543,8 +46562,8 @@
    PS=":"  ;;
  Windows* | CYGWIN* )
    PS=";"  ;;
---- ./jdk/test/java/io/Serializable/serialver/classpath/run.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/java/io/Serializable/serialver/classpath/run.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/java/io/Serializable/serialver/classpath/run.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/java/io/Serializable/serialver/classpath/run.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -47,7 +47,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -46554,8 +46573,8 @@
      PS=":"    ;;
    Windows* | CYGWIN* )
      PS=";"    ;;
---- ./jdk/test/java/io/Serializable/serialver/nested/run.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/java/io/Serializable/serialver/nested/run.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/java/io/Serializable/serialver/nested/run.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/java/io/Serializable/serialver/nested/run.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -47,7 +47,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -46565,8 +46584,8 @@
      PS=":"    ;;
    Windows* | CYGWIN* )
      PS=";"    ;;
---- ./jdk/test/java/lang/ClassLoader/Assert.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/java/lang/ClassLoader/Assert.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/java/lang/ClassLoader/Assert.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/java/lang/ClassLoader/Assert.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -25,7 +25,7 @@
  
  OS=`uname -s`
@@ -46576,8 +46595,8 @@
      FS="/"
      CHMOD="${FS}bin${FS}chmod"
      ;;
---- ./jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -45,13 +45,7 @@
  # set platform-specific variables
  OS=`uname -s`
@@ -46593,8 +46612,8 @@
      FS="/"
      ;;
    AIX )
---- ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -49,13 +49,7 @@
  # set platform-specific variables
  OS=`uname -s`
@@ -46610,8 +46629,8 @@
      FS="/"
      ;;
    AIX )
---- ./jdk/test/java/lang/StringCoding/CheckEncodings.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/java/lang/StringCoding/CheckEncodings.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/java/lang/StringCoding/CheckEncodings.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/java/lang/StringCoding/CheckEncodings.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -30,7 +30,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -46621,8 +46640,8 @@
    Windows* | CYGWIN* )
      echo "Passed"; exit 0 ;;
    * ) echo "Unrecognized system!" ;  exit 1 ;;
---- ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -44,7 +44,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -46632,8 +46651,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/java/lang/instrument/MakeJAR2.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/java/lang/instrument/MakeJAR2.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/java/lang/instrument/MakeJAR2.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/java/lang/instrument/MakeJAR2.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -49,7 +49,7 @@
  
  OS=`uname -s`
@@ -46643,8 +46662,8 @@
        PATHSEP=":"
        ;;
  
---- ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -35,15 +35,7 @@
  
  OS=`uname -s`
@@ -46662,8 +46681,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -61,7 +61,7 @@
  while true; do
    echo "Run $i: TestSystemLoadAvg"
@@ -46673,8 +46692,8 @@
           runOne GetSystemLoadAverage
           ;;
        * )
---- ./jdk/test/java/net/Authenticator/B4933582.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/java/net/Authenticator/B4933582.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/java/net/Authenticator/B4933582.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/java/net/Authenticator/B4933582.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -26,7 +26,7 @@
  
  OS=`uname -s`
@@ -46684,8 +46703,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java	Thu Sep 07 23:37:21 2017 -0700
 @@ -45,6 +45,8 @@
              return (true);
          if (p.getProperty ("os.name").equals ("Linux"))
@@ -46695,8 +46714,8 @@
          if (p.getProperty ("os.name").startsWith ("Mac OS"))
              return (true);
          // Check for specific Solaris version from here
---- ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -27,7 +27,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -46706,8 +46725,8 @@
      PATHSEP=":"
      FILESEP="/"
      ;;
---- ./jdk/test/java/net/Socket/OldSocketImpl.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/java/net/Socket/OldSocketImpl.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/java/net/Socket/OldSocketImpl.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/java/net/Socket/OldSocketImpl.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -28,7 +28,7 @@
  
  OS=`uname -s`
@@ -46717,8 +46736,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/java/net/URL/B5086147.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/java/net/URL/B5086147.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/java/net/URL/B5086147.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/java/net/URL/B5086147.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -26,7 +26,7 @@
  
  OS=`uname -s`
@@ -46728,8 +46747,8 @@
      exit 0
      ;;
    CYGWIN* )
---- ./jdk/test/java/net/URL/runconstructor.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/java/net/URL/runconstructor.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/java/net/URL/runconstructor.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/java/net/URL/runconstructor.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -27,7 +27,7 @@
  #
  OS=`uname -s`
@@ -46739,8 +46758,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/java/net/URLClassLoader/B5077773.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/java/net/URLClassLoader/B5077773.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/java/net/URLClassLoader/B5077773.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/java/net/URLClassLoader/B5077773.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -34,7 +34,7 @@
  
  OS=`uname -s`
@@ -46750,8 +46769,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -27,7 +27,7 @@
  
  OS=`uname -s`
@@ -46761,8 +46780,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/java/net/URLConnection/6212146/test.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/java/net/URLConnection/6212146/test.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/java/net/URLConnection/6212146/test.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/java/net/URLConnection/6212146/test.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -33,7 +33,7 @@
  
  OS=`uname -s`
@@ -46772,8 +46791,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile	Thu Sep 07 23:37:21 2017 -0700
 @@ -71,6 +71,48 @@
    EXTRA_LIBS = -lc
  endif
@@ -46823,8 +46842,8 @@
  LIBDIR=lib/$(PLATFORM)-$(ARCH)
  LAUNCHERLIB=$(LIBDIR)/libLauncher.so
  
---- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -33,11 +33,14 @@
  # @run shell run_tests.sh
  
@@ -46893,8 +46912,8 @@
  
  LIBDIR=lib/${PLATFORM}-${ARCH}
  LAUNCHERLIB=${LIBDIR}/libLauncher.so
---- ./jdk/test/java/nio/charset/Charset/default.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/java/nio/charset/Charset/default.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/java/nio/charset/Charset/default.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/java/nio/charset/Charset/default.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -41,10 +41,14 @@
  fi
  
@@ -46914,8 +46933,8 @@
  
  JAVA=$TESTJAVA/bin/java
  
---- ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -34,7 +34,7 @@
  
  OS=`uname -s`
@@ -46925,8 +46944,8 @@
    # Skip locale test for Windows
    Windows* | CYGWIN* )
      echo "Passed"; exit 0 ;;
---- ./jdk/test/java/nio/charset/spi/basic.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/java/nio/charset/spi/basic.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/java/nio/charset/spi/basic.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/java/nio/charset/spi/basic.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -70,10 +70,14 @@
      L="$1"
      shift
@@ -46955,8 +46974,8 @@
    Windows* )      CPS=';' ;;
    *)              echo "Unknown platform: `uname`"; exit 1 ;;
  esac
---- ./jdk/test/java/nio/file/FileSystem/Basic.java	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/java/nio/file/FileSystem/Basic.java	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/java/nio/file/FileSystem/Basic.java	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/java/nio/file/FileSystem/Basic.java	Thu Sep 07 23:37:21 2017 -0700
 @@ -76,6 +76,8 @@
              checkSupported(fs, "posix", "unix", "owner", "acl", "user");
          if (os.equals("Linux"))
@@ -46966,8 +46985,8 @@
          if (os.contains("OS X"))
              checkSupported(fs, "posix", "unix", "owner");
          if (os.equals("Windows"))
---- ./jdk/test/java/nio/file/Files/CopyAndMove.java	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/java/nio/file/Files/CopyAndMove.java	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/java/nio/file/Files/CopyAndMove.java	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/java/nio/file/Files/CopyAndMove.java	Thu Sep 07 23:37:21 2017 -0700
 @@ -634,7 +634,7 @@
  
                  // check POSIX attributes are copied
@@ -46986,8 +47005,8 @@
          boolean isDirectory = isDirectory(file, NOFOLLOW_LINKS);
  
          if (isUnix) {
---- ./jdk/test/java/rmi/registry/readTest/readTest.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/java/rmi/registry/readTest/readTest.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/java/rmi/registry/readTest/readTest.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/java/rmi/registry/readTest/readTest.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -34,7 +34,7 @@
  REGARGS=""
  
@@ -46997,8 +47016,8 @@
      PS=":"
      FS="/"
      CHMOD="${FS}bin${FS}chmod"
---- ./jdk/test/java/rmi/reliability/launch_reliability.ksh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/java/rmi/reliability/launch_reliability.ksh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/java/rmi/reliability/launch_reliability.ksh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/java/rmi/reliability/launch_reliability.ksh	Thu Sep 07 23:37:21 2017 -0700
 @@ -84,14 +84,12 @@
  
  
@@ -47018,8 +47037,8 @@
  
  export PATH_SEP
  mainpid=$$
---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -46,15 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47037,8 +47056,8 @@
      PATHSEP=":"
      FILESEP="/"
      ;;
---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -34,15 +34,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47056,8 +47075,8 @@
      PATHSEP=":"
      FILESEP="/"
      ;;
---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -50,19 +50,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47079,8 +47098,8 @@
      PATHSEP=":"
      FILESEP="/"
      ;;
---- ./jdk/test/java/security/Security/signedfirst/Dyn.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/java/security/Security/signedfirst/Dyn.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/java/security/Security/signedfirst/Dyn.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/java/security/Security/signedfirst/Dyn.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -46,15 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47098,8 +47117,8 @@
      PATHSEP=":"
      FILESEP="/"
      ;;
---- ./jdk/test/java/security/Security/signedfirst/Static.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/java/security/Security/signedfirst/Static.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/java/security/Security/signedfirst/Static.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/java/security/Security/signedfirst/Static.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -46,15 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47117,8 +47136,8 @@
      PATHSEP=":"
      FILESEP="/"
      ;;
---- ./jdk/test/java/util/Currency/PropertiesTest.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/java/util/Currency/PropertiesTest.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/java/util/Currency/PropertiesTest.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/java/util/Currency/PropertiesTest.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -30,7 +30,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47128,8 +47147,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/java/util/PluggableLocale/ExecTest.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/java/util/PluggableLocale/ExecTest.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/java/util/PluggableLocale/ExecTest.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/java/util/PluggableLocale/ExecTest.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -58,7 +58,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47139,8 +47158,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -31,7 +31,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47150,8 +47169,8 @@
      PATHSEP=":"
      FILESEP="/"
      ;;
---- ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -72,10 +72,10 @@
  Windows* | CYGWIN* )
      DEL=";"
@@ -47165,8 +47184,8 @@
      DEL=":"
      HAS_S=YES
      ;;
---- ./jdk/test/java/util/ServiceLoader/basic.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/java/util/ServiceLoader/basic.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/java/util/ServiceLoader/basic.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/java/util/ServiceLoader/basic.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -42,9 +42,7 @@
  
  OS=`uname -s`
@@ -47178,8 +47197,8 @@
        SEP=':' ;;
      * )
        SEP='\;' ;;
---- ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -51,7 +51,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47189,8 +47208,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -92,6 +92,14 @@
        TMP="/tmp"
        ;;
@@ -47206,8 +47225,8 @@
     AIX )
        VAR="A different value for AIX"
        DEFAULT_JDK=/
---- ./jdk/test/javax/script/CommonSetup.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/javax/script/CommonSetup.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/javax/script/CommonSetup.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/javax/script/CommonSetup.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -36,7 +36,7 @@
  
  OS=`uname -s`
@@ -47217,8 +47236,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/javax/security/auth/Subject/doAs/Test.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/javax/security/auth/Subject/doAs/Test.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/javax/security/auth/Subject/doAs/Test.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/javax/security/auth/Subject/doAs/Test.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -33,17 +33,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47238,8 +47257,8 @@
      PS=":"
      FS="/"
      RM="/bin/rm -f"
---- ./jdk/test/jprt.config	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/jprt.config	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/jprt.config	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/jprt.config	Thu Sep 07 23:37:21 2017 -0700
 @@ -71,8 +71,8 @@
  
  # Uses 'uname -s', but only expect SunOS or Linux, assume Windows otherwise.
@@ -47307,8 +47326,8 @@
  
  # Export PATH setting
  PATH="${path4sdk}"
---- ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -50,7 +50,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47318,8 +47337,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java	Thu Sep 07 23:37:21 2017 -0700
 @@ -53,8 +53,13 @@
          return isOs("linux");
      }
@@ -47335,8 +47354,8 @@
      }
  
      public static String getOsName() {
---- ./jdk/test/sun/awt/dnd/8024061/bug8024061.java	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/sun/awt/dnd/8024061/bug8024061.java	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/sun/awt/dnd/8024061/bug8024061.java	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/sun/awt/dnd/8024061/bug8024061.java	Thu Sep 07 23:37:21 2017 -0700
 @@ -107,8 +107,8 @@
  
      public static void main(String[] args) throws AWTException, InvocationTargetException, InterruptedException {
@@ -47348,8 +47367,8 @@
                                 "skipping!");
              return;
          }
---- ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -45,37 +45,53 @@
  # has to locate libjvm.so. Also $! is not reliable on some releases of MKS.
  #{
@@ -47429,8 +47448,8 @@
  
  
  #
---- ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -35,7 +35,7 @@
  UMASK=`umask`
  
@@ -47440,8 +47459,8 @@
      PATHSEP=":"
      FILESEP="/"
      DFILESEP=$FILESEP
---- ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -86,10 +86,12 @@
  #    on Windows 98.
  
@@ -47459,8 +47478,8 @@
  
  JAVA=${TESTJAVA}/bin/java
  CLASSPATH=${TESTCLASSES}
---- ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -70,10 +70,12 @@
  # security the password file.
  
@@ -47478,8 +47497,8 @@
  
  
  # Create configuration file and dummy password file
---- ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -69,10 +69,12 @@
  # security the password file.
  
@@ -47497,8 +47516,8 @@
  
  # Create management and SSL configuration files
  
---- ./jdk/test/sun/net/www/MarkResetTest.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/sun/net/www/MarkResetTest.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/sun/net/www/MarkResetTest.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/sun/net/www/MarkResetTest.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -28,7 +28,7 @@
  
  OS=`uname -s`
@@ -47508,8 +47527,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -28,7 +28,7 @@
  
  OS=`uname -s`
@@ -47519,8 +47538,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/sun/net/www/protocol/jar/B5105410.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/sun/net/www/protocol/jar/B5105410.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/sun/net/www/protocol/jar/B5105410.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/sun/net/www/protocol/jar/B5105410.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -31,7 +31,7 @@
  
  OS=`uname -s`
@@ -47530,8 +47549,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -31,7 +31,7 @@
  
  OS=`uname -s`
@@ -47541,8 +47560,8 @@
      PS=":"
      FS="/"
      CHMOD="${FS}bin${FS}chmod"
---- ./jdk/test/sun/nio/ch/SelProvider.java	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/sun/nio/ch/SelProvider.java	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/sun/nio/ch/SelProvider.java	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/sun/nio/ch/SelProvider.java	Thu Sep 07 23:37:21 2017 -0700
 @@ -39,7 +39,7 @@
                  expected = "sun.nio.ch.DevPollSelectorProvider";
              } else if ("Linux".equals(osname)) {
@@ -47552,8 +47571,8 @@
                  expected = "sun.nio.ch.KQueueSelectorProvider";
              } else {
                  return;
---- ./jdk/test/sun/security/krb5/runNameEquals.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/sun/security/krb5/runNameEquals.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/sun/security/krb5/runNameEquals.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/sun/security/krb5/runNameEquals.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -48,7 +48,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47563,8 +47582,8 @@
      PATHSEP=":"
      FILESEP="/"
      NATIVE=true
---- ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -131,6 +131,27 @@
  	;;
      esac
@@ -47593,8 +47612,8 @@
    Windows* )  
      FS="\\"
      PS=";"
---- ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -93,6 +93,27 @@
  	;;
      esac
@@ -47623,8 +47642,8 @@
    Windows* )
      FS="\\"
      PS=";"
---- ./jdk/test/sun/security/pkcs11/PKCS11Test.java	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/sun/security/pkcs11/PKCS11Test.java	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/sun/security/pkcs11/PKCS11Test.java	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/sun/security/pkcs11/PKCS11Test.java	Thu Sep 07 23:37:21 2017 -0700
 @@ -245,6 +245,8 @@
          osMap.put("SunOS-amd64-64", "/usr/lib/mps/64/");
          osMap.put("Linux-i386-32", "/usr/lib/");
@@ -47634,8 +47653,8 @@
      }
  
      private final static char[] hexDigits = "0123456789abcdef".toCharArray();
---- ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -50,19 +50,7 @@
  
  OS=`uname -s`
@@ -47657,8 +47676,8 @@
      FS="/"
      PS=":"
      CP="${FS}bin${FS}cp"
---- ./jdk/test/sun/security/pkcs11/Provider/Login.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/sun/security/pkcs11/Provider/Login.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/sun/security/pkcs11/Provider/Login.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/sun/security/pkcs11/Provider/Login.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -51,19 +51,7 @@
  
  OS=`uname -s`
@@ -47680,8 +47699,8 @@
      FS="/"
      PS=":"
      CP="${FS}bin${FS}cp"
---- ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -44,11 +44,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47695,8 +47714,8 @@
      PATHSEP=":"
      FILESEP="/"
      ;;
---- ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -47,15 +47,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47714,8 +47733,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -33,7 +33,7 @@
  
  OS=`uname -s`
@@ -47725,8 +47744,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -42,7 +42,7 @@
  
  OS=`uname -s`
@@ -47736,8 +47755,8 @@
          FILESEP="/"
          PATHSEP=":"
          ;;
---- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -32,7 +32,7 @@
  HOSTNAME=`uname -n`
  OS=`uname -s`
@@ -47747,8 +47766,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -32,7 +32,7 @@
  HOSTNAME=`uname -n`
  OS=`uname -s`
@@ -47758,8 +47777,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -46,7 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47769,8 +47788,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -46,7 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47780,8 +47799,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/jarsigner/diffend.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/sun/security/tools/jarsigner/diffend.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/sun/security/tools/jarsigner/diffend.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/sun/security/tools/jarsigner/diffend.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -41,7 +41,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47791,8 +47810,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/jarsigner/oldsig.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/sun/security/tools/jarsigner/oldsig.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/sun/security/tools/jarsigner/oldsig.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/sun/security/tools/jarsigner/oldsig.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -42,7 +42,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47802,8 +47821,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -46,7 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47813,8 +47832,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -47,15 +47,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47832,8 +47851,8 @@
      PATHSEP=":"
      FILESEP="/"
      ;;
---- ./jdk/test/sun/security/tools/keytool/NoExtNPE.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/sun/security/tools/keytool/NoExtNPE.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/sun/security/tools/keytool/NoExtNPE.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/sun/security/tools/keytool/NoExtNPE.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -42,13 +42,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47849,8 +47868,8 @@
      FILESEP="/"
      ;;
    AIX )
---- ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -45,7 +45,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47860,8 +47879,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -46,7 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47871,8 +47890,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/keytool/autotest.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/sun/security/tools/keytool/autotest.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/sun/security/tools/keytool/autotest.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/sun/security/tools/keytool/autotest.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -71,6 +71,27 @@
              "/usr/lib/x86_64-linux-gnu/nss/libsoftokn3.so"`
      fi
@@ -47901,8 +47920,8 @@
    * )
      echo "Will not run test on: ${OS}"
      exit 0;
---- ./jdk/test/sun/security/tools/keytool/i18n.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/sun/security/tools/keytool/i18n.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/sun/security/tools/keytool/i18n.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/sun/security/tools/keytool/i18n.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -46,7 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47912,8 +47931,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/keytool/printssl.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/sun/security/tools/keytool/printssl.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/sun/security/tools/keytool/printssl.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/sun/security/tools/keytool/printssl.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -37,7 +37,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47923,8 +47942,8 @@
      FS="/"
      ;;
    CYGWIN* )
---- ./jdk/test/sun/security/tools/keytool/resource.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/sun/security/tools/keytool/resource.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/sun/security/tools/keytool/resource.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/sun/security/tools/keytool/resource.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -43,7 +43,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47934,8 +47953,8 @@
      NULL=/dev/null
      FS="/"
      ;;
---- ./jdk/test/sun/security/tools/keytool/standard.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/sun/security/tools/keytool/standard.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/sun/security/tools/keytool/standard.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/sun/security/tools/keytool/standard.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -44,7 +44,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47945,8 +47964,8 @@
      FS="/"
      ;;
    Windows_* )
---- ./jdk/test/sun/security/tools/policytool/Alias.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/sun/security/tools/policytool/Alias.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/sun/security/tools/policytool/Alias.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/sun/security/tools/policytool/Alias.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -47,7 +47,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47956,8 +47975,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/policytool/ChangeUI.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/sun/security/tools/policytool/ChangeUI.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/sun/security/tools/policytool/ChangeUI.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/sun/security/tools/policytool/ChangeUI.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -46,7 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47967,8 +47986,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -46,7 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47978,8 +47997,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/policytool/SaveAs.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/sun/security/tools/policytool/SaveAs.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/sun/security/tools/policytool/SaveAs.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/sun/security/tools/policytool/SaveAs.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -47,7 +47,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47989,8 +48008,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -46,7 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48000,8 +48019,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/policytool/UsePolicy.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/sun/security/tools/policytool/UsePolicy.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/sun/security/tools/policytool/UsePolicy.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/sun/security/tools/policytool/UsePolicy.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -46,7 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48011,8 +48030,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/policytool/i18n.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/sun/security/tools/policytool/i18n.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/sun/security/tools/policytool/i18n.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/sun/security/tools/policytool/i18n.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -46,7 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48023,7 +48042,7 @@
      PS=":"
      FS="/"
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh	Sun May 28 23:44:03 2017 -0700
++++ ./jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -0,0 +1,111 @@
 +#
 +# Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
@@ -48136,8 +48155,8 @@
 +
 +   else fail "unspecified test failure"
 +fi
---- ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -54,7 +54,7 @@
  
  OS=`uname -s`
@@ -48147,8 +48166,8 @@
        PATHSEP=":"
        ;;
  
---- ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -33,7 +33,7 @@
  
  case `uname -s` in
@@ -48158,8 +48177,8 @@
  esac
  
  N2A=$TESTJAVA/bin/native2ascii
---- ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh	Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh	Sun May 28 23:44:03 2017 -0700
+--- ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh	Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh	Thu Sep 07 23:37:21 2017 -0700
 @@ -56,7 +56,7 @@
  
  OS=`uname -s`
@@ -48169,8 +48188,8 @@
        PATHSEP=":"
        ;;
  
---- ./langtools/.hgtags	Thu Apr 27 06:11:41 2017 +0100
-+++ ./langtools/.hgtags	Sun May 28 21:31:38 2017 -0700
+--- ./langtools/.hgtags	Tue Aug 01 14:12:29 2017 +0100
++++ ./langtools/.hgtags	Thu Sep 07 23:37:13 2017 -0700
 @@ -123,6 +123,7 @@
  9425dd4f53d5bfcd992d9aecea0eb7d8b2d4f62b jdk7-b146
  d34578643d1c6c752d4a6b5e79c6ab1b60850b4a jdk7u1-b01
@@ -48179,13 +48198,13 @@
  cd2cc8b5edb045b950aed46d159b4fb8fc2fd1df jdk7u1-b02
  82820a30201dbf4b80f1916f3d0f4a92ad21b61a jdk7u1-b03
  baa2c13c70fea3d6e259a34f0903197fdceb64b5 jdk7u1-b04
-@@ -612,3 +613,4 @@
- 240ca8086e7151b5c516b5b46d84201e4e8f5806 jdk7u131-b00
- b1802aa8be3a49d2a5c07160f2406165e309efde jdk7u141-b00
+@@ -614,3 +615,4 @@
  853798299f7a4f38745632dc256219fbf75f861e jdk7u141-b01
-+ba8ba083c4392a1ddfe40467de1e08d77443807e jdk7u141-b02
---- ./langtools/test/Makefile	Thu Apr 27 06:11:41 2017 +0100
-+++ ./langtools/test/Makefile	Sun May 28 21:31:38 2017 -0700
+ ba8ba083c4392a1ddfe40467de1e08d77443807e jdk7u141-b02
+ 4624941508c189c7b81c3393664741640a9b0467 jdk7u151-b00
++205349c408f4715dbbaf428ceafca676e2333979 jdk7u151-b01
+--- ./langtools/test/Makefile	Tue Aug 01 14:12:29 2017 +0100
++++ ./langtools/test/Makefile	Thu Sep 07 23:37:13 2017 -0700
 @@ -45,6 +45,14 @@
      ARCH=i586
    endif
@@ -48221,8 +48240,8 @@
  
  # Root of all test results
  TEST_OUTPUT_DIR = $(TEST_ROOT)/../build/$(PLATFORM)-$(ARCH)/test/langtools
---- ./langtools/test/tools/javac/4846262/Test.sh	Thu Apr 27 06:11:41 2017 +0100
-+++ ./langtools/test/tools/javac/4846262/Test.sh	Sun May 28 21:31:38 2017 -0700
+--- ./langtools/test/tools/javac/4846262/Test.sh	Tue Aug 01 14:12:29 2017 +0100
++++ ./langtools/test/tools/javac/4846262/Test.sh	Thu Sep 07 23:37:13 2017 -0700
 @@ -44,7 +44,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48232,8 +48251,8 @@
      FS="/"
      ;;
    CYGWIN* )
---- ./langtools/test/tools/javac/6302184/T6302184.sh	Thu Apr 27 06:11:41 2017 +0100
-+++ ./langtools/test/tools/javac/6302184/T6302184.sh	Sun May 28 21:31:38 2017 -0700
+--- ./langtools/test/tools/javac/6302184/T6302184.sh	Tue Aug 01 14:12:29 2017 +0100
++++ ./langtools/test/tools/javac/6302184/T6302184.sh	Thu Sep 07 23:37:13 2017 -0700
 @@ -41,7 +41,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48243,8 +48262,8 @@
      FS="/"
      ;;
    CYGWIN* )
---- ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh	Thu Apr 27 06:11:41 2017 +0100
-+++ ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh	Sun May 28 21:31:38 2017 -0700
+--- ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh	Tue Aug 01 14:12:29 2017 +0100
++++ ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh	Thu Sep 07 23:37:13 2017 -0700
 @@ -56,7 +56,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48254,8 +48273,8 @@
      FS="/"
      CHMOD="${FS}bin${FS}chmod"
      ;;
---- ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh	Thu Apr 27 06:11:41 2017 +0100
-+++ ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh	Sun May 28 21:31:38 2017 -0700
+--- ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh	Tue Aug 01 14:12:29 2017 +0100
++++ ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh	Thu Sep 07 23:37:13 2017 -0700
 @@ -54,7 +54,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48265,8 +48284,8 @@
      PS=":"
      FS="/"
      ;;
---- ./langtools/test/tools/javac/MissingInclude.sh	Thu Apr 27 06:11:41 2017 +0100
-+++ ./langtools/test/tools/javac/MissingInclude.sh	Sun May 28 21:31:38 2017 -0700
+--- ./langtools/test/tools/javac/MissingInclude.sh	Tue Aug 01 14:12:29 2017 +0100
++++ ./langtools/test/tools/javac/MissingInclude.sh	Thu Sep 07 23:37:13 2017 -0700
 @@ -47,7 +47,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48276,8 +48295,8 @@
      FS="/"
      ;;
    Windows* )
---- ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh	Thu Apr 27 06:11:41 2017 +0100
-+++ ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh	Sun May 28 21:31:38 2017 -0700
+--- ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh	Tue Aug 01 14:12:29 2017 +0100
++++ ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh	Thu Sep 07 23:37:13 2017 -0700
 @@ -52,7 +52,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48287,8 +48306,8 @@
      PS=":"
      FS="/"
      ;;
---- ./langtools/test/tools/javac/T5090006/compiler.sh	Thu Apr 27 06:11:41 2017 +0100
-+++ ./langtools/test/tools/javac/T5090006/compiler.sh	Sun May 28 21:31:38 2017 -0700
+--- ./langtools/test/tools/javac/T5090006/compiler.sh	Tue Aug 01 14:12:29 2017 +0100
++++ ./langtools/test/tools/javac/T5090006/compiler.sh	Thu Sep 07 23:37:13 2017 -0700
 @@ -47,7 +47,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48298,8 +48317,8 @@
      FS="/"
      ;;
    Windows* )
---- ./langtools/test/tools/javac/apt.sh	Thu Apr 27 06:11:41 2017 +0100
-+++ ./langtools/test/tools/javac/apt.sh	Sun May 28 21:31:38 2017 -0700
+--- ./langtools/test/tools/javac/apt.sh	Tue Aug 01 14:12:29 2017 +0100
++++ ./langtools/test/tools/javac/apt.sh	Thu Sep 07 23:37:13 2017 -0700
 @@ -38,7 +38,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48309,8 +48328,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./langtools/test/tools/javac/constDebug/ConstDebug.sh	Thu Apr 27 06:11:41 2017 +0100
-+++ ./langtools/test/tools/javac/constDebug/ConstDebug.sh	Sun May 28 21:31:38 2017 -0700
+--- ./langtools/test/tools/javac/constDebug/ConstDebug.sh	Tue Aug 01 14:12:29 2017 +0100
++++ ./langtools/test/tools/javac/constDebug/ConstDebug.sh	Thu Sep 07 23:37:13 2017 -0700
 @@ -47,7 +47,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48320,8 +48339,8 @@
      PS=":"
      FS="/"
      ;;
---- ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh	Thu Apr 27 06:11:41 2017 +0100
-+++ ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh	Sun May 28 21:31:38 2017 -0700
+--- ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh	Tue Aug 01 14:12:29 2017 +0100
++++ ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh	Thu Sep 07 23:37:13 2017 -0700
 @@ -48,7 +48,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48331,8 +48350,8 @@
      FS="/"
      ;;
    CYGWIN* )
---- ./langtools/test/tools/javac/innerClassFile/Driver.sh	Thu Apr 27 06:11:41 2017 +0100
-+++ ./langtools/test/tools/javac/innerClassFile/Driver.sh	Sun May 28 21:31:38 2017 -0700
+--- ./langtools/test/tools/javac/innerClassFile/Driver.sh	Tue Aug 01 14:12:29 2017 +0100
++++ ./langtools/test/tools/javac/innerClassFile/Driver.sh	Thu Sep 07 23:37:13 2017 -0700
 @@ -53,7 +53,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48342,8 +48361,8 @@
      FS="/"
      ;;
    Windows* )
---- ./langtools/test/tools/javac/javazip/Test.sh	Thu Apr 27 06:11:41 2017 +0100
-+++ ./langtools/test/tools/javac/javazip/Test.sh	Sun May 28 21:31:38 2017 -0700
+--- ./langtools/test/tools/javac/javazip/Test.sh	Tue Aug 01 14:12:29 2017 +0100
++++ ./langtools/test/tools/javac/javazip/Test.sh	Thu Sep 07 23:37:13 2017 -0700
 @@ -41,7 +41,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48353,8 +48372,8 @@
      FS="/"
      SCR=`pwd`
      ;;
---- ./langtools/test/tools/javac/links/links.sh	Thu Apr 27 06:11:41 2017 +0100
-+++ ./langtools/test/tools/javac/links/links.sh	Sun May 28 21:31:38 2017 -0700
+--- ./langtools/test/tools/javac/links/links.sh	Tue Aug 01 14:12:29 2017 +0100
++++ ./langtools/test/tools/javac/links/links.sh	Thu Sep 07 23:37:13 2017 -0700
 @@ -53,7 +53,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48364,8 +48383,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./langtools/test/tools/javac/newlines/Newlines.sh	Thu Apr 27 06:11:41 2017 +0100
-+++ ./langtools/test/tools/javac/newlines/Newlines.sh	Sun May 28 21:31:38 2017 -0700
+--- ./langtools/test/tools/javac/newlines/Newlines.sh	Tue Aug 01 14:12:29 2017 +0100
++++ ./langtools/test/tools/javac/newlines/Newlines.sh	Thu Sep 07 23:37:13 2017 -0700
 @@ -50,7 +50,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48375,8 +48394,8 @@
      FS="/"
      ;;
    Windows* )
---- ./langtools/test/tools/javac/stackmap/T4955930.sh	Thu Apr 27 06:11:41 2017 +0100
-+++ ./langtools/test/tools/javac/stackmap/T4955930.sh	Sun May 28 21:31:38 2017 -0700
+--- ./langtools/test/tools/javac/stackmap/T4955930.sh	Tue Aug 01 14:12:29 2017 +0100
++++ ./langtools/test/tools/javac/stackmap/T4955930.sh	Thu Sep 07 23:37:13 2017 -0700
 @@ -41,7 +41,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48386,8 +48405,8 @@
      FS="/"
      ;;
    Windows_95 | Windows_98 | Windows_NT )
---- ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh	Thu Apr 27 06:11:41 2017 +0100
-+++ ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh	Sun May 28 21:31:38 2017 -0700
+--- ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh	Tue Aug 01 14:12:29 2017 +0100
++++ ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh	Thu Sep 07 23:37:13 2017 -0700
 @@ -55,7 +55,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48397,8 +48416,8 @@
      if [ -d /usr/lib/locale/en_US.UTF-8 -o -d /usr/lib/locale/en_US.utf8 ]
      then
          ENV="env LANG=en_US.UTF-8"
---- ./langtools/test/tools/javah/6257087/foo.sh	Thu Apr 27 06:11:41 2017 +0100
-+++ ./langtools/test/tools/javah/6257087/foo.sh	Sun May 28 21:31:38 2017 -0700
+--- ./langtools/test/tools/javah/6257087/foo.sh	Tue Aug 01 14:12:29 2017 +0100
++++ ./langtools/test/tools/javah/6257087/foo.sh	Thu Sep 07 23:37:13 2017 -0700
 @@ -41,7 +41,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48408,8 +48427,8 @@
      PS=":"
      FS="/"
      ;;
---- ./langtools/test/tools/javah/ConstMacroTest.sh	Thu Apr 27 06:11:41 2017 +0100
-+++ ./langtools/test/tools/javah/ConstMacroTest.sh	Sun May 28 21:31:38 2017 -0700
+--- ./langtools/test/tools/javah/ConstMacroTest.sh	Tue Aug 01 14:12:29 2017 +0100
++++ ./langtools/test/tools/javah/ConstMacroTest.sh	Thu Sep 07 23:37:13 2017 -0700
 @@ -56,7 +56,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48419,8 +48438,8 @@
      PS=":"
      FS="/"
      ;;
---- ./langtools/test/tools/javah/MissingParamClassTest.sh	Thu Apr 27 06:11:41 2017 +0100
-+++ ./langtools/test/tools/javah/MissingParamClassTest.sh	Sun May 28 21:31:38 2017 -0700
+--- ./langtools/test/tools/javah/MissingParamClassTest.sh	Tue Aug 01 14:12:29 2017 +0100
++++ ./langtools/test/tools/javah/MissingParamClassTest.sh	Thu Sep 07 23:37:13 2017 -0700
 @@ -58,7 +58,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48430,8 +48449,8 @@
      PS=":"
      FS="/"
      ;;
---- ./langtools/test/tools/javah/ReadOldClass.sh	Thu Apr 27 06:11:41 2017 +0100
-+++ ./langtools/test/tools/javah/ReadOldClass.sh	Sun May 28 21:31:38 2017 -0700
+--- ./langtools/test/tools/javah/ReadOldClass.sh	Tue Aug 01 14:12:29 2017 +0100
++++ ./langtools/test/tools/javah/ReadOldClass.sh	Thu Sep 07 23:37:13 2017 -0700
 @@ -43,7 +43,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48441,8 +48460,8 @@
      PS=":"
      FS="/"
      ;;
---- ./langtools/test/tools/javap/pathsep.sh	Thu Apr 27 06:11:41 2017 +0100
-+++ ./langtools/test/tools/javap/pathsep.sh	Sun May 28 21:31:38 2017 -0700
+--- ./langtools/test/tools/javap/pathsep.sh	Tue Aug 01 14:12:29 2017 +0100
++++ ./langtools/test/tools/javap/pathsep.sh	Thu Sep 07 23:37:13 2017 -0700
 @@ -40,7 +40,7 @@
  # set platform-dependent variables
  OS=`uname -s`
diff --git a/java/openjdk7/files/patch-hotspot_src_share_vm_opto_lcm.cpp b/java/openjdk7/files/patch-hotspot_src_share_vm_opto_lcm.cpp
deleted file mode 100644
index cc4f623ccd8e..000000000000
--- a/java/openjdk7/files/patch-hotspot_src_share_vm_opto_lcm.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- hotspot/src/share/vm/opto/lcm.cpp.orig	2017-05-30 23:06:51 UTC
-+++ hotspot/src/share/vm/opto/lcm.cpp
-@@ -57,7 +57,7 @@
- // Check whether val is not-null-decoded compressed oop,
- // i.e. will grab into the base of the heap if it represents NULL.
- static bool accesses_heap_base_zone(Node *val) {
--  if (Universe::narrow_oop_base() > 0) { // Implies UseCompressedOops.
-+  if (Universe::narrow_oop_base() != NULL) { // Implies UseCompressedOops.
-     if (val && val->is_Mach()) {
-       if (val->as_Mach()->ideal_Opcode() == Op_DecodeN) {
-         // This assumes all Decodes with TypePtr::NotNull are matched to nodes that
diff --git a/java/openjdk8/files/patch-hotspot-src-os-bsd-vm-os_bsd.cpp b/java/openjdk8/files/patch-hotspot-src-os-bsd-vm-os_bsd.cpp
index f66e7637372f..09594d524ca7 100644
--- a/java/openjdk8/files/patch-hotspot-src-os-bsd-vm-os_bsd.cpp
+++ b/java/openjdk8/files/patch-hotspot-src-os-bsd-vm-os_bsd.cpp
@@ -1,6 +1,16 @@
---- ./hotspot/src/os/bsd/vm/os_bsd.cpp	2016-06-01 20:57:38.276230000 -0500
-+++ ./hotspot/src/os/bsd/vm/os_bsd.cpp	2016-06-01 20:56:46.380667000 -0500
-@@ -767,6 +767,11 @@
+--- hotspot/src/os/bsd/vm/os_bsd.cpp.orig	2017-09-06 22:12:44 UTC
++++ hotspot/src/os/bsd/vm/os_bsd.cpp
+@@ -189,7 +189,9 @@ julong os::Bsd::available_memory() {
+ #ifdef __FreeBSD__
+   static const char *vm_stats[] = {
+     "vm.stats.vm.v_free_count",
++#if __FreeBSD_version < 1200016
+     "vm.stats.vm.v_cache_count",
++#endif
+     "vm.stats.vm.v_inactive_count"
+   };
+   size_t size;
+@@ -775,6 +777,11 @@ static void *java_start(Thread *thread)
    guarantee(unique_thread_id != 0, "unique thread id was not found");
    osthread->set_unique_thread_id(unique_thread_id);
  #endif
@@ -12,7 +22,7 @@
    // initialize signal mask for this thread
    os::Bsd::hotspot_sigmask(thread);
  
-@@ -930,6 +935,11 @@
+@@ -938,6 +945,11 @@ bool os::create_attached_thread(JavaThre
    guarantee(unique_thread_id != 0, "just checking");
    osthread->set_unique_thread_id(unique_thread_id);
  #endif
diff --git a/java/openjdk8/files/patch-jdk_src_solaris_native_sun_management_OperatingSystemImpl.c b/java/openjdk8/files/patch-jdk_src_solaris_native_sun_management_OperatingSystemImpl.c
index 419e6c3f5cf7..53d58ea2a877 100644
--- a/java/openjdk8/files/patch-jdk_src_solaris_native_sun_management_OperatingSystemImpl.c
+++ b/java/openjdk8/files/patch-jdk_src_solaris_native_sun_management_OperatingSystemImpl.c
@@ -1,6 +1,16 @@
---- jdk/src/solaris/native/sun/management/OperatingSystemImpl.c.orig	2015-12-10 18:40:39 UTC
+--- jdk/src/solaris/native/sun/management/OperatingSystemImpl.c.orig	2017-09-06 22:12:44 UTC
 +++ jdk/src/solaris/native/sun/management/OperatingSystemImpl.c
-@@ -435,11 +435,6 @@ Java_sun_management_OperatingSystemImpl_
+@@ -368,7 +368,9 @@ Java_sun_management_OperatingSystemImpl_
+ #elif defined(__FreeBSD__)
+     static const char *vm_stats[] = {
+        "vm.stats.vm.v_free_count",
++#if __FreeBSD_version < 1200016
+        "vm.stats.vm.v_cache_count",
++#endif
+        /* "vm.stats.vm.v_inactive_count", */
+        NULL
+     };
+@@ -435,11 +437,6 @@ Java_sun_management_OperatingSystemImpl_
  }
  
  
diff --git a/java/openjfx8-devel/Makefile b/java/openjfx8-devel/Makefile
index 992c1c833337..9fa20bcb5bb0 100644
--- a/java/openjfx8-devel/Makefile
+++ b/java/openjfx8-devel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	openjfx8
 PORTVERSION=	20170722
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java x11-toolkits devel
 MASTER_SITES=	https://bitbucket.org/tobik/openjfx-rt/get/freebsd${PORTVERSION}${EXTRACT_SUFX}?dummy=/
 PKGNAMESUFFIX=	-devel
diff --git a/java/sigar/Makefile b/java/sigar/Makefile
index 64011b3671b4..429e392f1895 100644
--- a/java/sigar/Makefile
+++ b/java/sigar/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	sigar
 PORTVERSION=	1.7.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	java devel
 PKGNAMEPREFIX=	java-
 
diff --git a/lang/afnix/Makefile b/lang/afnix/Makefile
index 2ca49d573cc2..2e1658720ad3 100644
--- a/lang/afnix/Makefile
+++ b/lang/afnix/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	afnix
 PORTVERSION=	2.6.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	http://www.afnix.org/ftp/ \
 		ftp://ftp.stack.nl/pub/users/johans/afnix/
diff --git a/lang/alchemist.el/Makefile b/lang/alchemist.el/Makefile
index 5d8708803575..b91c5d0bde2a 100644
--- a/lang/alchemist.el/Makefile
+++ b/lang/alchemist.el/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	alchemist.el
 PORTVERSION=	1.8.2
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	lang
 
diff --git a/lang/angelscript/Makefile b/lang/angelscript/Makefile
index e26f0b86be80..b60a7938b925 100644
--- a/lang/angelscript/Makefile
+++ b/lang/angelscript/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	angelscript
 PORTVERSION=	2.29.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	http://www.angelcode.com/angelscript/sdk/files/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
diff --git a/lang/cilkplus/Makefile b/lang/cilkplus/Makefile
index 75b1a6504ca6..f4e89137add1 100644
--- a/lang/cilkplus/Makefile
+++ b/lang/cilkplus/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cilkplus
 PORTVERSION=	20160603
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang devel
 MASTER_SITES=	https://www.cilkplus.org/sites/default/files/runtime_source/
 PKGNAMESUFFIX=	-rtl
diff --git a/lang/cint/Makefile b/lang/cint/Makefile
index f8aa8676e57c..9b778220298d 100644
--- a/lang/cint/Makefile
+++ b/lang/cint/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cint
 PORTVERSION=	5.18.00
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	lang
 MASTER_SITES=	http://root.cern.ch/drupal/sites/default/files/
 
diff --git a/lang/cjs/Makefile b/lang/cjs/Makefile
index ee9139c40bae..f6625b1078b7 100644
--- a/lang/cjs/Makefile
+++ b/lang/cjs/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cjs
 PORTVERSION=	2.4.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	lang gnome
 DIST_SUBDIR=	gnome3
 
diff --git a/lang/clang34/Makefile b/lang/clang34/Makefile
index 689de2fdb11f..ad404fee47f5 100644
--- a/lang/clang34/Makefile
+++ b/lang/clang34/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	clang
 DISTVERSION=	3.4.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	lang devel
 MASTER_SITES=	http://llvm.org/releases/${PORTVERSION}/
 PKGNAMESUFFIX=	${LLVM_SUFFIX}
diff --git a/lang/clang35/Makefile b/lang/clang35/Makefile
index cc2ed22f9856..9c211ed70aaf 100644
--- a/lang/clang35/Makefile
+++ b/lang/clang35/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	clang
 DISTVERSION=	3.5.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	lang devel
 MASTER_SITES=   http://llvm.org/releases/3.5.2/
 PKGNAMESUFFIX=	${LLVM_SUFFIX}
diff --git a/lang/cling/Makefile b/lang/cling/Makefile
index dea822ee573d..1449918ae40b 100644
--- a/lang/cling/Makefile
+++ b/lang/cling/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=		cling
 PORTVERSION=		0.4
-PORTREVISION?=		2
+PORTREVISION?=		3
 CATEGORIES=		lang devel
 MASTER_SITES=		https://root.cern.ch/download/cling/
 DISTNAME=		${PORTNAME}_2016-12-29_sources
diff --git a/lang/clojure-mode.el/Makefile b/lang/clojure-mode.el/Makefile
index 131e7d294d2e..2ae155d87d6c 100644
--- a/lang/clojure-mode.el/Makefile
+++ b/lang/clojure-mode.el/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	clojure-mode.el
 PORTVERSION=	5.6.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	lang elisp
 
diff --git a/lang/csharp-mode.el/Makefile b/lang/csharp-mode.el/Makefile
index 42e50e479ae2..96a0829d9ec6 100644
--- a/lang/csharp-mode.el/Makefile
+++ b/lang/csharp-mode.el/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	csharp-mode.el
 PORTVERSION=	0.9.0
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	lang elisp
 
diff --git a/lang/elixir-mode.el/Makefile b/lang/elixir-mode.el/Makefile
index 5211ed134783..28a52ff9e1b7 100644
--- a/lang/elixir-mode.el/Makefile
+++ b/lang/elixir-mode.el/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	elixir-mode.el
 PORTVERSION=	2.3.1
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	lang
 
diff --git a/lang/erlang-runtime15/Makefile b/lang/erlang-runtime15/Makefile
index 56ff39fd4c54..baf77230b756 100644
--- a/lang/erlang-runtime15/Makefile
+++ b/lang/erlang-runtime15/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	erlang
 PORTVERSION=	15.b.03.1
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	lang parallel java
 MASTER_SITES=	http://www.erlang.org/download/:erlangorg		\
 		http://erlang.stacken.kth.se/download/:erlangorg	\
diff --git a/lang/erlang-runtime16/Makefile b/lang/erlang-runtime16/Makefile
index 2eef977af781..b62f4d652604 100644
--- a/lang/erlang-runtime16/Makefile
+++ b/lang/erlang-runtime16/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	erlang
 PORTVERSION=	16.b.03.1
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	lang parallel java
 MASTER_SITES=	http://www.erlang.org/download/:erlangorg		\
 		http://erlang.stacken.kth.se/download/:erlangorg	\
diff --git a/lang/erlang-runtime17/Makefile b/lang/erlang-runtime17/Makefile
index c368ac4a246f..119977dd4894 100644
--- a/lang/erlang-runtime17/Makefile
+++ b/lang/erlang-runtime17/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	erlang
 PORTVERSION=	17.5.6.9
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	lang parallel java
 MASTER_SITES=	http://www.erlang.org/download/:erlangorg		\
 		http://erlang.stacken.kth.se/download/:erlangorg	\
diff --git a/lang/erlang-runtime18/Makefile b/lang/erlang-runtime18/Makefile
index 9e4ac5b31008..18b86f815374 100644
--- a/lang/erlang-runtime18/Makefile
+++ b/lang/erlang-runtime18/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	erlang
 PORTVERSION=	18.3.4.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang parallel java
 MASTER_SITES=	http://www.erlang.org/download/:erlangorg		\
 		http://erlang.stacken.kth.se/download/:erlangorg	\
diff --git a/lang/fpc-tcl/Makefile b/lang/fpc-tcl/Makefile
index db00f7032222..83b0c3dbfa8c 100644
--- a/lang/fpc-tcl/Makefile
+++ b/lang/fpc-tcl/Makefile
@@ -6,6 +6,10 @@ PKGNAMESUFFIX=	-tcl
 
 COMMENT=	Free Pascal interface to the tcl/tk interpreter
 
+DEPRECATED=		This port depends on Tcl/Tk 8.4 , which is no longer\
+			maintained. Please port it to 8.5+
+EXPIRATION_DATE=	2017-10-15
+
 USE_FPC=	fcl-base
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
diff --git a/lang/gambit-c/Makefile b/lang/gambit-c/Makefile
index 65d127408b8e..3198cbe566e7 100644
--- a/lang/gambit-c/Makefile
+++ b/lang/gambit-c/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gambit-c
 PORTVERSION=	4.8.8
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 PORTEPOCH=	1
 CATEGORIES=	lang
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 42c0315376f1..1ac28d75436e 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gcc
-PORTVERSION=	5.4.0
-PORTREVISION=	2
+PORTVERSION=	${GCC_DEFAULT}
 CATEGORIES=	lang java
 MASTER_SITES=	# not applicable
 DISTFILES=	# not applicable
diff --git a/lang/gcc5-devel/Makefile b/lang/gcc5-devel/Makefile
index 789123b32971..d50bf2b16ac1 100644
--- a/lang/gcc5-devel/Makefile
+++ b/lang/gcc5-devel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gcc
-PORTVERSION=	5.4.1.s20170829
+PORTVERSION=	5.4.1.s20170905
 CATEGORIES=	lang java
 MASTER_SITES=	GCC/snapshots/${DIST_VERSION}
 PKGNAMESUFFIX=	${SUFFIX}-devel
@@ -15,6 +15,7 @@ LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
 ONLY_FOR_ARCHS=	aarch64 amd64 arm armv6 i386 powerpc powerpc64 sparc64
+
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libmpc.so:math/mpc
diff --git a/lang/gcc5-devel/distinfo b/lang/gcc5-devel/distinfo
index 6f1befd3d1a1..b2abae739e8c 100644
--- a/lang/gcc5-devel/distinfo
+++ b/lang/gcc5-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504125205
-SHA256 (gcc-5-20170829.tar.xz) = db247faf2738f85a002ee9e7b5941bf1f8a4b45d81703535188918ca9b48fcd4
-SIZE (gcc-5-20170829.tar.xz) = 69373312
+TIMESTAMP = 1504873792
+SHA256 (gcc-5-20170905.tar.xz) = ae7aa2d791329599bdebaf6f3a1aa4ec56194e8b0a6f5bcb5bca2154a6a17bec
+SIZE (gcc-5-20170905.tar.xz) = 69376996
diff --git a/lang/gcc5/Makefile b/lang/gcc5/Makefile
index 9a6d520a87f5..f420ceb1b841 100644
--- a/lang/gcc5/Makefile
+++ b/lang/gcc5/Makefile
@@ -14,6 +14,9 @@ COMMENT=	GNU Compiler Collection 5
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
+ONLY_FOR_ARCHS=	aarch64 amd64 arm armv6 i386 powerpc powerpc64 sparc64
+BROKEN_sparc64=	Does not build: bootstrap comparison failure
+
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libmpc.so:math/mpc
@@ -29,7 +32,6 @@ CPE_VENDOR=	gnu
 
 GCC_VERSION=	${PORTVERSION}
 SUFFIX=		${PORTVERSION:C/([0-9]+).*/\1/}
-ONLY_FOR_ARCHS=	aarch64 amd64 arm armv6 i386 powerpc powerpc64 sparc64
 USES=		compiler cpe gmake iconv libtool makeinfo perl5 tar:bzip2
 USE_BINUTILS=	yes
 USE_PERL5=	build
@@ -78,7 +80,6 @@ MAKE_ARGS+=STAGE1_CXXFLAGS=-fbracket-depth=512
 . endif
 .endif
 
-BROKEN_sparc64=	Does not build: bootstrap comparison failure
 LANGUAGES:=	c,c++,objc,fortran
 TARGLIB=	${PREFIX}/lib/gcc${SUFFIX}
 LIBEXEC=	${PREFIX}/libexec/gcc${SUFFIX}
diff --git a/lang/gcc6-devel/Makefile b/lang/gcc6-devel/Makefile
index 5e7fc52ebec3..a841d62bfcf5 100644
--- a/lang/gcc6-devel/Makefile
+++ b/lang/gcc6-devel/Makefile
@@ -2,7 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	gcc
-PORTVERSION=	6.4.1.s20170830
+PORTVERSION=	6.4.1.s20170906
+PORTREVISION=	1
 CATEGORIES=	lang java
 MASTER_SITES=	GCC/snapshots/${DIST_VERSION}
 PKGNAMESUFFIX=	${SUFFIX}-devel
@@ -15,6 +16,7 @@ LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
 ONLY_FOR_ARCHS=	aarch64 amd64 arm armv6 i386 powerpc powerpc64 sparc64
+
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libmpc.so:math/mpc
diff --git a/lang/gcc6-devel/distinfo b/lang/gcc6-devel/distinfo
index c60e8b3f334a..2e4e3c08299a 100644
--- a/lang/gcc6-devel/distinfo
+++ b/lang/gcc6-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504350601
-SHA256 (gcc-6-20170830.tar.xz) = 169a3bd16c43ed55b820fe50ee603671b4003956abc1cbed7ca4df51f23f404a
-SIZE (gcc-6-20170830.tar.xz) = 72586392
+TIMESTAMP = 1504873750
+SHA256 (gcc-6-20170906.tar.xz) = dd3f78d357a3dd88b6a6cd338fd03b844ada4e8e732257ad4135d153cac37585
+SIZE (gcc-6-20170906.tar.xz) = 72592608
diff --git a/lang/gcc6/Makefile b/lang/gcc6/Makefile
index 0fc43e4af2bd..cc3e7407dd5b 100644
--- a/lang/gcc6/Makefile
+++ b/lang/gcc6/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	6.4.0
+PORTREVISION=	1
 CATEGORIES=	lang java
 MASTER_SITES=	GCC/releases/gcc-${DISTVERSION}
 PKGNAMESUFFIX=	${SUFFIX}
@@ -13,14 +14,15 @@ COMMENT=	GNU Compiler Collection 6
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
+ONLY_FOR_ARCHS=	aarch64 amd64 arm armv6 i386 powerpc powerpc64 sparc64
+BROKEN_sparc64=	fails to configure: cannot compute suffix of object files: cannot compile
+
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libmpc.so:math/mpc
 BUILD_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 RUN_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 
-BROKEN_sparc64=		fails to configure: cannot compute suffix of object files: cannot compile
-
 .if defined(MAINTAINER_MODE)
 BUILD_DEPENDS+=	runtest:misc/dejagnu
 .endif
@@ -29,7 +31,6 @@ CPE_VENDOR=	gnu
 
 GCC_VERSION=	${PORTVERSION}
 SUFFIX=		${PORTVERSION:C/([0-9]+).*/\1/}
-ONLY_FOR_ARCHS=	aarch64 amd64 arm armv6 i386 powerpc powerpc64 sparc64
 USES=		compiler cpe gmake iconv libtool makeinfo perl5 tar:xz
 USE_BINUTILS=	yes
 USE_PERL5=	build
diff --git a/lang/gcc7-devel/Makefile b/lang/gcc7-devel/Makefile
index 089e76a06e53..e4a1a376fc1d 100644
--- a/lang/gcc7-devel/Makefile
+++ b/lang/gcc7-devel/Makefile
@@ -2,7 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	gcc
-PORTVERSION=	7.2.1.s20170831
+PORTVERSION=	7.2.1.s20170907
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	GCC/snapshots/${DIST_VERSION}
 PKGNAMESUFFIX=	${SUFFIX}-devel
@@ -15,6 +16,7 @@ LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
 ONLY_FOR_ARCHS=	aarch64 amd64 arm armv6 i386 powerpc powerpc64 sparc64
+
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libmpc.so:math/mpc
diff --git a/lang/gcc7-devel/distinfo b/lang/gcc7-devel/distinfo
index bc2f24cd99de..872f7bf97171 100644
--- a/lang/gcc7-devel/distinfo
+++ b/lang/gcc7-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504365447
-SHA256 (gcc-7-20170831.tar.xz) = 39b76c2a678cf4e0b275eceb7a03b89f2dd0788bc48774e5df2ff65492dde0ac
-SIZE (gcc-7-20170831.tar.xz) = 59100032
+TIMESTAMP = 1504873717
+SHA256 (gcc-7-20170907.tar.xz) = af37950ac7fc4996b4bdf22cbaaf5d1db52ff6490bfe3d83bcae5d5097645bc9
+SIZE (gcc-7-20170907.tar.xz) = 59108348
diff --git a/lang/gcc7/Makefile b/lang/gcc7/Makefile
index d33806273946..bd4ff420abd3 100644
--- a/lang/gcc7/Makefile
+++ b/lang/gcc7/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	7.2.0
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	GCC/releases/gcc-${DISTVERSION}
 PKGNAMESUFFIX=	${SUFFIX}
@@ -13,6 +14,8 @@ COMMENT=	GNU Compiler Collection 7
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
+ONLY_FOR_ARCHS=	aarch64 amd64 arm armv6 i386 powerpc powerpc64 sparc64
+
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libmpc.so:math/mpc
@@ -27,7 +30,6 @@ CPE_VENDOR=	gnu
 
 GCC_VERSION=	${PORTVERSION}
 SUFFIX=		${PORTVERSION:C/([0-9]+).*/\1/}
-ONLY_FOR_ARCHS=	aarch64 amd64 arm armv6 i386 powerpc powerpc64 sparc64
 USES=		compiler cpe gmake iconv libtool makeinfo perl5 tar:xz
 USE_BINUTILS=	yes
 USE_PERL5=	build
diff --git a/lang/gcc8-devel/Makefile b/lang/gcc8-devel/Makefile
index 6dca1c6dccb1..40adc1af6f53 100644
--- a/lang/gcc8-devel/Makefile
+++ b/lang/gcc8-devel/Makefile
@@ -2,7 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	gcc
-PORTVERSION=	8.0.0.s20170827
+PORTVERSION=	8.0.0.s20170910
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	GCC/snapshots/${DIST_VERSION}
 PKGNAMESUFFIX=	${SUFFIX}-devel
@@ -15,6 +16,7 @@ LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
 ONLY_FOR_ARCHS=	aarch64 amd64 arm armv6 i386 powerpc powerpc64 sparc64
+
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libmpc.so:math/mpc
diff --git a/lang/gcc8-devel/distinfo b/lang/gcc8-devel/distinfo
index 51f53bc1d461..df2d99332761 100644
--- a/lang/gcc8-devel/distinfo
+++ b/lang/gcc8-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504125231
-SHA256 (gcc-8-20170827.tar.xz) = 36a7d5357d7aa50d252fdd34d8020061e92162cf1c54ad23d8d1c39e4b773da9
-SIZE (gcc-8-20170827.tar.xz) = 59834872
+TIMESTAMP = 1505126116
+SHA256 (gcc-8-20170910.tar.xz) = dc120706ce1a6d208e3f514547be81ba711f32d73a6092bbdec373a2bc0fee48
+SIZE (gcc-8-20170910.tar.xz) = 59716644
diff --git a/lang/gcl/Makefile b/lang/gcl/Makefile
index a9b0cb6790e3..5e3ea12ec285 100644
--- a/lang/gcl/Makefile
+++ b/lang/gcl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gcl
 PORTVERSION=	2.6.12
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	lang tcl tk
 MASTER_SITES=	GNU
 
diff --git a/lang/gforth/Makefile b/lang/gforth/Makefile
index b3c71b108895..7b8148675d8d 100644
--- a/lang/gforth/Makefile
+++ b/lang/gforth/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gforth
 PORTVERSION=	0.7.3
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	lang
 MASTER_SITES=	http://www.complang.tuwien.ac.at/forth/gforth/ \
 		GNU
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 5b39c08b81d8..0085e185e735 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ghc
 PORTVERSION=	${GHC_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang haskell
 MASTER_SITES=	http://www.haskell.org/ghc/dist/${PORTVERSION}/:source \
 		LOCAL/pgj/:boot
diff --git a/lang/gprolog/Makefile b/lang/gprolog/Makefile
index 6d08447874df..a430dbfc59f3 100644
--- a/lang/gprolog/Makefile
+++ b/lang/gprolog/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gprolog
 PORTVERSION=	1.4.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	lang
 MASTER_SITES=	http://www.gprolog.org/
 
diff --git a/lang/haskell-mode.el/Makefile b/lang/haskell-mode.el/Makefile
index e8cae70387aa..8f0b837d30c8 100644
--- a/lang/haskell-mode.el/Makefile
+++ b/lang/haskell-mode.el/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	haskell-mode
 PORTVERSION=	16.1
+PORTREVISION=	1
 DISTVERSIONPREFIX=v
 CATEGORIES=	lang elisp
 
diff --git a/lang/hugs/Makefile b/lang/hugs/Makefile
index 487cb8429ac2..0b82f2a64c4c 100644
--- a/lang/hugs/Makefile
+++ b/lang/hugs/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	hugs98
 PORTVERSION=	200609
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	lang haskell
 MASTER_SITES=	http://cvs.haskell.org/Hugs/downloads/2006-09/
 DISTNAME=	${PORTNAME}-plus-${HUGS_DATE}
diff --git a/lang/icon/Makefile b/lang/icon/Makefile
index daef0006a0b4..b8843e428c8f 100644
--- a/lang/icon/Makefile
+++ b/lang/icon/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	icon
 PORTVERSION=	9.5.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	lang
 MASTER_SITES=	http://www.cs.arizona.edu/icon/ftp/packages/unix/
 DISTNAME=	${PORTNAME}-v${PORTVERSION:S/.//g}src
diff --git a/lang/io/Makefile b/lang/io/Makefile
index 36dd9127a5c0..9e332eb656bd 100644
--- a/lang/io/Makefile
+++ b/lang/io/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	io
-PORTVERSION=	2015.11.11
-PORTREVISION=	6
+PORTVERSION=	2017.09.06
 CATEGORIES=	lang
 
 MAINTAINER=	gahr@FreeBSD.org
@@ -13,11 +12,11 @@ LICENSE=	BSD3CLAUSE
 
 BROKEN_armv6=		fails to compile: ucontext.h: expected parameter declarator
 
+USES=		cmake:outsource,noninja compiler:c11 ssl
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	stevedekorte
-GH_TAGNAME=	23afbcc
 
-USES=		cmake:outsource,noninja compiler:c11
 MAKE_JOBS_UNSAFE=yes
 USE_LDCONFIG=	yes
 
@@ -48,4 +47,8 @@ post-install:
 	${MKDIR}  ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/samples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
+do-test:
+	cd ${BUILD_WRKSRC} && \
+	    ./_build/binaries/io ${WRKSRC}/libs/iovm/tests/correctness/run.io
+
 .include <bsd.port.mk>
diff --git a/lang/io/Makefile.addons b/lang/io/Makefile.addons
index da921ad16c7f..1f3c52cf92c8 100644
--- a/lang/io/Makefile.addons
+++ b/lang/io/Makefile.addons
@@ -17,6 +17,7 @@ DEFAULT_ADDONS=	AsyncRequest \
 		Loki \
 		MD5 \
 		NotificationCenter \
+		Oauth \
 		Obsidian \
 		Random \
 		Range \
@@ -39,6 +40,7 @@ DEFAULT_ADDONS=	AsyncRequest \
 #
 OPTIONAL_ADDONS=BigNum \
 		CFFI \
+		Cairo \
 		Clutter \
 		DBI \
 		EditLine \
@@ -72,6 +74,7 @@ OPTIONS_GROUP_ADDONS=${OPTIONAL_ADDONS}
 
 BigNum_LIB_DEPENDS=	libgmp.so:math/gmp
 CFFI_LIB_DEPENDS=	libffi.so:devel/libffi
+Cairo_USE=		GNOME=cairo
 Clutter_LIB_DEPENDS=	libclutter-glx-1.0.so:graphics/clutter
 DBI_LIB_DEPENDS=	libdbi.so:databases/libdbi
 EditLine_USES=		libedit
@@ -92,7 +95,7 @@ MySQL_USES=		mysql:client
 Ogg_LIB_DEPENDS=	libogg.so:audio/libogg
 OpenGL_USE=		GL=glut XORG=xmu
 PostgreSQL_USES=	pgsql
-Python_USES=		python
+Python_USES=		python:3.3+
 QDBM_LIB_DEPENDS=	libqdbm.so:databases/qdbm
 ReadLine_USES=		readline:port
 Regex_LIB_DEPENDS=	libpcre.so:devel/pcre
diff --git a/lang/io/distinfo b/lang/io/distinfo
index 6631f623bece..533f52531134 100644
--- a/lang/io/distinfo
+++ b/lang/io/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1467100370
-SHA256 (stevedekorte-io-2015.11.11-23afbcc_GH0.tar.gz) = d66a085288c278c3641c6c7360967ace54e5469b751659fca4e31fef7987975a
-SIZE (stevedekorte-io-2015.11.11-23afbcc_GH0.tar.gz) = 9212486
+TIMESTAMP = 1505299993
+SHA256 (stevedekorte-io-2017.09.06_GH0.tar.gz) = 9ac5cd94bbca65c989cd254be58a3a716f4e4f16480f0dc81070457aa353c217
+SIZE (stevedekorte-io-2017.09.06_GH0.tar.gz) = 9153588
diff --git a/lang/io/files/patch-CMakeLists.txt b/lang/io/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..294032df57d0
--- /dev/null
+++ b/lang/io/files/patch-CMakeLists.txt
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig	2017-08-11 18:47:18 UTC
++++ CMakeLists.txt
+@@ -35,7 +35,7 @@ endif()
+ project(IoLanguage)
+ 
+ # Default config when building with gcc variants
+-IF(CMAKE_COMPILER_IS_GNUCC)
++IF(CMAKE_COMPILER_IS_GNUCC OR (CMAKE_C_COMPILER_ID MATCHES "Clang"))
+ 	SET(CMAKE_BUILD_TYPE_DebugFast)
+ 	SET(CMAKE_CXX_FLAGS_DEBUGFAST "-g -O0")
+ 	SET(CMAKE_C_FLAGS_DEBUGFAST "-g -O0")
diff --git a/lang/io/files/patch-addons-SQLite3_CMakeLists.txt b/lang/io/files/patch-addons-SQLite3_CMakeLists.txt
deleted file mode 100644
index 924b403e371c..000000000000
--- a/lang/io/files/patch-addons-SQLite3_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
---- addons/SQLite3/CMakeLists.txt.orig	2012-10-02 16:24:59.000000000 +0200
-+++ addons/SQLite3/CMakeLists.txt	2012-10-02 16:25:24.000000000 +0200
-@@ -20,6 +20,9 @@
- 	# Additional include directories
- 	include_directories(${SQLITE_INCLUDE_DIRS})
- 
-+	# Additional link directories
-+	link_directories(${SQLITE_LIBRARY_DIRS})
-+
- 	# Generate the IoSQLite3Init.c file.
- 	# Argument SHOULD ALWAYS be the exact name of the addon, case is
- 	# important.
diff --git a/lang/io/files/patch-addons_Oauth_source_Oauth_crypto.c b/lang/io/files/patch-addons_Oauth_source_Oauth_crypto.c
new file mode 100644
index 000000000000..1ae4f1ea54e8
--- /dev/null
+++ b/lang/io/files/patch-addons_Oauth_source_Oauth_crypto.c
@@ -0,0 +1,11 @@
+--- addons/Oauth/source/Oauth/crypto.c.orig	2017-09-14 12:29:48 UTC
++++ addons/Oauth/source/Oauth/crypto.c
+@@ -658,7 +658,7 @@ void sha1_finalize(struct sha1_context *
+ 	sha1_update(self, bits, 8);
+ 
+ 	/* Store state in digest */
+-	SHA1Encode(digest, (uint32_t *)self->state, 20);
++	SHA1Encode(digest, self->state, 20);
+ 
+ 	/* Zeroize sensitive information.
+ 	 */
diff --git a/lang/io/files/patch-addons_Oauth_source_Oauth_crypto.h b/lang/io/files/patch-addons_Oauth_source_Oauth_crypto.h
new file mode 100644
index 000000000000..62f54e16d7b1
--- /dev/null
+++ b/lang/io/files/patch-addons_Oauth_source_Oauth_crypto.h
@@ -0,0 +1,11 @@
+--- addons/Oauth/source/Oauth/crypto.h.orig	2017-09-14 12:33:11 UTC
++++ addons/Oauth/source/Oauth/crypto.h
+@@ -16,7 +16,7 @@ struct md5_context
+ 
+ struct sha1_context
+ {
+-	unsigned long state[5];
++	uint32_t state[5];
+ 	unsigned long count[2];
+ 	unsigned char buffer[64];
+ };
diff --git a/lang/io/files/patch-addons_Oauth_source_Oauth_http.c b/lang/io/files/patch-addons_Oauth_source_Oauth_http.c
new file mode 100644
index 000000000000..49e6653e1320
--- /dev/null
+++ b/lang/io/files/patch-addons_Oauth_source_Oauth_http.c
@@ -0,0 +1,13 @@
+--- addons/Oauth/source/Oauth/http.c.orig	2017-09-13 10:44:59 UTC
++++ addons/Oauth/source/Oauth/http.c
+@@ -6,7 +6,10 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>
++#include <sys/types.h>
++#include <sys/socket.h>
+ #include <sys/select.h>
++#include <netinet/in.h>
+ #include <netdb.h>
+ #include <fcntl.h>
+ #include <errno.h>
diff --git a/lang/io/files/patch-libs_iovm_source_IoVersion.h b/lang/io/files/patch-libs_iovm_source_IoVersion.h
new file mode 100644
index 000000000000..342a0ed8dfac
--- /dev/null
+++ b/lang/io/files/patch-libs_iovm_source_IoVersion.h
@@ -0,0 +1,7 @@
+--- libs/iovm/source/IoVersion.h.orig	2017-08-11 18:47:18 UTC
++++ libs/iovm/source/IoVersion.h
+@@ -1,3 +1,3 @@
+ #ifndef IO_VERSION_STRING
+-#define IO_VERSION_STRING "20151111"
++#define IO_VERSION_STRING "20170906"
+ #endif
diff --git a/lang/io/files/patch-memchached-1-fd67950 b/lang/io/files/patch-memchached-1-fd67950
deleted file mode 100644
index 4cf23b1d273a..000000000000
--- a/lang/io/files/patch-memchached-1-fd67950
+++ /dev/null
@@ -1,93 +0,0 @@
-From fd6795035e4bcd1d2606f4f8f69c104bfbf5d5ff Mon Sep 17 00:00:00 2001
-From: Charles Ellis <hamled@gmail.com>
-Date: Sun, 20 May 2012 23:20:33 -0700
-Subject: [PATCH] Memcached stats method compatiblity fix
-
-The stats method of Memcached is now compatible with libmemcached 1.0+.
----
- addons/Memcached/source/IoMemcached.c | 41 +++++++++++++++++++++--------------
- modules/FindLibMemcached.cmake        |  2 +-
- 2 files changed, 26 insertions(+), 17 deletions(-)
-
-diff --git a/addons/Memcached/source/IoMemcached.c b/addons/Memcached/source/IoMemcached.c
-index c1be9ff..aa3fe67 100644
---- addons/Memcached/source/IoMemcached.c
-+++ addons/Memcached/source/IoMemcached.c
-@@ -472,39 +472,48 @@ values are maps with actual stats.
- IoObject *IoMemcached_stats(IoMemcached *self, IoObject *locals, IoMessage *m)
- {
- 	IoMap *results_map = IoMap_new(IOSTATE);
-+	memcached_st *mc = DATA(self)->mc;
- 
--	int i;
--	for(i = 0; i < memcached_server_list_count(DATA(self)->mc->servers); i++) {
--		memcached_server_st *server = DATA(self)->mc->servers + i;
-+	uint32_t pos = 0;
-+	while(pos < memcached_server_count(mc)) {
-+		memcached_server_instance_st server = memcached_server_instance_by_position(mc, pos);
-+		if(server == NULL)
-+			continue;
-+
-+		const char *hostname = memcached_server_name(server);
-+		const in_port_t port = memcached_server_port(server);
- 
- 		memcached_stat_st stats;
--		if(memcached_stat_servername(&stats, "", server->hostname, server->port) != 0)
-+		memcached_return_t rc = memcached_stat_servername(&stats, "", hostname, port);
-+		if(rc != MEMCACHED_SUCCESS)
- 			continue;
- 
--		memcached_return rc;
--		char **ckeys = memcached_stat_get_keys(DATA(self)->mc, &stats, &rc);
--
--		int ckeys_count = 0;
--		while(ckeys[ckeys_count] != NULL)
--			ckeys_count++;
-+		char **ckeys = memcached_stat_get_keys(mc, &stats, &rc);
-+		if(rc != MEMCACHED_SUCCESS)
-+			continue;
- 
- 		IoMap *per_server_map = IoMap_new(IOSTATE);
--		int k;
--		for(k = 0; k < ckeys_count; k++) {
--			char *ckey = ckeys[k];
--			char *cvalue = memcached_stat_get_value(DATA(self)->mc, &stats, ckey, &rc);
-+		char *ckey = *ckeys;
-+		while(ckey != NULL) {
-+			char *cvalue = memcached_stat_get_value(mc, &stats, ckey, &rc);
-+			if(rc != MEMCACHED_SUCCESS)
-+				continue;
-+
- 			IoMap_rawAtPut(per_server_map, IOSYMBOL(ckey), IOSYMBOL(cvalue));
- 			free(cvalue);
-+			ckey++;
- 		}
- 
- 		free(ckeys);
- 
- 		// "127.0.0.1:11211"
--		char *server_key = (char *) malloc((strlen(server->hostname) + 1 + 5 + 1) * sizeof(char));
--		sprintf(server_key, "%s:%d", server->hostname, server->port);
-+		char *server_key = (char *) malloc((strlen(hostname) + 1 + 5 + 1) * sizeof(char));
-+		sprintf(server_key, "%s:%d", hostname, port);
- 
- 		IoMap_rawAtPut(results_map, IOSYMBOL(server_key), per_server_map);
- 		free(server_key);
-+
-+		pos++;
- 	}
- 
- 	return results_map;
-diff --git a/modules/FindLibMemcached.cmake b/modules/FindLibMemcached.cmake
-index 46bf5e5..07ee3bb 100644
---- modules/FindLibMemcached.cmake
-+++ modules/FindLibMemcached.cmake
-@@ -6,7 +6,7 @@
- 
- FIND_PATH(LIBMEMCACHED_INCLUDE_DIR libmemcached/memcached.h)
- 
--FIND_LIBRARY(LIBMEMCACHED_LIBRARY NAMES memcached PATH /usr/lib /usr/local/lib)
-+FIND_LIBRARY(LIBMEMCACHED_LIBRARY NAMES memcached libmemcached PATH /usr/lib /usr/local/lib)
- 
- IF(LIBMEMCACHED_INCLUDE_DIR AND LIBMEMCACHED_LIBRARY)
- 	SET(LIBMEMCACHED_FOUND 1)
diff --git a/lang/io/files/patch-memchached-2-b53b3d8 b/lang/io/files/patch-memchached-2-b53b3d8
deleted file mode 100644
index 6fcd8ab83ff1..000000000000
--- a/lang/io/files/patch-memchached-2-b53b3d8
+++ /dev/null
@@ -1,180 +0,0 @@
-From b53b3d8e66d3e4f173500f70ce2df45763b2e0b2 Mon Sep 17 00:00:00 2001
-From: Charles Ellis <hamled@gmail.com>
-Date: Mon, 21 May 2012 00:01:35 -0700
-Subject: [PATCH] Further Memcached compatibility fixes
-
-The Memcached addon is now compatible with the API for libmemcached 1.0
-throughout. The stats method also sets the error state if errors were
-encountered.
----
- addons/Memcached/source/IoMemcached.c | 49 +++++++++++++++++++++--------------
- 1 file changed, 29 insertions(+), 20 deletions(-)
-
-diff --git a/addons/Memcached/source/IoMemcached.c b/addons/Memcached/source/IoMemcached.c
-index aa3fe67..0d0dfb4 100644
---- addons/Memcached/source/IoMemcached.c
-+++ addons/Memcached/source/IoMemcached.c
-@@ -105,7 +105,7 @@ Returns self.
- */
- IoObject *IoMemcached_addServer(IoMemcached *self, IoObject *locals, IoMessage *m)
- {
--	memcached_server_st *server;
-+	memcached_server_list_st server;
- 
- 	server = memcached_servers_parse(IoMessage_locals_cStringArgAt_(m, locals, 0));
- 	memcached_server_push(DATA(self)->mc, server);
-@@ -132,7 +132,7 @@ IoObject *IoMemcached_set(IoMemcached *self, IoObject *locals, IoMessage *m)
- 	size_t size;
- 	char *cvalue = IoMemcached_serialize(self, locals, value, &size, &flags);
- 
--	memcached_return rc;
-+	memcached_return_t rc;
- 	rc = memcached_set(DATA(self)->mc,
- 		CSTRING(key), IOSEQ_LENGTH(key),
- 		cvalue, size,
-@@ -164,7 +164,7 @@ IoObject *IoMemcached_add(IoMemcached *self, IoObject *locals, IoMessage *m)
- 	size_t size;
- 	char *cvalue = IoMemcached_serialize(self, locals, value, &size, &flags);
- 
--	memcached_return rc;
-+	memcached_return_t rc;
- 	rc = memcached_add(DATA(self)->mc,
- 		CSTRING(key), IOSEQ_LENGTH(key),
- 		cvalue, size,
-@@ -200,7 +200,7 @@ IoObject *IoMemcached_replace(IoMemcached *self, IoObject *locals, IoMessage *m)
- 	size_t size;
- 	char *cvalue = IoMemcached_serialize(self, locals, value, &size, &flags);
- 
--	memcached_return rc;
-+	memcached_return_t rc;
- 	rc = memcached_replace(DATA(self)->mc,
- 		CSTRING(key), IOSEQ_LENGTH(key),
- 		cvalue, size,
-@@ -230,7 +230,7 @@ IoObject *IoMemcached_append(IoMemcached *self, IoObject *locals, IoMessage *m)
- 	IoSeq *key   = IoMessage_locals_seqArgAt_(m, locals, 0);
- 	IoSeq *value = IoMessage_locals_seqArgAt_(m, locals, 1);
- 
--	memcached_return rc;
-+	memcached_return_t rc;
- 	rc = memcached_append(DATA(self)->mc,
- 		CSTRING(key),   IOSEQ_LENGTH(key),
- 		CSTRING(value), IOSEQ_LENGTH(value),
-@@ -254,7 +254,7 @@ IoObject *IoMemcached_prepend(IoMemcached *self, IoObject *locals, IoMessage *m)
- 	IoSeq *key   = IoMessage_locals_seqArgAt_(m, locals, 0);
- 	IoSeq *value = IoMessage_locals_seqArgAt_(m, locals, 1);
- 
--	memcached_return rc;
-+	memcached_return_t rc;
- 	rc = memcached_prepend(DATA(self)->mc,
- 		CSTRING(key),   IOSEQ_LENGTH(key),
- 		CSTRING(value), IOSEQ_LENGTH(value),
-@@ -279,7 +279,7 @@ IoObject *IoMemcached_get(IoMemcached *self, IoObject *locals, IoMessage *m)
- 
- 	size_t size;
- 	uint32_t flags;
--	memcached_return rc;
-+	memcached_return_t rc;
- 
- 	char *cvalue;
- 	cvalue = memcached_get(DATA(self)->mc,
-@@ -322,7 +322,7 @@ IoObject *IoMemcached_getMulti(IoMemcached *self, IoObject *locals, IoMessage *m
- 		IOASSERT(IOSEQ_LENGTH(key) < MEMCACHED_MAX_KEY, "key is too long");
- 	}
- 
--	char **ckeys = (char **) malloc(sizeof(char *) * keys_list_size);
-+	const char **ckeys = (const char **) malloc(sizeof(const char *) * keys_list_size);
- 	size_t *ckey_lengths = (size_t *) malloc(sizeof(size_t) * keys_list_size);
- 
- 	for(i = 0; i < keys_list_size; i++) {
-@@ -330,7 +330,7 @@ IoObject *IoMemcached_getMulti(IoMemcached *self, IoObject *locals, IoMessage *m
- 		ckey_lengths[i] = strlen(ckeys[i]);
- 	}
- 
--	memcached_return rc = memcached_mget(DATA(self)->mc, ckeys, ckey_lengths, keys_list_size);
-+	memcached_return_t rc = memcached_mget(DATA(self)->mc, ckeys, ckey_lengths, keys_list_size);
- 
- 	free(ckeys);
- 	free(ckey_lengths);
-@@ -377,7 +377,7 @@ IoObject *IoMemcached_delete(IoMemcached *self, IoObject *locals, IoMessage *m)
- 
- 	time_t time = IoMessage_argCount(m) == 2 ? IoMessage_locals_intArgAt_(m, locals, 1) : 0;
- 
--	memcached_return rc;
-+	memcached_return_t rc;
- 	rc = memcached_delete(DATA(self)->mc,
- 		CSTRING(key), IOSEQ_LENGTH(key),
- 		time
-@@ -423,7 +423,7 @@ IoObject *IoMemcached_incr(IoMemcached *self, IoObject *locals, IoMessage *m)
- 
- 	uint64_t new_value;
- 
--	memcached_return rc;
-+	memcached_return_t rc;
- 	rc = memcached_increment(DATA(self)->mc,
- 		CSTRING(key), IOSEQ_LENGTH(key),
- 		offset, &new_value
-@@ -451,7 +451,7 @@ IoObject *IoMemcached_decr(IoMemcached *self, IoObject *locals, IoMessage *m)
- 
- 	uint64_t new_value;
- 
--	memcached_return rc;
-+	memcached_return_t rc;
- 	rc = memcached_decrement(DATA(self)->mc,
- 		CSTRING(key), IOSEQ_LENGTH(key),
- 		offset, &new_value
-@@ -472,11 +472,11 @@ values are maps with actual stats.
- IoObject *IoMemcached_stats(IoMemcached *self, IoObject *locals, IoMessage *m)
- {
- 	IoMap *results_map = IoMap_new(IOSTATE);
--	memcached_st *mc = DATA(self)->mc;
- 
-+	int errors = 0;
- 	uint32_t pos = 0;
--	while(pos < memcached_server_count(mc)) {
--		memcached_server_instance_st server = memcached_server_instance_by_position(mc, pos);
-+	while(pos < memcached_server_count(DATA(self)->mc)) {
-+		memcached_server_instance_st server = memcached_server_instance_by_position(DATA(self)->mc, pos);
- 		if(server == NULL)
- 			continue;
- 
-@@ -485,19 +485,25 @@ IoObject *IoMemcached_stats(IoMemcached *self, IoObject *locals, IoMessage *m)
- 
- 		memcached_stat_st stats;
- 		memcached_return_t rc = memcached_stat_servername(&stats, "", hostname, port);
--		if(rc != MEMCACHED_SUCCESS)
-+		if(rc != MEMCACHED_SUCCESS) {
-+			errors++;
- 			continue;
-+		}
- 
--		char **ckeys = memcached_stat_get_keys(mc, &stats, &rc);
--		if(rc != MEMCACHED_SUCCESS)
-+		char **ckeys = memcached_stat_get_keys(DATA(self)->mc, &stats, &rc);
-+		if(rc != MEMCACHED_SUCCESS) {
-+			errors++;
- 			continue;
-+		}
- 
- 		IoMap *per_server_map = IoMap_new(IOSTATE);
- 		char *ckey = *ckeys;
- 		while(ckey != NULL) {
--			char *cvalue = memcached_stat_get_value(mc, &stats, ckey, &rc);
--			if(rc != MEMCACHED_SUCCESS)
-+			char *cvalue = memcached_stat_get_value(DATA(self)->mc, &stats, ckey, &rc);
-+			if(rc != MEMCACHED_SUCCESS) {
-+				errors++;
- 				continue;
-+			}
- 
- 			IoMap_rawAtPut(per_server_map, IOSYMBOL(ckey), IOSYMBOL(cvalue));
- 			free(cvalue);
-@@ -516,6 +522,9 @@ IoObject *IoMemcached_stats(IoMemcached *self, IoObject *locals, IoMessage *m)
- 		pos++;
- 	}
- 
-+	if(errors > 0)
-+		IoState_error_(IOSTATE, m, memcached_strerror(DATA(self)->mc, MEMCACHED_SOME_ERRORS));
-+
- 	return results_map;
- }
- 
diff --git a/lang/io/files/patch-memchached-3-0b4f7e7 b/lang/io/files/patch-memchached-3-0b4f7e7
deleted file mode 100644
index 217eef68527a..000000000000
--- a/lang/io/files/patch-memchached-3-0b4f7e7
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0b4f7e75e80bf25d382901f098b60c724e0dd6b3 Mon Sep 17 00:00:00 2001
-From: Kyle Marek-Spartz <zeckalpha@gmail.com>
-Date: Sat, 1 Feb 2014 09:23:43 -0600
-Subject: [PATCH] Changed type to get memcached >= 1.0.17 to compile. Still
- gives warning for: io/addons/Memcached/source/IoMemcached.c:46:2: warning:
- implicit declaration of function IoState_registerProtoWithFunc_ is invalid in
- C99
-
----
- addons/Memcached/source/IoMemcached.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/addons/Memcached/source/IoMemcached.c b/addons/Memcached/source/IoMemcached.c
-index 0d0dfb4..a4f3901 100644
---- addons/Memcached/source/IoMemcached.c
-+++ addons/Memcached/source/IoMemcached.c
-@@ -476,7 +476,7 @@ IoObject *IoMemcached_stats(IoMemcached *self, IoObject *locals, IoMessage *m)
- 	int errors = 0;
- 	uint32_t pos = 0;
- 	while(pos < memcached_server_count(DATA(self)->mc)) {
--		memcached_server_instance_st server = memcached_server_instance_by_position(DATA(self)->mc, pos);
-+		const memcached_instance_st *server = memcached_server_instance_by_position(DATA(self)->mc, pos);
- 		if(server == NULL)
- 			continue;
- 
diff --git a/lang/io/pkg-plist b/lang/io/pkg-plist
index 76106c9aa993..37ce2c20bcc7 100644
--- a/lang/io/pkg-plist
+++ b/lang/io/pkg-plist
@@ -4,24 +4,24 @@ lib/libbasekit.so
 lib/libcoroutine.so
 lib/libgarbagecollector.so
 lib/libiovmall.so
-%%AsyncRequest%%lib/io/addons/AsyncRequest/CMakeLists.txt
 %%AsyncRequest%%lib/io/addons/AsyncRequest/_build/dll/libIoAsyncRequest.so
+%%AsyncRequest%%lib/io/addons/AsyncRequest/CMakeLists.txt
 %%AsyncRequest%%lib/io/addons/AsyncRequest/depends
 %%AsyncRequest%%lib/io/addons/AsyncRequest/io/AsyncRequest.io
 %%AsyncRequest%%lib/io/addons/AsyncRequest/protos
 %%AsyncRequest%%lib/io/addons/AsyncRequest/source/IoAsyncRequest.c
 %%AsyncRequest%%lib/io/addons/AsyncRequest/source/IoAsyncRequest.h
 %%AsyncRequest%%lib/io/addons/AsyncRequest/source/IoAsyncRequestInit.c
-%%BigNum%%lib/io/addons/BigNum/CMakeLists.txt
 %%BigNum%%lib/io/addons/BigNum/_build/dll/libIoBigNum.so
+%%BigNum%%lib/io/addons/BigNum/CMakeLists.txt
 %%BigNum%%lib/io/addons/BigNum/depends
 %%BigNum%%lib/io/addons/BigNum/io/BigNum.io
 %%BigNum%%lib/io/addons/BigNum/protos
 %%BigNum%%lib/io/addons/BigNum/source/IoBigNum.c
 %%BigNum%%lib/io/addons/BigNum/source/IoBigNum.h
 %%BigNum%%lib/io/addons/BigNum/source/IoBigNumInit.c
-%%Bitly%%lib/io/addons/Bitly/CMakeLists.txt
 %%Bitly%%lib/io/addons/Bitly/_build/dll/libIoBitly.so
+%%Bitly%%lib/io/addons/Bitly/CMakeLists.txt
 %%Bitly%%lib/io/addons/Bitly/depends
 %%Bitly%%lib/io/addons/Bitly/io/Bitly.io
 %%Bitly%%lib/io/addons/Bitly/io/BitlyClient.io
@@ -29,20 +29,20 @@ lib/libiovmall.so
 %%Bitly%%lib/io/addons/Bitly/protos
 %%Bitly%%lib/io/addons/Bitly/source/.gitsidumb
 %%Bitly%%lib/io/addons/Bitly/source/IoBitlyInit.c
-%%Blowfish%%lib/io/addons/Blowfish/CMakeLists.txt
 %%Blowfish%%lib/io/addons/Blowfish/_build/dll/libIoBlowfish.so
+%%Blowfish%%lib/io/addons/Blowfish/CMakeLists.txt
 %%Blowfish%%lib/io/addons/Blowfish/depends
 %%Blowfish%%lib/io/addons/Blowfish/io/Blowfish.io
 %%Blowfish%%lib/io/addons/Blowfish/protos
+%%Blowfish%%lib/io/addons/Blowfish/source/blowfish.c
+%%Blowfish%%lib/io/addons/Blowfish/source/blowfish.h
 %%Blowfish%%lib/io/addons/Blowfish/source/IoBlowfish.c
 %%Blowfish%%lib/io/addons/Blowfish/source/IoBlowfish.h
 %%Blowfish%%lib/io/addons/Blowfish/source/IoBlowfishInit.c
-%%Blowfish%%lib/io/addons/Blowfish/source/blowfish.c
-%%Blowfish%%lib/io/addons/Blowfish/source/blowfish.h
 %%Blowfish%%lib/io/addons/Blowfish/tests/correctness/BlowfishTest.io
 %%Blowfish%%lib/io/addons/Blowfish/tests/correctness/run.io
-%%Box%%lib/io/addons/Box/CMakeLists.txt
 %%Box%%lib/io/addons/Box/_build/dll/libIoBox.so
+%%Box%%lib/io/addons/Box/CMakeLists.txt
 %%Box%%lib/io/addons/Box/depends
 %%Box%%lib/io/addons/Box/frameworks
 %%Box%%lib/io/addons/Box/io/Vector.io
@@ -53,16 +53,101 @@ lib/libiovmall.so
 %%Box%%lib/io/addons/Box/source/IoBoxInit.c
 %%Box%%lib/io/addons/Box/tests/correctness/BoxTest.io
 %%Box%%lib/io/addons/Box/tests/correctness/run.io
-%%Box%%lib/io/addons/Box/tests/performance/SpeedResults.txt
 %%Box%%lib/io/addons/Box/tests/performance/mandlebrot.c
 %%Box%%lib/io/addons/Box/tests/performance/mandlebrot.io
 %%Box%%lib/io/addons/Box/tests/performance/mandlebrot.py
 %%Box%%lib/io/addons/Box/tests/performance/runSpeedTests.io
 %%Box%%lib/io/addons/Box/tests/performance/speed.io
 %%Box%%lib/io/addons/Box/tests/performance/speed.py
-%%CFFI%%lib/io/addons/CFFI/CMakeLists.txt
-%%CFFI%%lib/io/addons/CFFI/README
+%%Box%%lib/io/addons/Box/tests/performance/SpeedResults.txt
+%%Cairo%%lib/io/addons/Cairo/_build/dll/libIoCairo.so
+%%Cairo%%lib/io/addons/Cairo/CMakeLists.txt
+%%Cairo%%lib/io/addons/Cairo/depends
+%%Cairo%%lib/io/addons/Cairo/io/Cairo.io
+%%Cairo%%lib/io/addons/Cairo/io/Z_RemoveGlobalAccess.io
+%%Cairo%%lib/io/addons/Cairo/protos
+%%Cairo%%lib/io/addons/Cairo/samples/arc.io
+%%Cairo%%lib/io/addons/Cairo/samples/arcNegative.io
+%%Cairo%%lib/io/addons/Cairo/samples/chart.io
+%%Cairo%%lib/io/addons/Cairo/samples/clip.io
+%%Cairo%%lib/io/addons/Cairo/samples/clipImage.io
+%%Cairo%%lib/io/addons/Cairo/samples/curveRectangle.io
+%%Cairo%%lib/io/addons/Cairo/samples/curveTo.io
+%%Cairo%%lib/io/addons/Cairo/samples/dash.io
+%%Cairo%%lib/io/addons/Cairo/samples/data/romedalen.png
+%%Cairo%%lib/io/addons/Cairo/samples/fillAndStroke.io
+%%Cairo%%lib/io/addons/Cairo/samples/fillAndStroke2.io
+%%Cairo%%lib/io/addons/Cairo/samples/fillAndStroke2.png
+%%Cairo%%lib/io/addons/Cairo/samples/gradient.io
+%%Cairo%%lib/io/addons/Cairo/samples/image.io
+%%Cairo%%lib/io/addons/Cairo/samples/imagePattern.io
+%%Cairo%%lib/io/addons/Cairo/samples/multiSegmentCaps.io
+%%Cairo%%lib/io/addons/Cairo/samples/path.io
+%%Cairo%%lib/io/addons/Cairo/samples/runAll.io
+%%Cairo%%lib/io/addons/Cairo/samples/Sample.io
+%%Cairo%%lib/io/addons/Cairo/samples/setLineCap.io
+%%Cairo%%lib/io/addons/Cairo/samples/setLineJoin.io
+%%Cairo%%lib/io/addons/Cairo/samples/text.io
+%%Cairo%%lib/io/addons/Cairo/samples/textAlignCenter.io
+%%Cairo%%lib/io/addons/Cairo/samples/textExtents.io
+%%Cairo%%lib/io/addons/Cairo/source/_IoCairoPDFSurface.c
+%%Cairo%%lib/io/addons/Cairo/source/_IoCairoPSSurface.c
+%%Cairo%%lib/io/addons/Cairo/source/_IoCairoSVGSurface.c
+%%Cairo%%lib/io/addons/Cairo/source/IoCairo_fileSurfaces.c
+%%Cairo%%lib/io/addons/Cairo/source/IoCairo.c
+%%Cairo%%lib/io/addons/Cairo/source/IoCairo.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoContext.c
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoContext.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoExtents.c
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoExtents.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoFontExtents.c
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoFontExtents.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoFontFace.c
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoFontFace.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoFontOptions.c
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoFontOptions.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoGlyph.c
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoGlyph.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoGradient.c
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoGradient.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoImageSurface.c
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoImageSurface.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoInit.c
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoLinearGradient.c
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoLinearGradient.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoMatrix.c
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoMatrix.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoPath.c
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoPath.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoPathElement.c
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoPathElement.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoPattern_inline.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoPattern.c
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoPattern.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoPDFSurface.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoPSSurface.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoRadialGradient.c
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoRadialGradient.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoRectangle.c
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoRectangle.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoScaledFont.c
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoScaledFont.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoSolidPattern.c
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoSolidPattern.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoSurface_inline.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoSurface.c
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoSurface.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoSurfacePattern.c
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoSurfacePattern.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoSVGSurface.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoTextExtents.c
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoTextExtents.h
+%%Cairo%%lib/io/addons/Cairo/source/tools.c
+%%Cairo%%lib/io/addons/Cairo/source/tools.h
+%%Cairo%%lib/io/addons/Cairo/tests/correctness/CairoTest.io
+%%Cairo%%lib/io/addons/Cairo/tests/correctness/run.io
 %%CFFI%%lib/io/addons/CFFI/_build/dll/libIoCFFI.so
+%%CFFI%%lib/io/addons/CFFI/CMakeLists.txt
 %%CFFI%%lib/io/addons/CFFI/depends
 %%CFFI%%lib/io/addons/CFFI/io/A_init.io
 %%CFFI%%lib/io/addons/CFFI/io/B_DataType.io
@@ -72,6 +157,7 @@ lib/libiovmall.so
 %%CFFI%%lib/io/addons/CFFI/io/Structure.io
 %%CFFI%%lib/io/addons/CFFI/io/Z_Array.io
 %%CFFI%%lib/io/addons/CFFI/protos
+%%CFFI%%lib/io/addons/CFFI/README
 %%CFFI%%lib/io/addons/CFFI/samples/LibC.io
 %%CFFI%%lib/io/addons/CFFI/samples/qsort.io
 %%CFFI%%lib/io/addons/CFFI/source/IoCFFIArray.c
@@ -87,12 +173,6 @@ lib/libiovmall.so
 %%CFFI%%lib/io/addons/CFFI/source/IoCFFIPointer.h
 %%CFFI%%lib/io/addons/CFFI/source/IoCFFIStructure.c
 %%CFFI%%lib/io/addons/CFFI/source/IoCFFIStructure.h
-%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/LICENSE
-%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/Makefile.vc
-%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/Makefile.vc.in
-%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/README
-%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/README.vc
-%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/VERSION
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/build/libffi.def
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/build/libffi.def.in
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/build/libffi.rc
@@ -101,9 +181,14 @@ lib/libiovmall.so
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/configure.awk
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/fficonfig.h
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/fficonfig.hw
+%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/include/ffi_common.h
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/include/ffi.h
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/include/ffi.h.in
-%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/include/ffi_common.h
+%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/LICENSE
+%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/Makefile.vc
+%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/Makefile.vc.in
+%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/README
+%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/README.vc
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/src/closures.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/src/debug.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/src/dlmalloc.c
@@ -118,8 +203,8 @@ lib/libiovmall.so
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/src/x86/ffi.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/src/x86/ffi64.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/src/x86/ffitarget.h
-%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/src/x86/win32.S
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/src/x86/win32.asm
+%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/src/x86/win32.S
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/src/x86/win64.S
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/closure_fn0.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/closure_fn1.c
@@ -130,11 +215,11 @@ lib/libiovmall.so
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/closure_fn6.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/closure_loc_fn0.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/closure_stdcall.c
+%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_1_1byte.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_12byte.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_16byte.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_18byte.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_19byte.c
-%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_1_1byte.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_20byte.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_20byte1.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_24byte.c
@@ -146,8 +231,8 @@ lib/libiovmall.so
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_4byte.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_5_1_byte.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_5byte.c
-%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_64byte.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_6_1_byte.c
+%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_64byte.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_6byte.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_7_1_byte.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_7byte.c
@@ -156,9 +241,9 @@ lib/libiovmall.so
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_9byte2.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_align_double.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_align_float.c
-%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_align_longdouble.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_align_longdouble_split.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_align_longdouble_split2.c
+%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_align_longdouble.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_align_pointer.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_align_sint16.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_align_sint32.c
@@ -167,19 +252,19 @@ lib/libiovmall.so
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_align_uint32.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_align_uint64.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_dbls_struct.c
-%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_double.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_double_va.c
+%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_double.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_float.c
-%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_longdouble.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_longdouble_va.c
+%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_longdouble.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_multi_schar.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_multi_sshort.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_multi_sshortchar.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_multi_uchar.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_multi_ushort.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_multi_ushortchar.c
-%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_pointer.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_pointer_stack.c
+%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_pointer.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_schar.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_sint.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_sshort.c
@@ -196,8 +281,8 @@ lib/libiovmall.so
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/float3.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/float4.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/huge_struct.c
-%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/many.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/many_win32.c
+%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/many.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/negint.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/nested_struct.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/nested_struct1.c
@@ -231,8 +316,8 @@ lib/libiovmall.so
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/stret_large2.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/stret_medium.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/stret_medium2.c
-%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/strlen.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/strlen_win32.c
+%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/strlen.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/struct1.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/struct2.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/struct3.c
@@ -244,34 +329,35 @@ lib/libiovmall.so
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/struct9.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/testclosure.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.special/ffitestcxx.h
-%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.special/unwindtest.cc
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.special/unwindtest_ffi_call.cc
+%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.special/unwindtest.cc
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/runtests.bat
+%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/VERSION
 %%CFFI%%lib/io/addons/CFFI/tests/correctness/ArrayTest.io
 %%CFFI%%lib/io/addons/CFFI/tests/correctness/CastingTest.io
 %%CFFI%%lib/io/addons/CFFI/tests/correctness/ComplexTest.io
 %%CFFI%%lib/io/addons/CFFI/tests/correctness/DataTypeTest.io
 %%CFFI%%lib/io/addons/CFFI/tests/correctness/PointerTest.io
+%%CFFI%%lib/io/addons/CFFI/tests/correctness/run.io
 %%CFFI%%lib/io/addons/CFFI/tests/correctness/StructureTest.io
 %%CFFI%%lib/io/addons/CFFI/tests/correctness/UnionTest.io
-%%CFFI%%lib/io/addons/CFFI/tests/correctness/run.io
-%%CGI%%lib/io/addons/CGI/CMakeLists.txt
 %%CGI%%lib/io/addons/CGI/_build/dll/libIoCGI.so
+%%CGI%%lib/io/addons/CGI/CMakeLists.txt
 %%CGI%%lib/io/addons/CGI/depends
 %%CGI%%lib/io/addons/CGI/io/CGI.io
 %%CGI%%lib/io/addons/CGI/protos
 %%CGI%%lib/io/addons/CGI/source/IoCGIInit.c
 %%CGI%%lib/io/addons/CGI/tests/correctness/CGITest.io
 %%CGI%%lib/io/addons/CGI/tests/correctness/run.io
-%%ContinuedFraction%%lib/io/addons/ContinuedFraction/CMakeLists.txt
 %%ContinuedFraction%%lib/io/addons/ContinuedFraction/_build/dll/libIoContinuedFraction.so
+%%ContinuedFraction%%lib/io/addons/ContinuedFraction/CMakeLists.txt
 %%ContinuedFraction%%lib/io/addons/ContinuedFraction/depends
 %%ContinuedFraction%%lib/io/addons/ContinuedFraction/io/ContinuedFraction.io
 %%ContinuedFraction%%lib/io/addons/ContinuedFraction/protos
 %%ContinuedFraction%%lib/io/addons/ContinuedFraction/samples/Sample.io
 %%ContinuedFraction%%lib/io/addons/ContinuedFraction/source/IoContinuedFractionInit.c
-%%Curses%%lib/io/addons/Curses/CMakeLists.txt
 %%Curses%%lib/io/addons/Curses/_build/dll/libIoCurses.so
+%%Curses%%lib/io/addons/Curses/CMakeLists.txt
 %%Curses%%lib/io/addons/Curses/depends
 %%Curses%%lib/io/addons/Curses/io/Curses.io
 %%Curses%%lib/io/addons/Curses/protos
@@ -281,18 +367,18 @@ lib/libiovmall.so
 %%Curses%%lib/io/addons/Curses/source/IoCurses.c
 %%Curses%%lib/io/addons/Curses/source/IoCurses.h
 %%Curses%%lib/io/addons/Curses/source/IoCursesInit.c
-%%DBI%%lib/io/addons/DBI/CMakeLists.txt
 %%DBI%%lib/io/addons/DBI/_build/dll/libIoDBI.so
+%%DBI%%lib/io/addons/DBI/CMakeLists.txt
 %%DBI%%lib/io/addons/DBI/depends
 %%DBI%%lib/io/addons/DBI/io/DBIConn.io
 %%DBI%%lib/io/addons/DBI/io/DBIRecord.io
 %%DBI%%lib/io/addons/DBI/protos
-%%DBI%%lib/io/addons/DBI/samples/Person.io
 %%DBI%%lib/io/addons/DBI/samples/benchmark.io
 %%DBI%%lib/io/addons/DBI/samples/dbi_init.io
 %%DBI%%lib/io/addons/DBI/samples/driver_info.io
 %%DBI%%lib/io/addons/DBI/samples/dummydata.io
 %%DBI%%lib/io/addons/DBI/samples/fetchobj.io
+%%DBI%%lib/io/addons/DBI/samples/Person.io
 %%DBI%%lib/io/addons/DBI/samples/queryOne.io
 %%DBI%%lib/io/addons/DBI/samples/simple.io
 %%DBI%%lib/io/addons/DBI/source/IoDBI.c
@@ -302,8 +388,8 @@ lib/libiovmall.so
 %%DBI%%lib/io/addons/DBI/source/IoDBIInit.c
 %%DBI%%lib/io/addons/DBI/source/IoDBIResult.c
 %%DBI%%lib/io/addons/DBI/source/IoDBIResult.h
-%%DistributedObjects%%lib/io/addons/DistributedObjects/CMakeLists.txt
 %%DistributedObjects%%lib/io/addons/DistributedObjects/_build/dll/libIoDistributedObjects.so
+%%DistributedObjects%%lib/io/addons/DistributedObjects/CMakeLists.txt
 %%DistributedObjects%%lib/io/addons/DistributedObjects/depends
 %%DistributedObjects%%lib/io/addons/DistributedObjects/io/DOConnection.io
 %%DistributedObjects%%lib/io/addons/DistributedObjects/io/DOServer.io
@@ -319,21 +405,21 @@ lib/libiovmall.so
 %%DistributedObjects%%lib/io/addons/DistributedObjects/tests/correctness/run.io
 %%DistributedObjects%%lib/io/addons/DistributedObjects/tests/performance/MDOTest.io
 %%DistributedObjects%%lib/io/addons/DistributedObjects/tests/performance/run.io
-%%EditLine%%lib/io/addons/EditLine/CMakeLists.txt
 %%EditLine%%lib/io/addons/EditLine/_build/dll/libIoEditLine.so
+%%EditLine%%lib/io/addons/EditLine/CMakeLists.txt
 %%EditLine%%lib/io/addons/EditLine/depends
 %%EditLine%%lib/io/addons/EditLine/protos
 %%EditLine%%lib/io/addons/EditLine/source/IoEditLine.c
 %%EditLine%%lib/io/addons/EditLine/source/IoEditLine.h
 %%EditLine%%lib/io/addons/EditLine/source/IoEditLineInit.c
-%%Facebook%%lib/io/addons/Facebook/CMakeLists.txt
 %%Facebook%%lib/io/addons/Facebook/_build/dll/libIoFacebook.so
+%%Facebook%%lib/io/addons/Facebook/CMakeLists.txt
 %%Facebook%%lib/io/addons/Facebook/depends
 %%Facebook%%lib/io/addons/Facebook/io/FBPost.io
 %%Facebook%%lib/io/addons/Facebook/protos
 %%Facebook%%lib/io/addons/Facebook/source/IoFacebookInit.c
-%%Flux%%lib/io/addons/Flux/CMakeLists.txt
 %%Flux%%lib/io/addons/Flux/_build/dll/libIoFlux.so
+%%Flux%%lib/io/addons/Flux/CMakeLists.txt
 %%Flux%%lib/io/addons/Flux/depends
 %%Flux%%lib/io/addons/Flux/io/Flux.io
 %%Flux%%lib/io/addons/Flux/io/Flux/Action.io
@@ -343,6 +429,12 @@ lib/libiovmall.so
 %%Flux%%lib/io/addons/Flux/io/Flux/GLObject.io
 %%Flux%%lib/io/addons/Flux/io/Flux/Keyboard.io
 %%Flux%%lib/io/addons/Flux/io/Flux/Mouse.io
+%%Flux%%lib/io/addons/Flux/io/Flux/new/HelloWorld.io
+%%Flux%%lib/io/addons/Flux/io/Flux/new/old/ObjectView.io
+%%Flux%%lib/io/addons/Flux/io/Flux/new/old/SlotView.io
+%%Flux%%lib/io/addons/Flux/io/Flux/new/old/StrokeFont.io
+%%Flux%%lib/io/addons/Flux/io/Flux/new/old/test.io
+%%Flux%%lib/io/addons/Flux/io/Flux/new/TreeView.io
 %%Flux%%lib/io/addons/Flux/io/Flux/OSMenu.io
 %%Flux%%lib/io/addons/Flux/io/Flux/OSWindow.io
 %%Flux%%lib/io/addons/Flux/io/Flux/Preferences.io
@@ -384,20 +476,17 @@ lib/libiovmall.so
 %%Flux%%lib/io/addons/Flux/io/Flux/Views/Text.io
 %%Flux%%lib/io/addons/Flux/io/Flux/Views/TextCell.io
 %%Flux%%lib/io/addons/Flux/io/Flux/Views/TextField.io
+%%Flux%%lib/io/addons/Flux/io/Flux/Views/VideoView.io
 %%Flux%%lib/io/addons/Flux/io/Flux/Views/VKnob.io
 %%Flux%%lib/io/addons/Flux/io/Flux/Views/VScrollArea.io
 %%Flux%%lib/io/addons/Flux/io/Flux/Views/VScroller.io
 %%Flux%%lib/io/addons/Flux/io/Flux/Views/VStackView.io
 %%Flux%%lib/io/addons/Flux/io/Flux/Views/VTabView.io
-%%Flux%%lib/io/addons/Flux/io/Flux/Views/VideoView.io
 %%Flux%%lib/io/addons/Flux/io/Flux/Views/Window.io
-%%Flux%%lib/io/addons/Flux/io/Flux/new/HelloWorld.io
-%%Flux%%lib/io/addons/Flux/io/Flux/new/TreeView.io
-%%Flux%%lib/io/addons/Flux/io/Flux/new/old/ObjectView.io
-%%Flux%%lib/io/addons/Flux/io/Flux/new/old/SlotView.io
-%%Flux%%lib/io/addons/Flux/io/Flux/new/old/StrokeFont.io
-%%Flux%%lib/io/addons/Flux/io/Flux/new/old/test.io
 %%Flux%%lib/io/addons/Flux/protos
+%%Flux%%lib/io/addons/Flux/resources/fonts/Free/_ReadMe/AUTHORS
+%%Flux%%lib/io/addons/Flux/resources/fonts/Free/_ReadMe/ChangeLog
+%%Flux%%lib/io/addons/Flux/resources/fonts/Free/_ReadMe/README
 %%Flux%%lib/io/addons/Flux/resources/fonts/Free/Mono/Bold.ttf
 %%Flux%%lib/io/addons/Flux/resources/fonts/Free/Mono/BoldItalic.ttf
 %%Flux%%lib/io/addons/Flux/resources/fonts/Free/Mono/Italic.ttf
@@ -410,11 +499,12 @@ lib/libiovmall.so
 %%Flux%%lib/io/addons/Flux/resources/fonts/Free/Serif/BoldItalic.ttf
 %%Flux%%lib/io/addons/Flux/resources/fonts/Free/Serif/Italic.ttf
 %%Flux%%lib/io/addons/Flux/resources/fonts/Free/Serif/Normal.ttf
-%%Flux%%lib/io/addons/Flux/resources/fonts/Free/_ReadMe/AUTHORS
-%%Flux%%lib/io/addons/Flux/resources/fonts/Free/_ReadMe/ChangeLog
-%%Flux%%lib/io/addons/Flux/resources/fonts/Free/_ReadMe/README
 %%Flux%%lib/io/addons/Flux/resources/fonts/ProFont/Mono/Normal.ttf
 %%Flux%%lib/io/addons/Flux/resources/fonts/T207/Mono/Normal.ttf
+%%Flux%%lib/io/addons/Flux/resources/fonts/Vera/_ReadMe/COPYRIGHT.TXT
+%%Flux%%lib/io/addons/Flux/resources/fonts/Vera/_ReadMe/local.conf
+%%Flux%%lib/io/addons/Flux/resources/fonts/Vera/_ReadMe/README.TXT
+%%Flux%%lib/io/addons/Flux/resources/fonts/Vera/_ReadMe/RELEASENOTES.TXT
 %%Flux%%lib/io/addons/Flux/resources/fonts/Vera/Mono/Black.ttf
 %%Flux%%lib/io/addons/Flux/resources/fonts/Vera/Mono/Bold.ttf
 %%Flux%%lib/io/addons/Flux/resources/fonts/Vera/Mono/Italic.ttf
@@ -425,10 +515,7 @@ lib/libiovmall.so
 %%Flux%%lib/io/addons/Flux/resources/fonts/Vera/Sans/Normal.ttf
 %%Flux%%lib/io/addons/Flux/resources/fonts/Vera/Serif/Bold.ttf
 %%Flux%%lib/io/addons/Flux/resources/fonts/Vera/Serif/Normal.ttf
-%%Flux%%lib/io/addons/Flux/resources/fonts/Vera/_ReadMe/COPYRIGHT.TXT
-%%Flux%%lib/io/addons/Flux/resources/fonts/Vera/_ReadMe/README.TXT
-%%Flux%%lib/io/addons/Flux/resources/fonts/Vera/_ReadMe/RELEASENOTES.TXT
-%%Flux%%lib/io/addons/Flux/resources/fonts/Vera/_ReadMe/local.conf
+%%Flux%%lib/io/addons/Flux/resources/themes/Milk/_ReadMe.txt
 %%Flux%%lib/io/addons/Flux/resources/themes/Milk/Arrows/Right.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Milk/Browser/Bottom.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Milk/Browser/BottomLeft.png
@@ -443,6 +530,9 @@ lib/libiovmall.so
 %%Flux%%lib/io/addons/Flux/resources/themes/Milk/Buttons/CheckBox/CheckedDisabled/Middle.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Milk/Buttons/CheckBox/Disabled/Middle.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Milk/Buttons/CheckBox/Normal/Middle.png
+%%Flux%%lib/io/addons/Flux/resources/themes/Milk/Buttons/Music/_old/MiniPlay.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Milk/Buttons/Music/_old/Music.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Milk/Buttons/Music/_old/Next.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Milk/Buttons/Music/Add/Active/Middle.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Milk/Buttons/Music/Add/Disabled/Middle.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Milk/Buttons/Music/Add/Normal/Middle.png
@@ -467,9 +557,6 @@ lib/libiovmall.so
 %%Flux%%lib/io/addons/Flux/resources/themes/Milk/Buttons/Music/Stop/Disabled/Middle.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Milk/Buttons/Music/Stop/Normal/Middle.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Milk/Buttons/Music/Volume/Volume.png
-%%Flux%%lib/io/addons/Flux/resources/themes/Milk/Buttons/Music/_old/MiniPlay.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Milk/Buttons/Music/_old/Music.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Milk/Buttons/Music/_old/Next.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Milk/Buttons/Popup/Check.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Milk/Buttons/Popup/CheckWhite.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Milk/Buttons/Popup/LittleArrows.png
@@ -571,7 +658,46 @@ lib/libiovmall.so
 %%Flux%%lib/io/addons/Flux/resources/themes/Milk/Window/Top.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Milk/Window/TopLeft.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Milk/Window/TopRight.png
-%%Flux%%lib/io/addons/Flux/resources/themes/Milk/_ReadMe.txt
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_ReadMe.txt
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/ComboBoxDisclosureLarge.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/ComboBoxDisclosureLarge1.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/ComboBoxDisclosureLarge2.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/ComboBoxDisclosureLarge3.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/Document Window TItlebar Stretch.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/GroupWell.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/GrowBoxDetachedRight.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/GrowBoxDetachedRight2.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/H Scroll Thumb Caps - Inactive.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/H Scroll Thumb Fill - Inactive.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/MetalWindowLargeClose.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/MetalWindowLargeCollapse.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/MetalWindowLargeZoom.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/Popup.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/PopupDisabled.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/Push Button Caps3.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/PushButtonCaps.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/PushButtonCaps2.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/RadioButton1.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/RadioButton2.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/RadioButton3.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/RadioButtonD1.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/RadioButtonD2.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/RoundButton1.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/RoundButton2.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/RoundButton3.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/ScrollArrowsNoneRight.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/ScrollArrowsNoneUp.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/ScrollVertCapsA.png
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/ScrollVertCapsA.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/ScrollVertFillD.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/ScrollVertKnobInactive.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/SliderHorizTrackCaps.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/SliderKnob.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/SliderKnobInactive.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/SliderVertCaps.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/SliderVertFill.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/WaveAnimation.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/WindowBackground.tiff
 %%Flux%%lib/io/addons/Flux/resources/themes/Neos/Arrows/Right.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Neos/Browser/Bottom.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Neos/Browser/BottomLeft.png
@@ -586,6 +712,9 @@ lib/libiovmall.so
 %%Flux%%lib/io/addons/Flux/resources/themes/Neos/Buttons/CheckBox/CheckedDisabled/Middle.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Neos/Buttons/CheckBox/Disabled/Middle.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Neos/Buttons/CheckBox/Normal/Middle.png
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/Buttons/Music/_old/MiniPlay.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/Buttons/Music/_old/Music.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/Buttons/Music/_old/Next.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Neos/Buttons/Music/Add/Active/Middle.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Neos/Buttons/Music/Add/Disabled/Middle.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Neos/Buttons/Music/Add/Normal/Middle.png
@@ -610,9 +739,6 @@ lib/libiovmall.so
 %%Flux%%lib/io/addons/Flux/resources/themes/Neos/Buttons/Music/Stop/Disabled/Middle.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Neos/Buttons/Music/Stop/Normal/Middle.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Neos/Buttons/Music/Volume/Volume.png
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/Buttons/Music/_old/MiniPlay.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/Buttons/Music/_old/Music.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/Buttons/Music/_old/Next.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Neos/Buttons/Popup/Check.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Neos/Buttons/Popup/CheckWhite.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Neos/Buttons/Popup/LittleArrows.png
@@ -685,6 +811,10 @@ lib/libiovmall.so
 %%Flux%%lib/io/addons/Flux/resources/themes/Neos/TextField/Square/Left.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Neos/TextField/Square/Middle.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Neos/TextField/Square/Right.png
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/Window/_old/shadowBottom.png
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/Window/_old/shadowBottomLeft.png
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/Window/_old/shadowLeft.png
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/Window/_old/shadowRight.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Neos/Window/Bottom.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Neos/Window/BottomLeft.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Neos/Window/BottomRight.png
@@ -709,50 +839,45 @@ lib/libiovmall.so
 %%Flux%%lib/io/addons/Flux/resources/themes/Neos/Window/Top.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Neos/Window/TopLeft.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Neos/Window/TopRight.png
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/Window/_old/shadowBottom.png
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/Window/_old/shadowBottomLeft.png
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/Window/_old/shadowLeft.png
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/Window/_old/shadowRight.png
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_ReadMe.txt
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/ComboBoxDisclosureLarge.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/ComboBoxDisclosureLarge1.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/ComboBoxDisclosureLarge2.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/ComboBoxDisclosureLarge3.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/Document Window TItlebar Stretch.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/GroupWell.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/GrowBoxDetachedRight.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/GrowBoxDetachedRight2.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/H Scroll Thumb Caps - Inactive.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/H Scroll Thumb Fill - Inactive.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/MetalWindowLargeClose.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/MetalWindowLargeCollapse.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/MetalWindowLargeZoom.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/Popup.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/PopupDisabled.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/Push Button Caps3.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/PushButtonCaps.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/PushButtonCaps2.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/RadioButton1.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/RadioButton2.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/RadioButton3.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/RadioButtonD1.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/RadioButtonD2.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/RoundButton1.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/RoundButton2.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/RoundButton3.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/ScrollArrowsNoneRight.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/ScrollArrowsNoneUp.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/ScrollVertCapsA.png
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/ScrollVertCapsA.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/ScrollVertFillD.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/ScrollVertKnobInactive.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/SliderHorizTrackCaps.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/SliderKnob.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/SliderKnobInactive.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/SliderVertCaps.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/SliderVertFill.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/WaveAnimation.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/WindowBackground.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/ComboBoxDisclosureLarge.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/ComboBoxDisclosureLarge1.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/ComboBoxDisclosureLarge2.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/ComboBoxDisclosureLarge3.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/Document Window TItlebar Stretch.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/GroupWell.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/GrowBoxDetachedRight.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/GrowBoxDetachedRight2.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/H Scroll Thumb Caps - Inactive.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/H Scroll Thumb Fill - Inactive.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/MetalWindowLargeClose.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/MetalWindowLargeCollapse.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/MetalWindowLargeZoom.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/Popup.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/PopupDisabled.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/Push Button Caps3.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/PushButtonCaps.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/PushButtonCaps2.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/RadioButton1.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/RadioButton2.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/RadioButton3.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/RadioButtonD1.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/RadioButtonD2.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/RoundButton1.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/RoundButton2.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/RoundButton3.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/ScrollArrowsNoneRight.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/ScrollArrowsNoneUp.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/ScrollVertCapsA.png
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/ScrollVertCapsA.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/ScrollVertFillD.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/ScrollVertKnobInactive.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/SliderHorizTrackCaps.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/SliderKnob.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/SliderKnobInactive.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/SliderVertCaps.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/SliderVertFill.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/WaveAnimation.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/WindowBackground.tiff
 %%Flux%%lib/io/addons/Flux/resources/themes/OSX/Arrows/Right.png
 %%Flux%%lib/io/addons/Flux/resources/themes/OSX/Browser/Bottom.png
 %%Flux%%lib/io/addons/Flux/resources/themes/OSX/Browser/BottomLeft.png
@@ -767,6 +892,9 @@ lib/libiovmall.so
 %%Flux%%lib/io/addons/Flux/resources/themes/OSX/Buttons/CheckBox/CheckedDisabled/Middle.png
 %%Flux%%lib/io/addons/Flux/resources/themes/OSX/Buttons/CheckBox/Disabled/Middle.png
 %%Flux%%lib/io/addons/Flux/resources/themes/OSX/Buttons/CheckBox/Normal/Middle.png
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/Buttons/Music/_old/MiniPlay.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/Buttons/Music/_old/Music.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/Buttons/Music/_old/Next.png
 %%Flux%%lib/io/addons/Flux/resources/themes/OSX/Buttons/Music/Add/Active/Middle.png
 %%Flux%%lib/io/addons/Flux/resources/themes/OSX/Buttons/Music/Add/Disabled/Middle.png
 %%Flux%%lib/io/addons/Flux/resources/themes/OSX/Buttons/Music/Add/Normal/Middle.png
@@ -791,9 +919,6 @@ lib/libiovmall.so
 %%Flux%%lib/io/addons/Flux/resources/themes/OSX/Buttons/Music/Stop/Disabled/Middle.png
 %%Flux%%lib/io/addons/Flux/resources/themes/OSX/Buttons/Music/Stop/Normal/Middle.png
 %%Flux%%lib/io/addons/Flux/resources/themes/OSX/Buttons/Music/Volume/Volume.png
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/Buttons/Music/_old/MiniPlay.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/Buttons/Music/_old/Music.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/Buttons/Music/_old/Next.png
 %%Flux%%lib/io/addons/Flux/resources/themes/OSX/Buttons/Popup/Active/Left.png
 %%Flux%%lib/io/addons/Flux/resources/themes/OSX/Buttons/Popup/Active/Middle.png
 %%Flux%%lib/io/addons/Flux/resources/themes/OSX/Buttons/Popup/Active/Right.png
@@ -875,6 +1000,10 @@ lib/libiovmall.so
 %%Flux%%lib/io/addons/Flux/resources/themes/OSX/TextField/Square/Left.png
 %%Flux%%lib/io/addons/Flux/resources/themes/OSX/TextField/Square/Middle.png
 %%Flux%%lib/io/addons/Flux/resources/themes/OSX/TextField/Square/Right.png
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/Window/_old/shadowBottom.png
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/Window/_old/shadowBottomLeft.png
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/Window/_old/shadowLeft.png
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/Window/_old/shadowRight.png
 %%Flux%%lib/io/addons/Flux/resources/themes/OSX/Window/Bottom.png
 %%Flux%%lib/io/addons/Flux/resources/themes/OSX/Window/BottomLeft.png
 %%Flux%%lib/io/addons/Flux/resources/themes/OSX/Window/BottomRight.png
@@ -899,49 +1028,6 @@ lib/libiovmall.so
 %%Flux%%lib/io/addons/Flux/resources/themes/OSX/Window/Top.png
 %%Flux%%lib/io/addons/Flux/resources/themes/OSX/Window/TopLeft.png
 %%Flux%%lib/io/addons/Flux/resources/themes/OSX/Window/TopRight.png
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/Window/_old/shadowBottom.png
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/Window/_old/shadowBottomLeft.png
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/Window/_old/shadowLeft.png
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/Window/_old/shadowRight.png
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/ComboBoxDisclosureLarge.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/ComboBoxDisclosureLarge1.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/ComboBoxDisclosureLarge2.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/ComboBoxDisclosureLarge3.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/Document Window TItlebar Stretch.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/GroupWell.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/GrowBoxDetachedRight.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/GrowBoxDetachedRight2.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/H Scroll Thumb Caps - Inactive.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/H Scroll Thumb Fill - Inactive.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/MetalWindowLargeClose.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/MetalWindowLargeCollapse.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/MetalWindowLargeZoom.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/Popup.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/PopupDisabled.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/Push Button Caps3.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/PushButtonCaps.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/PushButtonCaps2.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/RadioButton1.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/RadioButton2.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/RadioButton3.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/RadioButtonD1.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/RadioButtonD2.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/RoundButton1.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/RoundButton2.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/RoundButton3.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/ScrollArrowsNoneRight.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/ScrollArrowsNoneUp.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/ScrollVertCapsA.png
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/ScrollVertCapsA.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/ScrollVertFillD.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/ScrollVertKnobInactive.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/SliderHorizTrackCaps.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/SliderKnob.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/SliderKnobInactive.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/SliderVertCaps.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/SliderVertFill.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/WaveAnimation.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/WindowBackground.tiff
 %%Flux%%lib/io/addons/Flux/samples/Calculator/Calc.io
 %%Flux%%lib/io/addons/Flux/samples/China/china-instructions.html
 %%Flux%%lib/io/addons/Flux/samples/China/china.io
@@ -961,12 +1047,12 @@ lib/libiovmall.so
 %%Flux%%lib/io/addons/Flux/samples/Diagram/DBox.io
 %%Flux%%lib/io/addons/Flux/samples/Diagram/LabelView.io
 %%Flux%%lib/io/addons/Flux/samples/Diagram/LineView.io
-%%Flux%%lib/io/addons/Flux/samples/Diagram/Selectable.io
-%%Flux%%lib/io/addons/Flux/samples/Diagram/SelectionArea.io
 %%Flux%%lib/io/addons/Flux/samples/Diagram/main.io
 %%Flux%%lib/io/addons/Flux/samples/Diagram/notes/bugs.txt
 %%Flux%%lib/io/addons/Flux/samples/Diagram/notes/next-actions.txt
 %%Flux%%lib/io/addons/Flux/samples/Diagram/notes/plan.txt
+%%Flux%%lib/io/addons/Flux/samples/Diagram/Selectable.io
+%%Flux%%lib/io/addons/Flux/samples/Diagram/SelectionArea.io
 %%Flux%%lib/io/addons/Flux/samples/FileBrowser/main.io
 %%Flux%%lib/io/addons/Flux/samples/IRC/IRC.io
 %%Flux%%lib/io/addons/Flux/samples/IRC/main.io
@@ -978,13 +1064,14 @@ lib/libiovmall.so
 %%Flux%%lib/io/addons/Flux/samples/Self/main.io
 %%Flux%%lib/io/addons/Flux/samples/SheetTest/main.io
 %%Flux%%lib/io/addons/Flux/samples/Slideshow/main.io
-%%Flux%%lib/io/addons/Flux/samples/Slideshow/slides.txt
 %%Flux%%lib/io/addons/Flux/samples/Slideshow/slides_oopsla.txt
+%%Flux%%lib/io/addons/Flux/samples/Slideshow/slides.txt
+%%Flux%%lib/io/addons/Flux/samples/SongJam/_BSDLicense.txt
 %%Flux%%lib/io/addons/Flux/samples/SongJam/Images/GuitarOld.png
 %%Flux%%lib/io/addons/Flux/samples/SongJam/Images/Instruments/Bass.png
 %%Flux%%lib/io/addons/Flux/samples/SongJam/Images/Instruments/Drum.png
-%%Flux%%lib/io/addons/Flux/samples/SongJam/Images/Instruments/FX.png
 %%Flux%%lib/io/addons/Flux/samples/SongJam/Images/Instruments/Full Band.png
+%%Flux%%lib/io/addons/Flux/samples/SongJam/Images/Instruments/FX.png
 %%Flux%%lib/io/addons/Flux/samples/SongJam/Images/Instruments/Guitar.png
 %%Flux%%lib/io/addons/Flux/samples/SongJam/Images/Instruments/Horns.png
 %%Flux%%lib/io/addons/Flux/samples/SongJam/Images/Instruments/Keyboard.png
@@ -997,6 +1084,7 @@ lib/libiovmall.so
 %%Flux%%lib/io/addons/Flux/samples/SongJam/Images/MuteButton/Normal/Normal/Middle.png
 %%Flux%%lib/io/addons/Flux/samples/SongJam/Images/MuteButton/Select/Active/Middle.png
 %%Flux%%lib/io/addons/Flux/samples/SongJam/Images/MuteButton/Select/Normal/Middle.png
+%%Flux%%lib/io/addons/Flux/samples/SongJam/Images/newlogo.png
 %%Flux%%lib/io/addons/Flux/samples/SongJam/Images/SoloButton/Normal/Active/Middle.png
 %%Flux%%lib/io/addons/Flux/samples/SongJam/Images/SoloButton/Normal/Normal/Middle.png
 %%Flux%%lib/io/addons/Flux/samples/SongJam/Images/SoloButton/Normal/Normal/Middle.psd
@@ -1004,8 +1092,8 @@ lib/libiovmall.so
 %%Flux%%lib/io/addons/Flux/samples/SongJam/Images/SoloButton/Select/Normal/Middle.png
 %%Flux%%lib/io/addons/Flux/samples/SongJam/Images/Volume.png
 %%Flux%%lib/io/addons/Flux/samples/SongJam/Images/VolumeBack.png
-%%Flux%%lib/io/addons/Flux/samples/SongJam/Images/newlogo.png
 %%Flux%%lib/io/addons/Flux/samples/SongJam/LoopPanel.io
+%%Flux%%lib/io/addons/Flux/samples/SongJam/main.io
 %%Flux%%lib/io/addons/Flux/samples/SongJam/Prefs copy.io
 %%Flux%%lib/io/addons/Flux/samples/SongJam/Prefs.io
 %%Flux%%lib/io/addons/Flux/samples/SongJam/ProgressPanel.io
@@ -1020,32 +1108,30 @@ lib/libiovmall.so
 %%Flux%%lib/io/addons/Flux/samples/SongJam/SoundExtensions.io
 %%Flux%%lib/io/addons/Flux/samples/SongJam/TrackLabel.io
 %%Flux%%lib/io/addons/Flux/samples/SongJam/TrackMeter.io
-%%Flux%%lib/io/addons/Flux/samples/SongJam/TrackView.io
 %%Flux%%lib/io/addons/Flux/samples/SongJam/TracksView.io
+%%Flux%%lib/io/addons/Flux/samples/SongJam/TrackView.io
 %%Flux%%lib/io/addons/Flux/samples/SongJam/UserLicense.txt
 %%Flux%%lib/io/addons/Flux/samples/SongJam/VolumeSlider.io
 %%Flux%%lib/io/addons/Flux/samples/SongJam/WaveView.io
-%%Flux%%lib/io/addons/Flux/samples/SongJam/_BSDLicense.txt
-%%Flux%%lib/io/addons/Flux/samples/SongJam/main.io
 %%Flux%%lib/io/addons/Flux/samples/Test/main.io
 %%Flux%%lib/io/addons/Flux/samples/Test/main2.io
 %%Flux%%lib/io/addons/Flux/source/IoFluxInit.c
-%%Fnmatch%%lib/io/addons/Fnmatch/CMakeLists.txt
 %%Fnmatch%%lib/io/addons/Fnmatch/_build/dll/libIoFnmatch.so
+%%Fnmatch%%lib/io/addons/Fnmatch/CMakeLists.txt
 %%Fnmatch%%lib/io/addons/Fnmatch/depends
 %%Fnmatch%%lib/io/addons/Fnmatch/source/IoFnmatch.c
 %%Fnmatch%%lib/io/addons/Fnmatch/source/IoFnmatch.h
 %%Fnmatch%%lib/io/addons/Fnmatch/source/IoFnmatchInit.c
 %%Fnmatch%%lib/io/addons/Fnmatch/tests/correctness/FnmatchTest.io
 %%Fnmatch%%lib/io/addons/Fnmatch/tests/correctness/run.io
-%%Font%%lib/io/addons/Font/CMakeLists.txt
 %%Font%%lib/io/addons/Font/_build/dll/libIoFont.so
+%%Font%%lib/io/addons/Font/CMakeLists.txt
 %%Font%%lib/io/addons/Font/depends
 %%Font%%lib/io/addons/Font/protos
-%%Font%%lib/io/addons/Font/samples/Terminal.io
 %%Font%%lib/io/addons/Font/samples/fontTest.io
 %%Font%%lib/io/addons/Font/samples/oopsla.txt
 %%Font%%lib/io/addons/Font/samples/slides.io
+%%Font%%lib/io/addons/Font/samples/Terminal.io
 %%Font%%lib/io/addons/Font/samples/test.io
 %%Font%%lib/io/addons/Font/samples/test2.io
 %%Font%%lib/io/addons/Font/source/FreeTypeErrorCodes.c
@@ -1055,8 +1141,8 @@ lib/libiovmall.so
 %%Font%%lib/io/addons/Font/source/IoFont.c
 %%Font%%lib/io/addons/Font/source/IoFont.h
 %%Font%%lib/io/addons/Font/source/IoFontInit.c
-%%GLFW%%lib/io/addons/GLFW/CMakeLists.txt
 %%GLFW%%lib/io/addons/GLFW/_build/dll/libIoGLFW.so
+%%GLFW%%lib/io/addons/GLFW/CMakeLists.txt
 %%GLFW%%lib/io/addons/GLFW/depends
 %%GLFW%%lib/io/addons/GLFW/protos
 %%GLFW%%lib/io/addons/GLFW/samples/lesson01.io
@@ -1069,21 +1155,19 @@ lib/libiovmall.so
 %%GLFW%%lib/io/addons/GLFW/samples/lesson08.io
 %%GLFW%%lib/io/addons/GLFW/source/IoGLFW.c
 %%GLFW%%lib/io/addons/GLFW/source/IoGLFW.h
-%%GLFW%%lib/io/addons/GLFW/source/IoGLFWInit.c
 %%GLFW%%lib/io/addons/GLFW/source/IoGLFWconst.h
 %%GLFW%%lib/io/addons/GLFW/source/IoGLFWfunc.h
-%%GoogleSearch%%lib/io/addons/GoogleSearch/CMakeLists.txt
+%%GLFW%%lib/io/addons/GLFW/source/IoGLFWInit.c
 %%GoogleSearch%%lib/io/addons/GoogleSearch/_build/dll/libIoGoogleSearch.so
+%%GoogleSearch%%lib/io/addons/GoogleSearch/CMakeLists.txt
 %%GoogleSearch%%lib/io/addons/GoogleSearch/depends
 %%GoogleSearch%%lib/io/addons/GoogleSearch/io/GoogleSearch.io
 %%GoogleSearch%%lib/io/addons/GoogleSearch/protos
 %%GoogleSearch%%lib/io/addons/GoogleSearch/samples/Google.io
 %%GoogleSearch%%lib/io/addons/GoogleSearch/samples/GoogleTranslate.io
 %%GoogleSearch%%lib/io/addons/GoogleSearch/source/IoGoogleSearchInit.c
-%%HttpClient%%lib/io/addons/HttpClient/CMakeLists.txt
-%%HttpClient%%lib/io/addons/HttpClient/README
-%%HttpClient%%lib/io/addons/HttpClient/TODO
 %%HttpClient%%lib/io/addons/HttpClient/_build/dll/libIoHttpClient.so
+%%HttpClient%%lib/io/addons/HttpClient/CMakeLists.txt
 %%HttpClient%%lib/io/addons/HttpClient/depends
 %%HttpClient%%lib/io/addons/HttpClient/io/HCConnection.io
 %%HttpClient%%lib/io/addons/HttpClient/io/HCRequest.io
@@ -1092,18 +1176,20 @@ lib/libiovmall.so
 %%HttpClient%%lib/io/addons/HttpClient/io/HCUrl.io
 %%HttpClient%%lib/io/addons/HttpClient/io/HttpClient.io
 %%HttpClient%%lib/io/addons/HttpClient/protos
+%%HttpClient%%lib/io/addons/HttpClient/README
 %%HttpClient%%lib/io/addons/HttpClient/source/.gitsidumb
 %%HttpClient%%lib/io/addons/HttpClient/source/IoHttpClientInit.c
-%%Image%%lib/io/addons/Image/CMakeLists.txt
+%%HttpClient%%lib/io/addons/HttpClient/TODO
 %%Image%%lib/io/addons/Image/_build/dll/libIoImage.so
+%%Image%%lib/io/addons/Image/CMakeLists.txt
 %%Image%%lib/io/addons/Image/depends
 %%Image%%lib/io/addons/Image/io/Image.io
 %%Image%%lib/io/addons/Image/protos
+%%Image%%lib/io/addons/Image/samples/images/lotus_t.jpg
+%%Image%%lib/io/addons/Image/samples/images/lotus_t.png
 %%Image%%lib/io/addons/Image/samples/images/lotus.jpg
 %%Image%%lib/io/addons/Image/samples/images/lotus.png
 %%Image%%lib/io/addons/Image/samples/images/lotus.tiff
-%%Image%%lib/io/addons/Image/samples/images/lotus_t.jpg
-%%Image%%lib/io/addons/Image/samples/images/lotus_t.png
 %%Image%%lib/io/addons/Image/samples/scale.io
 %%Image%%lib/io/addons/Image/samples/test.io
 %%Image%%lib/io/addons/Image/source/Image.c
@@ -1118,33 +1204,16 @@ lib/libiovmall.so
 %%Image%%lib/io/addons/Image/source/PNGImage.h
 %%Image%%lib/io/addons/Image/source/TIFFImage.c
 %%Image%%lib/io/addons/Image/source/TIFFImage.h
-%%LZO%%lib/io/addons/LZO/CMakeLists.txt
-%%LZO%%lib/io/addons/LZO/_build/dll/libIoLZO.so
-%%LZO%%lib/io/addons/LZO/depends
-%%LZO%%lib/io/addons/LZO/io/LZO.io
-%%LZO%%lib/io/addons/LZO/protos
-%%LZO%%lib/io/addons/LZO/source/IoLZODecoder.c
-%%LZO%%lib/io/addons/LZO/source/IoLZODecoder.h
-%%LZO%%lib/io/addons/LZO/source/IoLZOEncoder.c
-%%LZO%%lib/io/addons/LZO/source/IoLZOEncoder.h
-%%LZO%%lib/io/addons/LZO/source/IoLZOInit.c
-%%LZO%%lib/io/addons/LZO/source/lzoconf.h
-%%LZO%%lib/io/addons/LZO/source/lzodefs.h
-%%LZO%%lib/io/addons/LZO/source/minilzo.c
-%%LZO%%lib/io/addons/LZO/source/minilzo.h
-%%LZO%%lib/io/addons/LZO/source/minilzo_COPYING
-%%LZO%%lib/io/addons/LZO/tests/correctness/LZOTest.io
-%%LZO%%lib/io/addons/LZO/tests/correctness/run.io
-%%LibSndFile%%lib/io/addons/LibSndFile/CMakeLists.txt
 %%LibSndFile%%lib/io/addons/LibSndFile/_build/dll/libIoLibSndFile.so
+%%LibSndFile%%lib/io/addons/LibSndFile/CMakeLists.txt
 %%LibSndFile%%lib/io/addons/LibSndFile/depends
 %%LibSndFile%%lib/io/addons/LibSndFile/io/LibSndFile.io
 %%LibSndFile%%lib/io/addons/LibSndFile/protos
 %%LibSndFile%%lib/io/addons/LibSndFile/source/IoLibSndFile.c
 %%LibSndFile%%lib/io/addons/LibSndFile/source/IoLibSndFile.h
 %%LibSndFile%%lib/io/addons/LibSndFile/source/IoLibSndFileInit.c
-%%Libxml2%%lib/io/addons/Libxml2/CMakeLists.txt
 %%Libxml2%%lib/io/addons/Libxml2/_build/dll/libIoLibxml2.so
+%%Libxml2%%lib/io/addons/Libxml2/CMakeLists.txt
 %%Libxml2%%lib/io/addons/Libxml2/depends
 %%Libxml2%%lib/io/addons/Libxml2/io/Libxml2.io
 %%Libxml2%%lib/io/addons/Libxml2/protos
@@ -1153,8 +1222,8 @@ lib/libiovmall.so
 %%Libxml2%%lib/io/addons/Libxml2/source/IoXmlReader.h
 %%Libxml2%%lib/io/addons/Libxml2/source/IoXmlWriter.c
 %%Libxml2%%lib/io/addons/Libxml2/source/IoXmlWriter.h
-%%Loki%%lib/io/addons/Loki/CMakeLists.txt
 %%Loki%%lib/io/addons/Loki/_build/dll/libIoLoki.so
+%%Loki%%lib/io/addons/Loki/CMakeLists.txt
 %%Loki%%lib/io/addons/Loki/depends
 %%Loki%%lib/io/addons/Loki/io/Assembler.io
 %%Loki%%lib/io/addons/Loki/io/CodeGeneration.io
@@ -1188,8 +1257,8 @@ lib/libiovmall.so
 %%Loki%%lib/io/addons/Loki/source/IoLinker.h
 %%Loki%%lib/io/addons/Loki/source/IoLokiInit.c
 %%Loki%%lib/io/addons/Loki/tests/correctness/testcg.io
-%%Loudmouth%%lib/io/addons/Loudmouth/CMakeLists.txt
 %%Loudmouth%%lib/io/addons/Loudmouth/_build/dll/libIoLoudmouth.so
+%%Loudmouth%%lib/io/addons/Loudmouth/CMakeLists.txt
 %%Loudmouth%%lib/io/addons/Loudmouth/depends
 %%Loudmouth%%lib/io/addons/Loudmouth/io/JID.io
 %%Loudmouth%%lib/io/addons/Loudmouth/io/Loudmouth.io
@@ -1201,8 +1270,25 @@ lib/libiovmall.so
 %%Loudmouth%%lib/io/addons/Loudmouth/tests/correctness/JID.io
 %%Loudmouth%%lib/io/addons/Loudmouth/tests/correctness/LoudmouthMessage.io
 %%Loudmouth%%lib/io/addons/Loudmouth/tests/correctness/run.io
-%%MD5%%lib/io/addons/MD5/CMakeLists.txt
+%%LZO%%lib/io/addons/LZO/_build/dll/libIoLZO.so
+%%LZO%%lib/io/addons/LZO/CMakeLists.txt
+%%LZO%%lib/io/addons/LZO/depends
+%%LZO%%lib/io/addons/LZO/io/LZO.io
+%%LZO%%lib/io/addons/LZO/protos
+%%LZO%%lib/io/addons/LZO/source/IoLZODecoder.c
+%%LZO%%lib/io/addons/LZO/source/IoLZODecoder.h
+%%LZO%%lib/io/addons/LZO/source/IoLZOEncoder.c
+%%LZO%%lib/io/addons/LZO/source/IoLZOEncoder.h
+%%LZO%%lib/io/addons/LZO/source/IoLZOInit.c
+%%LZO%%lib/io/addons/LZO/source/lzoconf.h
+%%LZO%%lib/io/addons/LZO/source/lzodefs.h
+%%LZO%%lib/io/addons/LZO/source/minilzo_COPYING
+%%LZO%%lib/io/addons/LZO/source/minilzo.c
+%%LZO%%lib/io/addons/LZO/source/minilzo.h
+%%LZO%%lib/io/addons/LZO/tests/correctness/LZOTest.io
+%%LZO%%lib/io/addons/LZO/tests/correctness/run.io
 %%MD5%%lib/io/addons/MD5/_build/dll/libIoMD5.so
+%%MD5%%lib/io/addons/MD5/CMakeLists.txt
 %%MD5%%lib/io/addons/MD5/depends
 %%MD5%%lib/io/addons/MD5/io/MD5_extras.io
 %%MD5%%lib/io/addons/MD5/protos
@@ -1214,8 +1300,8 @@ lib/libiovmall.so
 %%MD5%%lib/io/addons/MD5/source/md5.c
 %%MD5%%lib/io/addons/MD5/source/md5.h
 %%MD5%%lib/io/addons/MD5/tests/correctness/MD5Test.io
-%%Memcached%%lib/io/addons/Memcached/CMakeLists.txt
 %%Memcached%%lib/io/addons/Memcached/_build/dll/libIoMemcached.so
+%%Memcached%%lib/io/addons/Memcached/CMakeLists.txt
 %%Memcached%%lib/io/addons/Memcached/depends
 %%Memcached%%lib/io/addons/Memcached/io/Memcached_extras.io
 %%Memcached%%lib/io/addons/Memcached/protos
@@ -1223,14 +1309,35 @@ lib/libiovmall.so
 %%Memcached%%lib/io/addons/Memcached/source/IoMemcached.h
 %%Memcached%%lib/io/addons/Memcached/source/IoMemcachedInit.c
 %%Memcached%%lib/io/addons/Memcached/tests/correctness/run.io
-%%NotificationCenter%%lib/io/addons/NotificationCenter/CMakeLists.txt
 %%NotificationCenter%%lib/io/addons/NotificationCenter/_build/dll/libIoNotificationCenter.so
+%%NotificationCenter%%lib/io/addons/NotificationCenter/CMakeLists.txt
 %%NotificationCenter%%lib/io/addons/NotificationCenter/depends
 %%NotificationCenter%%lib/io/addons/NotificationCenter/io/NotificationCenter.io
 %%NotificationCenter%%lib/io/addons/NotificationCenter/protos
 %%NotificationCenter%%lib/io/addons/NotificationCenter/source/IoNotificationCenterInit.c
-%%Obsidian%%lib/io/addons/Obsidian/CMakeLists.txt
+%%Oauth%%lib/io/addons/Oauth/_build/dll/libIoOauth.so
+%%Oauth%%lib/io/addons/Oauth/CMakeLists.txt
+%%Oauth%%lib/io/addons/Oauth/depends
+%%Oauth%%lib/io/addons/Oauth/io/Oauth_extras.io
+%%Oauth%%lib/io/addons/Oauth/io/OauthRequest.io
+%%Oauth%%lib/io/addons/Oauth/io/OauthResponse.io
+%%Oauth%%lib/io/addons/Oauth/protos
+%%Oauth%%lib/io/addons/Oauth/source/IoOauth.c
+%%Oauth%%lib/io/addons/Oauth/source/IoOauth.h
+%%Oauth%%lib/io/addons/Oauth/source/IoOauthInit.c
+%%Oauth%%lib/io/addons/Oauth/source/Oauth/_aux.c
+%%Oauth%%lib/io/addons/Oauth/source/Oauth/_aux.h
+%%Oauth%%lib/io/addons/Oauth/source/Oauth/crypto.c
+%%Oauth%%lib/io/addons/Oauth/source/Oauth/crypto.h
+%%Oauth%%lib/io/addons/Oauth/source/Oauth/http.c
+%%Oauth%%lib/io/addons/Oauth/source/Oauth/http.h
+%%Oauth%%lib/io/addons/Oauth/source/Oauth/Oauth.c
+%%Oauth%%lib/io/addons/Oauth/source/Oauth/Oauth.h
+%%Oauth%%lib/io/addons/Oauth/source/Oauth/tls.c
+%%Oauth%%lib/io/addons/Oauth/source/Oauth/tls.h
+%%Oauth%%lib/io/addons/Oauth/tests/correctness/OAuthTest.io
 %%Obsidian%%lib/io/addons/Obsidian/_build/dll/libIoObsidian.so
+%%Obsidian%%lib/io/addons/Obsidian/CMakeLists.txt
 %%Obsidian%%lib/io/addons/Obsidian/depends
 %%Obsidian%%lib/io/addons/Obsidian/io/Obsidian.io
 %%Obsidian%%lib/io/addons/Obsidian/io/ObsidianClient.io
@@ -1249,8 +1356,8 @@ lib/libiovmall.so
 %%Obsidian%%lib/io/addons/Obsidian/tests/performance/ObsidianNetwork.io
 %%Obsidian%%lib/io/addons/Obsidian/tests/performance/ObsidianTest.io
 %%Obsidian%%lib/io/addons/Obsidian/tests/performance/run.io
-%%Ogg%%lib/io/addons/Ogg/CMakeLists.txt
 %%Ogg%%lib/io/addons/Ogg/_build/dll/libIoOgg.so
+%%Ogg%%lib/io/addons/Ogg/CMakeLists.txt
 %%Ogg%%lib/io/addons/Ogg/depends
 %%Ogg%%lib/io/addons/Ogg/io/Ogg.io
 %%Ogg%%lib/io/addons/Ogg/protos
@@ -1265,8 +1372,8 @@ lib/libiovmall.so
 %%Ogg%%lib/io/addons/Ogg/source/IoOggStreamState.h
 %%Ogg%%lib/io/addons/Ogg/source/IoOggSyncState.c
 %%Ogg%%lib/io/addons/Ogg/source/IoOggSyncState.h
-%%OpenGL%%lib/io/addons/OpenGL/CMakeLists.txt
 %%OpenGL%%lib/io/addons/OpenGL/_build/dll/libIoOpenGL.so
+%%OpenGL%%lib/io/addons/OpenGL/CMakeLists.txt
 %%OpenGL%%lib/io/addons/OpenGL/depends
 %%OpenGL%%lib/io/addons/OpenGL/io/DisplayList.io
 %%OpenGL%%lib/io/addons/OpenGL/io/GLApp.io
@@ -1279,16 +1386,15 @@ lib/libiovmall.so
 %%OpenGL%%lib/io/addons/OpenGL/io/Texture.io
 %%OpenGL%%lib/io/addons/OpenGL/io/Vector.io
 %%OpenGL%%lib/io/addons/OpenGL/protos
-%%OpenGL%%lib/io/addons/OpenGL/samples/Mandlebrot.io
 %%OpenGL%%lib/io/addons/OpenGL/samples/balls.io
 %%OpenGL%%lib/io/addons/OpenGL/samples/cube.io
 %%OpenGL%%lib/io/addons/OpenGL/samples/cylinder.io
 %%OpenGL%%lib/io/addons/OpenGL/samples/events.io
 %%OpenGL%%lib/io/addons/OpenGL/samples/game.io
-%%OpenGL%%lib/io/addons/OpenGL/samples/game/Tank.io
 %%OpenGL%%lib/io/addons/OpenGL/samples/game/_ReadMe.txt
 %%OpenGL%%lib/io/addons/OpenGL/samples/game/client.io
 %%OpenGL%%lib/io/addons/OpenGL/samples/game/server.io
+%%OpenGL%%lib/io/addons/OpenGL/samples/game/Tank.io
 %%OpenGL%%lib/io/addons/OpenGL/samples/globe.io
 %%OpenGL%%lib/io/addons/OpenGL/samples/grabTextureTest.io
 %%OpenGL%%lib/io/addons/OpenGL/samples/images/earth.gif
@@ -1297,28 +1403,29 @@ lib/libiovmall.so
 %%OpenGL%%lib/io/addons/OpenGL/samples/images/world_hires.jpg
 %%OpenGL%%lib/io/addons/OpenGL/samples/images/world_hires2.jpg
 %%OpenGL%%lib/io/addons/OpenGL/samples/lines.io
+%%OpenGL%%lib/io/addons/OpenGL/samples/Mandlebrot.io
 %%OpenGL%%lib/io/addons/OpenGL/samples/polygonSmoothing.io
 %%OpenGL%%lib/io/addons/OpenGL/samples/sphere.io
 %%OpenGL%%lib/io/addons/OpenGL/samples/test2.io
 %%OpenGL%%lib/io/addons/OpenGL/source/GLIncludes.h
 %%OpenGL%%lib/io/addons/OpenGL/source/IoBox_gl.c
 %%OpenGL%%lib/io/addons/OpenGL/source/IoBox_gl.h
+%%OpenGL%%lib/io/addons/OpenGL/source/IoGLconst.h
 %%OpenGL%%lib/io/addons/OpenGL/source/IoGLEconst.h
 %%OpenGL%%lib/io/addons/OpenGL/source/IoGLEfunc.h
+%%OpenGL%%lib/io/addons/OpenGL/source/IoGLfunc.h
 %%OpenGL%%lib/io/addons/OpenGL/source/IoGLScissor.c
 %%OpenGL%%lib/io/addons/OpenGL/source/IoGLScissor.h
 %%OpenGL%%lib/io/addons/OpenGL/source/IoGLU.c
 %%OpenGL%%lib/io/addons/OpenGL/source/IoGLU.h
+%%OpenGL%%lib/io/addons/OpenGL/source/IoGLUconst.h
+%%OpenGL%%lib/io/addons/OpenGL/source/IoGLUfunc.h
 %%OpenGL%%lib/io/addons/OpenGL/source/IoGLUQuadric.c
 %%OpenGL%%lib/io/addons/OpenGL/source/IoGLUQuadric.h
 %%OpenGL%%lib/io/addons/OpenGL/source/IoGLUT.c
 %%OpenGL%%lib/io/addons/OpenGL/source/IoGLUT.h
 %%OpenGL%%lib/io/addons/OpenGL/source/IoGLUTconst.h
 %%OpenGL%%lib/io/addons/OpenGL/source/IoGLUTfunc.h
-%%OpenGL%%lib/io/addons/OpenGL/source/IoGLUconst.h
-%%OpenGL%%lib/io/addons/OpenGL/source/IoGLUfunc.h
-%%OpenGL%%lib/io/addons/OpenGL/source/IoGLconst.h
-%%OpenGL%%lib/io/addons/OpenGL/source/IoGLfunc.h
 %%OpenGL%%lib/io/addons/OpenGL/source/IoOpenGL.c
 %%OpenGL%%lib/io/addons/OpenGL/source/IoOpenGL.h
 %%OpenGL%%lib/io/addons/OpenGL/source/IoOpenGLInit.c
@@ -1328,16 +1435,16 @@ lib/libiovmall.so
 %%OpenGL%%lib/io/addons/OpenGL/source/new/IoGLE.h
 %%OpenGL%%lib/io/addons/OpenGL/source/new/IoSceneNode.c
 %%OpenGL%%lib/io/addons/OpenGL/source/new/IoSceneNode.h
-%%PostgreSQL%%lib/io/addons/PostgreSQL/CMakeLists.txt
 %%PostgreSQL%%lib/io/addons/PostgreSQL/_build/dll/libIoPostgreSQL.so
+%%PostgreSQL%%lib/io/addons/PostgreSQL/CMakeLists.txt
 %%PostgreSQL%%lib/io/addons/PostgreSQL/depends
 %%PostgreSQL%%lib/io/addons/PostgreSQL/io/PostgreSQL.io
 %%PostgreSQL%%lib/io/addons/PostgreSQL/protos
 %%PostgreSQL%%lib/io/addons/PostgreSQL/samples/pgsql-sample.io
-%%PostgreSQL%%lib/io/addons/PostgreSQL/source/IoPostgreSQLInit.c
 %%PostgreSQL%%lib/io/addons/PostgreSQL/source/empty
-%%Python%%lib/io/addons/Python/CMakeLists.txt
+%%PostgreSQL%%lib/io/addons/PostgreSQL/source/IoPostgreSQLInit.c
 %%Python%%lib/io/addons/Python/_build/dll/libIoPython.so
+%%Python%%lib/io/addons/Python/CMakeLists.txt
 %%Python%%lib/io/addons/Python/depends
 %%Python%%lib/io/addons/Python/protos
 %%Python%%lib/io/addons/Python/samples/UsingPython.io
@@ -1346,23 +1453,23 @@ lib/libiovmall.so
 %%Python%%lib/io/addons/Python/source/IoPythonInit.c
 %%Python%%lib/io/addons/Python/source/PythonData.c
 %%Python%%lib/io/addons/Python/source/PythonData.h
-%%Python%%lib/io/addons/Python/tests/correctness/UserTest.io
 %%Python%%lib/io/addons/Python/tests/correctness/run.io
-%%QDBM%%lib/io/addons/QDBM/CMakeLists.txt
+%%Python%%lib/io/addons/Python/tests/correctness/UserTest.io
 %%QDBM%%lib/io/addons/QDBM/_build/dll/libIoQDBM.so
+%%QDBM%%lib/io/addons/QDBM/CMakeLists.txt
 %%QDBM%%lib/io/addons/QDBM/depends
 %%QDBM%%lib/io/addons/QDBM/io/QDBM.io
 %%QDBM%%lib/io/addons/QDBM/protos
 %%QDBM%%lib/io/addons/QDBM/source/IoQDBM.c
 %%QDBM%%lib/io/addons/QDBM/source/IoQDBM.h
 %%QDBM%%lib/io/addons/QDBM/source/IoQDBMInit.c
-%%QDBM%%lib/io/addons/QDBM/tests/correctness/QDBMTest.io
 %%QDBM%%lib/io/addons/QDBM/tests/correctness/basic.io
+%%QDBM%%lib/io/addons/QDBM/tests/correctness/QDBMTest.io
 %%QDBM%%lib/io/addons/QDBM/tests/correctness/run.io
 %%QDBM%%lib/io/addons/QDBM/tests/correctness/test.c
 %%QDBM%%lib/io/addons/QDBM/tests/correctness/testPath.io
-%%Random%%lib/io/addons/Random/CMakeLists.txt
 %%Random%%lib/io/addons/Random/_build/dll/libIoRandom.so
+%%Random%%lib/io/addons/Random/CMakeLists.txt
 %%Random%%lib/io/addons/Random/depends
 %%Random%%lib/io/addons/Random/io/List.io
 %%Random%%lib/io/addons/Random/protos
@@ -1371,21 +1478,21 @@ lib/libiovmall.so
 %%Random%%lib/io/addons/Random/source/IoRandomInit.c
 %%Random%%lib/io/addons/Random/tests/correctness/ListTest.io
 %%Random%%lib/io/addons/Random/tests/correctness/run.io
-%%Range%%lib/io/addons/Range/CMakeLists.txt
 %%Range%%lib/io/addons/Range/_build/dll/libIoRange.so
+%%Range%%lib/io/addons/Range/CMakeLists.txt
 %%Range%%lib/io/addons/Range/depends
 %%Range%%lib/io/addons/Range/io/Extras.io
 %%Range%%lib/io/addons/Range/io/Range.io
 %%Range%%lib/io/addons/Range/protos
+%%Range%%lib/io/addons/Range/source/IoRange_inline.h
 %%Range%%lib/io/addons/Range/source/IoRange.c
 %%Range%%lib/io/addons/Range/source/IoRange.h
 %%Range%%lib/io/addons/Range/source/IoRangeApi.h
 %%Range%%lib/io/addons/Range/source/IoRangeInit.c
-%%Range%%lib/io/addons/Range/source/IoRange_inline.h
 %%Range%%lib/io/addons/Range/tests/correctness/RangeTest.io
 %%Range%%lib/io/addons/Range/tests/correctness/run.io
-%%Rational%%lib/io/addons/Rational/CMakeLists.txt
 %%Rational%%lib/io/addons/Rational/_build/dll/libIoRational.so
+%%Rational%%lib/io/addons/Rational/CMakeLists.txt
 %%Rational%%lib/io/addons/Rational/depends
 %%Rational%%lib/io/addons/Rational/io/Rational.io
 %%Rational%%lib/io/addons/Rational/protos
@@ -1393,8 +1500,8 @@ lib/libiovmall.so
 %%Rational%%lib/io/addons/Rational/source/IoRationalInit.c
 %%Rational%%lib/io/addons/Rational/tests/correctness/RationalTest.io
 %%Rational%%lib/io/addons/Rational/tests/correctness/run.io
-%%ReadLine%%lib/io/addons/ReadLine/CMakeLists.txt
 %%ReadLine%%lib/io/addons/ReadLine/_build/dll/libIoReadLine.so
+%%ReadLine%%lib/io/addons/ReadLine/CMakeLists.txt
 %%ReadLine%%lib/io/addons/ReadLine/depends
 %%ReadLine%%lib/io/addons/ReadLine/protos
 %%ReadLine%%lib/io/addons/ReadLine/source/IoReadLine.c
@@ -1402,8 +1509,8 @@ lib/libiovmall.so
 %%ReadLine%%lib/io/addons/ReadLine/source/IoReadLineInit.c
 %%ReadLine%%lib/io/addons/ReadLine/tests/correctness/ReadLineTest.io
 %%ReadLine%%lib/io/addons/ReadLine/tests/correctness/run.io
-%%Regex%%lib/io/addons/Regex/CMakeLists.txt
 %%Regex%%lib/io/addons/Regex/_build/dll/libIoRegex.so
+%%Regex%%lib/io/addons/Regex/CMakeLists.txt
 %%Regex%%lib/io/addons/Regex/depends
 %%Regex%%lib/io/addons/Regex/io/Regex.io
 %%Regex%%lib/io/addons/Regex/io/RegexMatch.io
@@ -1419,41 +1526,47 @@ lib/libiovmall.so
 %%Regex%%lib/io/addons/Regex/source/IoRegexMatches.h
 %%Regex%%lib/io/addons/Regex/source/Regex.c
 %%Regex%%lib/io/addons/Regex/source/Regex.h
-%%Regex%%lib/io/addons/Regex/tests/correctness/RegexMatchTest.io
 %%Regex%%lib/io/addons/Regex/tests/correctness/RegexMatchesTest.io
+%%Regex%%lib/io/addons/Regex/tests/correctness/RegexMatchTest.io
 %%Regex%%lib/io/addons/Regex/tests/correctness/RegexTest.io
-%%Regex%%lib/io/addons/Regex/tests/correctness/SequenceTest.io
 %%Regex%%lib/io/addons/Regex/tests/correctness/run.io
-%%SGML%%lib/io/addons/SGML/CMakeLists.txt
+%%Regex%%lib/io/addons/Regex/tests/correctness/SequenceTest.io
+%%SampleRateConverter%%lib/io/addons/SampleRateConverter/_build/dll/libIoSampleRateConverter.so
+%%SampleRateConverter%%lib/io/addons/SampleRateConverter/CMakeLists.txt
+%%SampleRateConverter%%lib/io/addons/SampleRateConverter/depends
+%%SampleRateConverter%%lib/io/addons/SampleRateConverter/io/SampleRateConverter.io
+%%SampleRateConverter%%lib/io/addons/SampleRateConverter/protos
+%%SampleRateConverter%%lib/io/addons/SampleRateConverter/samples/loopback.io
+%%SampleRateConverter%%lib/io/addons/SampleRateConverter/samples/mp3filestream.io
+%%SampleRateConverter%%lib/io/addons/SampleRateConverter/samples/mp3netstream.io
+%%SampleRateConverter%%lib/io/addons/SampleRateConverter/samples/server.io
+%%SampleRateConverter%%lib/io/addons/SampleRateConverter/samples/sndplay.io
+%%SampleRateConverter%%lib/io/addons/SampleRateConverter/samples/sounds/max.mp3
+%%SampleRateConverter%%lib/io/addons/SampleRateConverter/samples/sounds/max.wav
+%%SampleRateConverter%%lib/io/addons/SampleRateConverter/source/IoSampleRateConverter.c
+%%SampleRateConverter%%lib/io/addons/SampleRateConverter/source/IoSampleRateConverter.h
+%%SampleRateConverter%%lib/io/addons/SampleRateConverter/source/IoSampleRateConverterInit.c
 %%SGML%%lib/io/addons/SGML/_build/dll/libIoSGML.so
 %%SGML%%lib/io/addons/SGML/_build/dll/libsgml.a
+%%SGML%%lib/io/addons/SGML/CMakeLists.txt
 %%SGML%%lib/io/addons/SGML/depends
 %%SGML%%lib/io/addons/SGML/io/SGMLElement.io
 %%SGML%%lib/io/addons/SGML/protos
 %%SGML%%lib/io/addons/SGML/source/IoSGMLInit.c
 %%SGML%%lib/io/addons/SGML/source/IoSGMLParser.c
 %%SGML%%lib/io/addons/SGML/source/IoSGMLParser.h
+%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/acgeneral.m4
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/Bugs
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/ChangeLog
-%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/License
-%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/Makefile
-%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/Makefile.in
-%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/README
-%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/TODO
-%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/acgeneral.m4
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/configure
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/configure.in
+%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/annotated.html
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/DomComment_8h-source.html
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/DomDocument_8h-source.html
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/DomElement_8h-source.html
-%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/DomNodeList_8h-source.html
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/DomNode_8h-source.html
+%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/DomNodeList_8h-source.html
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/DomText_8h-source.html
-%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/SgmlExtensionHtml_8h-source.html
-%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/SgmlExtensionXml_8h-source.html
-%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/SgmlParser_8h-source.html
-%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/Variant_8h-source.html
-%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/annotated.html
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/doxygen.css
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/doxygen.png
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/examples.html
@@ -1473,20 +1586,24 @@ lib/libiovmall.so
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/index.html
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/libsgml_8h-source.html
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/modules.html
-%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/namespaceSgml.html
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/namespaces.html
-%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/struct__dom__node.html
-%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/struct__dom__node__list.html
+%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/namespaceSgml.html
+%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/SgmlExtensionHtml_8h-source.html
+%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/SgmlExtensionXml_8h-source.html
+%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/SgmlParser_8h-source.html
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/struct__dom__node__list__node.html
+%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/struct__dom__node__list.html
+%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/struct__dom__node.html
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/struct__sgml__handlers.html
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/struct__variant__value.html
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/test_8c-example.html
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/testhtml_8c-example.html
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/testxml_8c-example.html
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/variant_8c-example.html
+%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/Variant_8h-source.html
+%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/examples/example.html
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/examples/Makefile
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/examples/Makefile.in
-%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/examples/example.html
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/examples/slashdot.html
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/examples/slashdot.xml
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/examples/test.c
@@ -1500,12 +1617,16 @@ lib/libiovmall.so
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/include/sgml/DomNode.h
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/include/sgml/DomNodeList.h
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/include/sgml/DomText.h
+%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/include/sgml/libsgml.h
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/include/sgml/SgmlExtensionHtml.h
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/include/sgml/SgmlExtensionXml.h
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/include/sgml/SgmlParser.h
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/include/sgml/Variant.h
-%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/include/sgml/libsgml.h
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/libsgml.doxy
+%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/License
+%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/Makefile
+%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/Makefile.in
+%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/README
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/src/CMakeLists.txt
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/src/DomComment.c
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/src/DomDocument.c
@@ -1519,49 +1640,25 @@ lib/libiovmall.so
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/src/SgmlExtensionXml.c
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/src/SgmlParser.c
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/src/Variant.c
-%%SGML%%lib/io/addons/SGML/tests/correctness/SGMLTest.io
+%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/TODO
 %%SGML%%lib/io/addons/SGML/tests/correctness/run.io
-%%SHA1%%lib/io/addons/SHA1/CMakeLists.txt
+%%SGML%%lib/io/addons/SGML/tests/correctness/SGMLTest.io
 %%SHA1%%lib/io/addons/SHA1/_build/dll/libIoSHA1.so
+%%SHA1%%lib/io/addons/SHA1/CMakeLists.txt
 %%SHA1%%lib/io/addons/SHA1/depends
 %%SHA1%%lib/io/addons/SHA1/io/sha1.io
 %%SHA1%%lib/io/addons/SHA1/protos
+%%SHA1%%lib/io/addons/SHA1/source/hmac.c
+%%SHA1%%lib/io/addons/SHA1/source/hmac.h
 %%SHA1%%lib/io/addons/SHA1/source/IoSHA1.c
 %%SHA1%%lib/io/addons/SHA1/source/IoSHA1.h
 %%SHA1%%lib/io/addons/SHA1/source/IoSHA1Init.c
-%%SHA1%%lib/io/addons/SHA1/source/hmac.c
-%%SHA1%%lib/io/addons/SHA1/source/hmac.h
 %%SHA1%%lib/io/addons/SHA1/source/sha1.c
 %%SHA1%%lib/io/addons/SHA1/source/sha1.h
-%%SHA1%%lib/io/addons/SHA1/tests/correctness/SHA1Test.io
 %%SHA1%%lib/io/addons/SHA1/tests/correctness/run.io
-%%SQLite3%%lib/io/addons/SQLite3/CMakeLists.txt
-%%SQLite3%%lib/io/addons/SQLite3/_build/dll/libIoSQLite3.so
-%%SQLite3%%lib/io/addons/SQLite3/depends
-%%SQLite3%%lib/io/addons/SQLite3/io/SQLite3.io
-%%SQLite3%%lib/io/addons/SQLite3/protos
-%%SQLite3%%lib/io/addons/SQLite3/source/IoSQLite3.c
-%%SQLite3%%lib/io/addons/SQLite3/source/IoSQLite3.h
-%%SQLite3%%lib/io/addons/SQLite3/source/IoSQLite3Init.c
-%%SQLite3%%lib/io/addons/SQLite3/tests/correctness/SQLite3Test.io
-%%SQLite3%%lib/io/addons/SQLite3/tests/correctness/run.io
-%%SampleRateConverter%%lib/io/addons/SampleRateConverter/CMakeLists.txt
-%%SampleRateConverter%%lib/io/addons/SampleRateConverter/_build/dll/libIoSampleRateConverter.so
-%%SampleRateConverter%%lib/io/addons/SampleRateConverter/depends
-%%SampleRateConverter%%lib/io/addons/SampleRateConverter/io/SampleRateConverter.io
-%%SampleRateConverter%%lib/io/addons/SampleRateConverter/protos
-%%SampleRateConverter%%lib/io/addons/SampleRateConverter/samples/loopback.io
-%%SampleRateConverter%%lib/io/addons/SampleRateConverter/samples/mp3filestream.io
-%%SampleRateConverter%%lib/io/addons/SampleRateConverter/samples/mp3netstream.io
-%%SampleRateConverter%%lib/io/addons/SampleRateConverter/samples/server.io
-%%SampleRateConverter%%lib/io/addons/SampleRateConverter/samples/sndplay.io
-%%SampleRateConverter%%lib/io/addons/SampleRateConverter/samples/sounds/max.mp3
-%%SampleRateConverter%%lib/io/addons/SampleRateConverter/samples/sounds/max.wav
-%%SampleRateConverter%%lib/io/addons/SampleRateConverter/source/IoSampleRateConverter.c
-%%SampleRateConverter%%lib/io/addons/SampleRateConverter/source/IoSampleRateConverter.h
-%%SampleRateConverter%%lib/io/addons/SampleRateConverter/source/IoSampleRateConverterInit.c
-%%Socket%%lib/io/addons/Socket/CMakeLists.txt
+%%SHA1%%lib/io/addons/SHA1/tests/correctness/SHA1Test.io
 %%Socket%%lib/io/addons/Socket/_build/dll/libIoSocket.so
+%%Socket%%lib/io/addons/Socket/CMakeLists.txt
 %%Socket%%lib/io/addons/Socket/depends
 %%Socket%%lib/io/addons/Socket/io/A0_EventManager.io
 %%Socket%%lib/io/addons/Socket/io/A1_Socket.io
@@ -1574,8 +1671,8 @@ lib/libiovmall.so
 %%Socket%%lib/io/addons/Socket/io/EvOutResponse.io
 %%Socket%%lib/io/addons/Socket/io/EvStatusCodes.io
 %%Socket%%lib/io/addons/Socket/io/IPAddress.io
-%%Socket%%lib/io/addons/Socket/io/URL.io
 %%Socket%%lib/io/addons/Socket/io/UnixPath.io
+%%Socket%%lib/io/addons/Socket/io/URL.io
 %%Socket%%lib/io/addons/Socket/protos
 %%Socket%%lib/io/addons/Socket/samples/ChatServer.io
 %%Socket%%lib/io/addons/Socket/samples/ClientServer.io
@@ -1590,6 +1687,7 @@ lib/libiovmall.so
 %%Socket%%lib/io/addons/Socket/samples/IRC/IoBot.io
 %%Socket%%lib/io/addons/Socket/samples/MiniEmailServer.io
 %%Socket%%lib/io/addons/Socket/samples/MinimalWebServer.io
+%%Socket%%lib/io/addons/Socket/samples/ptest.io
 %%Socket%%lib/io/addons/Socket/samples/Radio.io
 %%Socket%%lib/io/addons/Socket/samples/TerminalServer.io
 %%Socket%%lib/io/addons/Socket/samples/UDP/UDPClient.io
@@ -1597,27 +1695,24 @@ lib/libiovmall.so
 %%Socket%%lib/io/addons/Socket/samples/URLTest.io
 %%Socket%%lib/io/addons/Socket/samples/WebDownload.io
 %%Socket%%lib/io/addons/Socket/samples/WebRequest.io
-%%Socket%%lib/io/addons/Socket/samples/WebServer/WebServer.io
 %%Socket%%lib/io/addons/Socket/samples/WebServer/test.io
-%%Socket%%lib/io/addons/Socket/samples/ptest.io
+%%Socket%%lib/io/addons/Socket/samples/WebServer/WebServer.io
 %%Socket%%lib/io/addons/Socket/source/Address.c
 %%Socket%%lib/io/addons/Socket/source/Address.h
-%%Socket%%lib/io/addons/Socket/source/IPAddress.c
-%%Socket%%lib/io/addons/Socket/source/IPAddress.h
 %%Socket%%lib/io/addons/Socket/source/IoDNS.c
 %%Socket%%lib/io/addons/Socket/source/IoDNS.h
 %%Socket%%lib/io/addons/Socket/source/IoEvConnection.c
 %%Socket%%lib/io/addons/Socket/source/IoEvConnection.h
+%%Socket%%lib/io/addons/Socket/source/IoEvent.c
+%%Socket%%lib/io/addons/Socket/source/IoEvent.h
+%%Socket%%lib/io/addons/Socket/source/IoEventManager.c
+%%Socket%%lib/io/addons/Socket/source/IoEventManager.h
 %%Socket%%lib/io/addons/Socket/source/IoEvHttpServer.c
 %%Socket%%lib/io/addons/Socket/source/IoEvHttpServer.h
 %%Socket%%lib/io/addons/Socket/source/IoEvOutRequest.c
 %%Socket%%lib/io/addons/Socket/source/IoEvOutRequest.h
 %%Socket%%lib/io/addons/Socket/source/IoEvOutResponse.c
 %%Socket%%lib/io/addons/Socket/source/IoEvOutResponse.h
-%%Socket%%lib/io/addons/Socket/source/IoEvent.c
-%%Socket%%lib/io/addons/Socket/source/IoEvent.h
-%%Socket%%lib/io/addons/Socket/source/IoEventManager.c
-%%Socket%%lib/io/addons/Socket/source/IoEventManager.h
 %%Socket%%lib/io/addons/Socket/source/IoIPAddress.c
 %%Socket%%lib/io/addons/Socket/source/IoIPAddress.h
 %%Socket%%lib/io/addons/Socket/source/IoSocket.c
@@ -1625,48 +1720,60 @@ lib/libiovmall.so
 %%Socket%%lib/io/addons/Socket/source/IoSocketInit.c
 %%Socket%%lib/io/addons/Socket/source/IoUnixPath.c
 %%Socket%%lib/io/addons/Socket/source/IoUnixPath.h
+%%Socket%%lib/io/addons/Socket/source/IPAddress.c
+%%Socket%%lib/io/addons/Socket/source/IPAddress.h
 %%Socket%%lib/io/addons/Socket/source/LocalNameServers.c
 %%Socket%%lib/io/addons/Socket/source/LocalNameServers.h
-%%Socket%%lib/io/addons/Socket/source/Socket.c
-%%Socket%%lib/io/addons/Socket/source/Socket.h
-%%Socket%%lib/io/addons/Socket/source/UnixPath.c
-%%Socket%%lib/io/addons/Socket/source/UnixPath.h
 %%Socket%%lib/io/addons/Socket/source/new/IoEvDNS.c
 %%Socket%%lib/io/addons/Socket/source/new/IoEvDNS.h
 %%Socket%%lib/io/addons/Socket/source/new/IoEvDNSRequest.c
 %%Socket%%lib/io/addons/Socket/source/new/IoEvDNSRequest.h
+%%Socket%%lib/io/addons/Socket/source/Socket.c
+%%Socket%%lib/io/addons/Socket/source/Socket.h
+%%Socket%%lib/io/addons/Socket/source/UnixPath.c
+%%Socket%%lib/io/addons/Socket/source/UnixPath.h
 %%Socket%%lib/io/addons/Socket/tests/correctness/DNSTest.io
-%%Socket%%lib/io/addons/Socket/tests/correctness/SocketTest.io
 %%Socket%%lib/io/addons/Socket/tests/correctness/run.io
-%%SqlDatabase%%lib/io/addons/SqlDatabase/CMakeLists.txt
+%%Socket%%lib/io/addons/Socket/tests/correctness/SocketTest.io
 %%SqlDatabase%%lib/io/addons/SqlDatabase/_build/dll/libIoSqlDatabase.so
+%%SqlDatabase%%lib/io/addons/SqlDatabase/CMakeLists.txt
 %%SqlDatabase%%lib/io/addons/SqlDatabase/depends
 %%SqlDatabase%%lib/io/addons/SqlDatabase/io/SqlDatabase.io
 %%SqlDatabase%%lib/io/addons/SqlDatabase/protos
 %%SqlDatabase%%lib/io/addons/SqlDatabase/source/IoSqlDatabaseInit.c
-%%Syslog%%lib/io/addons/Syslog/CMakeLists.txt
+%%SQLite3%%lib/io/addons/SQLite3/_build/dll/libIoSQLite3.so
+%%SQLite3%%lib/io/addons/SQLite3/CMakeLists.txt
+%%SQLite3%%lib/io/addons/SQLite3/depends
+%%SQLite3%%lib/io/addons/SQLite3/io/SQLite3.io
+%%SQLite3%%lib/io/addons/SQLite3/protos
+%%SQLite3%%lib/io/addons/SQLite3/source/IoSQLite3.c
+%%SQLite3%%lib/io/addons/SQLite3/source/IoSQLite3.h
+%%SQLite3%%lib/io/addons/SQLite3/source/IoSQLite3Init.c
+%%SQLite3%%lib/io/addons/SQLite3/tests/correctness/run.io
+%%SQLite3%%lib/io/addons/SQLite3/tests/correctness/SQLite3Test.io
 %%Syslog%%lib/io/addons/Syslog/_build/dll/libIoSyslog.so
+%%Syslog%%lib/io/addons/Syslog/CMakeLists.txt
 %%Syslog%%lib/io/addons/Syslog/depends
 %%Syslog%%lib/io/addons/Syslog/protos
 %%Syslog%%lib/io/addons/Syslog/samples/sample.io
 %%Syslog%%lib/io/addons/Syslog/source/IoSyslog.c
 %%Syslog%%lib/io/addons/Syslog/source/IoSyslog.h
 %%Syslog%%lib/io/addons/Syslog/source/IoSyslogInit.c
-%%SystemCall%%lib/io/addons/SystemCall/CMakeLists.txt
 %%SystemCall%%lib/io/addons/SystemCall/_build/dll/libIoSystemCall.so
+%%SystemCall%%lib/io/addons/SystemCall/CMakeLists.txt
 %%SystemCall%%lib/io/addons/SystemCall/depends
 %%SystemCall%%lib/io/addons/SystemCall/io/SystemCall.io
 %%SystemCall%%lib/io/addons/SystemCall/protos
 %%SystemCall%%lib/io/addons/SystemCall/samples/pingtest.io
 %%SystemCall%%lib/io/addons/SystemCall/samples/test.io
 %%SystemCall%%lib/io/addons/SystemCall/samples/test2.io
+%%SystemCall%%lib/io/addons/SystemCall/source/callsystem.c
+%%SystemCall%%lib/io/addons/SystemCall/source/callsystem.h
 %%SystemCall%%lib/io/addons/SystemCall/source/IoSystemCall.c
 %%SystemCall%%lib/io/addons/SystemCall/source/IoSystemCall.h
 %%SystemCall%%lib/io/addons/SystemCall/source/IoSystemCallInit.c
-%%SystemCall%%lib/io/addons/SystemCall/source/callsystem.c
-%%SystemCall%%lib/io/addons/SystemCall/source/callsystem.h
-%%TagLib%%lib/io/addons/TagLib/CMakeLists.txt
 %%TagLib%%lib/io/addons/TagLib/_build/dll/libIoTagLib.so
+%%TagLib%%lib/io/addons/TagLib/CMakeLists.txt
 %%TagLib%%lib/io/addons/TagLib/depends
 %%TagLib%%lib/io/addons/TagLib/io/TagLib_extras.io
 %%TagLib%%lib/io/addons/TagLib/protos
@@ -1676,8 +1783,8 @@ lib/libiovmall.so
 %%TagLib%%lib/io/addons/TagLib/source/IoTagLib.c
 %%TagLib%%lib/io/addons/TagLib/source/IoTagLib.h
 %%TagLib%%lib/io/addons/TagLib/source/IoTagLibInit.c
-%%Theora%%lib/io/addons/Theora/CMakeLists.txt
 %%Theora%%lib/io/addons/Theora/_build/dll/libIoTheora.so
+%%Theora%%lib/io/addons/Theora/CMakeLists.txt
 %%Theora%%lib/io/addons/Theora/depends
 %%Theora%%lib/io/addons/Theora/io/Theora.io
 %%Theora%%lib/io/addons/Theora/protos
@@ -1690,8 +1797,8 @@ lib/libiovmall.so
 %%Theora%%lib/io/addons/Theora/source/IoTheoraInit.c
 %%Theora%%lib/io/addons/Theora/source/IoTheoraSetupInfo.c
 %%Theora%%lib/io/addons/Theora/source/IoTheoraSetupInfo.h
-%%Thread%%lib/io/addons/Thread/CMakeLists.txt
 %%Thread%%lib/io/addons/Thread/_build/dll/libIoThread.so
+%%Thread%%lib/io/addons/Thread/CMakeLists.txt
 %%Thread%%lib/io/addons/Thread/depends
 %%Thread%%lib/io/addons/Thread/protos
 %%Thread%%lib/io/addons/Thread/source/IoThread.c
@@ -1701,10 +1808,10 @@ lib/libiovmall.so
 %%Thread%%lib/io/addons/Thread/source/Thread.h
 %%Thread%%lib/io/addons/Thread/source/ThreadMutex.c
 %%Thread%%lib/io/addons/Thread/source/ThreadMutex.h
-%%Thread%%lib/io/addons/Thread/tests/correctness/ThreadTest.io
 %%Thread%%lib/io/addons/Thread/tests/correctness/run.io
-%%TokyoCabinet%%lib/io/addons/TokyoCabinet/CMakeLists.txt
+%%Thread%%lib/io/addons/Thread/tests/correctness/ThreadTest.io
 %%TokyoCabinet%%lib/io/addons/TokyoCabinet/_build/dll/libIoTokyoCabinet.so
+%%TokyoCabinet%%lib/io/addons/TokyoCabinet/CMakeLists.txt
 %%TokyoCabinet%%lib/io/addons/TokyoCabinet/depends
 %%TokyoCabinet%%lib/io/addons/TokyoCabinet/io/TokyoCabinet.io
 %%TokyoCabinet%%lib/io/addons/TokyoCabinet/protos
@@ -1716,13 +1823,13 @@ lib/libiovmall.so
 %%TokyoCabinet%%lib/io/addons/TokyoCabinet/source/IoTokyoCabinetPrefixCursor.c
 %%TokyoCabinet%%lib/io/addons/TokyoCabinet/source/IoTokyoCabinetPrefixCursor.h
 %%TokyoCabinet%%lib/io/addons/TokyoCabinet/test.db
-%%TokyoCabinet%%lib/io/addons/TokyoCabinet/tests/correctness/TokyoCabinetTest.io
 %%TokyoCabinet%%lib/io/addons/TokyoCabinet/tests/correctness/basic.io
 %%TokyoCabinet%%lib/io/addons/TokyoCabinet/tests/correctness/run.io
 %%TokyoCabinet%%lib/io/addons/TokyoCabinet/tests/correctness/testPath.io
+%%TokyoCabinet%%lib/io/addons/TokyoCabinet/tests/correctness/TokyoCabinetTest.io
 %%TokyoCabinet%%lib/io/addons/TokyoCabinet/tests/performance/perf.io
-%%Twitter%%lib/io/addons/Twitter/CMakeLists.txt
 %%Twitter%%lib/io/addons/Twitter/_build/dll/libIoTwitter.so
+%%Twitter%%lib/io/addons/Twitter/CMakeLists.txt
 %%Twitter%%lib/io/addons/Twitter/depends
 %%Twitter%%lib/io/addons/Twitter/io/A_TwitterFriendsFollowersCursor.io
 %%Twitter%%lib/io/addons/Twitter/io/Object.io
@@ -1741,8 +1848,17 @@ lib/libiovmall.so
 %%Twitter%%lib/io/addons/Twitter/samples/twitterSample.io
 %%Twitter%%lib/io/addons/Twitter/source/.gitsidumb
 %%Twitter%%lib/io/addons/Twitter/source/IoTwitterInit.c
-%%UUID%%lib/io/addons/UUID/CMakeLists.txt
+%%User%%lib/io/addons/User/_build/dll/libIoUser.so
+%%User%%lib/io/addons/User/CMakeLists.txt
+%%User%%lib/io/addons/User/depends
+%%User%%lib/io/addons/User/protos
+%%User%%lib/io/addons/User/source/IoUser.c
+%%User%%lib/io/addons/User/source/IoUser.h
+%%User%%lib/io/addons/User/source/IoUserInit.c
+%%User%%lib/io/addons/User/tests/correctness/run.io
+%%User%%lib/io/addons/User/tests/correctness/UserTest.io
 %%UUID%%lib/io/addons/UUID/_build/dll/libIoUUID.so
+%%UUID%%lib/io/addons/UUID/CMakeLists.txt
 %%UUID%%lib/io/addons/UUID/depends
 %%UUID%%lib/io/addons/UUID/io/uuid.io
 %%UUID%%lib/io/addons/UUID/protos
@@ -1750,19 +1866,9 @@ lib/libiovmall.so
 %%UUID%%lib/io/addons/UUID/source/IoUUID.h
 %%UUID%%lib/io/addons/UUID/source/IoUUIDInit.c
 %%UUID%%lib/io/addons/UUID/tests/correctness/run.io
-%%User%%lib/io/addons/User/CMakeLists.txt
-%%User%%lib/io/addons/User/_build/dll/libIoUser.so
-%%User%%lib/io/addons/User/depends
-%%User%%lib/io/addons/User/protos
-%%User%%lib/io/addons/User/source/IoUser.c
-%%User%%lib/io/addons/User/source/IoUser.h
-%%User%%lib/io/addons/User/source/IoUserInit.c
-%%User%%lib/io/addons/User/tests/correctness/UserTest.io
-%%User%%lib/io/addons/User/tests/correctness/run.io
-%%VertexDB%%lib/io/addons/VertexDB/CMakeLists.txt
 %%VertexDB%%lib/io/addons/VertexDB/_build/dll/libIoVertexDB.so
+%%VertexDB%%lib/io/addons/VertexDB/CMakeLists.txt
 %%VertexDB%%lib/io/addons/VertexDB/depends
-%%VertexDB%%lib/io/addons/VertexDB/io/VertexDB.io
 %%VertexDB%%lib/io/addons/VertexDB/io/protos/Node.io
 %%VertexDB%%lib/io/addons/VertexDB/io/protos/Queue.io
 %%VertexDB%%lib/io/addons/VertexDB/io/protos/Request.io
@@ -1770,15 +1876,15 @@ lib/libiovmall.so
 %%VertexDB%%lib/io/addons/VertexDB/io/protos/Server.io
 %%VertexDB%%lib/io/addons/VertexDB/io/protos/Settings.io
 %%VertexDB%%lib/io/addons/VertexDB/io/protos/Transaction.io
+%%VertexDB%%lib/io/addons/VertexDB/io/VertexDB.io
 %%VertexDB%%lib/io/addons/VertexDB/protos
 %%VertexDB%%lib/io/addons/VertexDB/samples/vertexdb.io
 %%VertexDB%%lib/io/addons/VertexDB/source/.gitisdumb
 %%VertexDB%%lib/io/addons/VertexDB/source/IoVertexDBInit.c
-%%VertexDB%%lib/io/addons/VertexDB/tests/correctness/VDBTest.io
 %%VertexDB%%lib/io/addons/VertexDB/tests/correctness/run.io
-%%Volcano%%lib/io/addons/Volcano/CMakeLists.txt
-%%Volcano%%lib/io/addons/Volcano/README
+%%VertexDB%%lib/io/addons/VertexDB/tests/correctness/VDBTest.io
 %%Volcano%%lib/io/addons/Volcano/_build/dll/libIoVolcano.so
+%%Volcano%%lib/io/addons/Volcano/CMakeLists.txt
 %%Volcano%%lib/io/addons/Volcano/depends
 %%Volcano%%lib/io/addons/Volcano/io/HandlerQueue.io
 %%Volcano%%lib/io/addons/Volcano/io/HttpParser.io
@@ -1791,18 +1897,19 @@ lib/libiovmall.so
 %%Volcano%%lib/io/addons/Volcano/io/VolcanoRequestHandler.io
 %%Volcano%%lib/io/addons/Volcano/io/VolcanoServer.io
 %%Volcano%%lib/io/addons/Volcano/protos
+%%Volcano%%lib/io/addons/Volcano/README
 %%Volcano%%lib/io/addons/Volcano/samples/example.io
+%%Volcano%%lib/io/addons/Volcano/source/http11_parser_common.rl
+%%Volcano%%lib/io/addons/Volcano/source/http11_parser.c
+%%Volcano%%lib/io/addons/Volcano/source/http11_parser.h
+%%Volcano%%lib/io/addons/Volcano/source/http11_parser.rl
 %%Volcano%%lib/io/addons/Volcano/source/HttpParser.c
 %%Volcano%%lib/io/addons/Volcano/source/HttpParser.h
 %%Volcano%%lib/io/addons/Volcano/source/IoHttpParser.c
 %%Volcano%%lib/io/addons/Volcano/source/IoHttpParser.h
 %%Volcano%%lib/io/addons/Volcano/source/IoVolcanoInit.c
-%%Volcano%%lib/io/addons/Volcano/source/http11_parser.c
-%%Volcano%%lib/io/addons/Volcano/source/http11_parser.h
-%%Volcano%%lib/io/addons/Volcano/source/http11_parser.rl
-%%Volcano%%lib/io/addons/Volcano/source/http11_parser_common.rl
-%%Vorbis%%lib/io/addons/Vorbis/CMakeLists.txt
 %%Vorbis%%lib/io/addons/Vorbis/_build/dll/libIoVorbis.so
+%%Vorbis%%lib/io/addons/Vorbis/CMakeLists.txt
 %%Vorbis%%lib/io/addons/Vorbis/depends
 %%Vorbis%%lib/io/addons/Vorbis/io/Vorbis.io
 %%Vorbis%%lib/io/addons/Vorbis/protos
@@ -1816,8 +1923,8 @@ lib/libiovmall.so
 %%Vorbis%%lib/io/addons/Vorbis/source/IoVorbisInfo.c
 %%Vorbis%%lib/io/addons/Vorbis/source/IoVorbisInfo.h
 %%Vorbis%%lib/io/addons/Vorbis/source/IoVorbisInit.c
-%%Yajl%%lib/io/addons/Yajl/CMakeLists.txt
 %%Yajl%%lib/io/addons/Yajl/_build/dll/libIoYajl.so
+%%Yajl%%lib/io/addons/Yajl/CMakeLists.txt
 %%Yajl%%lib/io/addons/Yajl/depends
 %%Yajl%%lib/io/addons/Yajl/io/YajlElement.io
 %%Yajl%%lib/io/addons/Yajl/protos
@@ -1827,10 +1934,10 @@ lib/libiovmall.so
 %%Yajl%%lib/io/addons/Yajl/source/IoYajlGen.h
 %%Yajl%%lib/io/addons/Yajl/source/IoYajlInit.c
 %%Yajl%%lib/io/addons/Yajl/test.io
-%%Yajl%%lib/io/addons/Yajl/tests/correctness/YajlTest.io
 %%Yajl%%lib/io/addons/Yajl/tests/correctness/run.io
-%%Zlib%%lib/io/addons/Zlib/CMakeLists.txt
+%%Yajl%%lib/io/addons/Yajl/tests/correctness/YajlTest.io
 %%Zlib%%lib/io/addons/Zlib/_build/dll/libIoZlib.so
+%%Zlib%%lib/io/addons/Zlib/CMakeLists.txt
 %%Zlib%%lib/io/addons/Zlib/depends
 %%Zlib%%lib/io/addons/Zlib/io/Zlib.io
 %%Zlib%%lib/io/addons/Zlib/protos
@@ -1839,6 +1946,6 @@ lib/libiovmall.so
 %%Zlib%%lib/io/addons/Zlib/source/IoZlibEncoder.c
 %%Zlib%%lib/io/addons/Zlib/source/IoZlibEncoder.h
 %%Zlib%%lib/io/addons/Zlib/source/IoZlibInit.c
-%%Zlib%%lib/io/addons/Zlib/tests/correctness/ZlibTest.io
 %%Zlib%%lib/io/addons/Zlib/tests/correctness/run.io
 %%Zlib%%lib/io/addons/Zlib/tests/correctness/test.gz
+%%Zlib%%lib/io/addons/Zlib/tests/correctness/ZlibTest.io
diff --git a/lang/itcl/Makefile b/lang/itcl/Makefile
index 50551dbf383c..6642cf99c4fb 100644
--- a/lang/itcl/Makefile
+++ b/lang/itcl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	itcl
 PORTVERSION=	3.4.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	lang tcl
 MASTER_SITES=	SF/incrtcl/%5BIncr%20Tcl_Tk%5D-source/3.4.1
@@ -11,7 +12,7 @@ DISTNAME=	itcl${PORTVERSION}
 MAINTAINER=	erik@bz.bzflag.bz
 COMMENT=	Object-oriented extension to Tcl [incr Tcl]
 
-USES+=		tcl:84+,tea
+USES+=		tcl:85+,tea
 
 USE_LDCONFIG=	${PREFIX}/lib/itcl${PORTVERSION:R}
 
diff --git a/lang/julia/Makefile b/lang/julia/Makefile
index bb0c1a4f20af..08677d4b8371 100644
--- a/lang/julia/Makefile
+++ b/lang/julia/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	julia
 PORTVERSION=	0.6.0
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-full
 CATEGORIES=	lang math
 MASTER_SITES=	https://github.com/JuliaLang/julia/releases/download/v${PORTVERSION}/
diff --git a/lang/kf5-kross/Makefile b/lang/kf5-kross/Makefile
index 83c4632ef2ff..5b75df65c1d9 100644
--- a/lang/kf5-kross/Makefile
+++ b/lang/kf5-kross/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	kross
 PORTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	lang kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/lang/mlton/Makefile b/lang/mlton/Makefile
index 4cf4bcc12f20..2fe44c7dddd7 100644
--- a/lang/mlton/Makefile
+++ b/lang/mlton/Makefile
@@ -12,7 +12,7 @@
 
 PORTNAME=	mlton
 PORTVERSION=	20100608
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	lang
 MASTER_SITES=	SF http://www.tbrk.org/distfiles/
 DISTFILES=	${SRC_DIST} ${BOOT_DIST}
diff --git a/lang/modula3/Makefile b/lang/modula3/Makefile
index 445ad95a2e5b..cb237cbc1132 100644
--- a/lang/modula3/Makefile
+++ b/lang/modula3/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	modula3
 PORTVERSION=	5.10.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	lang
 MASTER_SITES=	http://downloads.dragonlace.net/m3/:boot
 DISTFILES=	${SRCDISTFILE} ${BOOTDIST}
diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index 8554f1074eca..320c3446020e 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	mono
 PORTVERSION=	4.8.1.0
 DISTVERSIONPREFIX=	mono-
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang
 
 MAINTAINER=	mono@FreeBSD.org
diff --git a/lang/nhc98/Makefile b/lang/nhc98/Makefile
index 1fc18708a7e5..0896b0a2cce9 100644
--- a/lang/nhc98/Makefile
+++ b/lang/nhc98/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	nhc98
 PORTVERSION=	1.22
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	lang haskell
 MASTER_SITES=	http://haskell.org/${PORTNAME}/
 DISTFILES=	${PORTNAME}src-${PORTVERSION}${EXTRACT_SUFX}
diff --git a/lang/oo2c/Makefile b/lang/oo2c/Makefile
index 32458e81176a..0805c64d06b7 100644
--- a/lang/oo2c/Makefile
+++ b/lang/oo2c/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	oo2c
 PORTVERSION=	2.1.11
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	lang
 MASTER_SITES=	SF/ooc/ooc2/${PORTVERSION}
 DISTNAME=	${PORTNAME}_${BITS}-${PORTVERSION}
diff --git a/lang/opencoarrays/Makefile b/lang/opencoarrays/Makefile
index d868556d1d0e..b1287efaec47 100644
--- a/lang/opencoarrays/Makefile
+++ b/lang/opencoarrays/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	opencoarrays
 PORTVERSION=	1.9.1
+PORTREVISION=	1
 CATEGORIES=	lang parallel
 
 MAINTAINER=	as@cmplx.uk
diff --git a/lang/p5-ExtUtils-F77/Makefile b/lang/p5-ExtUtils-F77/Makefile
index ea8bcf16e15e..87e817819d1e 100644
--- a/lang/p5-ExtUtils-F77/Makefile
+++ b/lang/p5-ExtUtils-F77/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ExtUtils-F77
 PORTVERSION=	1.20
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	lang perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/lang/p5-List-MoreUtils/Makefile b/lang/p5-List-MoreUtils/Makefile
index 8004b2d4283d..494c8daaaccb 100644
--- a/lang/p5-List-MoreUtils/Makefile
+++ b/lang/p5-List-MoreUtils/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	List-MoreUtils
-PORTVERSION=	0.423
+PORTVERSION=	0.425
 CATEGORIES=	lang perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -14,8 +14,9 @@ LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	p5-Exporter-Tiny>=0.038:devel/p5-Exporter-Tiny \
-		p5-List-MoreUtils-XS>=${PORTVERSION}:lang/p5-List-MoreUtils-XS
+		p5-List-MoreUtils-XS>=0.423:lang/p5-List-MoreUtils-XS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
+TEST_DEPENDS=	p5-Test-LeakTrace>=0:devel/p5-Test-LeakTrace
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/lang/p5-List-MoreUtils/distinfo b/lang/p5-List-MoreUtils/distinfo
index 3c5ea044ba4e..ad646eb61a86 100644
--- a/lang/p5-List-MoreUtils/distinfo
+++ b/lang/p5-List-MoreUtils/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503418043
-SHA256 (List-MoreUtils-0.423.tar.gz) = b4d90b24809b399fda3772a45b1af9e29d89becf8ba4a4f78fa36234e4ed5396
-SIZE (List-MoreUtils-0.423.tar.gz) = 111374
+TIMESTAMP = 1504799673
+SHA256 (List-MoreUtils-0.425.tar.gz) = 28fc33d42181dee0047b19edba55301547943fd90aaa62f0c8b21d1a475b6558
+SIZE (List-MoreUtils-0.425.tar.gz) = 111444
diff --git a/lang/perl5-devel/Makefile b/lang/perl5-devel/Makefile
index 224a73bb9df8..cd73b07058c4 100644
--- a/lang/perl5-devel/Makefile
+++ b/lang/perl5-devel/Makefile
@@ -7,7 +7,7 @@ PORTNAME=	perl
 DISTVERSIONPREFIX=	v
 DISTVERSION=	${GH_TAGNAME:C/^v//:C/-g[0-9a-f]*$//}
 DISTVERSIONSUFFIX=	${GH_TAGNAME:C/.*-g/-g/}
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	lang devel perl5
 # XXX Leave only CPAN.
 MASTER_SITES=	LOCAL/mat/perl GH
@@ -35,7 +35,7 @@ TEST_ENV=	${MAKE_ENV} TEST_JOBS=${MAKE_JOBS_NUMBER} \
 USE_GITHUB=	yes
 GH_ACCOUNT=	Perl
 GH_PROJECT=	perl5
-GH_TAGNAME=	v5.27.3-35-g97fcda7
+GH_TAGNAME=	v5.27.3-84-g7bd9fb1
 
 OPTIONS_DEFINE=	DEBUG GDBM PERL_64BITINT MULTIPLICITY SITECUSTOMIZE \
 		THREADS PERL_MALLOC DTRACE DOT_INC
@@ -126,6 +126,10 @@ CONFIGURE_ARGS+=	\
 	-Alddlflags='-L${WRKSRC} -L${PREFIX}/${_ARCH_LIB}/CORE -lperl' \
 	-Dshrpldflags='$$(LDDLFLAGS:N-L${WRKSRC}:N-L${PREFIX}/${_ARCH_LIB}/CORE:N-lperl) -Wl,-soname,$$(LIBPERL)'
 
+# XXX should be fixed soon.
+CONFIGURE_ARGS+= \
+	 -Accflags=-DNO_USE_ATFUNCTIONS
+
 # Give a hint of where libperl.so can be found.
 USE_LDCONFIG=	${PREFIX}/${_ARCH_LIB}/CORE
 
diff --git a/lang/perl5-devel/distinfo b/lang/perl5-devel/distinfo
index 700e3c4ff1c2..3af9b1a35a52 100644
--- a/lang/perl5-devel/distinfo
+++ b/lang/perl5-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504527123
-SHA256 (perl/Perl-perl5-v5.27.3-35-g97fcda7_GH0.tar.gz) = 502add113fcf5720bc6c389d087a66d275bb60a890fbf28e52c78c37d3b1e1b9
-SIZE (perl/Perl-perl5-v5.27.3-35-g97fcda7_GH0.tar.gz) = 18653543
+TIMESTAMP = 1505131998
+SHA256 (perl/Perl-perl5-v5.27.3-84-g7bd9fb1_GH0.tar.gz) = 44113bd26b57a6d2a0ca63388cce67dd4ac73a4380c68ab7c128ccc2c1a045e6
+SIZE (perl/Perl-perl5-v5.27.3-84-g7bd9fb1_GH0.tar.gz) = 18671770
diff --git a/lang/perl5-devel/files/patch-Configure b/lang/perl5-devel/files/patch-Configure
index 1c2dc705617d..43f47e02e91a 100644
--- a/lang/perl5-devel/files/patch-Configure
+++ b/lang/perl5-devel/files/patch-Configure
@@ -1,6 +1,6 @@
---- Configure.orig	2017-05-22 10:22:21 UTC
+--- Configure.orig	2017-09-11 05:29:19 UTC
 +++ Configure
-@@ -3879,7 +3879,10 @@ esac
+@@ -3884,7 +3884,10 @@ esac
  . ./posthint.sh
  
  : who configured the system
@@ -12,7 +12,7 @@
  case "$cf_by" in
  "")
  	cf_by=`(logname) 2>/dev/null`
-@@ -5060,7 +5063,7 @@ esac
+@@ -5065,7 +5068,7 @@ esac
  : Now check and see which directories actually exist, avoiding duplicates
  for xxx in $dlist
  do
@@ -21,7 +21,7 @@
  		case " $libpth " in
  		*" $xxx "*) ;;
  		*) libpth="$libpth $xxx";;
-@@ -9655,8 +9658,7 @@ prefixvar=siteman3dir
+@@ -9660,8 +9663,7 @@ prefixvar=siteman3dir
  
  : determine where add-on public executable scripts go
  case "$sitescript" in
diff --git a/lang/perl5-devel/files/patch-perl.c b/lang/perl5-devel/files/patch-perl.c
index 047d1a096e38..0e16d47956b4 100644
--- a/lang/perl5-devel/files/patch-perl.c
+++ b/lang/perl5-devel/files/patch-perl.c
@@ -1,6 +1,6 @@
---- perl.c.orig	2017-08-14 09:52:12 UTC
+--- perl.c.orig	2017-09-11 05:29:19 UTC
 +++ perl.c
-@@ -1907,23 +1907,7 @@ S_Internals_V(pTHX_ CV *cv)
+@@ -1928,23 +1928,7 @@ S_Internals_V(pTHX_ CV *cv)
      PUSHs(Perl_newSVpvn_flags(aTHX_ non_bincompat_options,
  			      sizeof(non_bincompat_options) - 1, SVs_TEMP));
  
diff --git a/lang/perl5-devel/pkg-plist b/lang/perl5-devel/pkg-plist
index d2c4066bc40e..9ab599ce180c 100644
--- a/lang/perl5-devel/pkg-plist
+++ b/lang/perl5-devel/pkg-plist
@@ -728,6 +728,7 @@ etc/man.d/perl%%PKGNAMESUFFIX%%.conf
 %%ARCH_LIB%%/CORE/parser.h
 %%ARCH_LIB%%/CORE/patchlevel.h
 %%ARCH_LIB%%/CORE/perl.h
+%%ARCH_LIB%%/CORE/perl_langinfo.h
 %%ARCH_LIB%%/CORE/perlapi.h
 %%DTRACE%%%%ARCH_LIB%%/CORE/perldtrace.h
 %%ARCH_LIB%%/CORE/perlio.h
diff --git a/lang/phantomjs/Makefile b/lang/phantomjs/Makefile
index 16ab84ff3ac8..7703bb5d0bde 100644
--- a/lang/phantomjs/Makefile
+++ b/lang/phantomjs/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	phantomjs
 PORTVERSION=	2.1.1
-PORTREVISION=	1
+PORTREVISION=	5
 CATEGORIES=	lang
 
 MAINTAINER=	feld@FreeBSD.org
diff --git a/lang/phantomjs/files/patch-icu59 b/lang/phantomjs/files/patch-icu59
new file mode 100644
index 000000000000..2db4075f7530
--- /dev/null
+++ b/lang/phantomjs/files/patch-icu59
@@ -0,0 +1,64 @@
+------------------------------------------------------------------------
+r216187 | annulen@yandex.ru | 2017-05-05 00:33:41 +0900 (Fri, 05 May 2017) | 28 lines
+
+Fix compilation with ICU 59.1
+https://bugs.webkit.org/show_bug.cgi?id=171612
+
+Reviewed by Mark Lam.
+
+ICU 59.1 has broken source compatibility. Now it defines UChar as
+char16_t, which does not allow automatic type conversion from unsigned
+short in C++ code.
+
+--- src/qt/qtwebkit/Source/JavaScriptCore/API/JSStringRef.cpp.orig	2016-01-08 10:07:46 UTC
++++ src/qt/qtwebkit/Source/JavaScriptCore/API/JSStringRef.cpp
+@@ -37,7 +37,7 @@ using namespace WTF::Unicode;
+ JSStringRef JSStringCreateWithCharacters(const JSChar* chars, size_t numChars)
+ {
+     initializeThreading();
+-    return OpaqueJSString::create(chars, numChars).leakRef();
++    return OpaqueJSString::create(reinterpret_cast<const UChar*>(chars), numChars).leakRef();
+ }
+ 
+ JSStringRef JSStringCreateWithUTF8CString(const char* string)
+@@ -62,7 +62,7 @@ JSStringRef JSStringCreateWithUTF8CString(const char* 
+ JSStringRef JSStringCreateWithCharactersNoCopy(const JSChar* chars, size_t numChars)
+ {
+     initializeThreading();
+-    return OpaqueJSString::create(StringImpl::createWithoutCopying(chars, numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef();
++    return OpaqueJSString::create(StringImpl::createWithoutCopying(reinterpret_cast<const UChar*>(chars), numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef();
+ }
+ 
+ JSStringRef JSStringRetain(JSStringRef string)
+@@ -83,7 +83,7 @@ size_t JSStringGetLength(JSStringRef string)
+ 
+ const JSChar* JSStringGetCharactersPtr(JSStringRef string)
+ {
+-    return string->characters();
++    return reinterpret_cast<const JSChar*>(string->characters());
+ }
+ 
+ size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string)
+--- src/qt/qtwebkit/Source/JavaScriptCore/runtime/DateConversion.cpp.orig	2016-01-08 10:07:46 UTC
++++ src/qt/qtwebkit/Source/JavaScriptCore/runtime/DateConversion.cpp
+@@ -107,7 +107,8 @@ String formatDateTime(const GregorianDateTime& t, Date
+ #if OS(WINDOWS)
+             TIME_ZONE_INFORMATION timeZoneInformation;
+             GetTimeZoneInformation(&timeZoneInformation);
+-            const WCHAR* timeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName;
++            const WCHAR* winTimeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName;
++            String timeZoneName(reinterpret_cast<const UChar*>(winTimeZoneName));
+ #else
+             struct tm gtm = t;
+             char timeZoneName[70];
+--- src/qt/qtwebkit/Source/WebKit2/Shared/API/c/WKString.cpp.orig	2016-01-08 10:07:46 UTC
++++ src/qt/qtwebkit/Source/WebKit2/Shared/API/c/WKString.cpp
+@@ -55,7 +55,7 @@ size_t WKStringGetLength(WKStringRef stringRef)
+ size_t WKStringGetCharacters(WKStringRef stringRef, WKChar* buffer, size_t bufferLength)
+ {
+     COMPILE_ASSERT(sizeof(WKChar) == sizeof(UChar), WKStringGetCharacters_sizeof_WKChar_matches_UChar);
+-    return (toImpl(stringRef)->getCharacters(static_cast<UChar*>(buffer), bufferLength));
++    return (toImpl(stringRef)->getCharacters(reinterpret_cast<UChar*>(buffer), bufferLength));
+ }
+ 
+ size_t WKStringGetMaximumUTF8CStringSize(WKStringRef stringRef)
diff --git a/lang/pure/Makefile b/lang/pure/Makefile
index bc46fd50bb2f..604da9b34ff6 100644
--- a/lang/pure/Makefile
+++ b/lang/pure/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pure
 PORTVERSION=	0.64
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	lang
 MASTER_SITES=	https://bitbucket.org/purelang/pure-lang/downloads/
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
diff --git a/lang/py-hy/Makefile b/lang/py-hy/Makefile
index 970deb50de31..cf49e2b1fccc 100644
--- a/lang/py-hy/Makefile
+++ b/lang/py-hy/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	dave@dal.ca
-COMMENT=	Hy is a dialect of lisp that's is embedded in Python
+COMMENT=	Hy is a dialect of Lisp that is embedded in Python
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/lang/quack/Makefile b/lang/quack/Makefile
index b4a3551bf05d..6924356a03d4 100644
--- a/lang/quack/Makefile
+++ b/lang/quack/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	quack
 PORTVERSION=	0.47
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang scheme elisp
 MASTER_SITES=	http://www.neilvandyke.org/quack/
 DISTNAME=	${PORTNAME}
diff --git a/lang/racket-minimal/Makefile b/lang/racket-minimal/Makefile
index 5349196ed8b1..c045e8b54b0e 100644
--- a/lang/racket-minimal/Makefile
+++ b/lang/racket-minimal/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	racket
-PORTVERSION=	6.10
+PORTVERSION=	6.10.1
 CATEGORIES=	lang scheme
 MASTER_SITES=	http://mirror.racket-lang.org/installers/${PORTVERSION}/ \
 		http://www.cs.utah.edu/plt/installers/${PORTVERSION}/ \
diff --git a/lang/racket-minimal/distinfo b/lang/racket-minimal/distinfo
index 6f116c214adc..63077843e770 100644
--- a/lang/racket-minimal/distinfo
+++ b/lang/racket-minimal/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501664493
-SHA256 (racket-minimal/6.10/racket-minimal-6.10-src-builtpkgs.tgz) = 832496dad6c05121842ef3eec852505b658600653a40bbf9fe7d82dac9f7013d
-SIZE (racket-minimal/6.10/racket-minimal-6.10-src-builtpkgs.tgz) = 11161249
+TIMESTAMP = 1505292363
+SHA256 (racket-minimal/6.10.1/racket-minimal-6.10.1-src-builtpkgs.tgz) = a6d80de7b286ee6a683b41623942c83c4d2965dee5d3b5e25f220eec4952264d
+SIZE (racket-minimal/6.10.1/racket-minimal-6.10.1-src-builtpkgs.tgz) = 11163937
diff --git a/lang/racket-minimal/pkg-plist b/lang/racket-minimal/pkg-plist
index b6894c6306a9..406054879578 100644
--- a/lang/racket-minimal/pkg-plist
+++ b/lang/racket-minimal/pkg-plist
@@ -18,7 +18,7 @@ include/racket/schvers.h
 include/racket/sconfig.h
 include/racket/stypes.h
 include/racket/uconfig.h
-lib/libracket3m-6.10.so
+lib/libracket3m-6.10.1.so
 lib/libracket3m.so
 lib/racket/buildinfo
 lib/racket/gracket
diff --git a/lang/racket/Makefile b/lang/racket/Makefile
index 5dc351609fc1..435d6f8ae411 100644
--- a/lang/racket/Makefile
+++ b/lang/racket/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	racket
-PORTVERSION=	6.10
+PORTVERSION=	6.10.1
 CATEGORIES=	lang scheme
 MASTER_SITES=	http://mirror.racket-lang.org/installers/${PORTVERSION}/ \
 		http://www.cs.utah.edu/plt/installers/${PORTVERSION}/ \
diff --git a/lang/racket/distinfo b/lang/racket/distinfo
index 7f221412704b..788400731b71 100644
--- a/lang/racket/distinfo
+++ b/lang/racket/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501667918
-SHA256 (racket/6.10/racket-6.10-src-builtpkgs.tgz) = 6162ee4762541bb57db5d86ace7f51b0345d50ac2ae31b4f9fac472080a230ac
-SIZE (racket/6.10/racket-6.10-src-builtpkgs.tgz) = 119082262
+TIMESTAMP = 1505292447
+SHA256 (racket/6.10.1/racket-6.10.1-src-builtpkgs.tgz) = a73074394c7cf59f9ce62ad1c495ffa31d0a57ea7ea7f44f272d22f2d7af319a
+SIZE (racket/6.10.1/racket-6.10.1-src-builtpkgs.tgz) = 119081256
diff --git a/lang/racket/pkg-plist b/lang/racket/pkg-plist
index 99ea034900ef..4a96cc98203b 100644
--- a/lang/racket/pkg-plist
+++ b/lang/racket/pkg-plist
@@ -20,7 +20,7 @@ bin/setup-plt
 bin/slatex
 bin/slideshow
 bin/swindle
-lib/libracket3m-6.10.so
+lib/libracket3m-6.10.1.so
 %%ETCDIR%%/config.rktd
 include/racket/escheme.h
 include/racket/ext.exp
diff --git a/lang/ratfor/Makefile b/lang/ratfor/Makefile
index 09369e850860..d2b59df97091 100644
--- a/lang/ratfor/Makefile
+++ b/lang/ratfor/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ratfor
 PORTVERSION=	1985.06
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	lang
 MASTER_SITES=	LOCAL/obrien \
 		http://sepwww.stanford.edu/sep/prof/
diff --git a/lang/rust/Makefile b/lang/rust/Makefile
index bd01aad4503c..25f2a93356f1 100644
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	rust
 PORTVERSION?=	1.19.0
+PORTREVISION?=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://static.rust-lang.org/dist/:src \
 		https://static.rust-lang.org/dist/:rust_bootstrap \
diff --git a/lang/rust/files/patch-src_libbacktrace_fileline.c b/lang/rust/files/patch-src_libbacktrace_fileline.c
new file mode 100644
index 000000000000..88e16025ddfc
--- /dev/null
+++ b/lang/rust/files/patch-src_libbacktrace_fileline.c
@@ -0,0 +1,42 @@
+--- src/libbacktrace/fileline.c.orig	2017-06-06 00:42:59 UTC
++++ src/libbacktrace/fileline.c
+@@ -38,8 +38,39 @@ POSSIBILITY OF SUCH DAMAGE.  */
+ #include <fcntl.h>
+ #include <stdlib.h>
+ 
++#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__)
++#include <sys/sysctl.h>
++#include <limits.h>
++#endif
++
+ #include "backtrace.h"
+ #include "internal.h"
++
++#if !defined(HAVE_GETEXECNAME) && defined(KERN_PROC_PATHNAME)
++/* Return pathname of executable or 0 on failure. */
++#define HAVE_GETEXECNAME
++static char execname[PATH_MAX + 1];
++static const char *
++getexecname(void)
++{
++  size_t path_len = sizeof(execname);
++  int mib[] = {
++    CTL_KERN,
++#if defined(__NetBSD__)
++    KERN_PROC_ARGS,
++    -1,
++    KERN_PROC_PATHNAME,
++#else
++    KERN_PROC,
++    KERN_PROC_PATHNAME,
++    -1,
++#endif
++  };
++  u_int miblen = sizeof(mib) / sizeof(mib[0]);
++  int rc = sysctl(mib, miblen, execname, &path_len, NULL, 0);
++  return rc ? NULL : execname;
++}
++#endif /* !HAVE_GETEXECNAME && KERN_PROC_PATHNAME */
+ 
+ #ifndef HAVE_GETEXECNAME
+ #define getexecname() NULL
diff --git a/lang/rust/pkg-message b/lang/rust/pkg-message
deleted file mode 100644
index 2c45f1375f0b..000000000000
--- a/lang/rust/pkg-message
+++ /dev/null
@@ -1,12 +0,0 @@
-======================================================================
-
-Printing Rust backtraces requires procfs(5) mounted on /proc .
-If you have not already done so, please do the following:
-
-	mount -t procfs proc /proc
-
-To make it permanent, you need the following lines in /etc/fstab:
-
-	proc	/proc		procfs		rw	0	0
-
-======================================================================
diff --git a/lang/sagittarius-scheme/Makefile b/lang/sagittarius-scheme/Makefile
index c43f9b8b4594..cd304b4f90c0 100644
--- a/lang/sagittarius-scheme/Makefile
+++ b/lang/sagittarius-scheme/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	sagittarius
 PORTVERSION=	0.8.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	https://bitbucket.org/ktakashi/sagittarius-scheme/downloads/ \
 		LOCAL/ashish
diff --git a/lang/sbcl/Makefile b/lang/sbcl/Makefile
index d652b18759a5..bbab8959bde0 100644
--- a/lang/sbcl/Makefile
+++ b/lang/sbcl/Makefile
@@ -1,9 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	sbcl
-DISTVERSION=	1.3.20
+DISTVERSION=	1.3.21
 DISTVERSIONSUFFIX=	-source
-PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	lang lisp
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${DISTVERSION} \
diff --git a/lang/sbcl/distinfo b/lang/sbcl/distinfo
index 6e07ce201ddf..d6060358ed66 100644
--- a/lang/sbcl/distinfo
+++ b/lang/sbcl/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1502973638
-SHA256 (sbcl-1.3.20-source.tar.bz2) = 5282318053b62ff041c14956dd5a2e2e66697482141713c6c5df375d05cd1f62
-SIZE (sbcl-1.3.20-source.tar.bz2) = 5873056
+TIMESTAMP = 1504356074
+SHA256 (sbcl-1.3.21-source.tar.bz2) = 684c51c0f041d78055053fbf350c10cc54f9aea4d32895901617eb5edd56158e
+SIZE (sbcl-1.3.21-source.tar.bz2) = 5901141
 SHA256 (sbcl-1.2.7-x86-64-freebsd-binary.tar.bz2) = c61f5e777e56921d2452d0fa6b71024ccd9b99bc659676498d398b8663176492
 SIZE (sbcl-1.2.7-x86-64-freebsd-binary.tar.bz2) = 10463348
 SHA256 (sbcl-1.2.7-x86-freebsd-binary.tar.bz2) = cf68bfab780a14964d9593f5b47fa3e174cf43e95ae3e558712d218f1c37bdbe
diff --git a/lang/scala/Makefile b/lang/scala/Makefile
index 5c3ba1c3a8c4..65a18d074240 100644
--- a/lang/scala/Makefile
+++ b/lang/scala/Makefile
@@ -2,11 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	scala
-PORTVERSION=	2.12.2
+PORTVERSION=	2.12.3
 CATEGORIES=	lang java
 MASTER_SITES=	http://www.scala-lang.org/files/archive/
 
-MAINTAINER=	mitsururike@gmail.com
+MAINTAINER=	jan0sch@mykolab.com
 COMMENT=	Scala Programming Language
 
 LICENSE=	BSD3CLAUSE
diff --git a/lang/scala/distinfo b/lang/scala/distinfo
index 8fce793eca39..c846bbf21052 100644
--- a/lang/scala/distinfo
+++ b/lang/scala/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1496388020
-SHA256 (scala-2.12.2.tgz) = 196168b246fcf10e275491c5e58a50ca9eb696da95e49155b3f86f001346a6f5
-SIZE (scala-2.12.2.tgz) = 19596088
+TIMESTAMP = 1503126013
+SHA256 (scala-2.12.3.tgz) = 2b796ab773fbedcc734ba881a6486d54180b699ade8ba7493e91912044267c8c
+SIZE (scala-2.12.3.tgz) = 19760624
diff --git a/lang/scm/Makefile b/lang/scm/Makefile
index 6f5d54cb35ae..371edb24702c 100644
--- a/lang/scm/Makefile
+++ b/lang/scm/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	scm
 PORTVERSION=	5f2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	lang scheme
 MASTER_SITES=	http://groups.csail.mit.edu/mac/ftpdir/scm/%SUBDIR%/
 MASTER_SITE_SUBDIR=	. OLD
diff --git a/lang/spidermonkey24/Makefile b/lang/spidermonkey24/Makefile
index c3f8d853bb95..4bb7104d4fb8 100644
--- a/lang/spidermonkey24/Makefile
+++ b/lang/spidermonkey24/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=		spidermonkey24
 PORTVERSION=		24.2.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=		lang
 MASTER_SITES=		MOZILLA/js
 #http://people.mozilla.org/~sstangl/
diff --git a/lang/spidermonkey38/Makefile b/lang/spidermonkey38/Makefile
index b47f4a5ac4de..b6097a927d0e 100644
--- a/lang/spidermonkey38/Makefile
+++ b/lang/spidermonkey38/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	spidermonkey38
 PORTVERSION=	38.8.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	MOZILLA/firefox/releases/${PORTVERSION}esr/source
 DISTNAME=	firefox-${PORTVERSION}esr.source
diff --git a/lang/swift/Makefile b/lang/swift/Makefile
index 5f3b30f29320..a0ed69f498d5 100644
--- a/lang/swift/Makefile
+++ b/lang/swift/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	swift
 PORTVERSION=	3.1.1
+PORTREVISION=	1
 DISTVERSIONPREFIX=	swift-
 DISTVERSIONSUFFIX=	-RELEASE
 CATEGORIES=	lang
diff --git a/lang/tcbasic/Makefile b/lang/tcbasic/Makefile
index 573ae2030f31..c2839567172b 100644
--- a/lang/tcbasic/Makefile
+++ b/lang/tcbasic/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	tcbasic
-PORTVERSION=	2.1.0
+PORTVERSION=	2.2.0
 CATEGORIES=	lang
 MASTER_SITES=	https://github.com/tcort/${PORTNAME}/releases/download/v${PORTVERSION}/
 
diff --git a/lang/tcbasic/distinfo b/lang/tcbasic/distinfo
index 654202d1701c..f02a611fdb45 100644
--- a/lang/tcbasic/distinfo
+++ b/lang/tcbasic/distinfo
@@ -1,2 +1,3 @@
-SHA256 (tcbasic-2.1.0.tar.gz) = 00b1535237cb7fdea30acbed063cca3b82df221ce5d1b69104ae4dbc7d7ea194
-SIZE (tcbasic-2.1.0.tar.gz) = 119570
+TIMESTAMP = 1505046706
+SHA256 (tcbasic-2.2.0.tar.gz) = 0fd87000f5c192ead1d02a2169e46eb6316660e89113ab3e901426e585a0054b
+SIZE (tcbasic-2.2.0.tar.gz) = 135017
diff --git a/lang/tcbasic/pkg-descr b/lang/tcbasic/pkg-descr
index 62e0ec44767d..42a63f360c98 100644
--- a/lang/tcbasic/pkg-descr
+++ b/lang/tcbasic/pkg-descr
@@ -1,9 +1,7 @@
-tcbasic implements a small subset of BASIC known as Tiny BASIC.
-It provides the following statements and commands: INPUT, PRINT,
-LET, GOTO, GOSUB, RETURN, IF, END, CLEAR, LIST, RUN, and STOP.
-Integer and floating point arithmetic is supported, and strings
-may be PRINTed. The following built-in functions are provided:
-SIN, COS, TAN, COT, ATN, EXP, LOG, ABS, SQR, RND.
+tcbasic implements a small subset of BASIC known as Tiny BASIC
+with added support for floating point numbers and many of the
+built-in mathematical functions in Dartmouth BASIC. It supports
+basic I/O, flow control, subroutines, and debug tracing.
 
 The small size of the language make it easy to learn and master
 while providing all of the building blocks needed to develop many
diff --git a/lang/tcl84/Makefile b/lang/tcl84/Makefile
index ace392e8d4d0..cf16362e3323 100644
--- a/lang/tcl84/Makefile
+++ b/lang/tcl84/Makefile
@@ -14,6 +14,9 @@ DISTNAME=	${PORTNAME}${PORTVERSION}-src
 MAINTAINER=	tcltk@FreeBSD.org
 COMMENT=	Tool Command Language
 
+DEPRECATED=		Tcl/Tk 8.4 is no longer maintained, please use 8.5+
+EXPIRATION_DATE=	2017-10-15
+
 LICENSE=	TclTk
 LICENSE_NAME=	Tcl/Tk License
 LICENSE_FILE=	${WRKSRC}/../license.terms
diff --git a/lang/tcl86/pkg-plist b/lang/tcl86/pkg-plist
index 5a8ec935aed9..791940208550 100644
--- a/lang/tcl86/pkg-plist
+++ b/lang/tcl86/pkg-plist
@@ -1684,5 +1684,3 @@ lib/tcl%%TCL_VER%%/word.tcl
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/WET
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Zulu
 libdata/pkgconfig/tcl.pc
-
-
diff --git a/lang/tcl87/Makefile b/lang/tcl87/Makefile
index 930385659e88..98eea339e4a0 100644
--- a/lang/tcl87/Makefile
+++ b/lang/tcl87/Makefile
@@ -2,12 +2,13 @@
 # $FreeBSD$
 
 PORTNAME=	tcl
-DISTVERSION=	8.7.a0.20170903
-PORTREVISION=	0
+DISTVERSION=	8.7a1
+PORTREVISION=	1
 CATEGORIES=	lang
-MASTER_SITES=	http://core.tcl.tk/tcl/tarball/
-PKGNAMESUFFIX=	${PORTVERSION:R:R:S/.//}
-DISTFILES=	Tcl+Source+Code${EXTRACT_SUFX}?uuid=${FOSSIL_CHECKIN}
+MASTER_SITES=	SF/tcl/Tcl/${DISTVERSION} \
+		TCLTK/tcl8_7
+PKGNAMESUFFIX=	${PORTVERSION:R:S/.//}
+DISTNAME=	${PORTNAME}${DISTVERSION}-src
 
 MAINTAINER=	tcltk@FreeBSD.org
 COMMENT=	Tool Command Language
@@ -32,9 +33,7 @@ OPTIONS_EXCLUDE+=	DTRACE
 
 OPTIONS_EXCLUDE_FreeBSD_10=	DTRACE
 
-FOSSIL_CHECKIN=	95c4436a1e
-
-PATCH_WRKSRC=	${WRKDIR}/Tcl_Source_Code
+PATCH_WRKSRC=	${WRKDIR}/${PORTNAME}${DISTVERSION}
 WRKSRC=		${PATCH_WRKSRC}/unix
 
 ALL_TARGET=	all
@@ -49,7 +48,7 @@ CONFIGURE_ARGS=	--enable-shared \
 		--enable-symbols
 CONFIGURE_ENV=	PORTSDIR=${PORTSDIR}
 
-TCL_VER=	${PORTVERSION:R:R}
+TCL_VER=	${PORTVERSION:R}
 MAN_SUFFIX=	${PKGBASE}
 
 MAKE_ENV=	SHORT_TCL_VER=${PKGNAMESUFFIX} \
diff --git a/lang/tcl87/distinfo b/lang/tcl87/distinfo
index 5b0cf80c5646..cce61d918450 100644
--- a/lang/tcl87/distinfo
+++ b/lang/tcl87/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504452062
-SHA256 (Tcl+Source+Code.tar.gz?uuid=95c4436a1e) = 5087ee52b0b91a3bde635a0f016bc85709161b84a7e85126c00b8166855016a9
-SIZE (Tcl+Source+Code.tar.gz?uuid=95c4436a1e) = 6716510
+TIMESTAMP = 1504851119
+SHA256 (tcl8.7a1-src.tar.gz) = 2bbd4e0bbdebeaf5dc6cc823d0805afb45c764292f6667d9ce2b9fcf5399e0dc
+SIZE (tcl8.7a1-src.tar.gz) = 5908950
diff --git a/lang/tcl87/files/patch-unix-Makefile.in b/lang/tcl87/files/patch-unix-Makefile.in
index 2ad42707391f..608f06ee34ac 100644
--- a/lang/tcl87/files/patch-unix-Makefile.in
+++ b/lang/tcl87/files/patch-unix-Makefile.in
@@ -81,9 +81,9 @@
  	    do \
  	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/opt0.4; \
  	    done;
- 	@echo "Installing package msgcat 1.6.0 as a Tcl Module";
--	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.6.0.tm;
-+	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat-1.6.0.tm;
+ 	@echo "Installing package msgcat 1.6.1 as a Tcl Module";
+-	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.6.1.tm;
++	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat-1.6.1.tm;
  	@echo "Installing package tcltest 2.4.0 as a Tcl Module";
 -	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.4.0.tm;
 +	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest-2.4.0.tm;
diff --git a/lang/tcl87/pkg-plist b/lang/tcl87/pkg-plist
index 182002ba4cb6..74da58d16e65 100644
--- a/lang/tcl87/pkg-plist
+++ b/lang/tcl87/pkg-plist
@@ -14,7 +14,7 @@ include/tcl%%TCL_VER%%/tclTomMathDecls.h
 %%MODULES%%lib/tcl%%TCL_VER%%/http-2.8.12.tm
 %%MODULES%%lib/tcl%%TCL_VER%%/http1.0/http.tcl
 %%MODULES%%lib/tcl%%TCL_VER%%/http1.0/pkgIndex.tcl
-%%MODULES%%lib/tcl%%TCL_VER%%/msgcat-1.6.0.tm
+%%MODULES%%lib/tcl%%TCL_VER%%/msgcat-1.6.1.tm
 %%MODULES%%lib/tcl%%TCL_VER%%/opt0.4/optparse.tcl
 %%MODULES%%lib/tcl%%TCL_VER%%/opt0.4/pkgIndex.tcl
 %%MODULES%%lib/tcl%%TCL_VER%%/platform-1.0.14.tm
diff --git a/lang/tuareg-mode.el/Makefile b/lang/tuareg-mode.el/Makefile
index b0e16d15dbc2..6de2bcc38b48 100644
--- a/lang/tuareg-mode.el/Makefile
+++ b/lang/tuareg-mode.el/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	tuareg-mode
 PORTVERSION=	2.0.8
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	lang elisp
 
diff --git a/lang/v8-devel/Makefile b/lang/v8-devel/Makefile
index d108b70bcb85..02dd32d294a1 100644
--- a/lang/v8-devel/Makefile
+++ b/lang/v8-devel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	v8
 PORTVERSION=	3.27.7
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	lang
 MASTER_SITES=	LOCAL/vanilla
 PKGNAMESUFFIX=	-devel
@@ -23,7 +23,7 @@ ALL_TARGET=	native
 MAKE_ARGS=	library=shared use_system_icu=on
 MAKE_ENV=	CC.host=${CC} CXX.host=${CXX} LINK.host=${CXX} LINK.target=${CXX}
 USE_LDCONFIG=	yes
-USES=		compiler cpe execinfo gmake python:2 shebangfix tar:xz
+USES=		compiler cpe execinfo gmake localbase python:2 shebangfix tar:xz
 
 CPE_VENDOR=	google
 
diff --git a/lang/v8-devel/files/patch-src_runtime.cc b/lang/v8-devel/files/patch-src_runtime.cc
new file mode 100644
index 000000000000..98c747ef8f24
--- /dev/null
+++ b/lang/v8-devel/files/patch-src_runtime.cc
@@ -0,0 +1,10 @@
+--- src/runtime.cc.orig	2014-06-03 08:52:11 UTC
++++ src/runtime.cc
+@@ -56,6 +56,7 @@
+ #include "unicode/dtfmtsym.h"
+ #include "unicode/dtptngen.h"
+ #include "unicode/locid.h"
++#include "unicode/normlzr.h"
+ #include "unicode/numfmt.h"
+ #include "unicode/numsys.h"
+ #include "unicode/rbbi.h"
diff --git a/lang/v8/Makefile b/lang/v8/Makefile
index 0ef2badd0577..8f820b71740f 100644
--- a/lang/v8/Makefile
+++ b/lang/v8/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	v8
 PORTVERSION=	3.18.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	lang
 MASTER_SITES=	LOCAL/vanilla
 
diff --git a/lang/x10/Makefile b/lang/x10/Makefile
index 8416ea25ffd4..617bcade45ce 100644
--- a/lang/x10/Makefile
+++ b/lang/x10/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	x10
 PORTVERSION=	2.2.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	lang devel java
 MASTER_SITES=	http://dist.codehaus.org/x10/dependencies/ \
 		SF
diff --git a/lang/yap-devel/Makefile b/lang/yap-devel/Makefile
index ab1dc582fc25..da2292627e63 100644
--- a/lang/yap-devel/Makefile
+++ b/lang/yap-devel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	yap
 PORTVERSION=	6.3.3
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	lang
 MASTER_SITES=	http://www.dcc.fc.up.pt/~vsc/Yap/
 PKGNAMESUFFIX=	-devel
diff --git a/lang/yap/Makefile b/lang/yap/Makefile
index b825544a6dcc..c3827ca00dd9 100644
--- a/lang/yap/Makefile
+++ b/lang/yap/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	yap
 PORTVERSION=	6.2.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	lang
 MASTER_SITES=	http://www.dcc.fc.up.pt/~vsc/Yap/
 
diff --git a/lang/ypsilon/Makefile b/lang/ypsilon/Makefile
index 0c02f5816d7e..0080d91b020b 100644
--- a/lang/ypsilon/Makefile
+++ b/lang/ypsilon/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ypsilon
 PORTVERSION=	0.9.6.3
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	lang scheme
 
 MAINTAINER=	vmagerya@gmail.com
diff --git a/mail/annoyance-filter/Makefile b/mail/annoyance-filter/Makefile
index 9e14cfacf4d6..8114c129b028 100644
--- a/mail/annoyance-filter/Makefile
+++ b/mail/annoyance-filter/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	annoyance-filter
 PORTVERSION=	1.0d
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	mail
 MASTER_SITES=	SF/annoyancefilter/annoyancefilter/${PORTVERSION} \
 		http://www.fourmilab.ch/annoyance-filter/
diff --git a/mail/c-sig/Makefile b/mail/c-sig/Makefile
index 68a35aaf94d2..58c896477ebc 100644
--- a/mail/c-sig/Makefile
+++ b/mail/c-sig/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	c-sig
 PORTVERSION=	3.8
-PORTREVISION=	17
+PORTREVISION=	18
 CATEGORIES=	mail elisp
 MASTER_SITES=	LOCAL/tota/${PORTNAME}
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}.${PORTVERSION}
 MAINTAINER=	yasu@utahime.org
 COMMENT=	Signature insertion tool for Emacs
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
 
 USE_EMACS=	yes
 
diff --git a/mail/dovecot-pigeonhole/Makefile b/mail/dovecot-pigeonhole/Makefile
index 2f530fe6a3d0..d561068c41f1 100644
--- a/mail/dovecot-pigeonhole/Makefile
+++ b/mail/dovecot-pigeonhole/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	dovecot-pigeonhole
 PORTVERSION=	0.4.20
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://pigeonhole.dovecot.org/releases/${DOVECOTVERSION}/
 DISTNAME=	${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${PORTVERSION}
diff --git a/mail/libmapi/Makefile b/mail/libmapi/Makefile
index 61bee50daa8f..5a208dd60a93 100644
--- a/mail/libmapi/Makefile
+++ b/mail/libmapi/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	libmapi
 PORTVERSION=	2.3
 DISTVERSIONPREFIX=	openchange-
 DISTVERSIONSUFFIX=	-VULCAN
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	mail
 
 MAINTAINER=	kwm@FreeBSD.org
diff --git a/mail/libvmime/Makefile b/mail/libvmime/Makefile
index a19e34f3f1b7..c7781624765a 100644
--- a/mail/libvmime/Makefile
+++ b/mail/libvmime/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libvmime
 PORTVERSION=	0.9.2
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	mail
 
diff --git a/mail/mailest/Makefile b/mail/mailest/Makefile
index 621161806196..19742be01401 100644
--- a/mail/mailest/Makefile
+++ b/mail/mailest/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	mailest
 PORTVERSION=	0.9.22
 DISTVERSIONPREFIX=	${PORTNAME}-
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 
 MAINTAINER=	hrs@FreeBSD.org
diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index 0f7f05bf7409..be9dfb25387c 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mailman
 DISTVERSION=	2.1.24
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	GNU \
 		SF/${PORTNAME}/Mailman%202.1%20%28stable%29/${PORTVERSION} \
@@ -34,7 +35,9 @@ CONFIGURE_ARGS+=--with-python=${PYTHON_CMD} \
 		--with-username=${MM_USERNAME} \
 		--with-groupname=${MM_GROUPNAME} \
 		--with-mail-gid=${MAIL_GID} --with-cgi-gid=${CGI_GID} \
-		--with-permcheck=no
+		--with-permcheck=no \
+		--with-mailhost=// \
+		--with-urlhost=//
 
 # The Mailman port supports a number of variables that may be tweaked at
 # build time.  Getting the values of some of them right is crucial!
diff --git a/mail/mailman/files/pkg-install.in b/mail/mailman/files/pkg-install.in
index 90d4f0584318..ce9bbd6474c0 100644
--- a/mail/mailman/files/pkg-install.in
+++ b/mail/mailman/files/pkg-install.in
@@ -106,6 +106,9 @@ POST-INSTALL)
     echo "---> rcfile sets mailman_fix_perms to no, skipping check_perms"
   fi
 
+  echo "---> Fixing up default host names (MAILHOST, URLHOST)"
+  sed -Ee "s}^(DEFAULT_(EMAIL|URL)_HOST) = '//'}\1 = '`hostname -f`'}" -i '' "%%MAILMANDIR%%/Mailman/Defaults.py"
+
   echo "---> Running assorted other checks"
   if egrep -q "^[ \t]*MTA.*=.*Postfix" "%%MAILMANDIR%%/Mailman/mm_cfg.py" ; then
       # run Postfix-specific checks
diff --git a/mail/mew/Makefile b/mail/mew/Makefile
index c28d99b0c167..eeb5e199a03f 100644
--- a/mail/mew/Makefile
+++ b/mail/mew/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mew
 PORTVERSION=	6.7
+PORTREVISION=	1
 CATEGORIES=	mail elisp
 MASTER_SITES=	http://www.mew.org/Release/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/mail/milter-callback/Makefile b/mail/milter-callback/Makefile
index b80f91d0a721..38d0f8fbab5e 100644
--- a/mail/milter-callback/Makefile
+++ b/mail/milter-callback/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	milter-callback
 PORTVERSION=	1.6.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	LOCAL/ehaupt
 
diff --git a/mail/mu4e-maildirs/Makefile b/mail/mu4e-maildirs/Makefile
index 7333822335f1..66c17eff54d3 100644
--- a/mail/mu4e-maildirs/Makefile
+++ b/mail/mu4e-maildirs/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	mu4e-maildirs
 PORTVERSION=	0.8.20160126
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
diff --git a/mail/mu4e/Makefile b/mail/mu4e/Makefile
index b7830d50242c..0665ebc14ca9 100644
--- a/mail/mu4e/Makefile
+++ b/mail/mu4e/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	mu4e
 PORTVERSION=	0.9.16
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index cba305adb706..b0647c658731 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	mutt
-PORTVERSION=	1.8.3
-PORTREVISION?=	0
+PORTVERSION=	1.9.0
+PORTREVISION?=	1
 CATEGORIES+=	mail ipv6
 MASTER_SITES=	ftp://ftp.mutt.org/pub/mutt/ \
 		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
@@ -38,7 +38,7 @@ CONFIGURE_ARGS=	--disable-fcntl --with-ssl=${OPENSSLBASE} \
 		--enable-external-dotlock --enable-pop --enable-imap \
 		--enable-compressed
 
-USES+=		cpe shebangfix ssl
+USES+=		cpe ncurses shebangfix ssl
 SHEBANG_FILES=	doc/gen-map-doc smime_keys.pl contrib/smime_keys_test.pl
 
 .if defined(MUTT_CONFIGURE_ARGS)
@@ -57,9 +57,8 @@ OPTIONS_EXCLUDE=	NLS DOCS EXAMPLES
 OPTIONS_DEFINE=	SASL DEBUG DOCS EXAMPLES FLOCK \
 		FORCEBASE64 GPGME GREETING_PATCH HTML ICONV IDN IFDEF_PATCH \
 		LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH \
-		NLS NNTP PARENT_CHILD_MATCH_PATCH QUOTE_PATCH \
-		REVERSE_REPLY_PATCH SIDEBAR SMART_DATE SMIME_OUTLOOK_COMPAT \
-		SMTP URLVIEW XML
+		NLS NNTP QUOTE_PATCH REVERSE_REPLY_PATCH SIDEBAR SMART_DATE \
+		SMIME_OUTLOOK_COMPAT SMTP URLVIEW XML
 
 OPTIONS_SINGLE=	GSSAPI HCACHE SCREEN
 OPTIONS_RADIO=	SPELL
@@ -82,7 +81,6 @@ MAILBOX_MANPAGES_DESC=	Install mbox.5/mmdf.5 manpages
 MAILDIR_MTIME_PATCH_DESC=	Maildir mtime patch
 NCURSES_DESC=	Ncurses support
 NLS_DESC=	Native language support (implies ICONV)
-PARENT_CHILD_MATCH_PATCH_DESC=	Parent/child match
 QUOTE_PATCH_DESC=	Extended quoting
 REVERSE_REPLY_PATCH_DESC=	Reverse_reply
 SIDEBAR_DESC=	Sidebar support
@@ -100,9 +98,8 @@ XML_DESC=	Use XML tools for rebuilding documentation
 
 OPTIONS_DEFAULT=	GPGME HTML HCACHE_BDB ICONV IDN \
 		IFDEF_PATCH LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH \
-		NLS NCURSES PARENT_CHILD_MATCH_PATCH QUOTE_PATCH \
-		REVERSE_REPLY_PATCH SMART_DATE SMIME_OUTLOOK_COMPAT SASL SMTP \
-		URLVIEW XML GSSAPI_NONE
+		NLS NCURSES QUOTE_PATCH REVERSE_REPLY_PATCH SMART_DATE \
+		SMIME_OUTLOOK_COMPAT SASL SMTP URLVIEW XML GSSAPI_NONE
 .endif
 
 RUN_DEPENDS+=	${LOCALBASE}/etc/mime.types:misc/mime-support
@@ -170,7 +167,6 @@ ICONV_CONFIGURE_ON=	${ICONV_CONFIGURE_ARG}
 ICONV_CONFIGURE_OFF=	--disable-iconv
 
 ASPELL_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-aspell
-PARENT_CHILD_MATCH_PATCH_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-parent-child-match
 REVERSE_REPLY_PATCH_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-reverse_reply
 
 SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
@@ -201,8 +197,7 @@ GREETING_PATCH_PATCHFILES=	mutt-${GREETING_PATCH_VERSION}.vc.greeting:vc
 QUOTE_PATCH_PATCHFILES=	patch-${VVV_PATCH_VERSION}.vvv.initials.gz:vvv \
 			patch-${VVV_PATCH_VERSION}.vvv.quote.gz:vvv
 
-NNTP_DISTFILES=	patch-${VVV_PATCH_VERSION}.vvv.nntp.gz:vvv \
-		patch-${VVV_PATCH_VERSION}.vvv.nntp_ru.gz:vvv
+NNTP_PATCHFILES=	patch-${VVV_PATCH_VERSION}.vvv.nntp.gz:-p1:vvv
 NNTP_CONFIGURE_ON=	--enable-nntp
 NNTP_VARS=	XML_NEEDED=yes
 NNTP_CATEGORIES=	news
@@ -214,7 +209,7 @@ DOCS_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-doc-ref
 .include <bsd.port.options.mk>
 
 # un/comment as each VERSION is created for PORTVERSION
-VVV_PATCH_VERSION=	1.8.2
+#VVV_PATCH_VERSION=	1.8.3
 #GREETING_PATCH_VERSION=	1.8.3
 
 .if !defined(VVV_PATCH_VERSION)
@@ -238,12 +233,6 @@ LDFLAGS+=		-L${LOCALBASE}/lib -Wl,-rpath=${LOCALBASE}/lib:/usr/lib -ltinfow
 CFLAGS+=		${CFLAGS_ADD}
 LDFLAGS+=		${LDFLAGS_ADD}
 
-pre-patch-NNTP-on:
-	@${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/patch-${VVV_PATCH_VERSION}.vvv.nntp.gz > ${WRKDIR}/patch-nntp
-	@${REINPLACE_CMD} -E '/^diff.*\/doc\/manual.txt$$/,/^diff/d' \
-		${WRKDIR}/patch-nntp
-	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-nntp
-
 post-patch-NNTP-on:
 .if ${PORT_OPTIONS:MMAILDIR_MTIME_PATCH}
 	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-maildir-mtime-nntp
diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo
index 59e5e2cc1fc8..ab1bf55875e1 100644
--- a/mail/mutt/distinfo
+++ b/mail/mutt/distinfo
@@ -1,15 +1,13 @@
-TIMESTAMP = 1496461712
-SHA256 (mutt/mutt-1.8.3.tar.gz) = 9b81746d67ffeca5ea44f60893b70dc93c86d4bc10187d4dd360185e4d42ed42
-SIZE (mutt/mutt-1.8.3.tar.gz) = 4122012
-SHA256 (mutt/patch-1.8.2.vvv.nntp.gz) = 940cf7fd4fbea39f48bd5594180a7be5c3cc6714d62eeb3f2e5fbc0ab4b3545b
-SIZE (mutt/patch-1.8.2.vvv.nntp.gz) = 60675
-SHA256 (mutt/patch-1.8.2.vvv.nntp_ru.gz) = c85a288ed6864c311cbc70b31bab9f0d0d1051846becb5e8fe737609fd939a9c
-SIZE (mutt/patch-1.8.2.vvv.nntp_ru.gz) = 3465
+TIMESTAMP = 1505077543
+SHA256 (mutt/mutt-1.9.0.tar.gz) = ec6d7595d3a1f26ae9f565b5ba5ffee94f9b2dc0683b0014684f2dc874f9e2d4
+SIZE (mutt/mutt-1.9.0.tar.gz) = 4191932
 SHA256 (mutt/date-conditional.diff) = 8936c5fe7a2a62a68f2a8d001c7a6dddf138c48186a338482b6639507ba9133e
 SIZE (mutt/date-conditional.diff) = 2023
-SHA256 (mutt/mutt-1.8.3.vc.greeting) = 73113eb0a3eb761755315ab03c0b6bcb316c09603461a1f8a3f54bd870a576cc
-SIZE (mutt/mutt-1.8.3.vc.greeting) = 4499
-SHA256 (mutt/patch-1.8.2.vvv.initials.gz) = e929c863dd012624b2ac724cd296f346374cd2522f256020fa458e94890ca750
-SIZE (mutt/patch-1.8.2.vvv.initials.gz) = 686
-SHA256 (mutt/patch-1.8.2.vvv.quote.gz) = 03b1aa4aa9152b968fc1709e68207073df62b9b1a5da43ff1d680d6dfe17fe35
-SIZE (mutt/patch-1.8.2.vvv.quote.gz) = 1282
+SHA256 (mutt/mutt-1.9.0.vc.greeting) = b4ac804c24a07c7eb8330ebfdc94cdbf6fd7a4671badfb32fb611df09c008317
+SIZE (mutt/mutt-1.9.0.vc.greeting) = 4534
+SHA256 (mutt/patch-1.9.0.vvv.nntp.gz) = f7098b713dfcbb2a4a6e5edaf536eb99be6d92fad073d5d3ac436b0191c7c892
+SIZE (mutt/patch-1.9.0.vvv.nntp.gz) = 60687
+SHA256 (mutt/patch-1.9.0.vvv.initials.gz) = 4673ca438fb673dfee09c6b8b8f9e8e78af06056f1b515c6030b0533dae847e5
+SIZE (mutt/patch-1.9.0.vvv.initials.gz) = 681
+SHA256 (mutt/patch-1.9.0.vvv.quote.gz) = 22967bd615bd0c10046e264270b6d9cd037fd078365ed3bc1f4d631b8c69b003
+SIZE (mutt/patch-1.9.0.vvv.quote.gz) = 1279
diff --git a/mail/mutt/files/extra-patch-forcebase64-nntp b/mail/mutt/files/extra-patch-forcebase64-nntp
index a99180ca32d2..b4b699d845cb 100644
--- a/mail/mutt/files/extra-patch-forcebase64-nntp
+++ b/mail/mutt/files/extra-patch-forcebase64-nntp
@@ -1,6 +1,6 @@
---- init.h.orig	2017-04-14 01:20:27 UTC
+--- init.h.orig	2017-09-10 22:12:31 UTC
 +++ init.h
-@@ -903,6 +903,11 @@ struct option_t MuttVars[] = {
+@@ -911,6 +911,11 @@ struct option_t MuttVars[] = {
    ** message via mail.
    */
  #endif
@@ -12,9 +12,9 @@
    { "force_name",	DT_BOOL, R_NONE, OPTFORCENAME, 0 },
    /*
    ** .pp
---- mutt.h.orig	2017-04-14 01:20:27 UTC
+--- mutt.h.orig	2017-09-10 22:12:31 UTC
 +++ mutt.h
-@@ -368,6 +368,7 @@ enum
+@@ -379,6 +379,7 @@ enum
    OPTFCCCLEAR,
    OPTFLAGSAFE,
    OPTFOLLOWUPTO,
@@ -22,9 +22,9 @@
    OPTFORCENAME,
    OPTFORWDECODE,
    OPTFORWQUOTE,
---- sendlib.c.orig	2017-04-14 01:20:27 UTC
+--- sendlib.c.orig	2017-09-10 22:12:31 UTC
 +++ sendlib.c
-@@ -1175,7 +1175,9 @@ static void mutt_set_encoding (BODY *b, 
+@@ -1180,7 +1180,9 @@ static void mutt_set_encoding (BODY *b, 
    if (b->type == TYPETEXT)
    {
      char *chsname = mutt_get_body_charset (send_charset, sizeof (send_charset), b);
diff --git a/mail/mutt/files/extra-patch-ifdef b/mail/mutt/files/extra-patch-ifdef
index 6eb420e9e296..edf5e20454b5 100644
--- a/mail/mutt/files/extra-patch-ifdef
+++ b/mail/mutt/files/extra-patch-ifdef
@@ -1,8 +1,8 @@
---- PATCHES.orig	2017-06-03 23:06:11 UTC
+--- PATCHES.orig	2017-09-04 23:34:26 UTC
 +++ PATCHES
 @@ -0,0 +1 @@
 +patch-1.5.4.cd.ifdef.1
---- init.c.orig	2017-05-30 19:27:52 UTC
+--- init.c.orig	2017-09-04 23:34:22 UTC
 +++ init.c
 @@ -656,6 +656,52 @@ static mbchar_table *parse_mbchar_table 
    return t;
@@ -57,9 +57,9 @@
  static int parse_unignore (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err)
  {
    do
---- init.h.orig	2017-06-03 23:06:11 UTC
+--- init.h.orig	2017-09-04 23:34:22 UTC
 +++ init.h
-@@ -3904,6 +3904,7 @@ static int parse_lists (BUFFER *, BUFFER
+@@ -4037,6 +4037,7 @@ static int parse_lists (BUFFER *, BUFFER
  static int parse_unlists (BUFFER *, BUFFER *, unsigned long, BUFFER *);
  static int parse_alias (BUFFER *, BUFFER *, unsigned long, BUFFER *);
  static int parse_unalias (BUFFER *, BUFFER *, unsigned long, BUFFER *);
@@ -67,7 +67,7 @@
  static int parse_ignore (BUFFER *, BUFFER *, unsigned long, BUFFER *);
  static int parse_unignore (BUFFER *, BUFFER *, unsigned long, BUFFER *);
  static int parse_source (BUFFER *, BUFFER *, unsigned long, BUFFER *);
-@@ -3966,6 +3967,7 @@ const struct command_t Commands[] = {
+@@ -4099,6 +4100,7 @@ const struct command_t Commands[] = {
    { "hdr_order",	parse_list,		UL &HeaderOrderList },
  #ifdef HAVE_ICONV
    { "iconv-hook",	mutt_parse_hook,	MUTT_ICONVHOOK },
diff --git a/mail/mutt/files/extra-patch-maildir-mtime b/mail/mutt/files/extra-patch-maildir-mtime
index 9fd76c2d89af..bec92fef5335 100644
--- a/mail/mutt/files/extra-patch-maildir-mtime
+++ b/mail/mutt/files/extra-patch-maildir-mtime
@@ -1,9 +1,9 @@
---- PATCHES.orig	2017-06-03 22:37:15 UTC
-+++ PATCHES
+--- PATCHES.orig	2017-09-04 15:19:31.167205000 -0400
++++ PATCHES	2017-09-04 15:19:31.168636000 -0400
 @@ -0,0 +1 @@
 +patch-1.5.7.ust.maildir-mtime.2
---- browser.c.orig	2017-06-03 22:37:03 UTC
-+++ browser.c
+--- browser.c.orig	2017-09-04 15:19:27.714342000 -0400
++++ browser.c	2017-09-04 15:19:31.178678000 -0400
 @@ -32,6 +32,7 @@
  #ifdef USE_IMAP
  #include "imap.h"
@@ -12,7 +12,7 @@
  
  #include <stdlib.h>
  #include <dirent.h>
-@@ -413,6 +414,21 @@ static void init_state (struct browser_s
+@@ -413,6 +414,21 @@
      menu->data = state->entry;
  }
  
@@ -34,7 +34,7 @@
  static int examine_directory (MUTTMENU *menu, struct browser_state *state,
  			      char *d, const char *prefix)
  {
-@@ -476,6 +492,7 @@ static int examine_directory (MUTTMENU *
+@@ -476,6 +492,7 @@
      tmp = Incoming;
      while (tmp && mutt_strcmp (buffer, tmp->path))
        tmp = tmp->next;
@@ -42,9 +42,9 @@
      if (tmp && Context &&
          !mutt_strcmp (tmp->realpath, Context->realpath))
      {
-@@ -549,6 +566,7 @@ static int examine_mailboxes (MUTTMENU *
-     strfcpy (buffer, NONULL(tmp->path), sizeof (buffer));
-     mutt_pretty_mailbox (buffer, sizeof (buffer));
+@@ -549,6 +566,7 @@
+ 	s.st_mtime = st2.st_mtime;
+     }
  
 +    check_maildir_times (tmp, &s);
      add_folder (menu, state, buffer, &s, tmp);
diff --git a/mail/mutt/files/extra-patch-maildir-mtime-nntp b/mail/mutt/files/extra-patch-maildir-mtime-nntp
index 7162b524e223..a6fbcd7ca513 100644
--- a/mail/mutt/files/extra-patch-maildir-mtime-nntp
+++ b/mail/mutt/files/extra-patch-maildir-mtime-nntp
@@ -1,8 +1,8 @@
---- PATCHES.orig	2017-04-09 21:00:46 UTC
+--- PATCHES.orig	2017-09-10 21:57:09 UTC
 +++ PATCHES
 @@ -0,0 +1 @@
 +patch-1.5.7.ust.maildir-mtime.2
---- browser.c.orig	2017-04-09 20:49:44 UTC
+--- browser.c.orig	2017-09-10 21:56:59 UTC
 +++ browser.c
 @@ -35,6 +35,7 @@
  #ifdef USE_NNTP
@@ -43,8 +43,8 @@
          !mutt_strcmp (tmp->realpath, Context->realpath))
      {
 @@ -737,6 +754,7 @@ static int examine_mailboxes (MUTTMENU *
-     strfcpy (buffer, NONULL(tmp->path), sizeof (buffer));
-     mutt_pretty_mailbox (buffer, sizeof (buffer));
+ 	s.st_mtime = st2.st_mtime;
+     }
  
 +    check_maildir_times (tmp, &s);
      add_folder (menu, state, buffer, &s, tmp, NULL);
diff --git a/mail/mutt/files/extra-patch-reverse_reply b/mail/mutt/files/extra-patch-reverse_reply
index d36df1f75ec2..18fe9d20776b 100644
--- a/mail/mutt/files/extra-patch-reverse_reply
+++ b/mail/mutt/files/extra-patch-reverse_reply
@@ -1,10 +1,10 @@
---- PATCHES.orig	2017-06-03 23:21:18 UTC
+--- PATCHES.orig	2017-09-04 23:35:30 UTC
 +++ PATCHES
 @@ -0,0 +1 @@
 +patch-1.5.6.cb.reverse_reply.2
---- init.h.orig	2017-06-03 23:21:18 UTC
+--- init.h.orig	2017-09-04 23:35:27 UTC
 +++ init.h
-@@ -2588,6 +2588,13 @@ struct option_t MuttVars[] = {
+@@ -2687,6 +2687,13 @@ struct option_t MuttVars[] = {
    ** possibly including eventual real names.  When it is \fIunset\fP, mutt will
    ** override any such real names with the setting of the $$realname variable.
    */
@@ -18,9 +18,9 @@
    { "rfc2047_parameters", DT_BOOL, R_NONE, OPTRFC2047PARAMS, 0 },
    /*
    ** .pp
---- mutt.h.orig	2017-06-03 23:21:23 UTC
+--- mutt.h.orig	2017-09-04 23:35:27 UTC
 +++ mutt.h
-@@ -440,6 +440,7 @@ enum
+@@ -448,6 +448,7 @@ enum
    OPTREVALIAS,
    OPTREVNAME,
    OPTREVREAL,
@@ -28,7 +28,7 @@
    OPTRFC2047PARAMS,
    OPTSAVEADDRESS,
    OPTSAVEEMPTY,
---- protos.h.orig	2017-05-30 19:27:53 UTC
+--- protos.h.orig	2017-09-04 23:35:27 UTC
 +++ protos.h
 @@ -93,6 +93,7 @@ ADDRESS *mutt_get_address (ENVELOPE *, c
  ADDRESS *mutt_lookup_alias (const char *s);
@@ -38,9 +38,9 @@
  ADDRESS *mutt_expand_aliases (ADDRESS *);
  ADDRESS *mutt_parse_adrlist (ADDRESS *, const char *);
  
---- send.c.orig	2017-05-30 19:27:53 UTC
+--- send.c.orig	2017-09-04 23:35:27 UTC
 +++ send.c
-@@ -585,6 +585,10 @@ void mutt_fix_reply_recipients (ENVELOPE
+@@ -598,6 +598,10 @@ void mutt_fix_reply_recipients (ENVELOPE
    /* the CC field can get cluttered, especially with lists */
    env->to = mutt_remove_duplicates (env->to);
    env->cc = mutt_remove_duplicates (env->cc);
@@ -51,9 +51,9 @@
    env->cc = mutt_remove_xrefs (env->to, env->cc);
    
    if (env->cc && !env->to)
---- sendlib.c.orig	2017-05-30 19:27:53 UTC
+--- sendlib.c.orig	2017-09-04 23:35:27 UTC
 +++ sendlib.c
-@@ -2714,6 +2714,35 @@ static void set_noconv_flags (BODY *b, s
+@@ -2753,6 +2753,35 @@ static void set_noconv_flags (BODY *b, s
    }
  }
  
diff --git a/mail/mutt/files/patch-smime-self b/mail/mutt/files/patch-smime-self
deleted file mode 100644
index bb5540e30e2b..000000000000
--- a/mail/mutt/files/patch-smime-self
+++ /dev/null
@@ -1,63 +0,0 @@
---- contrib/smime.rc.orig	2017-05-30 19:26:40 UTC
-+++ contrib/smime.rc
-@@ -23,8 +23,12 @@ set crypt_verify_sig = yes
- 
- # The (default) keyfile for signing/decrypting.  Uncomment the following
- # line and replace the keyid with your own.
--set smime_default_key="12345678.0"
-+# set smime_default_key="12345678.0"
- 
-+# Uncomment the following line in addition to the one above, if you want that
-+# all encrypted messages are also encrypted with your default key.
-+# set smime_encrypt_self = yes
-+  
- # Uncomment to make mutt ask what key to use when trying to decrypt a message.
- # It will use the default key above (if that was set) else.
- # unset smime_decrypt_use_default_key
---- crypt.c.orig	2017-06-04 00:05:52 UTC
-+++ crypt.c
-@@ -229,8 +229,18 @@ int mutt_protect (HEADER *msg, char *key
-     if ((WithCrypto & APPLICATION_SMIME)
-         && (msg->security & APPLICATION_SMIME))
-     {
--      if (!(tmp_pbody = crypt_smime_build_smime_entity (tmp_smime_pbody,
--                                                        keylist)))
-+	   char *new_keylist = keylist;
-+
-+		 if (SmimeDefaultKey && query_quadoption(OPT_SMIMEENCRYPTSELF, _("Encrypt message to S/MIME Default Key also?")) == MUTT_YES)
-+		 {
-+			int size = mutt_strlen(keylist) + mutt_strlen (SmimeDefaultKey) + 2; /* +1 for NULL, +1 for \n */
-+			new_keylist = safe_malloc(size);
-+			snprintf(new_keylist, size, "%s%s\n", keylist, SmimeDefaultKey);
-+	   }
-+		 
-+	  tmp_pbody = crypt_smime_build_smime_entity (tmp_smime_pbody, new_keylist);
-+	  safe_free((void **)&new_keylist);
-+	  if (!tmp_pbody)
-       {
- 	/* signed ? free it! */
- 	return (-1);
---- init.h.orig	2017-06-04 00:05:52 UTC
-+++ init.h
-@@ -3017,6 +3017,11 @@ struct option_t MuttVars[] = {
-   ** possible \fCprintf(3)\fP-like sequences.
-   ** (S/MIME only)
-   */
-+  { "smime_encrypt_self",	DT_QUAD,	 R_NONE, OPT_SMIMEENCRYPTSELF, 1 },
-+  /*
-+  ** .pp
-+  ** Encrypt the message to smime_default_key too.
-+  */
-   { "smime_encrypt_with",	DT_STR,	 R_NONE, UL &SmimeCryptAlg, UL "aes256" },
-   /*
-   ** .pp
---- mutt.h.orig	2017-06-04 00:05:52 UTC
-+++ mutt.h
-@@ -284,6 +284,7 @@ enum
-   OPT_FORWEDIT,
-   OPT_FCCATTACH,
-   OPT_INCLUDE,
-+  OPT_SMIMEENCRYPTSELF,
-   OPT_MFUPTO,
-   OPT_MIMEFWD,
-   OPT_MIMEFWDREST,
diff --git a/mail/mutt/files/patch-smime-sender b/mail/mutt/files/patch-smime-sender
index 750474cd007c..9234ea627960 100644
--- a/mail/mutt/files/patch-smime-sender
+++ b/mail/mutt/files/patch-smime-sender
@@ -1,4 +1,4 @@
---- commands.c.orig	2017-05-30 19:27:52 UTC
+--- commands.c.orig	2017-09-08 22:18:16 UTC
 +++ commands.c
 @@ -185,7 +185,7 @@ int mutt_display_message (HEADER *cur)
      {
@@ -9,23 +9,9 @@
  	  mutt_message ( _("S/MIME signature successfully verified."));
  	else
  	  mutt_error ( _("S/MIME certificate owner does not match sender."));
---- contrib/smime.rc.orig	2017-06-04 00:06:24 UTC
-+++ contrib/smime.rc
-@@ -8,7 +8,10 @@ set smime_is_default
- 
- # Uncomment this if you don't want to set labels for certificates you add.
- # unset smime_ask_cert_label
--
-+ 
-+# Uncomment this if you don't want to check for sender's email address
-+# set smime_dont_check_sender = yes
-+  
- # Passphrase expiration
- set smime_timeout=300
- 
---- init.h.orig	2017-06-04 00:06:24 UTC
+--- init.h.orig	2017-09-08 22:18:16 UTC
 +++ init.h
-@@ -3000,6 +3000,15 @@ struct option_t MuttVars[] = {
+@@ -3099,6 +3099,15 @@ struct option_t MuttVars[] = {
    ** to determine the key to use. It will ask you to supply a key, if it can't find one.
    ** (S/MIME only)
    */
@@ -41,11 +27,11 @@
    { "smime_sign_as",			DT_SYN,  R_NONE, UL "smime_default_key", 0 },
    { "smime_default_key",		DT_STR,	 R_NONE, UL &SmimeDefaultKey, 0 },
    /*
---- mutt.h.orig	2017-06-04 00:06:24 UTC
+--- mutt.h.orig	2017-09-08 22:18:16 UTC
 +++ mutt.h
-@@ -513,6 +513,7 @@ enum
-   OPTCRYPTTIMESTAMP,
+@@ -521,6 +521,7 @@ enum
    OPTSMIMEISDEFAULT,
+   OPTSMIMESELFENCRYPT,
    OPTASKCERTLABEL,
 +  OPTSMIMENOSENDER,
    OPTSDEFAULTDECRYPTKEY,
diff --git a/mail/mutt/files/patch-threadcomplete b/mail/mutt/files/patch-threadcomplete
index da05ebf338e5..335b4ba96e0b 100644
--- a/mail/mutt/files/patch-threadcomplete
+++ b/mail/mutt/files/patch-threadcomplete
@@ -1,4 +1,4 @@
---- mutt.h.orig	2017-06-03 22:52:35 UTC
+--- mutt.h.orig	2017-09-04 23:39:03 UTC
 +++ mutt.h
 @@ -211,6 +211,7 @@ enum
    MUTT_EXPIRED,
@@ -8,9 +8,9 @@
  
    /* actions for mutt_pattern_comp/mutt_pattern_exec */
    MUTT_AND,
---- pattern.c.orig	2017-06-03 22:52:35 UTC
+--- pattern.c.orig	2017-09-04 23:39:03 UTC
 +++ pattern.c
-@@ -57,6 +57,7 @@ static const struct pattern_flags
+@@ -56,6 +56,7 @@ static const struct pattern_flags
  }
  Flags[] =
  {
@@ -18,7 +18,7 @@
    { 'A', MUTT_ALL,			0,		NULL },
    { 'b', MUTT_BODY,		MUTT_FULL_MSG,	eat_regexp },
    { 'B', MUTT_WHOLE_MSG,		MUTT_FULL_MSG,	eat_regexp },
-@@ -1302,6 +1303,16 @@ pattern_exec (struct pattern_t *pat, pat
+@@ -1270,6 +1271,16 @@ mutt_pattern_exec (struct pattern_t *pat
        else
          result = mutt_is_list_cc (pat->alladdr, h->env->to, h->env->cc);
        return (pat->not ^ result);
diff --git a/mail/neomutt/Makefile b/mail/neomutt/Makefile
index d0308cc59258..8955f131ce88 100644
--- a/mail/neomutt/Makefile
+++ b/mail/neomutt/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	neomutt
-PORTVERSION=	20170714
+PORTVERSION=	20170912
 DISTVERSIONPREFIX=	${PORTNAME}-
 CATEGORIES=	mail
 
@@ -14,9 +14,10 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.md
 RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:misc/mime-support \
 		urlview:textproc/urlview
 
+USES=		autoreconf iconv:translit localbase shebangfix ssl
+
 USE_GITHUB=	yes
 
-USES=		autoreconf iconv:translit localbase shebangfix ssl
 GNU_CONFIGURE=	yes
 
 OPTIONS_SUB=	yes
diff --git a/mail/neomutt/distinfo b/mail/neomutt/distinfo
index 7439951e7a06..ec320c9c9518 100644
--- a/mail/neomutt/distinfo
+++ b/mail/neomutt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500055455
-SHA256 (neomutt-neomutt-neomutt-20170714_GH0.tar.gz) = 40d48920f95ca49ab96eb109b658f5cf6e1c222320c58bdd03769c1355d7a383
-SIZE (neomutt-neomutt-neomutt-20170714_GH0.tar.gz) = 2509160
+TIMESTAMP = 1505232644
+SHA256 (neomutt-neomutt-neomutt-20170912_GH0.tar.gz) = 9f0d128fe8dbbbddb67e2b629f8b5e52a9d892f82c735845c1708c14e3046657
+SIZE (neomutt-neomutt-neomutt-20170912_GH0.tar.gz) = 2533245
diff --git a/mail/neomutt/pkg-plist b/mail/neomutt/pkg-plist
index bd365c883e79..4c3497f1b02c 100644
--- a/mail/neomutt/pkg-plist
+++ b/mail/neomutt/pkg-plist
@@ -91,24 +91,6 @@ man/man5/muttrc.5.gz
 %%PORTDOCS%%%%DOCSDIR%%/samples/colors.default
 %%PORTDOCS%%%%DOCSDIR%%/samples/colors.linux
 %%PORTDOCS%%%%DOCSDIR%%/samples/gpg.rc
-%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.aix-3.2.5.rc
-%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.aix-4.1.5.rc
-%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.aix-4.2.0.rc
-%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.aix-4.3.2.rc
-%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.freebsd-3.3.rc
-%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.glibc-2.1.3.rc
-%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.glibc-2.1.90.rc
-%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.hpux-10.01.rc
-%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.hpux-10.20.rc
-%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.hpux-11.00.rc
-%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.irix-6.5.rc
-%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.osf1-4.0a.rc
-%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.osf1-4.0d.rc
-%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.solaris-2.4.rc
-%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.solaris-2.5.1.rc
-%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.solaris-2.6-cjk.rc
-%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.solaris-2.6.rc
-%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.solaris-2.7.rc
 %%PORTDOCS%%%%DOCSDIR%%/samples/pgp2.rc
 %%PORTDOCS%%%%DOCSDIR%%/samples/pgp5.rc
 %%PORTDOCS%%%%DOCSDIR%%/samples/pgp6.rc
diff --git a/mail/opendmarc/Makefile b/mail/opendmarc/Makefile
index 463a315e1e9e..f45a2dbfd3e8 100644
--- a/mail/opendmarc/Makefile
+++ b/mail/opendmarc/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	opendmarc
-PORTVERSION=	1.3.1
-PORTREVISION=	4
+PORTVERSION=	1.3.2
 CATEGORIES=	mail security
 MASTER_SITES=	SF/${PORTNAME} \
 		SF/${PORTNAME}/Previous%20Releases
diff --git a/mail/opendmarc/distinfo b/mail/opendmarc/distinfo
index 88ca42780d93..1610182ddbe4 100644
--- a/mail/opendmarc/distinfo
+++ b/mail/opendmarc/distinfo
@@ -1,2 +1,3 @@
-SHA256 (opendmarc-1.3.1.tar.gz) = a0c0cf74de68454cbdce16a3095b96e70fc16614325052ea230878d1ca64da6b
-SIZE (opendmarc-1.3.1.tar.gz) = 640151
+TIMESTAMP = 1500636334
+SHA256 (opendmarc-1.3.2.tar.gz) = 213c4b01a9ff5dcdf331f7bd1dd6a382077abbf8ee9111852f2101ec917c2ffb
+SIZE (opendmarc-1.3.2.tar.gz) = 593448
diff --git a/mail/opendmarc/pkg-plist b/mail/opendmarc/pkg-plist
index 8d4e636e03c0..39aa5442e0d8 100644
--- a/mail/opendmarc/pkg-plist
+++ b/mail/opendmarc/pkg-plist
@@ -3,7 +3,7 @@ include/opendmarc/dmarc.h
 lib/libopendmarc.a
 lib/libopendmarc.so
 lib/libopendmarc.so.2
-lib/libopendmarc.so.2.0.1
+lib/libopendmarc.so.2.0.2
 man/man5/opendmarc.conf.5.gz
 man/man8/opendmarc-check.8.gz
 man/man8/opendmarc-expire.8.gz
diff --git a/mail/p5-Email-Simple/Makefile b/mail/p5-Email-Simple/Makefile
index c9b3bab0b119..de5be1823b8d 100644
--- a/mail/p5-Email-Simple/Makefile
+++ b/mail/p5-Email-Simple/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Email-Simple
-PORTVERSION=	2.213
+PORTVERSION=	2.214
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Email-Simple/distinfo b/mail/p5-Email-Simple/distinfo
index ec003492c18f..b6299a1e7dce 100644
--- a/mail/p5-Email-Simple/distinfo
+++ b/mail/p5-Email-Simple/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1484304106
-SHA256 (Email-Simple-2.213.tar.gz) = cdb97a9d647231cc0f7207a31ed6ec5ffde6b8ac6504910dc378bf619ed57cc5
-SIZE (Email-Simple-2.213.tar.gz) = 39302
+TIMESTAMP = 1504948354
+SHA256 (Email-Simple-2.214.tar.gz) = b2f02b37441ea60efbddebbd675017d26bb767e9a4de3e0fc30b5410a1416b92
+SIZE (Email-Simple-2.214.tar.gz) = 39590
diff --git a/mail/pop3vscan/Makefile b/mail/pop3vscan/Makefile
index 9b85dbfd3d78..906a46cb7e21 100644
--- a/mail/pop3vscan/Makefile
+++ b/mail/pop3vscan/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pop3vscan
 PORTVERSION=	0.4
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	mail
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
diff --git a/mail/py-notmuch/Makefile b/mail/py-notmuch/Makefile
index 1557151ff8b7..1f7a5d7a3036 100644
--- a/mail/py-notmuch/Makefile
+++ b/mail/py-notmuch/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	notmuch
-PORTVERSION=	0.23.1
+PORTVERSION=	0.25
 CATEGORIES=	mail python
 MASTER_SITES=	http://notmuchmail.org/releases/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/mail/py-notmuch/distinfo b/mail/py-notmuch/distinfo
index bf23634dbb05..a763791620ea 100644
--- a/mail/py-notmuch/distinfo
+++ b/mail/py-notmuch/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479199291
-SHA256 (notmuch-0.23.1.tar.gz) = e8012a1aa9afa47dfeb78f826610577e6bf9714e0933f28139c8611aad96d180
-SIZE (notmuch-0.23.1.tar.gz) = 690069
+TIMESTAMP = 1504984307
+SHA256 (notmuch-0.25.tar.gz) = 65d28d1f783d02629039f7d15d9a2bada147a7d3809f86fe8d13861b0f6ae60b
+SIZE (notmuch-0.25.tar.gz) = 882093
diff --git a/mail/py-pymailq/Makefile b/mail/py-pymailq/Makefile
index b207a4169cf7..fb65284d4a14 100644
--- a/mail/py-pymailq/Makefile
+++ b/mail/py-pymailq/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pymailq
-PORTVERSION=	0.5.4
+PORTVERSION=	0.8.0
 CATEGORIES=	mail python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -27,8 +27,9 @@ PLIST_FILES+=	man/man1/pqshell.1.gz
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/sbin/postqueue|${LOCALBASE}/sbin/postqueue|' \
-		${WRKSRC}/pymailq/store.py
+	@${REINPLACE_CMD} -e \
+		's|%%DOCSDIR%%|${DOCSDIR}|g; s|%%EXAMPLESDIR%%|${EXAMPLESDIR}|g' \
+		${WRKSRC}/setup.py
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/man/pqshell.1 ${STAGEDIR}${MANPREFIX}/man/man1/pqshell-${PYTHON_VER}.1
diff --git a/mail/py-pymailq/distinfo b/mail/py-pymailq/distinfo
index d57979e25ca8..e17c1658e104 100644
--- a/mail/py-pymailq/distinfo
+++ b/mail/py-pymailq/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495872044
-SHA256 (pymailq-0.5.4.tar.gz) = 25e6afc496c5cbd46221ced5c3db2f0bf86acdbe2f0a8753493143b75768b493
-SIZE (pymailq-0.5.4.tar.gz) = 25038
+TIMESTAMP = 1504168247
+SHA256 (pymailq-0.8.0.tar.gz) = 48b463d8a7563b2cb368a60c169143a3f1b3b5f8bf232610d7bfc2c0c18644ec
+SIZE (pymailq-0.8.0.tar.gz) = 29881
diff --git a/mail/py-pymailq/files/patch-setup.py b/mail/py-pymailq/files/patch-setup.py
index 85d81687cf23..155429d00f21 100644
--- a/mail/py-pymailq/files/patch-setup.py
+++ b/mail/py-pymailq/files/patch-setup.py
@@ -1,11 +1,17 @@
---- setup.py.orig	2017-05-29 11:46:42 UTC
+--- setup.py.orig	2017-08-31 10:22:19 UTC
 +++ setup.py
-@@ -39,8 +39,6 @@ if __name__ == '__main__':
+@@ -39,11 +39,10 @@ if __name__ == '__main__':
          scripts=['bin/pqshell'],
          packages=['pymailq'],
          package_dir={'pymailq': 'pymailq'},
--        data_files=[('share/doc/pymailq', ['README.rst', 'LICENSE']),
--                      ('share/man/man1/', ['man/pqshell.1'])],
+-        data_files=[('share/doc/pymailq', ['README.rst', 'LICENSE', 'CHANGES']),
+-                    ('share/doc/pymailq/examples', [
++        data_files=[('%%DOCSDIR%%', ['README.rst', 'LICENSE', 'CHANGES']),
++                    ('%%EXAMPLESDIR%%', [
+                         'share/doc/examples/pymailq.ini'
+-                    ]),
+-                    ('share/man/man1', ['man/pqshell.1'])],
++                    ])],
          keywords=['postfix', 'shell', 'mailq', 'python', 'pqshell', 'postqueue'],
          classifiers=[
-             'Development Status :: 2 - Pre-Alpha',
+             'Development Status :: 5 - Production/Stable',
diff --git a/mail/roundcube/Makefile b/mail/roundcube/Makefile
index 809faaff19cb..164393ff6512 100644
--- a/mail/roundcube/Makefile
+++ b/mail/roundcube/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	roundcube
-DISTVERSION=	1.3.0
+DISTVERSION=	1.3.1
 PORTEPOCH=	1
 CATEGORIES?=	mail www
 MASTER_SITES=	https://github.com/roundcube/roundcubemail/releases/download/${DISTVERSION}/
diff --git a/mail/roundcube/distinfo b/mail/roundcube/distinfo
index a28f1fbf2dbb..c9d5f60d2188 100644
--- a/mail/roundcube/distinfo
+++ b/mail/roundcube/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1498605012
-SHA256 (roundcubemail-1.3.0-complete.tar.gz) = a9c4d084716482171b23216d57ad9dafd85bd34f1eee73824c62327fc22b995a
-SIZE (roundcubemail-1.3.0-complete.tar.gz) = 6158919
+TIMESTAMP = 1505113862
+SHA256 (roundcubemail-1.3.1-complete.tar.gz) = f071bbe84f90ba55582289dcef7b70198b81e0aedd4de8422945658bbee3da0b
+SIZE (roundcubemail-1.3.1-complete.tar.gz) = 5296647
diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile
index b4bf13661ada..8b420b0f1e0c 100644
--- a/mail/rspamd/Makefile
+++ b/mail/rspamd/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	rspamd
-PORTVERSION=	1.6.3
+PORTVERSION=	1.6.4
 CATEGORIES=	mail
 
 MAINTAINER=	vsevolod@FreeBSD.org
diff --git a/mail/rspamd/distinfo b/mail/rspamd/distinfo
index 15f1e24e47e2..c9535d2e17d4 100644
--- a/mail/rspamd/distinfo
+++ b/mail/rspamd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501192321
-SHA256 (vstakhov-rspamd-1.6.3_GH0.tar.gz) = 0d89fc4966c71b209a0f566458b1651dfa11b651b5e772cbe599177270e8c13f
-SIZE (vstakhov-rspamd-1.6.3_GH0.tar.gz) = 2476617
+TIMESTAMP = 1505043191
+SHA256 (vstakhov-rspamd-1.6.4_GH0.tar.gz) = 70560ffe308e25086ff9c56d8ba40e759652693b4e94fcc10f808620928d510f
+SIZE (vstakhov-rspamd-1.6.4_GH0.tar.gz) = 2482277
diff --git a/mail/rubygem-actionmailer5/Makefile b/mail/rubygem-actionmailer5/Makefile
index 719fd69321d0..9b1e89ace8d7 100644
--- a/mail/rubygem-actionmailer5/Makefile
+++ b/mail/rubygem-actionmailer5/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	actionmailer
-PORTVERSION=	5.1.3
+PORTVERSION=	5.1.4
 CATEGORIES=	mail rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	5
diff --git a/mail/rubygem-actionmailer5/distinfo b/mail/rubygem-actionmailer5/distinfo
index 0d09c74a1b56..ea5ef38f054d 100644
--- a/mail/rubygem-actionmailer5/distinfo
+++ b/mail/rubygem-actionmailer5/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501862710
-SHA256 (rubygem/actionmailer-5.1.3.gem) = a2841384bb40951e6d63ca78ca665bdfcc792c732825cc2c83ae4b4d05363f67
-SIZE (rubygem/actionmailer-5.1.3.gem) = 29184
+TIMESTAMP = 1504891682
+SHA256 (rubygem/actionmailer-5.1.4.gem) = 5ae798850bd284f803cc006887d6b089692183a8c192393436c519bd6ec598e9
+SIZE (rubygem/actionmailer-5.1.4.gem) = 29184
diff --git a/mail/rubygem-actionmailer50/Makefile b/mail/rubygem-actionmailer50/Makefile
index e3d6b27eaf5f..b28b51670910 100644
--- a/mail/rubygem-actionmailer50/Makefile
+++ b/mail/rubygem-actionmailer50/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	actionmailer
-PORTVERSION=	5.0.5
+PORTVERSION=	5.0.6
 CATEGORIES=	mail rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	50
diff --git a/mail/rubygem-actionmailer50/distinfo b/mail/rubygem-actionmailer50/distinfo
index b429300724c9..9f43a1f4a5c3 100644
--- a/mail/rubygem-actionmailer50/distinfo
+++ b/mail/rubygem-actionmailer50/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501604053
-SHA256 (rubygem/actionmailer-5.0.5.gem) = c48a93381dde7206fd2cb0ddc00a922021fcdf6bce35c262bd357c7922a63fb7
-SIZE (rubygem/actionmailer-5.0.5.gem) = 28672
+TIMESTAMP = 1504891771
+SHA256 (rubygem/actionmailer-5.0.6.gem) = bb1113dd020f310fc7948bd13766eeab6cf975a0e1322c8a10cd12adbcacea4f
+SIZE (rubygem/actionmailer-5.0.6.gem) = 28672
diff --git a/mail/rubygem-email_reply_trimmer/Makefile b/mail/rubygem-email_reply_trimmer/Makefile
index 2806e848b317..38118a314afd 100644
--- a/mail/rubygem-email_reply_trimmer/Makefile
+++ b/mail/rubygem-email_reply_trimmer/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	email_reply_trimmer
-PORTVERSION=	0.1.7
+PORTVERSION=	0.1.8
 CATEGORIES=	mail rubygems
 MASTER_SITES=	RG
 
diff --git a/mail/rubygem-email_reply_trimmer/distinfo b/mail/rubygem-email_reply_trimmer/distinfo
index eb58dbd8e412..95f13470d60e 100644
--- a/mail/rubygem-email_reply_trimmer/distinfo
+++ b/mail/rubygem-email_reply_trimmer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501603991
-SHA256 (rubygem/email_reply_trimmer-0.1.7.gem) = c6ef96e927305cdac2796b8bc0df1514550bdfa351c068dc28db0027a6d8e358
-SIZE (rubygem/email_reply_trimmer-0.1.7.gem) = 39936
+TIMESTAMP = 1505452143
+SHA256 (rubygem/email_reply_trimmer-0.1.8.gem) = 8967bc4f64c4aa7b0f4919de22f0155eaac431aaf735dedc60717d432fb24d20
+SIZE (rubygem/email_reply_trimmer-0.1.8.gem) = 40448
diff --git a/mail/sendmail/files/site.config.m4.gdbm b/mail/sendmail/files/site.config.m4.gdbm
new file mode 100644
index 000000000000..0210aab3851c
--- /dev/null
+++ b/mail/sendmail/files/site.config.m4.gdbm
@@ -0,0 +1,4 @@
+APPENDDEF(`confMAPDEF', `-DNDBM')
+APPENDDEF(`confINCDIRS', `-I%%LOCALBASE%%/include')
+APPENDDEF(`confLIBDIRS', `-L%%LOCALBASE%%/lib')
+APPENDDEF(`confLIBS', `-lgdbm_compat -lgdbm')
diff --git a/mail/sgwi/Makefile b/mail/sgwi/Makefile
index 4e1b04381714..d3bbc4d4b027 100644
--- a/mail/sgwi/Makefile
+++ b/mail/sgwi/Makefile
@@ -3,9 +3,10 @@
 
 PORTNAME=	sgwi
 PORTVERSION=	1.1.8
+PORTREVISION=	1
 CATEGORIES=	mail www
 MASTER_SITES=	http://www.vanheusden.com/sgwi/ \
-		http://lukasz.wasikowski.net/files/
+		https://www.freebsd.systems/files/
 DISTNAME=	sqlgreywebinterface-${PORTVERSION}
 
 MAINTAINER=	lukasz@wasikowski.net
@@ -13,7 +14,7 @@ COMMENT=	PHP web interface to SQLGrey
 
 LICENSE=	GPLv2
 
-USES=		tar:tgz
+USES=		tar:tgz php:web
 NO_BUILD=	yes
 SUB_FILES+=	pkg-message pkg-install
 SUB_LIST=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
@@ -27,12 +28,10 @@ SQLITE3_DESC=	SQLite3 back-end (use pgsql PHP extension)
 
 OPTIONS_DEFAULT=MYSQL
 
-MYSQL_USE=	PHP=mysql
+MYSQL_USE=	PHP=mysqli
 PGSQL_USE=	PHP=pgsql
 SQLITE3_USE=	PHP=sqlite3
 
-WANT_PHP_WEB=	yes
-
 post-patch:
 		${FIND} ${WRKSRC} -name '*.orig' -delete
 
diff --git a/mail/sgwi/distinfo b/mail/sgwi/distinfo
index d833cd3a30a1..79fad51ad296 100644
--- a/mail/sgwi/distinfo
+++ b/mail/sgwi/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1498052573
 SHA256 (sqlgreywebinterface-1.1.8.tgz) = 33685805e417f13de7224fe5ccb98c4a4a2df27cb2f1c98a3a8ae76f2911cf08
 SIZE (sqlgreywebinterface-1.1.8.tgz) = 14257
diff --git a/mail/spamdyke/Makefile b/mail/spamdyke/Makefile
index 8b82c2c16cd2..f35cbd797d77 100644
--- a/mail/spamdyke/Makefile
+++ b/mail/spamdyke/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	spamdyke
 PORTVERSION=	5.0.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	http://www.spamdyke.org/releases/
 
diff --git a/mail/spamprobe/Makefile b/mail/spamprobe/Makefile
index 580425b8eee3..048811f5fab4 100644
--- a/mail/spamprobe/Makefile
+++ b/mail/spamprobe/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=		spamprobe
 PORTVERSION=	1.4d
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=		mail
 MASTER_SITES=	SF
 
diff --git a/mail/squirrelmail-translations/Makefile b/mail/squirrelmail-translations/Makefile
index e023de4bd1da..8edd0c29f964 100644
--- a/mail/squirrelmail-translations/Makefile
+++ b/mail/squirrelmail-translations/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	squirrelmail>=${PORTVERSION}:mail/squirrelmail
 USES=		tar:bzip2 gettext
 WRKSRC=		${WRKDIR}/squirrelmail.locales
 NO_ARCH=	yes
-PORTSCOUT=	ignore
+PORTSCOUT=	ignore:1
 
 # if you were using WITHOUT_WWWDIR, use SQUIRRELDIR=${PREFIX}/squirrelmail
 SQUIRRELDIR?=	${PREFIX}/www/squirrelmail
diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index aa92dbcf7c91..6f7e8c910e01 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -19,7 +19,7 @@ USES=		cpe gettext perl5 php:web tar:bzip2
 USE_PHP=	session hash gettext mbstring pcre openssl xml
 USE_PERL5=	run
 NO_ARCH=	yes
-PORTSCOUT=	ignore
+PORTSCOUT=	ignore:1
 
 WRKSRC=		${WRKDIR}/${PORTNAME}.stable/${PORTNAME}
 
diff --git a/mail/trojita/Makefile b/mail/trojita/Makefile
index 287ef7476a94..756945062dcb 100644
--- a/mail/trojita/Makefile
+++ b/mail/trojita/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	trojita
 PORTVERSION=	0.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	SF/${PORTNAME}/src/
 
diff --git a/mail/wanderlust-devel/Makefile b/mail/wanderlust-devel/Makefile
index af3c5ee7dd83..88cfc3583309 100644
--- a/mail/wanderlust-devel/Makefile
+++ b/mail/wanderlust-devel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	wanderlust
 PORTVERSION=	2.15.9.b.${SNAPDATE}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail elisp
 PKGNAMESUFFIX=	-devel-${EMACS_PORT_NAME}
 
diff --git a/mail/wanderlust/Makefile b/mail/wanderlust/Makefile
index 1aef3bd56361..cb43b7ae428e 100644
--- a/mail/wanderlust/Makefile
+++ b/mail/wanderlust/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	wanderlust
 PORTVERSION=	2.14.0
-PORTREVISION=	18
+PORTREVISION=	19
 CATEGORIES=	mail elisp
 MASTER_SITES=	ftp://ftp.gohome.org/wl/stable/ \
 		http://www.jpl.org/elips/wl/
diff --git a/mail/x-face-e21/Makefile b/mail/x-face-e21/Makefile
index 837395cd1c29..d89e3081a664 100644
--- a/mail/x-face-e21/Makefile
+++ b/mail/x-face-e21/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	x-face-e21
 PORTVERSION=	20070306
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	mail elisp
 MASTER_SITES=	http://www.jpl.org/elips/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/mail/xcite/Makefile b/mail/xcite/Makefile
index dd412646e70b..c53ea09c82cf 100644
--- a/mail/xcite/Makefile
+++ b/mail/xcite/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xcite
 PORTVERSION=	1.60
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	mail elisp
 MASTER_SITES=	http://www.gentei.org/~yuuji/software/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/math/Makefile b/math/Makefile
index 5a5c6af4a1fd..46a005483a04 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -7,7 +7,10 @@
     SUBDIR += PDL
     SUBDIR += R
     SUBDIR += R-cran-Amelia
+    SUBDIR += R-cran-CVST
     SUBDIR += R-cran-ChangeAnomalyDetection
+    SUBDIR += R-cran-DEoptimR
+    SUBDIR += R-cran-DRR
     SUBDIR += R-cran-Formula
     SUBDIR += R-cran-KFAS
     SUBDIR += R-cran-LearnBayes
@@ -21,6 +24,7 @@
     SUBDIR += R-cran-RSvgDevice
     SUBDIR += R-cran-RcppArmadillo
     SUBDIR += R-cran-RcppEigen
+    SUBDIR += R-cran-RcppRoll
     SUBDIR += R-cran-Rmpfr
     SUBDIR += R-cran-Rsolnp
     SUBDIR += R-cran-SparseM
@@ -32,7 +36,9 @@
     SUBDIR += R-cran-car
     SUBDIR += R-cran-coda
     SUBDIR += R-cran-combinat
+    SUBDIR += R-cran-ddalpha
     SUBDIR += R-cran-deldir
+    SUBDIR += R-cran-dimRed
     SUBDIR += R-cran-dlmodeler
     SUBDIR += R-cran-dplyr
     SUBDIR += R-cran-expm
@@ -40,14 +46,17 @@
     SUBDIR += R-cran-fracdiff
     SUBDIR += R-cran-geepack
     SUBDIR += R-cran-gmp
+    SUBDIR += R-cran-gower
     SUBDIR += R-cran-gpclib
     SUBDIR += R-cran-gss
     SUBDIR += R-cran-gtable
     SUBDIR += R-cran-igraph
     SUBDIR += R-cran-influenceR
     SUBDIR += R-cran-inline
+    SUBDIR += R-cran-ipred
     SUBDIR += R-cran-irlba
     SUBDIR += R-cran-labeling
+    SUBDIR += R-cran-lava
     SUBDIR += R-cran-lazyeval
     SUBDIR += R-cran-lme4
     SUBDIR += R-cran-maxLik
@@ -62,11 +71,14 @@
     SUBDIR += R-cran-numDeriv
     SUBDIR += R-cran-outliers
     SUBDIR += R-cran-pbkrtest
+    SUBDIR += R-cran-prodlim
     SUBDIR += R-cran-psych
     SUBDIR += R-cran-quadprog
     SUBDIR += R-cran-qualityTools
     SUBDIR += R-cran-quantreg
+    SUBDIR += R-cran-recipes
     SUBDIR += R-cran-rgenoud
+    SUBDIR += R-cran-robustbase
     SUBDIR += R-cran-sandwich
     SUBDIR += R-cran-sf
     SUBDIR += R-cran-sm
diff --git a/math/R-cran-CVST/Makefile b/math/R-cran-CVST/Makefile
new file mode 100644
index 000000000000..04ecc1fbc717
--- /dev/null
+++ b/math/R-cran-CVST/Makefile
@@ -0,0 +1,20 @@
+# Created by: TAKATSU Tomonari <tota@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	CVST
+DISTVERSION=	0.2-1
+CATEGORIES=	math
+DISTNAME=	${PORTNAME}_${DISTVERSION}
+
+MAINTAINER=	tota@FreeBSD.org
+COMMENT=	Fast Cross-Validation via Sequential Testing
+
+LICENSE=	GPLv2+
+
+CRAN_DEPENDS=	R-cran-kernlab>0:science/R-cran-kernlab
+BUILD_DEPENDS=	${CRAN_DEPENDS}
+RUN_DEPENDS=	${CRAN_DEPENDS}
+
+USES=		cran:auto-plist
+
+.include <bsd.port.mk>
diff --git a/math/R-cran-CVST/distinfo b/math/R-cran-CVST/distinfo
new file mode 100644
index 000000000000..6a56e81bf3de
--- /dev/null
+++ b/math/R-cran-CVST/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1505027642
+SHA256 (CVST_0.2-1.tar.gz) = a27fd2bfa778fce9b9a68d2b9206c66af27b3c36a973dd45ce673886a267aa9f
+SIZE (CVST_0.2-1.tar.gz) = 12452
diff --git a/math/R-cran-CVST/pkg-descr b/math/R-cran-CVST/pkg-descr
new file mode 100644
index 000000000000..70fda66c91fe
--- /dev/null
+++ b/math/R-cran-CVST/pkg-descr
@@ -0,0 +1,16 @@
+This package implements the fast cross-validation via sequential
+testing (CVST) procedure. CVST is an improved cross-validation
+procedure which uses non-parametric testing coupled with sequential
+analysis to determine the best parameter set on linearly increasing
+subsets of the data. By eliminating underperforming candidates
+quickly and keeping promising candidates as long as possible, the
+method speeds up the computation while preserving the capability
+of a full cross-validation. Additionally to the CVST the package
+contains an implementation of the ordinary k-fold cross-validation
+with a flexible and powerful set of helper objects and methods to
+handle the overall model selection process. The implementations of
+the Cochran's Q test with permutations and the sequential testing
+framework of Wald are generic and can therefore also be used in
+other contexts.
+
+WWW: https://cran.r-project.org/web/packages/CVST/
diff --git a/math/R-cran-DEoptimR/Makefile b/math/R-cran-DEoptimR/Makefile
new file mode 100644
index 000000000000..8e63a76fc818
--- /dev/null
+++ b/math/R-cran-DEoptimR/Makefile
@@ -0,0 +1,16 @@
+# Created by: TAKATSU Tomonari <tota@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	DEoptimR
+DISTVERSION=	1.0-8
+CATEGORIES=	math
+DISTNAME=	${PORTNAME}_${DISTVERSION}
+
+MAINTAINER=	tota@FreeBSD.org
+COMMENT=	Differential Evolution Optimization in Pure R
+
+LICENSE=	GPLv2+
+
+USES=		cran:auto-plist
+
+.include <bsd.port.mk>
diff --git a/math/R-cran-DEoptimR/distinfo b/math/R-cran-DEoptimR/distinfo
new file mode 100644
index 000000000000..00181cc21341
--- /dev/null
+++ b/math/R-cran-DEoptimR/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1505040137
+SHA256 (DEoptimR_1.0-8.tar.gz) = 846911c1b2561a9fae73a8c60a21a5680963ebb0050af3c1f1147ae9a121e5ef
+SIZE (DEoptimR_1.0-8.tar.gz) = 35401
diff --git a/math/R-cran-DEoptimR/pkg-descr b/math/R-cran-DEoptimR/pkg-descr
new file mode 100644
index 000000000000..d5352b36eb30
--- /dev/null
+++ b/math/R-cran-DEoptimR/pkg-descr
@@ -0,0 +1,9 @@
+Differential Evolution (DE) stochastic algorithms for global
+optimization of problems with and without constraints. The aim is
+to curate a collection of its state-of-the-art variants that (1)
+do not sacrifice simplicity of design, (2) are essentially tuning-free,
+and (3) can be efficiently implemented directly in the R language.
+Currently, it only provides an implementation of the 'jDE' algorithm
+by Brest et al. (2006) <doi:10.1109/TEVC.2006.872133>.
+
+WWW: https://cran.r-project.org/web/packages/DEoptimR/
diff --git a/math/R-cran-DRR/Makefile b/math/R-cran-DRR/Makefile
new file mode 100644
index 000000000000..0c443069cea9
--- /dev/null
+++ b/math/R-cran-DRR/Makefile
@@ -0,0 +1,21 @@
+# Created by: TAKATSU Tomonari <tota@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	DRR
+PORTVERSION=	0.0.2
+CATEGORIES=	math
+DISTNAME=	${PORTNAME}_${PORTVERSION}
+
+MAINTAINER=	tota@FreeBSD.org
+COMMENT=	Dimensionality Reduction via Regression
+
+LICENSE=	GPLv3
+
+CRAN_DEPENDS=	R-cran-kernlab>0:science/R-cran-kernlab \
+		R-cran-CVST>0:math/R-cran-CVST
+BUILD_DEPENDS=	${CRAN_DEPENDS}
+RUN_DEPENDS=	${CRAN_DEPENDS}
+
+USES=		cran:auto-plist
+
+.include <bsd.port.mk>
diff --git a/math/R-cran-DRR/distinfo b/math/R-cran-DRR/distinfo
new file mode 100644
index 000000000000..41f2b7c09464
--- /dev/null
+++ b/math/R-cran-DRR/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1505024562
+SHA256 (DRR_0.0.2.tar.gz) = 02860f05f97a6020012fb6ebfe0d7738dd9e9db0555326f1ef57199fcde58ee9
+SIZE (DRR_0.0.2.tar.gz) = 116827
diff --git a/math/R-cran-DRR/pkg-descr b/math/R-cran-DRR/pkg-descr
new file mode 100644
index 000000000000..3f9e7a59b6a2
--- /dev/null
+++ b/math/R-cran-DRR/pkg-descr
@@ -0,0 +1,4 @@
+An Implementation of Dimensionality Reduction via Regression using
+Kernel Ridge Regression.
+
+WWW: https://cran.r-project.org/web/packages/DRR/
diff --git a/math/R-cran-RcppRoll/Makefile b/math/R-cran-RcppRoll/Makefile
new file mode 100644
index 000000000000..45333d55d37e
--- /dev/null
+++ b/math/R-cran-RcppRoll/Makefile
@@ -0,0 +1,20 @@
+# Created by: TAKATSU Tomonari <tota@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	RcppRoll
+DISTVERSION=	0.2.2
+CATEGORIES=	math
+DISTNAME=	${PORTNAME}_${DISTVERSION}
+
+MAINTAINER=	tota@FreeBSD.org
+COMMENT=	Efficient Rolling / Windowed Operations
+
+LICENSE=	GPLv2+
+
+CRAN_DEPENDS=	R-cran-Rcpp>0:devel/R-cran-Rcpp
+BUILD_DEPENDS=	${CRAN_DEPENDS}
+RUN_DEPENDS=	${CRAN_DEPENDS}
+
+USES=		cran:auto-plist,compiles
+
+.include <bsd.port.mk>
diff --git a/math/R-cran-RcppRoll/distinfo b/math/R-cran-RcppRoll/distinfo
new file mode 100644
index 000000000000..bf4b1b2a99af
--- /dev/null
+++ b/math/R-cran-RcppRoll/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1505046201
+SHA256 (RcppRoll_0.2.2.tar.gz) = 51c76812687e2a8572c6037b0c095c0a30ee6a24783edf2c7c717d547ddfbfa7
+SIZE (RcppRoll_0.2.2.tar.gz) = 13680
diff --git a/math/R-cran-RcppRoll/pkg-descr b/math/R-cran-RcppRoll/pkg-descr
new file mode 100644
index 000000000000..30601342c153
--- /dev/null
+++ b/math/R-cran-RcppRoll/pkg-descr
@@ -0,0 +1,6 @@
+Provides fast and efficient routines for common rolling / windowed
+operations. Routines for the efficient computation of windowed mean,
+median, sum, product, minimum, maximum, standard deviation and
+variance are provided.
+
+WWW: https://cran.r-project.org/web/packages/RcppRoll/
diff --git a/math/R-cran-ddalpha/Makefile b/math/R-cran-ddalpha/Makefile
new file mode 100644
index 000000000000..44907501a889
--- /dev/null
+++ b/math/R-cran-ddalpha/Makefile
@@ -0,0 +1,22 @@
+# Created by: TAKATSU Tomonari <tota@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	ddalpha
+PORTVERSION=	1.2.1
+CATEGORIES=	math
+DISTNAME=	${PORTNAME}_${PORTVERSION}
+
+MAINTAINER=	tota@FreeBSD.org
+COMMENT=	Depth-Based Classification and Calculation of Data Depth
+
+LICENSE=	GPLv2
+
+CRAN_DEPENDS=	R-cran-robustbase>0:math/R-cran-robustbase \
+		R-cran-Rcpp>=0.11.0:devel/R-cran-Rcpp \
+		R-cran-BH>0:devel/R-cran-BH
+BUILD_DEPENDS=	${CRAN_DEPENDS}
+RUN_DEPENDS=	${CRAN_DEPENDS}
+
+USES=		cran:auto-plist,compiles
+
+.include <bsd.port.mk>
diff --git a/math/R-cran-ddalpha/distinfo b/math/R-cran-ddalpha/distinfo
new file mode 100644
index 000000000000..8abd3ed45c0d
--- /dev/null
+++ b/math/R-cran-ddalpha/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1505038914
+SHA256 (ddalpha_1.2.1.tar.gz) = c4a9842e9dec1bd992460e6c68b5f2f5d6463d0c2474ef2e0e572dd34b284d5b
+SIZE (ddalpha_1.2.1.tar.gz) = 417557
diff --git a/math/R-cran-ddalpha/pkg-descr b/math/R-cran-ddalpha/pkg-descr
new file mode 100644
index 000000000000..a17a6f3fcc1c
--- /dev/null
+++ b/math/R-cran-ddalpha/pkg-descr
@@ -0,0 +1,10 @@
+Contains procedures for depth-based supervised learning, which are
+entirely non-parametric, in particular the DDalpha-procedure (Lange,
+Mosler and Mozharovskyi, 2014). The training data sample is transformed
+by a statistical depth function to a compact low-dimensional space,
+where the final classification is done. It also offers an extension
+to functional data and routines for calculating certain notions of
+statistical depth functions. 50 multivariate and 5 functional
+classification problems are included.
+
+WWW: https://cran.r-project.org/web/packages/ddalpha/
diff --git a/math/R-cran-dimRed/Makefile b/math/R-cran-dimRed/Makefile
new file mode 100644
index 000000000000..a3d910a62b80
--- /dev/null
+++ b/math/R-cran-dimRed/Makefile
@@ -0,0 +1,21 @@
+# Created by: TAKATSU Tomonari <tota@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	dimRed
+PORTVERSION=	0.1.0
+CATEGORIES=	math
+DISTNAME=	${PORTNAME}_${PORTVERSION}
+
+MAINTAINER=	tota@FreeBSD.org
+COMMENT=	Framework for Dimensionality Reduction
+
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+CRAN_DEPENDS=	R-cran-DRR>0:math/R-cran-DRR
+BUILD_DEPENDS=	${CRAN_DEPENDS}
+RUN_DEPENDS=	${CRAN_DEPENDS}
+
+USES=		cran:auto-plist,compiles
+
+.include <bsd.port.mk>
diff --git a/math/R-cran-dimRed/distinfo b/math/R-cran-dimRed/distinfo
new file mode 100644
index 000000000000..27198fc781ad
--- /dev/null
+++ b/math/R-cran-dimRed/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1505019349
+SHA256 (dimRed_0.1.0.tar.gz) = fb0cef7a21b8a5219c74e5227a282168599dd63e904130366f3d2fed8a625a39
+SIZE (dimRed_0.1.0.tar.gz) = 70299
diff --git a/math/R-cran-dimRed/pkg-descr b/math/R-cran-dimRed/pkg-descr
new file mode 100644
index 000000000000..2a382e1b3ec7
--- /dev/null
+++ b/math/R-cran-dimRed/pkg-descr
@@ -0,0 +1,4 @@
+A collection of dimensionality reduction techniques from R packages
+and provides a common interface for calling the methods.
+
+WWW: https://cran.r-project.org/web/packages/dimRed/
diff --git a/math/R-cran-gower/Makefile b/math/R-cran-gower/Makefile
new file mode 100644
index 000000000000..9ef4511de1f8
--- /dev/null
+++ b/math/R-cran-gower/Makefile
@@ -0,0 +1,16 @@
+# Created by: TAKATSU Tomonari <tota@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	gower
+DISTVERSION=	0.1.2
+CATEGORIES=	math
+DISTNAME=	${PORTNAME}_${DISTVERSION}
+
+MAINTAINER=	tota@FreeBSD.org
+COMMENT=	Gower's Distance
+
+LICENSE=	GPLv3
+
+USES=		cran:auto-plist,compiles
+
+.include <bsd.port.mk>
diff --git a/math/R-cran-gower/distinfo b/math/R-cran-gower/distinfo
new file mode 100644
index 000000000000..fdd0474e93a0
--- /dev/null
+++ b/math/R-cran-gower/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1505047545
+SHA256 (gower_0.1.2.tar.gz) = eb91b2d2784d237c7055abcf3cfa4fc0b2226b855a0c29fc5a4e8eaa689079d5
+SIZE (gower_0.1.2.tar.gz) = 17393
diff --git a/math/R-cran-gower/pkg-descr b/math/R-cran-gower/pkg-descr
new file mode 100644
index 000000000000..f05e8088d456
--- /dev/null
+++ b/math/R-cran-gower/pkg-descr
@@ -0,0 +1,5 @@
+Compute Gower's distance (or similarity) coefficient between records.
+Compute the top-n matches between records. Core algorithms are
+executed in parallel on systems supporting OpenMP.
+
+WWW: https://cran.r-project.org/web/packages/gower/
diff --git a/math/R-cran-ipred/Makefile b/math/R-cran-ipred/Makefile
new file mode 100644
index 000000000000..ddb3533eda4c
--- /dev/null
+++ b/math/R-cran-ipred/Makefile
@@ -0,0 +1,20 @@
+# Created by: TAKATSU Tomonari <tota@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	ipred
+DISTVERSION=	0.9-6
+CATEGORIES=	math
+DISTNAME=	${PORTNAME}_${DISTVERSION}
+
+MAINTAINER=	tota@FreeBSD.org
+COMMENT=	Improved Predictors
+
+LICENSE=	GPLv2+
+
+CRAN_DEPENDS=	R-cran-prodlim>0:math/R-cran-prodlim
+BUILD_DEPENDS=	${CRAN_DEPENDS}
+RUN_DEPENDS=	${CRAN_DEPENDS}
+
+USES=		cran:auto-plist,compiles
+
+.include <bsd.port.mk>
diff --git a/math/R-cran-ipred/distinfo b/math/R-cran-ipred/distinfo
new file mode 100644
index 000000000000..ce7d197b327f
--- /dev/null
+++ b/math/R-cran-ipred/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1504922950
+SHA256 (ipred_0.9-6.tar.gz) = b8d36438eb9b7209d27b85738dcad03b2e535dcb2f4191432780d9cbf00d3cef
+SIZE (ipred_0.9-6.tar.gz) = 186516
diff --git a/math/R-cran-ipred/pkg-descr b/math/R-cran-ipred/pkg-descr
new file mode 100644
index 000000000000..6f9c132ac82d
--- /dev/null
+++ b/math/R-cran-ipred/pkg-descr
@@ -0,0 +1,5 @@
+Improved predictive models by indirect classification and bagging
+for classification, regression and survival problems as well as
+resampling based estimators of prediction error.
+
+WWW: https://cran.r-project.org/web/packages/ipred/
diff --git a/math/R-cran-lava/Makefile b/math/R-cran-lava/Makefile
new file mode 100644
index 000000000000..76a7fa654f2c
--- /dev/null
+++ b/math/R-cran-lava/Makefile
@@ -0,0 +1,20 @@
+# Created by: TAKATSU Tomonari <tota@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	lava
+DISTVERSION=	1.5
+CATEGORIES=	math
+DISTNAME=	${PORTNAME}_${DISTVERSION}
+
+MAINTAINER=	tota@FreeBSD.org
+COMMENT=	Latent Variable Models
+
+LICENSE=	GPLv3
+
+CRAN_DEPENDS=	R-cran-numDeriv>0:math/R-cran-numDeriv
+BUILD_DEPENDS=	${CRAN_DEPENDS}
+RUN_DEPENDS=	${CRAN_DEPENDS}
+
+USES=		cran:auto-plist
+
+.include <bsd.port.mk>
diff --git a/math/R-cran-lava/distinfo b/math/R-cran-lava/distinfo
new file mode 100644
index 000000000000..3d5157b29555
--- /dev/null
+++ b/math/R-cran-lava/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1504939480
+SHA256 (lava_1.5.tar.gz) = 82fdc3fccb48c0928e043c08162220381269f83e73d902335107f510423fda74
+SIZE (lava_1.5.tar.gz) = 828070
diff --git a/math/R-cran-lava/pkg-descr b/math/R-cran-lava/pkg-descr
new file mode 100644
index 000000000000..ce65e25cc103
--- /dev/null
+++ b/math/R-cran-lava/pkg-descr
@@ -0,0 +1,3 @@
+Estimation and simulation of latent variable models.
+
+WWW: https://cran.r-project.org/web/packages/lava/
diff --git a/math/R-cran-memisc/Makefile b/math/R-cran-memisc/Makefile
index 4f0c66dc2193..1625ccb7a91f 100644
--- a/math/R-cran-memisc/Makefile
+++ b/math/R-cran-memisc/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	memisc
-DISTVERSION=	0.99.13.2
+DISTVERSION=	0.99.14.2
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
diff --git a/math/R-cran-memisc/distinfo b/math/R-cran-memisc/distinfo
index ea2ed6ecd1ec..56e3cffdef14 100644
--- a/math/R-cran-memisc/distinfo
+++ b/math/R-cran-memisc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503901710
-SHA256 (memisc_0.99.13.2.tar.gz) = 5791e7b0ffd2ae99e76d697e323427886080bd8b30433f5566dce1a2862c054b
-SIZE (memisc_0.99.13.2.tar.gz) = 1312604
+TIMESTAMP = 1505080988
+SHA256 (memisc_0.99.14.2.tar.gz) = 865706bebe1713efc1a2ac7a7eeadb5b27a92d7a8c3fe757cf17fc4644c658fc
+SIZE (memisc_0.99.14.2.tar.gz) = 1313654
diff --git a/math/R-cran-prodlim/Makefile b/math/R-cran-prodlim/Makefile
new file mode 100644
index 000000000000..ce08df4af22f
--- /dev/null
+++ b/math/R-cran-prodlim/Makefile
@@ -0,0 +1,21 @@
+# Created by: TAKATSU Tomonari <tota@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	prodlim
+PORTVERSION=	1.6.1
+CATEGORIES=	math
+DISTNAME=	${PORTNAME}_${PORTVERSION}
+
+MAINTAINER=	tota@FreeBSD.org
+COMMENT=	Product-Limit Estimation for Censored Event History Analysis
+
+LICENSE=	GPLv2+
+
+CRAN_DEPENDS=	R-cran-Rcpp>=0.11.5:devel/R-cran-Rcpp \
+		R-cran-lava>0:math/R-cran-lava
+BUILD_DEPENDS=	${CRAN_DEPENDS}
+RUN_DEPENDS=	${CRAN_DEPENDS}
+
+USES=		cran:auto-plist,compiles
+
+.include <bsd.port.mk>
diff --git a/math/R-cran-prodlim/distinfo b/math/R-cran-prodlim/distinfo
new file mode 100644
index 000000000000..dd19c9eda7f4
--- /dev/null
+++ b/math/R-cran-prodlim/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1504934329
+SHA256 (prodlim_1.6.1.tar.gz) = 3f2665257118a3db8682731a500b1ae4d669af344672dc2037f987bee3cca154
+SIZE (prodlim_1.6.1.tar.gz) = 124175
diff --git a/math/R-cran-prodlim/pkg-descr b/math/R-cran-prodlim/pkg-descr
new file mode 100644
index 000000000000..24aecd77541d
--- /dev/null
+++ b/math/R-cran-prodlim/pkg-descr
@@ -0,0 +1,5 @@
+Fast and user friendly implementation of nonparametric estimators
+for censored event history (survival) analysis. Kaplan-Meier and
+Aalen-Johansen method.
+
+WWW: https://cran.r-project.org/web/packages/prodlim/
diff --git a/math/R-cran-recipes/Makefile b/math/R-cran-recipes/Makefile
new file mode 100644
index 000000000000..8f57a6c7d063
--- /dev/null
+++ b/math/R-cran-recipes/Makefile
@@ -0,0 +1,32 @@
+# Created by: TAKATSU Tomonari <tota@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	recipes
+PORTVERSION=	0.1.0
+CATEGORIES=	math
+DISTNAME=	${PORTNAME}_${PORTVERSION}
+
+MAINTAINER=	tota@FreeBSD.org
+COMMENT=	Preprocessing Tools to Create Design Matrices
+
+LICENSE=	GPLv2
+
+CRAN_DEPENDS=	R-cran-dplyr>0:math/R-cran-dplyr \
+		R-cran-tibble>0:devel/R-cran-tibble \
+		R-cran-ipred>0:math/R-cran-ipred \
+		R-cran-dimRed>=0.1.0:math/R-cran-dimRed \
+		R-cran-lubridate>0:devel/R-cran-lubridate \
+		R-cran-timeDate>0:finance/R-cran-timeDate \
+		R-cran-ddalpha>0:math/R-cran-ddalpha \
+		R-cran-purrr>0:devel/R-cran-purrr \
+		R-cran-rlang>=0.1.1:devel/R-cran-rlang \
+		R-cran-gower>0:math/R-cran-gower \
+		R-cran-RcppRoll>0:math/R-cran-RcppRoll \
+		R-cran-tidyselect>=0.1.1:devel/R-cran-tidyselect \
+		R-cran-magrittr>0:devel/R-cran-magrittr
+BUILD_DEPENDS=	${CRAN_DEPENDS}
+RUN_DEPENDS=	${CRAN_DEPENDS}
+
+USES=		cran:auto-plist
+
+.include <bsd.port.mk>
diff --git a/math/R-cran-recipes/distinfo b/math/R-cran-recipes/distinfo
new file mode 100644
index 000000000000..b88171be934e
--- /dev/null
+++ b/math/R-cran-recipes/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1504921818
+SHA256 (recipes_0.1.0.tar.gz) = 6ba689b5101f54d8b32844ee15cf0e8f4cee471e62fc3f36ab1d463c0099cd67
+SIZE (recipes_0.1.0.tar.gz) = 523958
diff --git a/math/R-cran-recipes/pkg-descr b/math/R-cran-recipes/pkg-descr
new file mode 100644
index 000000000000..277de9b54f5b
--- /dev/null
+++ b/math/R-cran-recipes/pkg-descr
@@ -0,0 +1,8 @@
+An extensible framework to create and preprocess design matrices.
+Recipes consist of one or more data manipulation and analysis
+"steps". Statistical parameters for the steps can be estimated from
+an initial data set and then applied to other data sets. The resulting
+design matrices can then be used as inputs into statistical or
+machine learning models.
+
+WWW: https://cran.r-project.org/web/packages/recipes/
diff --git a/math/R-cran-robustbase/Makefile b/math/R-cran-robustbase/Makefile
new file mode 100644
index 000000000000..c67936a3b622
--- /dev/null
+++ b/math/R-cran-robustbase/Makefile
@@ -0,0 +1,20 @@
+# Created by: TAKATSU Tomonari <tota@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	robustbase
+DISTVERSION=	0.92-7
+CATEGORIES=	math
+DISTNAME=	${PORTNAME}_${DISTVERSION}
+
+MAINTAINER=	tota@FreeBSD.org
+COMMENT=	Basic Robust Statistics
+
+LICENSE=	GPLv2+
+
+CRAN_DEPENDS=	R-cran-DEoptimR>0:math/R-cran-DEoptimR
+BUILD_DEPENDS=	${CRAN_DEPENDS}
+RUN_DEPENDS=	${CRAN_DEPENDS}
+
+USES=		cran:auto-plist,compiles
+
+.include <bsd.port.mk>
diff --git a/math/R-cran-robustbase/distinfo b/math/R-cran-robustbase/distinfo
new file mode 100644
index 000000000000..0db79ca35f47
--- /dev/null
+++ b/math/R-cran-robustbase/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1505039483
+SHA256 (robustbase_0.92-7.tar.gz) = fcbd6ccbb0291b599fe6a674a91344511e0a691b9cadba0a9d40037faa22bf8f
+SIZE (robustbase_0.92-7.tar.gz) = 3430164
diff --git a/math/R-cran-robustbase/pkg-descr b/math/R-cran-robustbase/pkg-descr
new file mode 100644
index 000000000000..c2abde810c88
--- /dev/null
+++ b/math/R-cran-robustbase/pkg-descr
@@ -0,0 +1,7 @@
+"Essential" Robust Statistics. Tools allowing to analyze data with
+robust methods. This includes regression methodology including model
+selections and multivariate statistics where we strive to cover the
+book "Robust Statistics, Theory and Methods" by 'Maronna, Martin
+and Yohai'; Wiley 2006.
+
+WWW: https://cran.r-project.org/web/packages/robustbase/
diff --git a/math/R/Makefile b/math/R/Makefile
index ccd60a6680d0..988ac931a119 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=		R
 DISTVERSION=		3.4.1
-PORTREVISION=		6
+PORTREVISION=		7
 CATEGORIES=		math lang
 MASTER_SITES=		CRAN/src/base/R-${PORTVERSION:C|\..*||}
 
diff --git a/math/algae/Makefile b/math/algae/Makefile
index e86a0d701495..894e9e75a3a7 100644
--- a/math/algae/Makefile
+++ b/math/algae/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	algae
 PORTVERSION=	4.3.6
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	math
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
diff --git a/math/armadillo/Makefile b/math/armadillo/Makefile
index 0a625ccce8e6..c17ecf7ba277 100644
--- a/math/armadillo/Makefile
+++ b/math/armadillo/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	armadillo
 PORTVERSION=	7.950.1
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	SF/arma
 
diff --git a/math/arpack-ng/Makefile b/math/arpack-ng/Makefile
index 1f81ad3571de..b3ec98f55755 100644
--- a/math/arpack-ng/Makefile
+++ b/math/arpack-ng/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	arpack-ng
 PORTVERSION=	3.4.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/math/arpack/Makefile b/math/arpack/Makefile
index 954c0b554181..9a38858dbf82 100644
--- a/math/arpack/Makefile
+++ b/math/arpack/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	arpack
 PORTVERSION=	96
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	math
 MASTER_SITES=	http://www.caam.rice.edu/software/ARPACK/SRC/
 DISTFILES=	${PORTNAME}${PORTVERSION}.tar.gz patch.tar.gz
diff --git a/math/aspcud/Makefile b/math/aspcud/Makefile
index 520209ca1139..65eadd4ec497 100644
--- a/math/aspcud/Makefile
+++ b/math/aspcud/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	aspcud
 PORTVERSION=	1.9.1
 DISTVERSIONSUFFIX=	-source
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math ports-mgmt sysutils
 MASTER_SITES=	SOURCEFORGE/potassco/${PORTNAME}/${PORTVERSION}
 
diff --git a/math/atlas/Makefile b/math/atlas/Makefile
index 812b3f64c8a2..4199cbdb55eb 100644
--- a/math/atlas/Makefile
+++ b/math/atlas/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	atlas
 PORTVERSION=	3.8.4
-PORTREVISION=	10
+PORTREVISION=	12
 PORTEPOCH=	1
 CATEGORIES=	math
 MASTER_SITES=	SF/math-${PORTNAME}/Stable/${PORTVERSION}
diff --git a/math/blacs/Makefile b/math/blacs/Makefile
index fa78dca526c5..63bf9c2a3649 100644
--- a/math/blacs/Makefile
+++ b/math/blacs/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	blacs
 PORTVERSION=	1.7
-PORTREVISION=	29
+PORTREVISION=	30
 CATEGORIES=	math
 MASTER_SITES=	NETLIB/blacs
 DISTNAME=	BLACS
diff --git a/math/blocksolve95/Makefile b/math/blocksolve95/Makefile
index 5c8b32b89427..04a8cf8cde08 100644
--- a/math/blocksolve95/Makefile
+++ b/math/blocksolve95/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	blocksolve95
 PORTVERSION=	3.0
-PORTREVISION=	18
+PORTREVISION=	19
 CATEGORIES=	math parallel
 MASTER_SITES=	ftp://ftp.mcs.anl.gov/pub/BlockSolve95/ \
 		http://ftp.mcs.anl.gov/pub/BlockSolve95/
diff --git a/math/cadabra2/Makefile b/math/cadabra2/Makefile
index 58d22d0f524f..4828bb0fc0fb 100644
--- a/math/cadabra2/Makefile
+++ b/math/cadabra2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	cadabra2
 PORTVERSION=	2.1.5
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@rawbw.com
diff --git a/math/cadabra2/pkg-descr b/math/cadabra2/pkg-descr
index 548b51cdbb20..549243469863 100644
--- a/math/cadabra2/pkg-descr
+++ b/math/cadabra2/pkg-descr
@@ -7,4 +7,4 @@ transformations, component computations, implicit coordinate
 dependence, multiple index types and many more. The input format
 is a subset of TeX.
 
-WWW: http://cadabra.science/
+WWW: https://cadabra.science/
diff --git a/math/cantor/Makefile b/math/cantor/Makefile
index f36eb18dec3b..9d975ee43972 100644
--- a/math/cantor/Makefile
+++ b/math/cantor/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	cantor
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	math kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/math/cblas/Makefile b/math/cblas/Makefile
index d71cf9310ce3..edc089c2d774 100644
--- a/math/cblas/Makefile
+++ b/math/cblas/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cblas
 PORTVERSION=	1.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	math
 MASTER_SITES=	NL/blas/blast-forum/ LOCAL/bf
 DISTFILES=	cblas.tgz
diff --git a/math/ceres-solver/Makefile b/math/ceres-solver/Makefile
index c02fe49aa0a1..4e8582574d7f 100644
--- a/math/ceres-solver/Makefile
+++ b/math/ceres-solver/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	ceres-solver
 DISTVERSION=	1.13.0
+PORTREVISION=	1
 CATEGORIES=	math
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
diff --git a/math/cgal/Makefile b/math/cgal/Makefile
index 90d3efc04b29..4ff00853693c 100644
--- a/math/cgal/Makefile
+++ b/math/cgal/Makefile
@@ -3,10 +3,10 @@
 
 PORTNAME=	cgal
 PORTVERSION=	4.9
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math
-MASTER_SITES=	https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-4.9/
-DISTNAME=	CGAL-${PORTVERSION}
+MASTER_SITES=	https://github.com/${PORTNAME:tu}/${PORTNAME}/releases/download/releases/${DISTNAME}/
+DISTNAME=	${PORTNAME:tu}-${PORTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Computational geometry library
@@ -14,26 +14,37 @@ COMMENT=	Computational geometry library
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/tuple/tuple.hpp:devel/boost-libs
-RUN_DEPENDS=	${LOCALBASE}/include/boost/tuple/tuple.hpp:devel/boost-libs
-LIB_DEPENDS=	libmpfr.so:math/mpfr \
+BROKEN_sparc64=	does not build: fails to compile all_files.cpp
+
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/eigen3.pc:math/eigen3 \
+		${LOCALBASE}/lib/libntl.a:math/ntl
+LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
+		libmpfr.so:math/mpfr \
 		libgmp.so:math/gmp
 
-BROKEN_sparc64=	does not build: fails to compile all_files.cpp
+#TODO math/mpfi, math/rs, graphics/qglviewer
+#Not yet in ports
 
-USE_LDCONFIG=	yes
 USES=		cmake shebangfix tar:xz
-USE_QT5=	buildtools_build core gui opengl qmake_build widgets
+USE_LDCONFIG=	yes
 SHEBANG_FILES=	scripts/cgal_create_CMakeLists \
 		scripts/cgal_create_cmake_script
 
+OPTIONS_DEFINE=	VISUALIZATION QT5
+VISUALIZATION_IMPLIES=	QT5
+OPTIONS_SUB=	yes
+
+VISUALIZATION_DESC=	Visualization Required for most demos (Qt5 Geomview)
+VISUALIZATION_LIB_DEPENDS=	libgeomview.so:graphics/geomview
+
 .include <bsd.port.options.mk>
 
-.if ${ARCH} == i386 && ${OPSYS} == FreeBSD && ((${OSVERSION} >= 1100000 && ${OSVERSION} < 1100508) || (${OSVERSION} >= 1200000 && ${OSVERSION} < 1200017))
-# clang internal error in clang 3.8
-BUILD_DEPENDS+=	clang39:devel/llvm39
-CC=		clang39
-CXX=		clang++39
+.if ${PORT_OPTIONS:MQT5}
+CMAKE_ARGS+=	-DWITH_CGAL_Qt5=ON
+USE_QT5+=	core gui opengl widgets svg buildtools_build qmake_build
+USE_GL+=	gl glu
+.else
+CMAKE_ARGS+=	-DWITH_CGAL_Qt5=OFF
 .endif
 
 .include <bsd.port.mk>
diff --git a/math/cgal/distinfo b/math/cgal/distinfo
index b90a6efec33c..b8a4ff2828fe 100644
--- a/math/cgal/distinfo
+++ b/math/cgal/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1476253394
+TIMESTAMP = 1505311637
 SHA256 (CGAL-4.9.tar.xz) = 63ac5df71f912f34f2f0f2e54a303578df51f4ec2627db593a65407d791f9039
 SIZE (CGAL-4.9.tar.xz) = 13749292
diff --git a/math/cgal/pkg-plist b/math/cgal/pkg-plist
index e15596992dc0..0b3dc76d0bad 100644
--- a/math/cgal/pkg-plist
+++ b/math/cgal/pkg-plist
@@ -2509,7 +2509,6 @@ include/CGAL/compiler_config.h
 include/CGAL/compute_average_spacing.h
 include/CGAL/compute_outer_frame_margin.h
 include/CGAL/config.h
-include/CGAL/config.h.orig
 include/CGAL/connect_holes.h
 include/CGAL/constant.h
 include/CGAL/constructions/Polygon_offset_cons_ftC2.h
@@ -2912,6 +2911,9 @@ lib/CGAL/CGAL_ImageIOExports.cmake
 lib/CGAL/CGAL_ImageIOLibConfig.cmake
 lib/CGAL/CGAL_Locate_CGAL_TAUCS.cmake
 lib/CGAL/CGAL_Macros.cmake
+%%QT5%%lib/CGAL/CGAL_Qt5Exports-%%CMAKE_BUILD_TYPE%%.cmake
+%%QT5%%lib/CGAL/CGAL_Qt5Exports.cmake
+%%QT5%%lib/CGAL/CGAL_Qt5LibConfig.cmake
 lib/CGAL/CGAL_SCM.cmake
 lib/CGAL/CGAL_SetupBoost.cmake
 lib/CGAL/CGAL_SetupDependencies.cmake
@@ -2967,4 +2969,7 @@ lib/libCGAL_Core.so.12.0.0
 lib/libCGAL_ImageIO.so
 lib/libCGAL_ImageIO.so.12
 lib/libCGAL_ImageIO.so.12.0.0
+%%QT5%%lib/libCGAL_Qt5.so
+%%QT5%%lib/libCGAL_Qt5.so.12
+%%QT5%%lib/libCGAL_Qt5.so.12.0.0
 man/man1/cgal_create_cmake_script.1.gz
diff --git a/math/clp/Makefile b/math/clp/Makefile
index 6bba21f44379..183c18a38a4b 100644
--- a/math/clp/Makefile
+++ b/math/clp/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Clp
 PORTVERSION=	1.16.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	http://www.coin-or.org/download/source/${PORTNAME}/ \
 		http://www.mavetju.org/download/adopted/
diff --git a/math/cmlib/Makefile b/math/cmlib/Makefile
index 84a6e50eb277..dbadb8ab5935 100644
--- a/math/cmlib/Makefile
+++ b/math/cmlib/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cmlib
 PORTVERSION=	3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	NL/blas:blas ftp://ftp.nist.gov/pub/cmlib/
 # Get d1mach.f, i1mach.f, r1mach.f from BLAS, rather than from CMLIB.
diff --git a/math/coq/Makefile b/math/coq/Makefile
index 58260aa16ec3..06cc1f061877 100644
--- a/math/coq/Makefile
+++ b/math/coq/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	coq
 PORTVERSION=	8.6
+PORTREVISION=	1
 PORTEPOCH=	3
 CATEGORIES=	math
 MASTER_SITES=	http://coq.inria.fr/distrib/V${PORTVERSION}/files/ \
diff --git a/math/cryptominisat/Makefile b/math/cryptominisat/Makefile
index 64a07bc33386..f651432d472b 100644
--- a/math/cryptominisat/Makefile
+++ b/math/cryptominisat/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	cryptominisat
 PORTVERSION=	5.0.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math
 
 MAINTAINER=	6yearold@gmail.com
diff --git a/math/cvc3/Makefile b/math/cvc3/Makefile
index c855e2cad457..e32088918add 100644
--- a/math/cvc3/Makefile
+++ b/math/cvc3/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cvc3
 PORTVERSION=	2.4.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	http://www.cs.nyu.edu/acsys/cvc3/download/${PORTVERSION}/
 
diff --git a/math/dynare/Makefile b/math/dynare/Makefile
index 0bcc73ab4152..b5e6c8a69cd6 100644
--- a/math/dynare/Makefile
+++ b/math/dynare/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	dynare
 PORTVERSION=	4.5.1
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://www.dynare.org/release/source/
 
diff --git a/math/eispack/Makefile b/math/eispack/Makefile
index 1f47565bb20a..4f80d0be0f61 100644
--- a/math/eispack/Makefile
+++ b/math/eispack/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	eispack
 PORTVERSION=	1.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	math
 MASTER_SITES=	NL
 DISTFILES=	${SRCS}
diff --git a/math/ess/Makefile b/math/ess/Makefile
index 5cab64e83aaf..f40bb86115db 100644
--- a/math/ess/Makefile
+++ b/math/ess/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ess
 DISTVERSION=	16.04
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://ess.r-project.org/downloads/ess/ \
 		http://stat.ethz.ch/ESS/downloads/ess/
diff --git a/math/fflas-ffpack/Makefile b/math/fflas-ffpack/Makefile
index a6250350f50d..23c5f2d953b2 100644
--- a/math/fflas-ffpack/Makefile
+++ b/math/fflas-ffpack/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	fflas-ffpack
 PORTVERSION=	1.4.3
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	math
 MASTER_SITES=	http://linalg.org/ LOCAL/bf
 
diff --git a/math/fftw/Makefile b/math/fftw/Makefile
index 18a2f23aa14c..8ea9e2d90a48 100644
--- a/math/fftw/Makefile
+++ b/math/fftw/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	fftw
 PORTVERSION=	2.1.5
-PORTREVISION?=	14
+PORTREVISION?=	15
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.fftw.org/pub/fftw/ 		\
 		ftp://ftp.fftw.org/pub/fftw/old/ 	\
diff --git a/math/fftw3/Makefile b/math/fftw3/Makefile
index 82829c8f410d..0ff754314ed5 100644
--- a/math/fftw3/Makefile
+++ b/math/fftw3/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	fftw3
 DISTVERSION=	3.3.6-pl2
-PORTREVISION?=	0
+PORTREVISION?=	2
 CATEGORIES=	math
 MASTER_SITES=	http://www.fftw.org/ \
 		ftp://ftp.fftw.org/pub/fftw/
diff --git a/math/fityk/Makefile b/math/fityk/Makefile
index 5522808b8e55..6755593b6340 100644
--- a/math/fityk/Makefile
+++ b/math/fityk/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	fityk
 PORTVERSION=	1.3.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/math/freemat/Makefile b/math/freemat/Makefile
index 3acc3699e132..1c4dddf7a231 100644
--- a/math/freemat/Makefile
+++ b/math/freemat/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	FreeMat
 PORTVERSION=	4.2
 DISTVERSIONSUFFIX=	-Source
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	math science
 MASTER_SITES=	SF/freemat/FreeMat4
 
diff --git a/math/fxt/pkg-descr b/math/fxt/pkg-descr
index f153850bafa1..f4c06e284255 100644
--- a/math/fxt/pkg-descr
+++ b/math/fxt/pkg-descr
@@ -1,6 +1,6 @@
 fxt is a library package (coming as C++ source code) containing various
 algorithms for:
-   - Fast Fourier Transform (FFT) incl. real-vlued,
+   - Fast Fourier Transform (FFT) incl. real-valued,
    - multidimensional and weighted variants.
    - Fast Hartley Transform (FHT)
    - Number Theoretic Transform (NTT), Fast Walsh Transform.
diff --git a/math/gambit/Makefile b/math/gambit/Makefile
index 13735edfde29..9b77f46d5cc3 100644
--- a/math/gambit/Makefile
+++ b/math/gambit/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gambit
 PORTVERSION=	15.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}${PORTVERSION:R:R}/${PORTVERSION}
 
diff --git a/math/giacxcas/Makefile b/math/giacxcas/Makefile
index d2bc299e1f64..97124b7a2148 100644
--- a/math/giacxcas/Makefile
+++ b/math/giacxcas/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	giacxcas
 DISTVERSION=	1.2.3-55
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	http://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/:giac \
 		http://www-fourier.ujf-grenoble.fr/~parisse/giac/freebsd/
diff --git a/math/gotoblas/Makefile b/math/gotoblas/Makefile
index 8082fad14017..55694f2f831b 100644
--- a/math/gotoblas/Makefile
+++ b/math/gotoblas/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gotoblas
 PORTVERSION=	2.${GOTOBLAS2VER}.${LAPACKVER}
-PORTREVISION=	9
+PORTREVISION=	11
 CATEGORIES=	math
 MASTER_SITES=	LOCAL/maho/gotoblas \
 		NL/lapack:lapack NL/lapack/timing:lapack_tmg
diff --git a/math/gracetmpl/Makefile b/math/gracetmpl/Makefile
index 22be4de44280..a41704b694e5 100644
--- a/math/gracetmpl/Makefile
+++ b/math/gracetmpl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gracetmpl
 PORTVERSION=	0.3.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math print
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
diff --git a/math/gretl/Makefile b/math/gretl/Makefile
index 0d127066f14f..c62878d4f892 100644
--- a/math/gretl/Makefile
+++ b/math/gretl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gretl
 PORTVERSION=	1.9.13
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	math finance
 MASTER_SITES=	SF
 
diff --git a/math/gringo/Makefile b/math/gringo/Makefile
index 8ff3f9ab64a8..501500eb1d1e 100644
--- a/math/gringo/Makefile
+++ b/math/gringo/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gringo
 PORTVERSION=	4.5.2
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONSUFFIX=	-source
 CATEGORIES=	math devel
 MASTER_SITES=	SOURCEFORGE/potassco/${PORTNAME}/${PORTVERSION}
diff --git a/math/hfst/Makefile b/math/hfst/Makefile
index 7753eea41da9..80f273b0b81e 100644
--- a/math/hfst/Makefile
+++ b/math/hfst/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	hfst
 PORTVERSION=	3.8.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/source
 
diff --git a/math/ipopt/Makefile b/math/ipopt/Makefile
index c89b9cf70304..9567a56c3c2d 100644
--- a/math/ipopt/Makefile
+++ b/math/ipopt/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Ipopt
 PORTVERSION=	3.12.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	http://www.coin-or.org/download/source/Ipopt/ \
 		http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/OLD/:metis \
diff --git a/math/ised/Makefile b/math/ised/Makefile
index fcc683de4b46..b9b7d6925ef9 100644
--- a/math/ised/Makefile
+++ b/math/ised/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ised
 PORTVERSION=	2.7.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	SF/${PORTNAME}
 
diff --git a/math/jags/Makefile b/math/jags/Makefile
index 39b162b18d11..2275178a16ad 100644
--- a/math/jags/Makefile
+++ b/math/jags/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mcmc-jags
 PORTVERSION=	4.2.0
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	SF/mcmc-jags/JAGS/${S}.x/Source/:1 \
 		SF/mcmc-jags/Examples/${S}.x/:2 \
diff --git a/math/kig/Makefile b/math/kig/Makefile
index dd4363701917..a5ea321de3ec 100644
--- a/math/kig/Makefile
+++ b/math/kig/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kig
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/math/kktdirect/Makefile b/math/kktdirect/Makefile
index 3f8ec7dc5ef2..4e447d33c287 100644
--- a/math/kktdirect/Makefile
+++ b/math/kktdirect/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kktdirect
 PORTVERSION=	0.5
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	math
 MASTER_SITES=	http://www.cs.ubc.ca/~rbridson/download/ LOCAL/bf
 DISTNAME=	KKTDirect${PORTVERSION}
diff --git a/math/lapack++/Makefile b/math/lapack++/Makefile
index 719607d1dda9..b6a510088c17 100644
--- a/math/lapack++/Makefile
+++ b/math/lapack++/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	lapack++
 PORTVERSION=	2.5.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	SF/lapackpp \
 		http://math.nist.gov/lapack++/:doc
diff --git a/math/lapack/Makefile b/math/lapack/Makefile
index 9dc6e042d54a..f9e716e66012 100644
--- a/math/lapack/Makefile
+++ b/math/lapack/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME?=	lapack
 PORTVERSION=	3.5.0
-PORTREVISION?=	2	# Never remove this line, keep PORTREVISION?=0 in case.
+PORTREVISION?=	3	# Never remove this line, keep PORTREVISION?=0 in case.
 CATEGORIES=	math
 MASTER_SITES=	NL/lapack/
 DISTFILES=	lapack-${PORTVERSION}.tgz
diff --git a/math/lapack95/Makefile b/math/lapack95/Makefile
index 569629518fb5..7e15f1775e8b 100644
--- a/math/lapack95/Makefile
+++ b/math/lapack95/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	lapack95
 PORTVERSION=	1.0
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	math
 MASTER_SITES=	NL
 DISTNAME=	${PORTNAME}
diff --git a/math/levmar/Makefile b/math/levmar/Makefile
index 6d549d609246..b75509cdfc67 100644
--- a/math/levmar/Makefile
+++ b/math/levmar/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	levmar
 PORTVERSION=	2.6
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	math
 MASTER_SITES=	http://users.ics.forth.gr/~lourakis/levmar/
 
diff --git a/math/libRmath/Makefile b/math/libRmath/Makefile
index ed3059a1fd7d..f441b0c65c4d 100644
--- a/math/libRmath/Makefile
+++ b/math/libRmath/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libRmath
 PORTVERSION=	3.4.1
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	math lang
 MASTER_SITES=	CRAN/src/base/R-${PORTVERSION:C|\..*||}
 DISTNAME=	R-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
diff --git a/math/libflame/Makefile b/math/libflame/Makefile
index f4d9f23c2189..a24dfb8babca 100644
--- a/math/libflame/Makefile
+++ b/math/libflame/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libflame
 DISTVERSION=	r7421
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math
 MASTER_SITES=	http://www.cs.utexas.edu/users/%SUBDIR%/:1,2 LOCAL/bf:3
 MASTER_SITE_SUBDIR=	flame/snapshots/:1 field/docs/:2
diff --git a/math/librsb/Makefile b/math/librsb/Makefile
index 3ee55e4c0883..fee4a5ba820b 100644
--- a/math/librsb/Makefile
+++ b/math/librsb/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	librsb
 PORTVERSION=	1.2.0r7
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	SF/librsb
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/r/-rc/}
diff --git a/math/libtsnnls/Makefile b/math/libtsnnls/Makefile
index dbe09b32a57b..e7e6ab4e474a 100644
--- a/math/libtsnnls/Makefile
+++ b/math/libtsnnls/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libtsnnls
 PORTVERSION=	2.3.3
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	math
 MASTER_SITES=	http://www.jasoncantarella.com/downloads/
 
diff --git a/math/linpack/Makefile b/math/linpack/Makefile
index bbf23815657f..ddd74b3429a7 100644
--- a/math/linpack/Makefile
+++ b/math/linpack/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	linpack
 PORTVERSION=	1.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	math
 MASTER_SITES=	NL
 DISTFILES=	${SRCS}
diff --git a/math/math77/Makefile b/math/math77/Makefile
index f6389408cf94..99a344ca4a59 100644
--- a/math/math77/Makefile
+++ b/math/math77/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	math77
 PORTVERSION=	6.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	NL/math
 DISTNAME=	${PORTNAME}
diff --git a/math/maxima/Makefile b/math/maxima/Makefile
index e38ad666f98b..693fb80ac3d6 100644
--- a/math/maxima/Makefile
+++ b/math/maxima/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	maxima
 PORTVERSION=	5.40.0
+PORTREVISION=	1
 CATEGORIES=	math lisp tk
 MASTER_SITES=	SF/maxima/Maxima-source/${PORTVERSION}-source
 
@@ -16,7 +17,7 @@ PATCH_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash
 RUN_DEPENDS=	${LOCALBASE}/bin/${LISPPORT} \
 		${LOCALBASE}/bin/gnuplot:math/gnuplot
 
-USES=			gmake makeinfo perl5 python:build tk:84+ shared-mime-info
+USES=			gmake makeinfo perl5 python:build tk:85+ shared-mime-info
 USE_PERL5=		build
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--prefix=${PREFIX} \
diff --git a/math/metis/Makefile b/math/metis/Makefile
index f747d4ab68cc..aba4a1819bbc 100644
--- a/math/metis/Makefile
+++ b/math/metis/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	metis
 PORTVERSION=	5.1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/
 
diff --git a/math/miracl/Makefile b/math/miracl/Makefile
index 5aaa13836547..bafa5b39ce4f 100644
--- a/math/miracl/Makefile
+++ b/math/miracl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	miracl
 PORTVERSION=	5.6
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	math
 MASTER_SITES=	http://mirror.shatow.net/freebsd/${PORTNAME}/ \
diff --git a/math/mosesdecoder/Makefile b/math/mosesdecoder/Makefile
index 009ccca22152..210f91e522ba 100644
--- a/math/mosesdecoder/Makefile
+++ b/math/mosesdecoder/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	mosesdecoder
 PORTVERSION=	2.1.1
 DISTVERSIONPREFIX=	RELEASE-
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math
 
 MAINTAINER=	demon@FreeBSD.org
diff --git a/math/mtl/Makefile b/math/mtl/Makefile
index bedbb757e541..34e72c033d20 100644
--- a/math/mtl/Makefile
+++ b/math/mtl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mtl
 DISTVERSION=	2.1.2-23.tentative
+PORTREVISION=	1
 CATEGORIES=	math devel
 MASTER_SITES=	http://www.osl.iu.edu/download/research/mtl/
 
diff --git a/math/mumps/Makefile b/math/mumps/Makefile
index e1be5c805497..86516c3910ac 100644
--- a/math/mumps/Makefile
+++ b/math/mumps/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mumps
 PORTVERSION=	4.10.0	# Please do not upgrade to 5+: if needed repocopy to math/mumps5
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	math
 MASTER_SITES=	http://mumps.enseeiht.fr/		\
 		http://graal.ens-lyon.fr/MUMPS/		\
diff --git a/math/octave-forge-actuarial/Makefile b/math/octave-forge-actuarial/Makefile
index d8444305208a..c13e6d380fe7 100644
--- a/math/octave-forge-actuarial/Makefile
+++ b/math/octave-forge-actuarial/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-actuarial
 PORTVERSION=	1.1.0
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-audio/Makefile b/math/octave-forge-audio/Makefile
index 9083e54644a4..36053bb1337b 100644
--- a/math/octave-forge-audio/Makefile
+++ b/math/octave-forge-audio/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-audio
 PORTVERSION=	1.1.4
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-bim/Makefile b/math/octave-forge-bim/Makefile
index c6218ffbdf70..10d43f1c924f 100644
--- a/math/octave-forge-bim/Makefile
+++ b/math/octave-forge-bim/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-bim
 PORTVERSION=	1.1.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-bioinfo/Makefile b/math/octave-forge-bioinfo/Makefile
index 185b2bbccdcf..def4e9d230f2 100644
--- a/math/octave-forge-bioinfo/Makefile
+++ b/math/octave-forge-bioinfo/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-bioinfo
 PORTVERSION=	0.1.2
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-bsltl/Makefile b/math/octave-forge-bsltl/Makefile
index e32e78ab5152..22882f81743b 100644
--- a/math/octave-forge-bsltl/Makefile
+++ b/math/octave-forge-bsltl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	octave-forge-bsltl
 PORTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-cgi/Makefile b/math/octave-forge-cgi/Makefile
index 96df0ae46d6a..f339116576c8 100644
--- a/math/octave-forge-cgi/Makefile
+++ b/math/octave-forge-cgi/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-cgi
 PORTVERSION=	0.1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-civil-engineering/Makefile b/math/octave-forge-civil-engineering/Makefile
index 7b2d6b3850a1..9c6ac50d5bed 100644
--- a/math/octave-forge-civil-engineering/Makefile
+++ b/math/octave-forge-civil-engineering/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-civil-engineering
 PORTVERSION=	1.0.7
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-communications/Makefile b/math/octave-forge-communications/Makefile
index f84ed036dc9f..2f1ab27ef44a 100644
--- a/math/octave-forge-communications/Makefile
+++ b/math/octave-forge-communications/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-communications
 PORTVERSION=	1.2.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-control/Makefile b/math/octave-forge-control/Makefile
index 80d74c6a0b13..f2af47632a70 100644
--- a/math/octave-forge-control/Makefile
+++ b/math/octave-forge-control/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-control
 PORTVERSION=	3.0.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-data-smoothing/Makefile b/math/octave-forge-data-smoothing/Makefile
index 0435ede922db..a1991d4e9072 100644
--- a/math/octave-forge-data-smoothing/Makefile
+++ b/math/octave-forge-data-smoothing/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-data-smoothing
 PORTVERSION=	1.3.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-database/Makefile b/math/octave-forge-database/Makefile
index a428f8d14ab6..3ae8dd8920a0 100644
--- a/math/octave-forge-database/Makefile
+++ b/math/octave-forge-database/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-database
 PORTVERSION=	2.4.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-dataframe/Makefile b/math/octave-forge-dataframe/Makefile
index 36920cb791cc..e9031c1429c1 100644
--- a/math/octave-forge-dataframe/Makefile
+++ b/math/octave-forge-dataframe/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	octave-forge-dataframe
 PORTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-divand/Makefile b/math/octave-forge-divand/Makefile
index 1da84f7f9989..5e06c6a183d5 100644
--- a/math/octave-forge-divand/Makefile
+++ b/math/octave-forge-divand/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-divand
 PORTVERSION=	1.1.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-doctest/Makefile b/math/octave-forge-doctest/Makefile
index 2ce25ef1e173..e14780d1f669 100644
--- a/math/octave-forge-doctest/Makefile
+++ b/math/octave-forge-doctest/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-doctest
 PORTVERSION=	0.5.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-econometrics/Makefile b/math/octave-forge-econometrics/Makefile
index 20c7a280b0e7..057a64d5374b 100644
--- a/math/octave-forge-econometrics/Makefile
+++ b/math/octave-forge-econometrics/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-econometrics
 PORTVERSION=	1.1.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-engine/Makefile b/math/octave-forge-engine/Makefile
index 3b5288960f13..cc926c279849 100644
--- a/math/octave-forge-engine/Makefile
+++ b/math/octave-forge-engine/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-engine
 PORTVERSION=	1.0.9
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-fenv/Makefile b/math/octave-forge-fenv/Makefile
index 19cf79ec6b95..0498b141bff8 100644
--- a/math/octave-forge-fenv/Makefile
+++ b/math/octave-forge-fenv/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-fenv
 PORTVERSION=	0.1.0
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-financial/Makefile b/math/octave-forge-financial/Makefile
index a80dc4ee6a34..1b74207df3ae 100644
--- a/math/octave-forge-financial/Makefile
+++ b/math/octave-forge-financial/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-financial
 PORTVERSION=	0.5.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-fits/Makefile b/math/octave-forge-fits/Makefile
index 76dc0ca8eca3..f00d3cd6a8b0 100644
--- a/math/octave-forge-fits/Makefile
+++ b/math/octave-forge-fits/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	octave-forge-fits
 PORTVERSION=	1.0.7
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-fl-core/Makefile b/math/octave-forge-fl-core/Makefile
index c85d392f362c..b83f37a276c1 100644
--- a/math/octave-forge-fl-core/Makefile
+++ b/math/octave-forge-fl-core/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-fl-core
 PORTVERSION=	1.0.0
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-fpl/Makefile b/math/octave-forge-fpl/Makefile
index 787a3a82df42..e9f1da1d18b3 100644
--- a/math/octave-forge-fpl/Makefile
+++ b/math/octave-forge-fpl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-fpl
 PORTVERSION=	1.3.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-fuzzy-logic-toolkit/Makefile b/math/octave-forge-fuzzy-logic-toolkit/Makefile
index 0997ec514f55..3eb33ed5be78 100644
--- a/math/octave-forge-fuzzy-logic-toolkit/Makefile
+++ b/math/octave-forge-fuzzy-logic-toolkit/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-fuzzy-logic-toolkit
 PORTVERSION=	0.4.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-ga/Makefile b/math/octave-forge-ga/Makefile
index 63739c9af5ed..afe0dcfe0e04 100644
--- a/math/octave-forge-ga/Makefile
+++ b/math/octave-forge-ga/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-ga
 PORTVERSION=	0.10.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-general/Makefile b/math/octave-forge-general/Makefile
index 196e1383aecc..87b6cfa47093 100644
--- a/math/octave-forge-general/Makefile
+++ b/math/octave-forge-general/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-general
 PORTVERSION=	2.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-generate_html/Makefile b/math/octave-forge-generate_html/Makefile
index c47ae6dbf6bc..f13988baba55 100644
--- a/math/octave-forge-generate_html/Makefile
+++ b/math/octave-forge-generate_html/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	octave-forge-generate_html
 PORTVERSION=	0.3.1
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-geometry/Makefile b/math/octave-forge-geometry/Makefile
index d638c960a7e9..d779130b17fa 100644
--- a/math/octave-forge-geometry/Makefile
+++ b/math/octave-forge-geometry/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	octave-forge-geometry
 PORTVERSION=	3.0.0
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-gnuplot/Makefile b/math/octave-forge-gnuplot/Makefile
index cdf44bf27cb4..f84211a87ba0 100644
--- a/math/octave-forge-gnuplot/Makefile
+++ b/math/octave-forge-gnuplot/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-gnuplot
 PORTVERSION=	1.0.1
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-gsl/Makefile b/math/octave-forge-gsl/Makefile
index ec2a6041a9da..3990c2896453 100644
--- a/math/octave-forge-gsl/Makefile
+++ b/math/octave-forge-gsl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-gsl
 PORTVERSION=	2.0.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-ident/Makefile b/math/octave-forge-ident/Makefile
index 8b0432c9fba5..ded721379b7c 100644
--- a/math/octave-forge-ident/Makefile
+++ b/math/octave-forge-ident/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-ident
 PORTVERSION=	1.0.7
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-image/Makefile b/math/octave-forge-image/Makefile
index bd8f16deceb3..966c5f90bbba 100644
--- a/math/octave-forge-image/Makefile
+++ b/math/octave-forge-image/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-image
 PORTVERSION=	2.6.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-informationtheory/Makefile b/math/octave-forge-informationtheory/Makefile
index f6386cd1bdab..8de9b691ac5c 100644
--- a/math/octave-forge-informationtheory/Makefile
+++ b/math/octave-forge-informationtheory/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-informationtheory
 PORTVERSION=	0.1.8
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-integration/Makefile b/math/octave-forge-integration/Makefile
index 9b59a6040c9f..486bce5a2d98 100644
--- a/math/octave-forge-integration/Makefile
+++ b/math/octave-forge-integration/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-integration
 PORTVERSION=	1.0.7
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-interval/Makefile b/math/octave-forge-interval/Makefile
index 3710a81bb828..0b24b0467d8c 100644
--- a/math/octave-forge-interval/Makefile
+++ b/math/octave-forge-interval/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	octave-forge-interval
 PORTVERSION=	2.1.0
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-io/Makefile b/math/octave-forge-io/Makefile
index ebd92b1e7d62..b27deb8e71dc 100644
--- a/math/octave-forge-io/Makefile
+++ b/math/octave-forge-io/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	octave-forge-io
 PORTVERSION=	2.4.7
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	math
 
diff --git a/math/octave-forge-irsa/Makefile b/math/octave-forge-irsa/Makefile
index 4a89927ab7ba..0daf09dc8e5a 100644
--- a/math/octave-forge-irsa/Makefile
+++ b/math/octave-forge-irsa/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-irsa
 PORTVERSION=	1.0.7
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-level-set/Makefile b/math/octave-forge-level-set/Makefile
index afed08c0a7e2..3863342964e1 100644
--- a/math/octave-forge-level-set/Makefile
+++ b/math/octave-forge-level-set/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-level-set
 PORTVERSION=	0.3.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-linear-algebra/Makefile b/math/octave-forge-linear-algebra/Makefile
index 9049eb6b920d..aba679096d00 100644
--- a/math/octave-forge-linear-algebra/Makefile
+++ b/math/octave-forge-linear-algebra/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-linear-algebra
 PORTVERSION=	2.2.2
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	math
 
diff --git a/math/octave-forge-lssa/Makefile b/math/octave-forge-lssa/Makefile
index 577676403d4c..6146005d34ad 100644
--- a/math/octave-forge-lssa/Makefile
+++ b/math/octave-forge-lssa/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-lssa
 PORTVERSION=	0.1.2
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-ltfat/Makefile b/math/octave-forge-ltfat/Makefile
index af87a1bbd9c9..06c1f14b0aae 100644
--- a/math/octave-forge-ltfat/Makefile
+++ b/math/octave-forge-ltfat/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-ltfat
 PORTVERSION=	2.1.2
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	math
 
diff --git a/math/octave-forge-mapping/Makefile b/math/octave-forge-mapping/Makefile
index 76ce61a7c562..64687dc00843 100644
--- a/math/octave-forge-mapping/Makefile
+++ b/math/octave-forge-mapping/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-mapping
 PORTVERSION=	1.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-mechanics/Makefile b/math/octave-forge-mechanics/Makefile
index aa211900ba75..7e1e3b707dce 100644
--- a/math/octave-forge-mechanics/Makefile
+++ b/math/octave-forge-mechanics/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-mechanics
 PORTVERSION=	1.3.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-miscellaneous/Makefile b/math/octave-forge-miscellaneous/Makefile
index 1f994c044e3b..a68673e32ee3 100644
--- a/math/octave-forge-miscellaneous/Makefile
+++ b/math/octave-forge-miscellaneous/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-miscellaneous
 PORTVERSION=	1.2.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-missing-functions/Makefile b/math/octave-forge-missing-functions/Makefile
index 16bf098de194..4e7713b4d83a 100644
--- a/math/octave-forge-missing-functions/Makefile
+++ b/math/octave-forge-missing-functions/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-missing-functions
 PORTVERSION=	1.0.2
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-msh/Makefile b/math/octave-forge-msh/Makefile
index 9b77d701c481..5df8d3ed5560 100644
--- a/math/octave-forge-msh/Makefile
+++ b/math/octave-forge-msh/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-msh
 PORTVERSION=	1.0.10
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-multicore/Makefile b/math/octave-forge-multicore/Makefile
index 163a5be5a79d..6faa23306b44 100644
--- a/math/octave-forge-multicore/Makefile
+++ b/math/octave-forge-multicore/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-multicore
 PORTVERSION=	0.2.15
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-mvn/Makefile b/math/octave-forge-mvn/Makefile
index 06cc01b6e96b..7996d3f52e77 100644
--- a/math/octave-forge-mvn/Makefile
+++ b/math/octave-forge-mvn/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-mvn
 PORTVERSION=	1.1.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-nan/Makefile b/math/octave-forge-nan/Makefile
index 0e7aa29f161c..349efa41298f 100644
--- a/math/octave-forge-nan/Makefile
+++ b/math/octave-forge-nan/Makefile
@@ -2,7 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	octave-forge-nan
-PORTVERSION=	3.1.2
+PORTVERSION=	3.1.4
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-nan/distinfo b/math/octave-forge-nan/distinfo
index 7c5841d6d484..57aedc400f16 100644
--- a/math/octave-forge-nan/distinfo
+++ b/math/octave-forge-nan/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1498102023
-SHA256 (octave-forge/nan-3.1.2.tar.gz) = 0bb8d985cf3b1d5c478253c60a5712af6af301842b869fba1ce93693ce40398d
-SIZE (octave-forge/nan-3.1.2.tar.gz) = 160542
+TIMESTAMP = 1505070981
+SHA256 (octave-forge/nan-3.1.4.tar.gz) = 083707ce86fe8d64581d18cf1d355c385cfcd36d57af305e299de7690eee988b
+SIZE (octave-forge/nan-3.1.4.tar.gz) = 178597
diff --git a/math/octave-forge-ncarray/Makefile b/math/octave-forge-ncarray/Makefile
index 2ae0a9f39553..266bebceccea 100644
--- a/math/octave-forge-ncarray/Makefile
+++ b/math/octave-forge-ncarray/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	octave-forge-ncarray
 PORTVERSION=	1.0.4
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-netcdf/Makefile b/math/octave-forge-netcdf/Makefile
index aae5b38a1dff..e4d50afcfd9c 100644
--- a/math/octave-forge-netcdf/Makefile
+++ b/math/octave-forge-netcdf/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	octave-forge-netcdf
 PORTVERSION=	1.0.11
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-nlwing2/Makefile b/math/octave-forge-nlwing2/Makefile
index 4e94679840c2..bb13fb708be3 100644
--- a/math/octave-forge-nlwing2/Makefile
+++ b/math/octave-forge-nlwing2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-nlwing2
 PORTVERSION=	1.2.0
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-nnet/Makefile b/math/octave-forge-nnet/Makefile
index 68472b0d3b1d..9c6311cadcf8 100644
--- a/math/octave-forge-nnet/Makefile
+++ b/math/octave-forge-nnet/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-nnet
 PORTVERSION=	0.1.13
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-nurbs/Makefile b/math/octave-forge-nurbs/Makefile
index ec15cc9e23dd..d7e6534b7560 100644
--- a/math/octave-forge-nurbs/Makefile
+++ b/math/octave-forge-nurbs/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	octave-forge-nurbs
 PORTVERSION=	1.3.13
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-ocs/Makefile b/math/octave-forge-ocs/Makefile
index 8c3c8503da2f..09c20b3cfd4b 100644
--- a/math/octave-forge-ocs/Makefile
+++ b/math/octave-forge-ocs/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-ocs
 PORTVERSION=	0.1.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-oct2mat/Makefile b/math/octave-forge-oct2mat/Makefile
index a593da44b52a..eed8e7877e5f 100644
--- a/math/octave-forge-oct2mat/Makefile
+++ b/math/octave-forge-oct2mat/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-oct2mat
 PORTVERSION=	1.0.7
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-octcdf/Makefile b/math/octave-forge-octcdf/Makefile
index 10e0d9c06983..f4bc3e05ea2a 100644
--- a/math/octave-forge-octcdf/Makefile
+++ b/math/octave-forge-octcdf/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-octcdf
 PORTVERSION=	1.1.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-octclip/Makefile b/math/octave-forge-octclip/Makefile
index b1cf256b25a7..bb46b2f40679 100644
--- a/math/octave-forge-octclip/Makefile
+++ b/math/octave-forge-octclip/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-octclip
 PORTVERSION=	1.0.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-octproj/Makefile b/math/octave-forge-octproj/Makefile
index 5293a538cee0..3e933ae2b6cc 100644
--- a/math/octave-forge-octproj/Makefile
+++ b/math/octave-forge-octproj/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-octproj
 PORTVERSION=	1.1.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-odebvp/Makefile b/math/octave-forge-odebvp/Makefile
index 0a0900266d3f..4a2bdd1295de 100644
--- a/math/octave-forge-odebvp/Makefile
+++ b/math/octave-forge-odebvp/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-odebvp
 PORTVERSION=	1.0.6
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-odepkg/Makefile b/math/octave-forge-odepkg/Makefile
index dc4f5930e404..83cae94d0906 100644
--- a/math/octave-forge-odepkg/Makefile
+++ b/math/octave-forge-odepkg/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-odepkg
 PORTVERSION=	0.8.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-optics/Makefile b/math/octave-forge-optics/Makefile
index 95deaf98d9e9..2279964346c5 100644
--- a/math/octave-forge-optics/Makefile
+++ b/math/octave-forge-optics/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-optics
 PORTVERSION=	0.1.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-optim/Makefile b/math/octave-forge-optim/Makefile
index 48bce6c90bae..d64d12a4ad3c 100644
--- a/math/octave-forge-optim/Makefile
+++ b/math/octave-forge-optim/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-optim
 PORTVERSION=	1.5.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-optiminterp/Makefile b/math/octave-forge-optiminterp/Makefile
index ca7b413049b5..e1c28afbac1a 100644
--- a/math/octave-forge-optiminterp/Makefile
+++ b/math/octave-forge-optiminterp/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-optiminterp
 PORTVERSION=	0.3.4
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-outliers/Makefile b/math/octave-forge-outliers/Makefile
index fc5d2e1fb38d..d6dde86bd63e 100644
--- a/math/octave-forge-outliers/Makefile
+++ b/math/octave-forge-outliers/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-outliers
 PORTVERSION=	0.13.9
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-parallel/Makefile b/math/octave-forge-parallel/Makefile
index a7dd0a759199..361e8d331489 100644
--- a/math/octave-forge-parallel/Makefile
+++ b/math/octave-forge-parallel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-parallel
 PORTVERSION=	3.1.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-pdb/Makefile b/math/octave-forge-pdb/Makefile
index cdcb4d55a509..8e18faf949e1 100644
--- a/math/octave-forge-pdb/Makefile
+++ b/math/octave-forge-pdb/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-pdb
 PORTVERSION=	1.0.7
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-plot/Makefile b/math/octave-forge-plot/Makefile
index 4d84f0121a7a..8e35b3fb3eaa 100644
--- a/math/octave-forge-plot/Makefile
+++ b/math/octave-forge-plot/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-plot
 PORTVERSION=	1.1.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-pt_br/Makefile b/math/octave-forge-pt_br/Makefile
index e180cda64738..45a911924c0c 100644
--- a/math/octave-forge-pt_br/Makefile
+++ b/math/octave-forge-pt_br/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-pt_br
 PORTVERSION=	1.0.9
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-quaternion/Makefile b/math/octave-forge-quaternion/Makefile
index 2d4d523913c9..b2c0ee2a323a 100644
--- a/math/octave-forge-quaternion/Makefile
+++ b/math/octave-forge-quaternion/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-quaternion
 PORTVERSION=	2.4.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-queueing/Makefile b/math/octave-forge-queueing/Makefile
index ba279b7d5be5..ddd279e27c4d 100644
--- a/math/octave-forge-queueing/Makefile
+++ b/math/octave-forge-queueing/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	octave-forge-queueing
 PORTVERSION=	1.2.5
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-secs1d/Makefile b/math/octave-forge-secs1d/Makefile
index 145095076286..fcacd1fd285e 100644
--- a/math/octave-forge-secs1d/Makefile
+++ b/math/octave-forge-secs1d/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-secs1d
 PORTVERSION=	0.0.9
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-secs2d/Makefile b/math/octave-forge-secs2d/Makefile
index 711652a43534..84eb6d968fe3 100644
--- a/math/octave-forge-secs2d/Makefile
+++ b/math/octave-forge-secs2d/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-secs2d
 PORTVERSION=	0.0.8
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-secs3d/Makefile b/math/octave-forge-secs3d/Makefile
index 3a70062780ba..70e5c7734c17 100644
--- a/math/octave-forge-secs3d/Makefile
+++ b/math/octave-forge-secs3d/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-secs3d
 PORTVERSION=	0.0.1
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-signal/Makefile b/math/octave-forge-signal/Makefile
index 0d909410deb7..f2140bfeecfc 100644
--- a/math/octave-forge-signal/Makefile
+++ b/math/octave-forge-signal/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-signal
 PORTVERSION=	1.3.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-simp/Makefile b/math/octave-forge-simp/Makefile
index 93cc60d3bfe9..3370f09fdf19 100644
--- a/math/octave-forge-simp/Makefile
+++ b/math/octave-forge-simp/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-simp
 PORTVERSION=	1.1.0
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-sockets/Makefile b/math/octave-forge-sockets/Makefile
index 7a95d781a7e9..2b3ce3adbc1f 100644
--- a/math/octave-forge-sockets/Makefile
+++ b/math/octave-forge-sockets/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-sockets
 PORTVERSION=	1.2.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-sparsersb/Makefile b/math/octave-forge-sparsersb/Makefile
index 27174b478eb9..73efac3f40fb 100644
--- a/math/octave-forge-sparsersb/Makefile
+++ b/math/octave-forge-sparsersb/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	octave-forge-sparsersb
 PORTVERSION=	1.0.5
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-specfun/Makefile b/math/octave-forge-specfun/Makefile
index da7f60752ced..7ff1753fac34 100644
--- a/math/octave-forge-specfun/Makefile
+++ b/math/octave-forge-specfun/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-specfun
 PORTVERSION=	1.1.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-special-matrix/Makefile b/math/octave-forge-special-matrix/Makefile
index 127ec59acd74..0d6d5b5df89b 100644
--- a/math/octave-forge-special-matrix/Makefile
+++ b/math/octave-forge-special-matrix/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-special-matrix
 PORTVERSION=	1.0.7
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-splines/Makefile b/math/octave-forge-splines/Makefile
index 093905839066..ddebace500aa 100644
--- a/math/octave-forge-splines/Makefile
+++ b/math/octave-forge-splines/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	octave-forge-splines
 PORTVERSION=	1.3.2
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-statistics/Makefile b/math/octave-forge-statistics/Makefile
index da2f12b993a9..be3ada8a7aeb 100644
--- a/math/octave-forge-statistics/Makefile
+++ b/math/octave-forge-statistics/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	octave-forge-statistics
 PORTVERSION=	1.3.0
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-stk/Makefile b/math/octave-forge-stk/Makefile
index 76215782b726..0462508c91f9 100644
--- a/math/octave-forge-stk/Makefile
+++ b/math/octave-forge-stk/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	octave-forge-stk
 PORTVERSION=	2.4.2
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-strings/Makefile b/math/octave-forge-strings/Makefile
index 9682ad2d28e3..4d876098fbb6 100644
--- a/math/octave-forge-strings/Makefile
+++ b/math/octave-forge-strings/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-strings
 PORTVERSION=	1.2.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-struct/Makefile b/math/octave-forge-struct/Makefile
index 3c4a717c505d..4aaa282981ea 100644
--- a/math/octave-forge-struct/Makefile
+++ b/math/octave-forge-struct/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-struct
 PORTVERSION=	1.0.14
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-symband/Makefile b/math/octave-forge-symband/Makefile
index dfc42d63cb12..28caba5d26d6 100644
--- a/math/octave-forge-symband/Makefile
+++ b/math/octave-forge-symband/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-symband
 PORTVERSION=	1.0.10
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-symbolic/Makefile b/math/octave-forge-symbolic/Makefile
index 5d5d1cc4b8fe..bf2554519df1 100644
--- a/math/octave-forge-symbolic/Makefile
+++ b/math/octave-forge-symbolic/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	octave-forge-symbolic
 PORTVERSION=	2.6.0
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-tcl-octave/Makefile b/math/octave-forge-tcl-octave/Makefile
index 489875c7882c..026660bcd8bf 100644
--- a/math/octave-forge-tcl-octave/Makefile
+++ b/math/octave-forge-tcl-octave/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-tcl-octave
 PORTVERSION=	0.1.8
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-tisean/Makefile b/math/octave-forge-tisean/Makefile
index 3e1eff3fbd8c..8c005b90a0e3 100644
--- a/math/octave-forge-tisean/Makefile
+++ b/math/octave-forge-tisean/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-tisean
 PORTVERSION=	0.2.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-tsa/Makefile b/math/octave-forge-tsa/Makefile
index 71f92d555fff..b2e333e8f529 100644
--- a/math/octave-forge-tsa/Makefile
+++ b/math/octave-forge-tsa/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	octave-forge-tsa
 PORTVERSION=	4.4.5
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-video/Makefile b/math/octave-forge-video/Makefile
index 99478f0dcd8e..b53c39e050ec 100644
--- a/math/octave-forge-video/Makefile
+++ b/math/octave-forge-video/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	octave-forge-video
 PORTVERSION=	1.2.4
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-zenity/Makefile b/math/octave-forge-zenity/Makefile
index 396700e61014..071205fd9094 100644
--- a/math/octave-forge-zenity/Makefile
+++ b/math/octave-forge-zenity/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-zenity
 PORTVERSION=	0.5.7
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-zeromq/Makefile b/math/octave-forge-zeromq/Makefile
index 49b92a199d03..1b55b87d32bf 100644
--- a/math/octave-forge-zeromq/Makefile
+++ b/math/octave-forge-zeromq/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-zeromq
 PORTVERSION=	1.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave/Makefile b/math/octave/Makefile
index a42812e37d60..b9e4241b1a30 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave
 PORTVERSION=	4.0.3
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	math
 MASTER_SITES=	GNU
 
diff --git a/math/openblas/Makefile b/math/openblas/Makefile
index b414bcff4e2f..ec50f49cd4a9 100644
--- a/math/openblas/Makefile
+++ b/math/openblas/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	openblas
 PORTVERSION=	0.2.20
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 PORTEPOCH=	1
 CATEGORIES=	math
diff --git a/math/openfst/Makefile b/math/openfst/Makefile
index 362f0335f799..85fa995bdcc3 100644
--- a/math/openfst/Makefile
+++ b/math/openfst/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	openfst
 PORTVERSION=	1.5.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	http://www.openfst.org/twiki/pub/FST/FstDownload/
 
diff --git a/math/opensolaris-libm/Makefile b/math/opensolaris-libm/Makefile
index 61c6f44e5faf..5c362bd774fc 100644
--- a/math/opensolaris-libm/Makefile
+++ b/math/opensolaris-libm/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	opensolaris-libm
 PORTVERSION=	2006.01.31
-PORTREVISION=	2
+PORTREVISION=	3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	math
 
diff --git a/math/p5-Math-Int128/Makefile b/math/p5-Math-Int128/Makefile
index 0eae09ec3517..b193d56ffdbb 100644
--- a/math/p5-Math-Int128/Makefile
+++ b/math/p5-Math-Int128/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Math-Int128
 PORTVERSION=	0.22
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/pdal/Makefile b/math/pdal/Makefile
index e048f22db2b8..233f72c62e04 100644
--- a/math/pdal/Makefile
+++ b/math/pdal/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pdal
 PORTVERSION=	1.5.0
+PORTREVISION=	1
 CATEGORIES=	math databases graphics
 
 MAINTAINER=	lbartoletti@tuxfamily.org
diff --git a/math/plplot/Makefile b/math/plplot/Makefile
index bb206a55838b..7f457412936b 100644
--- a/math/plplot/Makefile
+++ b/math/plplot/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	plplot
 PORTVERSION=	5.12.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math science
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Source
 
diff --git a/math/proofgeneral/Makefile b/math/proofgeneral/Makefile
index b21b88df7c44..bebf05cbecf6 100644
--- a/math/proofgeneral/Makefile
+++ b/math/proofgeneral/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	proofgeneral
 PORTVERSION=	4.1
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	math elisp
 MASTER_SITES=	http://proofgeneral.inf.ed.ac.uk/releases/
 PKGNAMESUFFIX=	-${EMACS_NAME}
diff --git a/math/py-cryptominisat/Makefile b/math/py-cryptominisat/Makefile
index 5556eb1a5224..c23bb3b767fe 100644
--- a/math/py-cryptominisat/Makefile
+++ b/math/py-cryptominisat/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	cryptominisat
 PORTVERSION=	5.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
diff --git a/math/py-matplotlib/Makefile b/math/py-matplotlib/Makefile
index aa0d2afaa5f6..c8d0ce1466cf 100644
--- a/math/py-matplotlib/Makefile
+++ b/math/py-matplotlib/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	matplotlib
 PORTVERSION=	1.5.3
-PORTREVISION=	2
+PORTREVISION=	3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	math python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/math/py-numexpr/Makefile b/math/py-numexpr/Makefile
index 893f2d0ce6d8..8958df029b56 100644
--- a/math/py-numexpr/Makefile
+++ b/math/py-numexpr/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	numexpr
-PORTVERSION=	2.6.2
+PORTVERSION=	2.6.3
 CATEGORIES=	math python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,11 +13,11 @@ COMMENT=	Fast numerical array expression evaluator for Python and NumPy
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.6,1:math/py-numpy
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.7,1:math/py-numpy
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PYTHON=	autoplist concurrent distutils
-USES=		python
+USES=		dos2unix python
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/numexpr/interpreter.so
diff --git a/math/py-numexpr/distinfo b/math/py-numexpr/distinfo
index e591e1171e46..f16fbb17d239 100644
--- a/math/py-numexpr/distinfo
+++ b/math/py-numexpr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1485797797
-SHA256 (numexpr-2.6.2.tar.gz) = 6ab8ff5c19e7f452966bf5a3220b845cf3244fe0b96544f7f9acedcc2db5c705
-SIZE (numexpr-2.6.2.tar.gz) = 90970
+TIMESTAMP = 1505424252
+SHA256 (numexpr-2.6.3.tar.gz) = 58fb9d6157777be515aae36da9a8859cd381b0f9c8e2ca16d392840be57300de
+SIZE (numexpr-2.6.3.tar.gz) = 90398
diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile
index 659971fa9be7..8c5eb1ae34bb 100644
--- a/math/py-numpy/Makefile
+++ b/math/py-numpy/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	numpy
 PORTVERSION=	1.13.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	math python
 MASTER_SITES=	http://docs.scipy.org/doc/${PORTNAME}-${PORTVERSION:C/\.[0-9]+$/.0/}/:doc
diff --git a/math/py-pysparse/Makefile b/math/py-pysparse/Makefile
index 5d0c37390617..d756f98c2700 100644
--- a/math/py-pysparse/Makefile
+++ b/math/py-pysparse/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pysparse
 PORTVERSION=	1.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
diff --git a/math/py-symeig/Makefile b/math/py-symeig/Makefile
index ff8ea054981f..3dba3d4e63b7 100644
--- a/math/py-symeig/Makefile
+++ b/math/py-symeig/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	symeig
 PORTVERSION=	1.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math python
 MASTER_SITES=	SF/mdp-toolkit/mdp-toolkit/2.4
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/math/py-theano/Makefile b/math/py-theano/Makefile
index 43367d4d574d..611e8615e28f 100644
--- a/math/py-theano/Makefile
+++ b/math/py-theano/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	theano
 PORTVERSION=	0.9.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math python
 MASTER_SITES=	CHEESESHOP/source/T/Theano
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/math/qalculate/Makefile b/math/qalculate/Makefile
index 4018ffba187e..12ee1d90b46c 100644
--- a/math/qalculate/Makefile
+++ b/math/qalculate/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	qalculate
 PORTVERSION=	1.0.0
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	math
 
diff --git a/math/qd/Makefile b/math/qd/Makefile
index 2c024f20746d..cccc1e22933b 100644
--- a/math/qd/Makefile
+++ b/math/qd/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	qd
 PORTVERSION=	2.3.7
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	math
 MASTER_SITES=	http://www.cs.berkeley.edu/~yozo/software/
 
diff --git a/math/qrupdate/Makefile b/math/qrupdate/Makefile
index 8af65a1f297c..f8467297071e 100644
--- a/math/qrupdate/Makefile
+++ b/math/qrupdate/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	qrupdate
 PORTVERSION=	1.1.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math
 MASTER_SITES=	SOURCEFORGE/qrupdate/qrupdate/1.2
 
diff --git a/math/rkward-kde4/Makefile b/math/rkward-kde4/Makefile
index 2f4e45b4248d..28d429d0c4c6 100644
--- a/math/rkward-kde4/Makefile
+++ b/math/rkward-kde4/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	rkward
 PORTVERSION=	0.6.5
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}/src
 PKGNAMESUFFIX=	-kde4
diff --git a/math/rpy2/Makefile b/math/rpy2/Makefile
index 080fdb520853..bbe4ccfcb265 100644
--- a/math/rpy2/Makefile
+++ b/math/rpy2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	rpy2
 PORTVERSION=	2.7.8
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math
 MASTER_SITES=	CHEESESHOP
 
diff --git a/math/saga/Makefile b/math/saga/Makefile
index 3782a13b9fb1..faa4d649e2e3 100644
--- a/math/saga/Makefile
+++ b/math/saga/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	saga
 PORTVERSION=	4.1.0
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]\.[[:digit:]]*$//}/SAGA%20-%20${PORTVERSION}
 #DISTNAME=	${PORTNAME}_${PORTVERSION}
diff --git a/math/scalapack/Makefile b/math/scalapack/Makefile
index 3d18089380e1..6c5c23bd80cd 100644
--- a/math/scalapack/Makefile
+++ b/math/scalapack/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	scalapack
 PORTVERSION=	2.0.2
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	math
 MASTER_SITES=	NL
 DISTFILES=	scalapack-${PORTVERSION}.tgz manpages.tgz
diff --git a/math/scilab/Makefile b/math/scilab/Makefile
index f8c0a1ce9af9..544e78d14e5d 100644
--- a/math/scilab/Makefile
+++ b/math/scilab/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	scilab
 PORTVERSION=	5.5.2
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	math cad java
 MASTER_SITES=	http://www.scilab.org/download/${PORTVERSION}/
 DISTFILES=	${DISTNAME}-src${EXTRACT_SUFX}
diff --git a/math/sdpa/Makefile b/math/sdpa/Makefile
index e8e6241cb014..ba4e2969b2da 100644
--- a/math/sdpa/Makefile
+++ b/math/sdpa/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	sdpa
 PORTVERSION=	7.3.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME} \
 		DEBIAN/pool/main/m/mumps:mumps
diff --git a/math/sdpara/Makefile b/math/sdpara/Makefile
index b7b9355800d0..d4c8310689d3 100644
--- a/math/sdpara/Makefile
+++ b/math/sdpara/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	sdpara
 PORTVERSION=	7.3.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math parallel
 MASTER_SITES=	SF/sdpa/sdpara
 DISTNAME=	${PORTNAME}.${PORTVERSION}.src.20100914
diff --git a/math/sfft/Makefile b/math/sfft/Makefile
index 2f813d9f047c..b31b6f7c852a 100644
--- a/math/sfft/Makefile
+++ b/math/sfft/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	sfft
 PORTVERSION=	0.1.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	math
 MASTER_SITES=	http://spiral.net/software/sfft/ LOCAL/bf
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
diff --git a/math/slatec/Makefile b/math/slatec/Makefile
index 2b4eb61f7d99..11edad12ddb8 100644
--- a/math/slatec/Makefile
+++ b/math/slatec/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	slatec
 PORTVERSION=	4.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	math
 MASTER_SITES=	NL/slatec/:slatec NL/blas/:blas
 # Get d1mach.f, i1mach.f, r1mach.f from BLAS, rather than from Slatec:
diff --git a/math/spblas/Makefile b/math/spblas/Makefile
index 6510b1310daf..c7121070ef41 100644
--- a/math/spblas/Makefile
+++ b/math/spblas/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	spblas
 DISTVERSION=	1_02
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 MASTER_SITES=	http://math.nist.gov/spblas/:1 LOCAL/bf/:1 NL/blas/blast-forum/:2
 DISTFILES=	nist_spblas_${DISTVERSION}.zip:1
diff --git a/math/suitesparse/Makefile b/math/suitesparse/Makefile
index fa8a4bd18441..686c2216c497 100644
--- a/math/suitesparse/Makefile
+++ b/math/suitesparse/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	suitesparse
 PORTVERSION=	4.0.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	math
 MASTER_SITES=	http://www.cise.ufl.edu/research/sparse/SuiteSparse/
 DISTNAME=	SuiteSparse-${PORTVERSION}
diff --git a/math/superlu/Makefile b/math/superlu/Makefile
index 5a54959ac3f0..768b9b276863 100644
--- a/math/superlu/Makefile
+++ b/math/superlu/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	superlu
 PORTVERSION=	5.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	http://crd-legacy.lbl.gov/~xiaoye/SuperLU/ \
 		http://crd-legacy.lbl.gov/~xiaoye/:doc
diff --git a/math/superlu_mt/Makefile b/math/superlu_mt/Makefile
index 38a11e030210..0998b295cc94 100644
--- a/math/superlu_mt/Makefile
+++ b/math/superlu_mt/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	superlu_mt
 PORTVERSION=	3.1.20160319
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://crd.lbl.gov/~xiaoye/SuperLU/ \
 		http://crd.lbl.gov/~xiaoye/:doc
diff --git a/math/taucs/Makefile b/math/taucs/Makefile
index ba4a481e0113..c230ac67a6dd 100644
--- a/math/taucs/Makefile
+++ b/math/taucs/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	taucs
 PORTVERSION=	2.2
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	math
 MASTER_SITES=	http://www.tau.ac.il/~stoledo/taucs/${PORTVERSION}/ \
 		LOCAL/bf
diff --git a/math/tomsfastmath/Makefile b/math/tomsfastmath/Makefile
index e05549f01612..d9e5ec3888f6 100644
--- a/math/tomsfastmath/Makefile
+++ b/math/tomsfastmath/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	tomsfastmath
 PORTVERSION=	0.12
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	http://libtom.net/files/
 DISTNAME=	tfm-${PORTVERSION}
diff --git a/math/trlan/Makefile b/math/trlan/Makefile
index 6e5c818a3399..ac04e7a19e95 100644
--- a/math/trlan/Makefile
+++ b/math/trlan/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	trlan
 PORTVERSION=	201009
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math
 MASTER_SITES=	https://codeforge.lbl.gov/frs/download.php/210/:1 \
 		http://crd.lbl.gov/~kewu/ps/:2 \
diff --git a/math/viennacl/Makefile b/math/viennacl/Makefile
index 010e1c95caf5..c6fa20968502 100644
--- a/math/viennacl/Makefile
+++ b/math/viennacl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	viennacl
 PORTVERSION=	1.7.1
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	SF/${PORTNAME}/1.7.x/
 DISTNAME=	ViennaCL-${PORTVERSION}
diff --git a/math/vowpal_wabbit/Makefile b/math/vowpal_wabbit/Makefile
index b5c8d00220ac..13226cd362fa 100644
--- a/math/vowpal_wabbit/Makefile
+++ b/math/vowpal_wabbit/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	vowpal_wabbit
 PORTVERSION=	7.10
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math
 
 MAINTAINER=	demon@FreeBSD.org
diff --git a/math/wfmath/Makefile b/math/wfmath/Makefile
index bff4cc1985b1..4affb003fee1 100644
--- a/math/wfmath/Makefile
+++ b/math/wfmath/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	wfmath
 PORTVERSION=	1.0.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	math
 MASTER_SITES=	SF/worldforge/${PORTNAME}%20%28math%20lib%29/${PORTVERSION}
 
diff --git a/math/x12arima/Makefile b/math/x12arima/Makefile
index 78c45f615433..ea76d9198b7a 100644
--- a/math/x12arima/Makefile
+++ b/math/x12arima/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	x12arima
 PORTVERSION=	0.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math finance
 MASTER_SITES=	http://www.census.gov/ts/x12a/v03/unix/
 DISTFILES=	omegav03src.tar.gz
diff --git a/math/yacas/Makefile b/math/yacas/Makefile
index d7e1da614d36..0f5d05b85b22 100644
--- a/math/yacas/Makefile
+++ b/math/yacas/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	yacas
 PORTVERSION=	1.6.0
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	math
 
diff --git a/misc/cave/Makefile b/misc/cave/Makefile
index 86cbbe37a08a..c43ffe89f586 100644
--- a/misc/cave/Makefile
+++ b/misc/cave/Makefile
@@ -9,6 +9,8 @@ MASTER_SITES=	SF/bjk/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Character Animation Viewer for Everyone
 
+LICENSE=	GPLv2+
+
 USES=		ncurses
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	LIBS="${LDFLAGS} -lncurses"
diff --git a/misc/cave/pkg-descr b/misc/cave/pkg-descr
index 9d9fb7cb1631..e63e895dc58d 100644
--- a/misc/cave/pkg-descr
+++ b/misc/cave/pkg-descr
@@ -2,4 +2,4 @@ CAVE (Character Animation Viewer for Everyone) is an ascii animation viewer.
 It uses (n)curses for its interface so you'll need to have those libraries
 installed.
 
-WWW: http://benkibbey.wordpress.com/cave/
+WWW: https://benkibbey.wordpress.com/cave/
diff --git a/misc/elscreen/Makefile b/misc/elscreen/Makefile
index 3a550537b812..8a91aba294a2 100644
--- a/misc/elscreen/Makefile
+++ b/misc/elscreen/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	elscreen
 PORTVERSION=	1.4.6
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	misc elisp
 MASTER_SITES=	ftp://ftp.morishima.net/pub/morishima.net/naoto/ElScreen/%SUBDIR%/
 MASTER_SITE_SUBDIR=	. old
diff --git a/misc/estic/Makefile b/misc/estic/Makefile
index 575be35cbce0..111c0d9611cd 100644
--- a/misc/estic/Makefile
+++ b/misc/estic/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=		estic
 PORTVERSION=		1.61
-PORTREVISION=		4
+PORTREVISION=		5
 CATEGORIES=		misc comms
 MASTER_SITES=		LOCAL/dinoex
 PKGNAMESUFFIX?=		${NOX11_SUFFIX}${PKGNAMESUFFIX2}
diff --git a/misc/metalink-tools/Makefile b/misc/metalink-tools/Makefile
index a5b8a075b241..458378698c41 100644
--- a/misc/metalink-tools/Makefile
+++ b/misc/metalink-tools/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	metalink
 PORTVERSION=	0.3.6
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	misc
 MASTER_SITES=	SF/metalinks/Metalink%20commandline/${PORTVERSION}
 PKGNAMESUFFIX?=	-tools
diff --git a/misc/rump/Makefile b/misc/rump/Makefile
index aafe9336ab40..5cfd4f282fe8 100644
--- a/misc/rump/Makefile
+++ b/misc/rump/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	rump
 PORTVERSION=	20170822
+PORTREVISION=	1
 CATEGORIES=	misc
 
 MAINTAINER=	vanilla@FreeBSD.org
diff --git a/misc/seabios/Makefile b/misc/seabios/Makefile
index 3017082c3c30..a63317bc518d 100644
--- a/misc/seabios/Makefile
+++ b/misc/seabios/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	seabios
 PORTVERSION=	1.10.2
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	http://code.coreboot.org/p/seabios/downloads/get/
 
diff --git a/misc/sword/Makefile b/misc/sword/Makefile
index 67ae92ec724d..332c9a9585c5 100644
--- a/misc/sword/Makefile
+++ b/misc/sword/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	sword
 PORTVERSION=	1.7.4
-PORTREVISION=	5
+PORTREVISION=	7
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.crosswire.org/pub/sword/source/v${PORTVERSION:R}/ \
 		http://crosswire.org/ftpmirror/pub/sword/source/v${PORTVERSION:R}/
diff --git a/multimedia/aegisub/Makefile b/multimedia/aegisub/Makefile
index af0a9ae0df55..64a1f5204388 100644
--- a/multimedia/aegisub/Makefile
+++ b/multimedia/aegisub/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	aegisub
 PORTVERSION=	3.2.2
-PORTREVISION=	19
+PORTREVISION=	20
 CATEGORIES=	multimedia
 MASTER_SITES=	http://ftp.aegisub.org/pub/archives/releases/source/ \
 		ftp://ftp.aegisub.org/pub/archives/releases/source/ \
diff --git a/multimedia/aegisub/files/patch-src_utils.cpp b/multimedia/aegisub/files/patch-src_utils.cpp
new file mode 100644
index 000000000000..40ea41c30ca9
--- /dev/null
+++ b/multimedia/aegisub/files/patch-src_utils.cpp
@@ -0,0 +1,12 @@
+https://github.com/Aegisub/Aegisub/commit/dd67db47cb22
+
+--- src/utils.cpp.orig	2014-12-08 00:07:09 UTC
++++ src/utils.cpp
+@@ -44,6 +44,7 @@
+ #include <boost/filesystem/path.hpp>
+ #include <map>
+ #include <unicode/locid.h>
++#include <unicode/unistr.h>
+ #include <wx/clipbrd.h>
+ #include <wx/filedlg.h>
+ #include <wx/stdpaths.h>
diff --git a/multimedia/assimp/Makefile b/multimedia/assimp/Makefile
index 601eb22acd88..e70e12ebc935 100644
--- a/multimedia/assimp/Makefile
+++ b/multimedia/assimp/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	assimp
 PORTVERSION=	4.0.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 
 MAINTAINER=	yuri@rawbw.com
diff --git a/multimedia/audacious-gtk3/Makefile b/multimedia/audacious-gtk3/Makefile
index 9cd1c0355c27..20597dbb6a71 100644
--- a/multimedia/audacious-gtk3/Makefile
+++ b/multimedia/audacious-gtk3/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	audacious
 PORTVERSION=	3.8.2
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONSUFFIX=	-gtk3
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://distfiles.audacious-media-player.org/
diff --git a/multimedia/audacious-plugins-gtk3/Makefile b/multimedia/audacious-plugins-gtk3/Makefile
index ebc82e7e4fdd..a0e697e08cb7 100644
--- a/multimedia/audacious-plugins-gtk3/Makefile
+++ b/multimedia/audacious-plugins-gtk3/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	audacious-plugins
 PORTVERSION=	3.8.2
-PORTREVISION=	4
+PORTREVISION=	5
 DISTVERSIONSUFFIX=	-gtk3
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://distfiles.audacious-media-player.org/
diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile
index bb33f38dcbc7..444f81530dbe 100644
--- a/multimedia/audacious-plugins/Makefile
+++ b/multimedia/audacious-plugins/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	audacious-plugins
 PORTVERSION=	3.8.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://distfiles.audacious-media-player.org/
 
diff --git a/multimedia/audacious/Makefile b/multimedia/audacious/Makefile
index 68971ef86a4c..fef7f9d5cff8 100644
--- a/multimedia/audacious/Makefile
+++ b/multimedia/audacious/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	audacious
 PORTVERSION=	3.8.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://distfiles.audacious-media-player.org/
 
diff --git a/multimedia/baka-mplayer/Makefile b/multimedia/baka-mplayer/Makefile
index ec8954e141d4..9a5cd1e35e1e 100644
--- a/multimedia/baka-mplayer/Makefile
+++ b/multimedia/baka-mplayer/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	baka-mplayer
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia audio
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/multimedia/bombono/Makefile b/multimedia/bombono/Makefile
index 3407a7ea7a43..cf570ad78402 100644
--- a/multimedia/bombono/Makefile
+++ b/multimedia/bombono/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	bombono
 PORTVERSION=	1.2.2
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-dvd/${PORTVERSION:R}
 DISTNAME=	${PORTNAME}-dvd-${PORTVERSION}
diff --git a/multimedia/dtv-scan-tables/Makefile b/multimedia/dtv-scan-tables/Makefile
index 15f37afe6311..66ace7d63d02 100644
--- a/multimedia/dtv-scan-tables/Makefile
+++ b/multimedia/dtv-scan-tables/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dtv-scan-tables
-PORTVERSION=	20140612
+PORTVERSION=	20170530
 CATEGORIES=	multimedia
 
 MAINTAINER=	dreamcat4@gmail.com
@@ -15,7 +15,7 @@ LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING.LGPL
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	oliv3r
-GH_TAGNAME=	14bd6c7
+GH_TAGNAME=	fb5fe05
 
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/multimedia/dtv-scan-tables/distinfo b/multimedia/dtv-scan-tables/distinfo
index 3e2aaef2b80e..00ffc37d80a9 100644
--- a/multimedia/dtv-scan-tables/distinfo
+++ b/multimedia/dtv-scan-tables/distinfo
@@ -1,2 +1,3 @@
-SHA256 (oliv3r-dtv-scan-tables-20140612-14bd6c7_GH0.tar.gz) = 7871e05a99727024c2538da0320115a63393fea47cc98eac9cae0d9da03b17eb
-SIZE (oliv3r-dtv-scan-tables-20140612-14bd6c7_GH0.tar.gz) = 121410
+TIMESTAMP = 1501062640
+SHA256 (oliv3r-dtv-scan-tables-20170530-fb5fe05_GH0.tar.gz) = 2411dda8b8f012068c646408ff405a50c7c7bc18161fff64b402358128560ee6
+SIZE (oliv3r-dtv-scan-tables-20170530-fb5fe05_GH0.tar.gz) = 262667
diff --git a/multimedia/dtv-scan-tables/pkg-plist b/multimedia/dtv-scan-tables/pkg-plist
index 4700a6057c08..1209687c2a09 100644
--- a/multimedia/dtv-scan-tables/pkg-plist
+++ b/multimedia/dtv-scan-tables/pkg-plist
@@ -1,7 +1,10 @@
 %%DATADIR%%/COPYING
 %%DATADIR%%/COPYING.LGPL
+%%DATADIR%%/README
 %%DATADIR%%/atsc/ca-AB-Calgary
+%%DATADIR%%/atsc/ca-ON-Toronto
 %%DATADIR%%/atsc/us-ATSC-center-frequencies-8VSB
+%%DATADIR%%/atsc/us-ATSC-center-frequencies-8VSB-062009
 %%DATADIR%%/atsc/us-CA-SF-Bay-Area
 %%DATADIR%%/atsc/us-CO-Denver
 %%DATADIR%%/atsc/us-Cable-EIA-542-HRC-center-frequencies-QAM256
@@ -12,7 +15,7 @@
 %%DATADIR%%/atsc/us-ID-Boise
 %%DATADIR%%/atsc/us-MA-Boston
 %%DATADIR%%/atsc/us-MI-Lansing
-%%DATADIR%%/atsc/us-NTSC-center-frequencies-8VSB
+%%DATADIR%%/atsc/us-NTSC-center-frequencies
 %%DATADIR%%/atsc/us-PA-Philadelphia
 %%DATADIR%%/channels-conf/atsc/us-Raleigh-Durham
 %%DATADIR%%/channels-conf/dvb-c/de-Berlin
@@ -58,9 +61,12 @@
 %%DATADIR%%/dvb-c/ch-Video2000
 %%DATADIR%%/dvb-c/ch-Zuerich-upc-cablecom
 %%DATADIR%%/dvb-c/ch-interGGA
+%%DATADIR%%/dvb-c/ch-quickline-ewaarberg
 %%DATADIR%%/dvb-c/cz-Moravianet
+%%DATADIR%%/dvb-c/cz-UPC
 %%DATADIR%%/dvb-c/de-Berlin
 %%DATADIR%%/dvb-c/de-Brandenburg-Havel
+%%DATADIR%%/dvb-c/de-Hessen-Unitymedia
 %%DATADIR%%/dvb-c/de-Kabel_BW
 %%DATADIR%%/dvb-c/de-Kabel_Deutschland-Hannover
 %%DATADIR%%/dvb-c/de-Muenchen
@@ -73,9 +79,11 @@
 %%DATADIR%%/dvb-c/dk-Aarhus-Antenneforening
 %%DATADIR%%/dvb-c/dk-Copenhagen-AFDK
 %%DATADIR%%/dvb-c/dk-Odense
+%%DATADIR%%/dvb-c/dk-YouSee
 %%DATADIR%%/dvb-c/es-Euskaltel
 %%DATADIR%%/dvb-c/fi-HTV
 %%DATADIR%%/dvb-c/fi-Joensuu-Tikka
+%%DATADIR%%/dvb-c/fi-Kaisa
 %%DATADIR%%/dvb-c/fi-TTV
 %%DATADIR%%/dvb-c/fi-Turku
 %%DATADIR%%/dvb-c/fi-dna
@@ -83,12 +91,12 @@
 %%DATADIR%%/dvb-c/fi-sonera
 %%DATADIR%%/dvb-c/fi-vaasa-oncable
 %%DATADIR%%/dvb-c/fr-noos-numericable
+%%DATADIR%%/dvb-c/hr-B.net
 %%DATADIR%%/dvb-c/hu-Digikabel
 %%DATADIR%%/dvb-c/lu-Ettelbruck-ACE
 %%DATADIR%%/dvb-c/nl-Delta
 %%DATADIR%%/dvb-c/nl-REKAM-CAIW_Gouda
 %%DATADIR%%/dvb-c/nl-Ziggo
-%%DATADIR%%/dvb-c/nl-upc
 %%DATADIR%%/dvb-c/no-Oslo-CanalDigital
 %%DATADIR%%/dvb-c/no-Oslo-Get
 %%DATADIR%%/dvb-c/ro-DigiTV
@@ -96,15 +104,23 @@
 %%DATADIR%%/dvb-c/se-comhem
 %%DATADIR%%/dvb-s/ABS1-75.0E
 %%DATADIR%%/dvb-s/AMC1-103w
+%%DATADIR%%/dvb-s/AMC10_C-135W
+%%DATADIR%%/dvb-s/AMC11_C-131W
 %%DATADIR%%/dvb-s/AMC16-85.0W
+%%DATADIR%%/dvb-s/AMC18_C-105W
 %%DATADIR%%/dvb-s/AMC4-101w
 %%DATADIR%%/dvb-s/AMC5-79w
 %%DATADIR%%/dvb-s/AMC6-72w
+%%DATADIR%%/dvb-s/AMC8_C-139W
 %%DATADIR%%/dvb-s/AMC9-83.0W
+%%DATADIR%%/dvb-s/AMC9_C-83.0W
 %%DATADIR%%/dvb-s/Agila2_C-146.0E
 %%DATADIR%%/dvb-s/Amazonas-61.0W
 %%DATADIR%%/dvb-s/Amos-4w
 %%DATADIR%%/dvb-s/Anik-F1-107.3W
+%%DATADIR%%/dvb-s/Anik-F1R_C-107.3W
+%%DATADIR%%/dvb-s/Anik-F2_C-111.1W
+%%DATADIR%%/dvb-s/Anik-F3-119W
 %%DATADIR%%/dvb-s/Apstar6_C-134.0E
 %%DATADIR%%/dvb-s/AsiaSat2_C-100.5E
 %%DATADIR%%/dvb-s/AsiaSat3S_C-105.5E
@@ -112,7 +128,6 @@
 %%DATADIR%%/dvb-s/Astra-19.2E
 %%DATADIR%%/dvb-s/Astra-23.5E
 %%DATADIR%%/dvb-s/Astra-28.2E
-%%DATADIR%%/dvb-s/Astra-31.5E
 %%DATADIR%%/dvb-s/Atlantic-Bird-1-12.5W
 %%DATADIR%%/dvb-s/Atlantic-Bird-3-5.0W
 %%DATADIR%%/dvb-s/BrasilSat-B1-75.0W
@@ -120,8 +135,8 @@
 %%DATADIR%%/dvb-s/BrasilSat-B4-70.0W
 %%DATADIR%%/dvb-s/BrasilsatB4-84.0W
 %%DATADIR%%/dvb-s/ChinaSat5A-87.5E
+%%DATADIR%%/dvb-s/Echostar-10+11-110W
 %%DATADIR%%/dvb-s/Estrela-do-Sul-63.0W
-%%DATADIR%%/dvb-s/Eurobird1-28.5E
 %%DATADIR%%/dvb-s/Eutelsat9-9.0E
 %%DATADIR%%/dvb-s/EutelsatW2-16E
 %%DATADIR%%/dvb-s/Express-3A-11.0W
@@ -129,12 +144,21 @@
 %%DATADIR%%/dvb-s/ExpressAM2-80.0E
 %%DATADIR%%/dvb-s/ExpressAM22-53.0E
 %%DATADIR%%/dvb-s/Galaxy10R-123w
+%%DATADIR%%/dvb-s/Galaxy13_C-127W
+%%DATADIR%%/dvb-s/Galaxy14_C-125W
+%%DATADIR%%/dvb-s/Galaxy15_C-133W
+%%DATADIR%%/dvb-s/Galaxy16_C-99.0W
 %%DATADIR%%/dvb-s/Galaxy17-91.0W
+%%DATADIR%%/dvb-s/Galaxy17_C-91.0W
 %%DATADIR%%/dvb-s/Galaxy19-97.0W
+%%DATADIR%%/dvb-s/Galaxy19_C-97.0W
+%%DATADIR%%/dvb-s/Galaxy23_C-121W
 %%DATADIR%%/dvb-s/Galaxy25-93.0W
 %%DATADIR%%/dvb-s/Galaxy27-129w
 %%DATADIR%%/dvb-s/Galaxy28-89.0W
+%%DATADIR%%/dvb-s/Galaxy28_C-89.0W
 %%DATADIR%%/dvb-s/Galaxy3C-95.0W
+%%DATADIR%%/dvb-s/Galaxy3C_C-95.0W
 %%DATADIR%%/dvb-s/Hispasat-30.0W
 %%DATADIR%%/dvb-s/Hotbird-13.0E
 %%DATADIR%%/dvb-s/IA7-129w
@@ -152,11 +176,11 @@
 %%DATADIR%%/dvb-s/Intelsat-6B-43.0W
 %%DATADIR%%/dvb-s/Intelsat-705-50.0W
 %%DATADIR%%/dvb-s/Intelsat-707-53.0W
-%%DATADIR%%/dvb-s/Intelsat-805-55.5W
-%%DATADIR%%/dvb-s/Intelsat-9-58.0W
 %%DATADIR%%/dvb-s/Intelsat-903-34.5W
 %%DATADIR%%/dvb-s/Intelsat-905-24.5W
 %%DATADIR%%/dvb-s/Intelsat-907-27.5W
+%%DATADIR%%/dvb-s/Intelsat21_C-58.0W
+%%DATADIR%%/dvb-s/Intelsat34_C-55.5W
 %%DATADIR%%/dvb-s/Intelsat8_C-166.0E
 %%DATADIR%%/dvb-s/JCSat3A_C-128.0E
 %%DATADIR%%/dvb-s/Measat3_C-91.5E
@@ -170,7 +194,10 @@
 %%DATADIR%%/dvb-s/PAS-43.0W
 %%DATADIR%%/dvb-s/PalapaC2_C-113.0E
 %%DATADIR%%/dvb-s/SBS6-74w
+%%DATADIR%%/dvb-s/SES1_C-101W
 %%DATADIR%%/dvb-s/SES2-87.0W
+%%DATADIR%%/dvb-s/SES2_C-87.0W
+%%DATADIR%%/dvb-s/SES3_C-103W
 %%DATADIR%%/dvb-s/ST1_C-80.0E
 %%DATADIR%%/dvb-s/Satmex-5-116.8W
 %%DATADIR%%/dvb-s/Satmex-6-113.0W
@@ -188,7 +215,6 @@
 %%DATADIR%%/dvb-s/Vinasat1_C-132.0E
 %%DATADIR%%/dvb-s/Yamal201-90.0E
 %%DATADIR%%/dvb-t/ad-Andorra
-%%DATADIR%%/dvb-t/ar-Argentina
 %%DATADIR%%/dvb-t/at-All
 %%DATADIR%%/dvb-t/au-Adelaide
 %%DATADIR%%/dvb-t/au-AdelaideFoothills
@@ -231,17 +257,17 @@
 %%DATADIR%%/dvb-t/ax-Smedsbole
 %%DATADIR%%/dvb-t/be-All
 %%DATADIR%%/dvb-t/bg-Sofia
-%%DATADIR%%/dvb-t/br-Brazil
-%%DATADIR%%/dvb-t/ca-AB-Calgary
 %%DATADIR%%/dvb-t/ch-All
 %%DATADIR%%/dvb-t/ch-Citycable
 %%DATADIR%%/dvb-t/ch-Geneva
+%%DATADIR%%/dvb-t/co-All
 %%DATADIR%%/dvb-t/cz-All
 %%DATADIR%%/dvb-t/de-Baden-Wuerttemberg
 %%DATADIR%%/dvb-t/de-Bayern
 %%DATADIR%%/dvb-t/de-Berlin
 %%DATADIR%%/dvb-t/de-Brandenburg
 %%DATADIR%%/dvb-t/de-Bremen
+%%DATADIR%%/dvb-t/de-Dusseldorf
 %%DATADIR%%/dvb-t/de-Hamburg
 %%DATADIR%%/dvb-t/de-Hessen
 %%DATADIR%%/dvb-t/de-Mecklenburg-Vorpommern
@@ -258,6 +284,7 @@
 %%DATADIR%%/dvb-t/es-Albacete
 %%DATADIR%%/dvb-t/es-Alfabia
 %%DATADIR%%/dvb-t/es-Alicante
+%%DATADIR%%/dvb-t/es-Almeria
 %%DATADIR%%/dvb-t/es-Alpicat
 %%DATADIR%%/dvb-t/es-Asturias
 %%DATADIR%%/dvb-t/es-BaixoMinho
@@ -275,7 +302,6 @@
 %%DATADIR%%/dvb-t/es-Muros-Noia
 %%DATADIR%%/dvb-t/es-Mussara
 %%DATADIR%%/dvb-t/es-Pamplona
-%%DATADIR%%/dvb-t/es-Rocacorba
 %%DATADIR%%/dvb-t/es-SC_Tenerife
 %%DATADIR%%/dvb-t/es-Santander
 %%DATADIR%%/dvb-t/es-Santiago_de_Compostela
@@ -513,6 +539,7 @@
 %%DATADIR%%/dvb-t/fi-Yllas
 %%DATADIR%%/dvb-t/fi-Yllasjarvi
 %%DATADIR%%/dvb-t/fr-All
+%%DATADIR%%/dvb-t/fr-Paris
 %%DATADIR%%/dvb-t/gr-Athens
 %%DATADIR%%/dvb-t/hk-HongKong
 %%DATADIR%%/dvb-t/hr-All
@@ -556,6 +583,7 @@
 %%DATADIR%%/dvb-t/ir-Tehran
 %%DATADIR%%/dvb-t/is-Reykjavik
 %%DATADIR%%/dvb-t/it-All
+%%DATADIR%%/dvb-t/ke-Nairobi
 %%DATADIR%%/dvb-t/lt-All
 %%DATADIR%%/dvb-t/lu-All
 %%DATADIR%%/dvb-t/lv-Riga
@@ -577,231 +605,608 @@
 %%DATADIR%%/dvb-t/pl-Czestochowa
 %%DATADIR%%/dvb-t/pl-Gdansk
 %%DATADIR%%/dvb-t/pl-Krakow
+%%DATADIR%%/dvb-t/pl-Krosno_Sucha_Gora
 %%DATADIR%%/dvb-t/pl-Rzeszow
+%%DATADIR%%/dvb-t/pl-Szczecin
 %%DATADIR%%/dvb-t/pl-Warszawa
 %%DATADIR%%/dvb-t/pl-Wroclaw
 %%DATADIR%%/dvb-t/pt-All
 %%DATADIR%%/dvb-t/ro-Bucharest
 %%DATADIR%%/dvb-t/ru-Krasnodar
 %%DATADIR%%/dvb-t/ru-Novosibirsk
+%%DATADIR%%/dvb-t/ru-Vladivostok
 %%DATADIR%%/dvb-t/ru-Volgodonsk
+%%DATADIR%%/dvb-t/ru-all
+%%DATADIR%%/dvb-t/se-Aareavaara
+%%DATADIR%%/dvb-t/se-Adolfstrom
+%%DATADIR%%/dvb-t/se-Agnas
+%%DATADIR%%/dvb-t/se-Akersjon
+%%DATADIR%%/dvb-t/se-Alafors
+%%DATADIR%%/dvb-t/se-Albacken
+%%DATADIR%%/dvb-t/se-Algsjo
+%%DATADIR%%/dvb-t/se-Alingsas_Mariedal
+%%DATADIR%%/dvb-t/se-Alvangen
 %%DATADIR%%/dvb-t/se-Alvdalen_Brunnsberg
 %%DATADIR%%/dvb-t/se-Alvdalsasen
+%%DATADIR%%/dvb-t/se-Alvsbacka
 %%DATADIR%%/dvb-t/se-Alvsbyn
+%%DATADIR%%/dvb-t/se-Ammarnas_Ribovardo
+%%DATADIR%%/dvb-t/se-Ammarnas_Tjultrask
 %%DATADIR%%/dvb-t/se-Amot
+%%DATADIR%%/dvb-t/se-Amotfors_Kroppstad
+%%DATADIR%%/dvb-t/se-An
+%%DATADIR%%/dvb-t/se-Andersvattnet_Ersmyrberget
 %%DATADIR%%/dvb-t/se-Ange_Snoberg
 %%DATADIR%%/dvb-t/se-Angebo
 %%DATADIR%%/dvb-t/se-Angelholm_Vegeholm
+%%DATADIR%%/dvb-t/se-Angersjo
+%%DATADIR%%/dvb-t/se-Are
+%%DATADIR%%/dvb-t/se-Arjang
+%%DATADIR%%/dvb-t/se-Arjeplog_Galtispouda
+%%DATADIR%%/dvb-t/se-Arosjokk
 %%DATADIR%%/dvb-t/se-Arvidsjaur_Jultrask
+%%DATADIR%%/dvb-t/se-Arvika_Orshultaberget
+%%DATADIR%%/dvb-t/se-As
+%%DATADIR%%/dvb-t/se-Asele_Aslia
+%%DATADIR%%/dvb-t/se-Asmon_Sormoflo
 %%DATADIR%%/dvb-t/se-Aspeboda
 %%DATADIR%%/dvb-t/se-Atvidaberg
 %%DATADIR%%/dvb-t/se-Avesta_Krylbo
+%%DATADIR%%/dvb-t/se-Backe
 %%DATADIR%%/dvb-t/se-Backefors
 %%DATADIR%%/dvb-t/se-Bankeryd
+%%DATADIR%%/dvb-t/se-Bengtsfors
+%%DATADIR%%/dvb-t/se-Berghamn
+%%DATADIR%%/dvb-t/se-Bergshamra_Vaxtuna
 %%DATADIR%%/dvb-t/se-Bergsjo_Balleberget
 %%DATADIR%%/dvb-t/se-Bergvik
+%%DATADIR%%/dvb-t/se-Billsjo
+%%DATADIR%%/dvb-t/se-Bispfors
+%%DATADIR%%/dvb-t/se-Bjorkliden_Tornehamn
+%%DATADIR%%/dvb-t/se-Bjorksele
+%%DATADIR%%/dvb-t/se-Bjorkvattnet
+%%DATADIR%%/dvb-t/se-Bjorna
+%%DATADIR%%/dvb-t/se-Bjurberget_Hemtjarn
+%%DATADIR%%/dvb-t/se-Bjurtrask
+%%DATADIR%%/dvb-t/se-Boberg
+%%DATADIR%%/dvb-t/se-Boda_Fagerum
+%%DATADIR%%/dvb-t/se-Boden_Skogsa
+%%DATADIR%%/dvb-t/se-Bograngen
 %%DATADIR%%/dvb-t/se-Bollebygd
 %%DATADIR%%/dvb-t/se-Bollnas
+%%DATADIR%%/dvb-t/se-Bonhamn
 %%DATADIR%%/dvb-t/se-Boras_Dalsjofors
 %%DATADIR%%/dvb-t/se-Boras_Sjobo
+%%DATADIR%%/dvb-t/se-Borgafjall
+%%DATADIR%%/dvb-t/se-Borgholm_Ramsattra
+%%DATADIR%%/dvb-t/se-Borgsjobyn
+%%DATADIR%%/dvb-t/se-Borkan
 %%DATADIR%%/dvb-t/se-Borlange_Idkerberget
 %%DATADIR%%/dvb-t/se-Borlange_Nygardarna
+%%DATADIR%%/dvb-t/se-Bortansbyn_Bortan
+%%DATADIR%%/dvb-t/se-Bosebyn
+%%DATADIR%%/dvb-t/se-Botsmark
 %%DATADIR%%/dvb-t/se-Bottnaryd_Ryd
+%%DATADIR%%/dvb-t/se-Bredaker
+%%DATADIR%%/dvb-t/se-Bredbyn_Kubbe
+%%DATADIR%%/dvb-t/se-Bredbyn_Vasterfannbyn
+%%DATADIR%%/dvb-t/se-Bredsjon
 %%DATADIR%%/dvb-t/se-Bromsebro
 %%DATADIR%%/dvb-t/se-Bruzaholm
+%%DATADIR%%/dvb-t/se-Bydalen_Hovdehogen
+%%DATADIR%%/dvb-t/se-Bygdetrask
+%%DATADIR%%/dvb-t/se-Bygdsiljum
 %%DATADIR%%/dvb-t/se-Byxelkrok
 %%DATADIR%%/dvb-t/se-Dadran
+%%DATADIR%%/dvb-t/se-Dal
 %%DATADIR%%/dvb-t/se-Dalfors
+%%DATADIR%%/dvb-t/se-Dals_Langed
 %%DATADIR%%/dvb-t/se-Dalstuga
+%%DATADIR%%/dvb-t/se-Degeberga
 %%DATADIR%%/dvb-t/se-Degerfors
 %%DATADIR%%/dvb-t/se-Delary
+%%DATADIR%%/dvb-t/se-Delary_Kolaboda
 %%DATADIR%%/dvb-t/se-Djura
+%%DATADIR%%/dvb-t/se-Dorotea
 %%DATADIR%%/dvb-t/se-Drevdagen
+%%DATADIR%%/dvb-t/se-Duved
 %%DATADIR%%/dvb-t/se-Duvnas
 %%DATADIR%%/dvb-t/se-Duvnas_Basna
+%%DATADIR%%/dvb-t/se-Edane
 %%DATADIR%%/dvb-t/se-Edsbyn
+%%DATADIR%%/dvb-t/se-Edsele
+%%DATADIR%%/dvb-t/se-Edsleskog_Hogheden
+%%DATADIR%%/dvb-t/se-Eksharad_Ekesberget
+%%DATADIR%%/dvb-t/se-Ellos
 %%DATADIR%%/dvb-t/se-Emmaboda_Balshult
+%%DATADIR%%/dvb-t/se-Enafors
 %%DATADIR%%/dvb-t/se-Enviken
+%%DATADIR%%/dvb-t/se-Erikslund_Bergasen
 %%DATADIR%%/dvb-t/se-Fagersta
+%%DATADIR%%/dvb-t/se-Fagersta_Jattasen
 %%DATADIR%%/dvb-t/se-Falerum_Centrum
+%%DATADIR%%/dvb-t/se-Falkenberg_Ringsegard
+%%DATADIR%%/dvb-t/se-Faltrask
 %%DATADIR%%/dvb-t/se-Falun_Lovberget
 %%DATADIR%%/dvb-t/se-Farila
+%%DATADIR%%/dvb-t/se-Farjestaden_Algutsrum
 %%DATADIR%%/dvb-t/se-Faro_Ajkerstrask
+%%DATADIR%%/dvb-t/se-Faro_Ajkestrask
 %%DATADIR%%/dvb-t/se-Farosund_Bunge
+%%DATADIR%%/dvb-t/se-Fengersfors
 %%DATADIR%%/dvb-t/se-Filipstad_Klockarhojden
 %%DATADIR%%/dvb-t/se-Finnveden
+%%DATADIR%%/dvb-t/se-Fjal
+%%DATADIR%%/dvb-t/se-Fjallsta
+%%DATADIR%%/dvb-t/se-Flarke
+%%DATADIR%%/dvb-t/se-Floda
+%%DATADIR%%/dvb-t/se-Flurkmark
+%%DATADIR%%/dvb-t/se-Flyggsjo
+%%DATADIR%%/dvb-t/se-Flyn
+%%DATADIR%%/dvb-t/se-Folsbyn
+%%DATADIR%%/dvb-t/se-Forsed
+%%DATADIR%%/dvb-t/se-Forsmo
+%%DATADIR%%/dvb-t/se-Forsmo_Yttersel
+%%DATADIR%%/dvb-t/se-Forsnaset
+%%DATADIR%%/dvb-t/se-Frankrikegarden_Frankrike
+%%DATADIR%%/dvb-t/se-Fransta
+%%DATADIR%%/dvb-t/se-Fredrika
 %%DATADIR%%/dvb-t/se-Fredriksberg
+%%DATADIR%%/dvb-t/se-Fredros
 %%DATADIR%%/dvb-t/se-Fritsla
+%%DATADIR%%/dvb-t/se-Fullsjon
+%%DATADIR%%/dvb-t/se-Funasdalen_Funasdalsberge
+%%DATADIR%%/dvb-t/se-Funasdalen_Telestation
 %%DATADIR%%/dvb-t/se-Furudal
+%%DATADIR%%/dvb-t/se-Gaddede
 %%DATADIR%%/dvb-t/se-Gallivare
+%%DATADIR%%/dvb-t/se-Gallsatter
+%%DATADIR%%/dvb-t/se-Gardikfors
+%%DATADIR%%/dvb-t/se-Gargnas
 %%DATADIR%%/dvb-t/se-Garpenberg_Kuppgarden
 %%DATADIR%%/dvb-t/se-Gavle_Skogmur
+%%DATADIR%%/dvb-t/se-Gillhov
+%%DATADIR%%/dvb-t/se-Glimakra
 %%DATADIR%%/dvb-t/se-Gnarp
 %%DATADIR%%/dvb-t/se-Gnesta
 %%DATADIR%%/dvb-t/se-Gnosjo_Marieholm
+%%DATADIR%%/dvb-t/se-Gordalen
 %%DATADIR%%/dvb-t/se-Goteborg_Brudaremossen
 %%DATADIR%%/dvb-t/se-Goteborg_Slattadamm
+%%DATADIR%%/dvb-t/se-Graninge
+%%DATADIR%%/dvb-t/se-Grasmark
+%%DATADIR%%/dvb-t/se-Grasmyr
+%%DATADIR%%/dvb-t/se-Grebbestad
+%%DATADIR%%/dvb-t/se-Grevie
+%%DATADIR%%/dvb-t/se-Grovelsjon
+%%DATADIR%%/dvb-t/se-Grums
+%%DATADIR%%/dvb-t/se-Guliksberg
+%%DATADIR%%/dvb-t/se-Guliksberg_Rodvattnet
 %%DATADIR%%/dvb-t/se-Gullbrandstorp
+%%DATADIR%%/dvb-t/se-Gumhojden
+%%DATADIR%%/dvb-t/se-Gunnarn_Sorsjoliden
 %%DATADIR%%/dvb-t/se-Gunnarsbo
+%%DATADIR%%/dvb-t/se-Gunnarsbyn
+%%DATADIR%%/dvb-t/se-Gunnarskog
 %%DATADIR%%/dvb-t/se-Gusum
+%%DATADIR%%/dvb-t/se-Hadanberg
 %%DATADIR%%/dvb-t/se-Hagfors_Varmullsasen
+%%DATADIR%%/dvb-t/se-Hakafot
+%%DATADIR%%/dvb-t/se-Halaforsen
+%%DATADIR%%/dvb-t/se-Haljeboda
+%%DATADIR%%/dvb-t/se-Hallan
 %%DATADIR%%/dvb-t/se-Hallaryd
+%%DATADIR%%/dvb-t/se-Hallastrom
 %%DATADIR%%/dvb-t/se-Hallbo
+%%DATADIR%%/dvb-t/se-Halle
+%%DATADIR%%/dvb-t/se-Halleviksstrand
+%%DATADIR%%/dvb-t/se-Hallsjo
 %%DATADIR%%/dvb-t/se-Halmstad_Hamnen
 %%DATADIR%%/dvb-t/se-Halmstad_Oskarstrom
+%%DATADIR%%/dvb-t/se-Hamburgsund
+%%DATADIR%%/dvb-t/se-Harads
 %%DATADIR%%/dvb-t/se-Harnosand_Harnon
+%%DATADIR%%/dvb-t/se-Harrsjon
 %%DATADIR%%/dvb-t/se-Hassela
 %%DATADIR%%/dvb-t/se-Havdhem
+%%DATADIR%%/dvb-t/se-Hede
 %%DATADIR%%/dvb-t/se-Hedemora
+%%DATADIR%%/dvb-t/se-Hedenaset
+%%DATADIR%%/dvb-t/se-Helgum
 %%DATADIR%%/dvb-t/se-Helsingborg_Olympia
+%%DATADIR%%/dvb-t/se-Hemavan
+%%DATADIR%%/dvb-t/se-Hemson
+%%DATADIR%%/dvb-t/se-Henan
 %%DATADIR%%/dvb-t/se-Hennan
 %%DATADIR%%/dvb-t/se-Hestra_Aspas
 %%DATADIR%%/dvb-t/se-Hjo_Grevback
 %%DATADIR%%/dvb-t/se-Hofors
 %%DATADIR%%/dvb-t/se-Hogfors
+%%DATADIR%%/dvb-t/se-Hoglunda
 %%DATADIR%%/dvb-t/se-Hogsby_Virstad
+%%DATADIR%%/dvb-t/se-Hogvalen
+%%DATADIR%%/dvb-t/se-Holjes
+%%DATADIR%%/dvb-t/se-Hollviken_Stora_Hammar
 %%DATADIR%%/dvb-t/se-Holsbybrunn_Holsbyholm
 %%DATADIR%%/dvb-t/se-Horby_Sallerup
 %%DATADIR%%/dvb-t/se-Horken
+%%DATADIR%%/dvb-t/se-Hornon
+%%DATADIR%%/dvb-t/se-Hotagen
+%%DATADIR%%/dvb-t/se-Hoting
+%%DATADIR%%/dvb-t/se-Hovfjallet
 %%DATADIR%%/dvb-t/se-Hudiksvall_Forsa
 %%DATADIR%%/dvb-t/se-Hudiksvall_Galgberget
+%%DATADIR%%/dvb-t/se-Hummelholm
+%%DATADIR%%/dvb-t/se-Hunnebostrand
 %%DATADIR%%/dvb-t/se-Huskvarna
+%%DATADIR%%/dvb-t/se-Husum
+%%DATADIR%%/dvb-t/se-Idivuoma
 %%DATADIR%%/dvb-t/se-Idre
 %%DATADIR%%/dvb-t/se-Ingatorp
 %%DATADIR%%/dvb-t/se-Ingvallsbenning
 %%DATADIR%%/dvb-t/se-Irevik
+%%DATADIR%%/dvb-t/se-Irevik_3195
+%%DATADIR%%/dvb-t/se-Ivarsbyn
+%%DATADIR%%/dvb-t/se-Jakkvik_Frakenmyren
 %%DATADIR%%/dvb-t/se-Jamjo
+%%DATADIR%%/dvb-t/se-Jarkvissle
 %%DATADIR%%/dvb-t/se-Jarnforsen
+%%DATADIR%%/dvb-t/se-Jarpen_Mellangardsberget
 %%DATADIR%%/dvb-t/se-Jarvso
+%%DATADIR%%/dvb-t/se-Jarvtrask
+%%DATADIR%%/dvb-t/se-Joestrom
+%%DATADIR%%/dvb-t/se-Jokkmokk_Nyborg
 %%DATADIR%%/dvb-t/se-Jokkmokk_Tjalmejaure
 %%DATADIR%%/dvb-t/se-Jonkoping_Bondberget
+%%DATADIR%%/dvb-t/se-Jormvattnet
+%%DATADIR%%/dvb-t/se-Jude
+%%DATADIR%%/dvb-t/se-Junsele_Hamptjarnsberget
+%%DATADIR%%/dvb-t/se-Junsele_Vallen
+%%DATADIR%%/dvb-t/se-Kagerod_Mollarp
+%%DATADIR%%/dvb-t/se-Kalarne
+%%DATADIR%%/dvb-t/se-Kalen
 %%DATADIR%%/dvb-t/se-Kalix
+%%DATADIR%%/dvb-t/se-Kallered
+%%DATADIR%%/dvb-t/se-Kallinge_Kalleberga
+%%DATADIR%%/dvb-t/se-Kallror
+%%DATADIR%%/dvb-t/se-Kampersvik_Ekeberget
 %%DATADIR%%/dvb-t/se-Karbole
+%%DATADIR%%/dvb-t/se-Karesuando
+%%DATADIR%%/dvb-t/se-Karlanda
 %%DATADIR%%/dvb-t/se-Karlsborg_Vaberget
 %%DATADIR%%/dvb-t/se-Karlshamn
+%%DATADIR%%/dvb-t/se-Karlskrona_Jamjo
 %%DATADIR%%/dvb-t/se-Karlskrona_Vamo
 %%DATADIR%%/dvb-t/se-Karlstad_Sormon
+%%DATADIR%%/dvb-t/se-Kasta_Ringkallen
+%%DATADIR%%/dvb-t/se-Kaxas
 %%DATADIR%%/dvb-t/se-Kaxholmen_Vistakulle
 %%DATADIR%%/dvb-t/se-Kinnastrom
 %%DATADIR%%/dvb-t/se-Kiruna_Kirunavaara
 %%DATADIR%%/dvb-t/se-Kisa
+%%DATADIR%%/dvb-t/se-Klingsta
+%%DATADIR%%/dvb-t/se-Klovsjo
 %%DATADIR%%/dvb-t/se-Knared
+%%DATADIR%%/dvb-t/se-Knavland
 %%DATADIR%%/dvb-t/se-Kopmanholmen
 %%DATADIR%%/dvb-t/se-Kopparberg
+%%DATADIR%%/dvb-t/se-Koppom
+%%DATADIR%%/dvb-t/se-Korstrask
+%%DATADIR%%/dvb-t/se-Kottsjon
+%%DATADIR%%/dvb-t/se-Kovland
 %%DATADIR%%/dvb-t/se-Kramfors_Lugnvik
+%%DATADIR%%/dvb-t/se-Kramfors_Ostby
+%%DATADIR%%/dvb-t/se-Krangede
+%%DATADIR%%/dvb-t/se-Kristineberg
 %%DATADIR%%/dvb-t/se-Kristinehamn_Utsiktsberget
+%%DATADIR%%/dvb-t/se-Krokstrand
+%%DATADIR%%/dvb-t/se-Kultsjon
+%%DATADIR%%/dvb-t/se-Kungalv
 %%DATADIR%%/dvb-t/se-Kungsater
+%%DATADIR%%/dvb-t/se-Kungsbacka_Ojersbo
 %%DATADIR%%/dvb-t/se-Kungsberget_GI
+%%DATADIR%%/dvb-t/se-Kungsberget_Gl
+%%DATADIR%%/dvb-t/se-Kungshamn
+%%DATADIR%%/dvb-t/se-Kurravaara
+%%DATADIR%%/dvb-t/se-Kvarnsvedjan
+%%DATADIR%%/dvb-t/se-Kvikkjokk_Arrevare
+%%DATADIR%%/dvb-t/se-Kvikkjokk_Tavvevare
+%%DATADIR%%/dvb-t/se-Kyrkesund
+%%DATADIR%%/dvb-t/se-Lagfors
+%%DATADIR%%/dvb-t/se-Laggarberg
+%%DATADIR%%/dvb-t/se-Laisvall
+%%DATADIR%%/dvb-t/se-Langa
+%%DATADIR%%/dvb-t/se-Langsele
 %%DATADIR%%/dvb-t/se-Langshyttan
 %%DATADIR%%/dvb-t/se-Langshyttan_Engelsfors
+%%DATADIR%%/dvb-t/se-Laxsjo
+%%DATADIR%%/dvb-t/se-Laxviken
+%%DATADIR%%/dvb-t/se-Leksand_Asledsberget
 %%DATADIR%%/dvb-t/se-Leksand_Karingberget
+%%DATADIR%%/dvb-t/se-Lekvattnet
 %%DATADIR%%/dvb-t/se-Lerdala
+%%DATADIR%%/dvb-t/se-Lesjofors
+%%DATADIR%%/dvb-t/se-Liden
+%%DATADIR%%/dvb-t/se-Liden_Osterstrom
+%%DATADIR%%/dvb-t/se-Lilla_Edet
+%%DATADIR%%/dvb-t/se-Lillogda
+%%DATADIR%%/dvb-t/se-Lillpite_Bastaberget
 %%DATADIR%%/dvb-t/se-Lilltjara_Digerberget
 %%DATADIR%%/dvb-t/se-Limedsforsen
 %%DATADIR%%/dvb-t/se-Lindshammar_Ramkvilla
 %%DATADIR%%/dvb-t/se-Linkoping_Vattentornet
+%%DATADIR%%/dvb-t/se-Linsell
+%%DATADIR%%/dvb-t/se-Lit
 %%DATADIR%%/dvb-t/se-Ljugarn
+%%DATADIR%%/dvb-t/se-Ljugarn_3193
+%%DATADIR%%/dvb-t/se-Ljungaverk
+%%DATADIR%%/dvb-t/se-Ljungdalen
+%%DATADIR%%/dvb-t/se-Ljustorp
+%%DATADIR%%/dvb-t/se-Ljusvattnet
+%%DATADIR%%/dvb-t/se-Loderups_Strandbad
 %%DATADIR%%/dvb-t/se-Loffstrand
+%%DATADIR%%/dvb-t/se-Lofsdalen
+%%DATADIR%%/dvb-t/se-Logdealv
 %%DATADIR%%/dvb-t/se-Lonneberga
 %%DATADIR%%/dvb-t/se-Lorstrand
+%%DATADIR%%/dvb-t/se-Lovanger
 %%DATADIR%%/dvb-t/se-Ludvika_Bjorkasen
 %%DATADIR%%/dvb-t/se-Lumsheden_Trekanten
 %%DATADIR%%/dvb-t/se-Lycksele_Knaften
 %%DATADIR%%/dvb-t/se-Mahult
+%%DATADIR%%/dvb-t/se-Mala
 %%DATADIR%%/dvb-t/se-Malmo_Jagersro
 %%DATADIR%%/dvb-t/se-Malung
+%%DATADIR%%/dvb-t/se-Manserud
+%%DATADIR%%/dvb-t/se-Mardsjo
 %%DATADIR%%/dvb-t/se-Mariannelund
 %%DATADIR%%/dvb-t/se-Markaryd_Hualtet
 %%DATADIR%%/dvb-t/se-Matfors
+%%DATADIR%%/dvb-t/se-Matsdal
+%%DATADIR%%/dvb-t/se-Medstugan
+%%DATADIR%%/dvb-t/se-Mittadalen
+%%DATADIR%%/dvb-t/se-Mjallom
+%%DATADIR%%/dvb-t/se-Mjosjo
+%%DATADIR%%/dvb-t/se-Moliden
+%%DATADIR%%/dvb-t/se-Molnbo_Tallstugan
 %%DATADIR%%/dvb-t/se-Molndal_Vasterberget
 %%DATADIR%%/dvb-t/se-Mora_Eldris
+%%DATADIR%%/dvb-t/se-Morkret
+%%DATADIR%%/dvb-t/se-Moskosel
 %%DATADIR%%/dvb-t/se-Motala_Ervasteby
 %%DATADIR%%/dvb-t/se-Mullsjo_Torestorp
+%%DATADIR%%/dvb-t/se-Munkedal
+%%DATADIR%%/dvb-t/se-Munkfors
+%%DATADIR%%/dvb-t/se-Muodoslompolo
+%%DATADIR%%/dvb-t/se-Nalden
+%%DATADIR%%/dvb-t/se-Nasaker
+%%DATADIR%%/dvb-t/se-Nasanget
 %%DATADIR%%/dvb-t/se-Nassjo
+%%DATADIR%%/dvb-t/se-Nasteln
 %%DATADIR%%/dvb-t/se-Navekvarn
+%%DATADIR%%/dvb-t/se-Naverede_Oberget
+%%DATADIR%%/dvb-t/se-Niemisel
+%%DATADIR%%/dvb-t/se-Nordanede
+%%DATADIR%%/dvb-t/se-Nordmaling
+%%DATADIR%%/dvb-t/se-Norra_Rorum
 %%DATADIR%%/dvb-t/se-Norrahammar
+%%DATADIR%%/dvb-t/se-Norraker
+%%DATADIR%%/dvb-t/se-Norrfors
+%%DATADIR%%/dvb-t/se-Norrhassel
 %%DATADIR%%/dvb-t/se-Norrkoping_Krokek
+%%DATADIR%%/dvb-t/se-Norrtalje_Sodra
 %%DATADIR%%/dvb-t/se-Norrtalje_Sodra_Bergen
+%%DATADIR%%/dvb-t/se-Norsjovallen
+%%DATADIR%%/dvb-t/se-Nyhem
 %%DATADIR%%/dvb-t/se-Nykoping
+%%DATADIR%%/dvb-t/se-Nyliden
+%%DATADIR%%/dvb-t/se-Nynashamn_Vattentornet
+%%DATADIR%%/dvb-t/se-Odsmal
+%%DATADIR%%/dvb-t/se-Olden_Telestation
+%%DATADIR%%/dvb-t/se-Olkamangi
+%%DATADIR%%/dvb-t/se-Olofstrom
 %%DATADIR%%/dvb-t/se-Orebro_Lockhyttan
+%%DATADIR%%/dvb-t/se-Orkelljunga
 %%DATADIR%%/dvb-t/se-Ornskoldsvik_As
 %%DATADIR%%/dvb-t/se-Oskarshamn
+%%DATADIR%%/dvb-t/se-Osmo_Bjorsta
+%%DATADIR%%/dvb-t/se-Osterforse
+%%DATADIR%%/dvb-t/se-Ostergraninge
 %%DATADIR%%/dvb-t/se-Ostersund_Brattasen
 %%DATADIR%%/dvb-t/se-Osthammar_Valo
+%%DATADIR%%/dvb-t/se-Ostmark
+%%DATADIR%%/dvb-t/se-Overammer
+%%DATADIR%%/dvb-t/se-Overhogdal
 %%DATADIR%%/dvb-t/se-Overkalix
+%%DATADIR%%/dvb-t/se-Overklinten
+%%DATADIR%%/dvb-t/se-Overrissjo
+%%DATADIR%%/dvb-t/se-Overtornea_Sarkivaara
+%%DATADIR%%/dvb-t/se-Overturingen
 %%DATADIR%%/dvb-t/se-Oxberg
 %%DATADIR%%/dvb-t/se-Pajala
 %%DATADIR%%/dvb-t/se-Paulistom
+%%DATADIR%%/dvb-t/se-Paulistrom
+%%DATADIR%%/dvb-t/se-Pilgrimstad
+%%DATADIR%%/dvb-t/se-Porjus
+%%DATADIR%%/dvb-t/se-Puoltsa
+%%DATADIR%%/dvb-t/se-Ragunda
+%%DATADIR%%/dvb-t/se-Ramsele_Skavasen
+%%DATADIR%%/dvb-t/se-Ramsjo
+%%DATADIR%%/dvb-t/se-Ramundberget
+%%DATADIR%%/dvb-t/se-Randalen
+%%DATADIR%%/dvb-t/se-Randijaure
+%%DATADIR%%/dvb-t/se-Ransater
 %%DATADIR%%/dvb-t/se-Rattvik
 %%DATADIR%%/dvb-t/se-Rengsjo
+%%DATADIR%%/dvb-t/se-Renstrom
+%%DATADIR%%/dvb-t/se-Resele
+%%DATADIR%%/dvb-t/se-Risback
+%%DATADIR%%/dvb-t/se-Rissna
+%%DATADIR%%/dvb-t/se-Ritsem
+%%DATADIR%%/dvb-t/se-Robertsfors
+%%DATADIR%%/dvb-t/se-Rojdafors
+%%DATADIR%%/dvb-t/se-Ronnang
 %%DATADIR%%/dvb-t/se-Rorbacksnas
+%%DATADIR%%/dvb-t/se-Rosson
+%%DATADIR%%/dvb-t/se-Rusksele
+%%DATADIR%%/dvb-t/se-Sadvaluspen
 %%DATADIR%%/dvb-t/se-Sagmyra
+%%DATADIR%%/dvb-t/se-Saivomuotka
 %%DATADIR%%/dvb-t/se-Salen
 %%DATADIR%%/dvb-t/se-Salfjallet
 %%DATADIR%%/dvb-t/se-Sarna_Mickeltemplet
 %%DATADIR%%/dvb-t/se-Satila
+%%DATADIR%%/dvb-t/se-Savar_Sorbyn
+%%DATADIR%%/dvb-t/se-Savast
 %%DATADIR%%/dvb-t/se-Saxdalen
+%%DATADIR%%/dvb-t/se-Seitevaare
+%%DATADIR%%/dvb-t/se-Selanger
+%%DATADIR%%/dvb-t/se-Seltjarn
+%%DATADIR%%/dvb-t/se-Sidensjo_Aberget
 %%DATADIR%%/dvb-t/se-Siljansnas_Uvberget
+%%DATADIR%%/dvb-t/se-Simrishamn_Fabriksgatan
+%%DATADIR%%/dvb-t/se-Skalan
+%%DATADIR%%/dvb-t/se-Skalmsjo
 %%DATADIR%%/dvb-t/se-Skarstad
+%%DATADIR%%/dvb-t/se-Skarvangen
 %%DATADIR%%/dvb-t/se-Skattungbyn
+%%DATADIR%%/dvb-t/se-Skaulo_Pyhakielinen
 %%DATADIR%%/dvb-t/se-Skelleftea
 %%DATADIR%%/dvb-t/se-Skene_Nycklarberget
+%%DATADIR%%/dvb-t/se-Skillingsfors
+%%DATADIR%%/dvb-t/se-Skorped
+%%DATADIR%%/dvb-t/se-Skottsund
 %%DATADIR%%/dvb-t/se-Skovde
+%%DATADIR%%/dvb-t/se-Skroven
+%%DATADIR%%/dvb-t/se-Skymnas
+%%DATADIR%%/dvb-t/se-Slussfors
 %%DATADIR%%/dvb-t/se-Smedjebacken_Uvberget
 %%DATADIR%%/dvb-t/se-Soderhamn
 %%DATADIR%%/dvb-t/se-Soderkoping
 %%DATADIR%%/dvb-t/se-Sodertalje_Ragnhildsborg
 %%DATADIR%%/dvb-t/se-Solleftea_Hallsta
 %%DATADIR%%/dvb-t/se-Solleftea_Multra
+%%DATADIR%%/dvb-t/se-Soraker
+%%DATADIR%%/dvb-t/se-Sorbygden
+%%DATADIR%%/dvb-t/se-Sorflarke
+%%DATADIR%%/dvb-t/se-Sorsele_Nalovardo
+%%DATADIR%%/dvb-t/se-Sorsele_Vattentornet
 %%DATADIR%%/dvb-t/se-Sorsjon
+%%DATADIR%%/dvb-t/se-Soukolojarvi
+%%DATADIR%%/dvb-t/se-Stalon
+%%DATADIR%%/dvb-t/se-Stigsjo
 %%DATADIR%%/dvb-t/se-Stockholm_Marieberg
 %%DATADIR%%/dvb-t/se-Stockholm_Nacka
+%%DATADIR%%/dvb-t/se-Stode_Hullsjon
+%%DATADIR%%/dvb-t/se-Stode_Intaget
+%%DATADIR%%/dvb-t/se-Stomne_Skasas
 %%DATADIR%%/dvb-t/se-Stora_Skedvi
+%%DATADIR%%/dvb-t/se-Stordalen
 %%DATADIR%%/dvb-t/se-Storfjaten
+%%DATADIR%%/dvb-t/se-Storlien
 %%DATADIR%%/dvb-t/se-Storuman
 %%DATADIR%%/dvb-t/se-Stromstad
+%%DATADIR%%/dvb-t/se-Stromsund_Grelsgard
+%%DATADIR%%/dvb-t/se-Stugun
 %%DATADIR%%/dvb-t/se-Styrsjobo
+%%DATADIR%%/dvb-t/se-Suddesjaur
+%%DATADIR%%/dvb-t/se-Suijavaara
+%%DATADIR%%/dvb-t/se-Sulvik
 %%DATADIR%%/dvb-t/se-Sundborn
 %%DATADIR%%/dvb-t/se-Sundsbruk
 %%DATADIR%%/dvb-t/se-Sundsvall_S_Stadsberget
+%%DATADIR%%/dvb-t/se-Sunne_As
 %%DATADIR%%/dvb-t/se-Sunne_Blabarskullen
+%%DATADIR%%/dvb-t/se-Sunnemo
+%%DATADIR%%/dvb-t/se-Svaneholm
+%%DATADIR%%/dvb-t/se-Svanstein
+%%DATADIR%%/dvb-t/se-Svardsosund_Svardso
 %%DATADIR%%/dvb-t/se-Svartnas
 %%DATADIR%%/dvb-t/se-Sveg_Brickan
+%%DATADIR%%/dvb-t/se-Sveg_Ransjo
+%%DATADIR%%/dvb-t/se-Svenstavik
+%%DATADIR%%/dvb-t/se-Svinesund
+%%DATADIR%%/dvb-t/se-Syssleback
 %%DATADIR%%/dvb-t/se-Taberg
 %%DATADIR%%/dvb-t/se-Tandadalen
+%%DATADIR%%/dvb-t/se-Tannas_Vastra
+%%DATADIR%%/dvb-t/se-Tanndalen
+%%DATADIR%%/dvb-t/se-Tarnaby_Ryfjallet
+%%DATADIR%%/dvb-t/se-Tarnamo
 %%DATADIR%%/dvb-t/se-Tasjo
+%%DATADIR%%/dvb-t/se-Tavelsjo
+%%DATADIR%%/dvb-t/se-Tocksfors
 %%DATADIR%%/dvb-t/se-Tollsjo
+%%DATADIR%%/dvb-t/se-Tormestorp
+%%DATADIR%%/dvb-t/se-Tornetrask
+%%DATADIR%%/dvb-t/se-Torpshammar
 %%DATADIR%%/dvb-t/se-Torsby_Bada
 %%DATADIR%%/dvb-t/se-Tranas_Bredkarr
 %%DATADIR%%/dvb-t/se-Tranemo
 %%DATADIR%%/dvb-t/se-Transtrand_Bolheden
 %%DATADIR%%/dvb-t/se-Traryd_Betas
+%%DATADIR%%/dvb-t/se-Trehorningsjo
+%%DATADIR%%/dvb-t/se-Trelleborg_Gylle
 %%DATADIR%%/dvb-t/se-Trollhattan
 %%DATADIR%%/dvb-t/se-Trosa
+%%DATADIR%%/dvb-t/se-Tullinge_Hamra
+%%DATADIR%%/dvb-t/se-Tyringe
 %%DATADIR%%/dvb-t/se-Tystberga
 %%DATADIR%%/dvb-t/se-Uddevalla_Herrestad
+%%DATADIR%%/dvb-t/se-Uddevalla_Kapelle
+%%DATADIR%%/dvb-t/se-Uggleheden
+%%DATADIR%%/dvb-t/se-Ullanger_Skidsta
 %%DATADIR%%/dvb-t/se-Ullared
 %%DATADIR%%/dvb-t/se-Ulricehamn
+%%DATADIR%%/dvb-t/se-Ulvohamn
 %%DATADIR%%/dvb-t/se-Ulvshyttan_Porjus
+%%DATADIR%%/dvb-t/se-Umea_Mariehem
+%%DATADIR%%/dvb-t/se-Umfors
+%%DATADIR%%/dvb-t/se-Umgransele_Granselelund
+%%DATADIR%%/dvb-t/se-Undersaker
 %%DATADIR%%/dvb-t/se-Uppsala_Rickomberga
 %%DATADIR%%/dvb-t/se-Uppsala_Vedyxa
+%%DATADIR%%/dvb-t/se-Utansjo
+%%DATADIR%%/dvb-t/se-Utanskog
 %%DATADIR%%/dvb-t/se-Vaddo_Elmsta
+%%DATADIR%%/dvb-t/se-Valadalen
+%%DATADIR%%/dvb-t/se-Valanger
 %%DATADIR%%/dvb-t/se-Valdemarsvik
+%%DATADIR%%/dvb-t/se-Valsjobyn
 %%DATADIR%%/dvb-t/se-Vannas_Granlundsberget
 %%DATADIR%%/dvb-t/se-Vansbro_Hummelberget
 %%DATADIR%%/dvb-t/se-Varberg_Grimeton
+%%DATADIR%%/dvb-t/se-Varmvattnet
+%%DATADIR%%/dvb-t/se-Varnamo_Alandsryd
+%%DATADIR%%/dvb-t/se-Vassbotten
+%%DATADIR%%/dvb-t/se-Vassijaure
+%%DATADIR%%/dvb-t/se-Vastansjo
 %%DATADIR%%/dvb-t/se-Vasteras_Lillharad
 %%DATADIR%%/dvb-t/se-Vastervik_Farhult
+%%DATADIR%%/dvb-t/se-Vato
 %%DATADIR%%/dvb-t/se-Vaxbo
+%%DATADIR%%/dvb-t/se-Vemdalsskalet
 %%DATADIR%%/dvb-t/se-Vessigebro
 %%DATADIR%%/dvb-t/se-Vetlanda_Nye
+%%DATADIR%%/dvb-t/se-Vidsel
+%%DATADIR%%/dvb-t/se-Vietas
 %%DATADIR%%/dvb-t/se-Vikmanshyttan
+%%DATADIR%%/dvb-t/se-Viksjo
+%%DATADIR%%/dvb-t/se-Vilhelmina
+%%DATADIR%%/dvb-t/se-Villands_Vanga
+%%DATADIR%%/dvb-t/se-Vindelgransele
+%%DATADIR%%/dvb-t/se-Vindeln_Renfors
 %%DATADIR%%/dvb-t/se-Virserum
 %%DATADIR%%/dvb-t/se-Visby_Follingbo
 %%DATADIR%%/dvb-t/se-Visby_Hamnen
+%%DATADIR%%/dvb-t/se-Visby_Havdhem
 %%DATADIR%%/dvb-t/se-Visingso
 %%DATADIR%%/dvb-t/se-Vislanda_Nydala
+%%DATADIR%%/dvb-t/se-Vitberget
+%%DATADIR%%/dvb-t/se-Vitsand
+%%DATADIR%%/dvb-t/se-Vitsand_Vagsjofors
 %%DATADIR%%/dvb-t/se-Voxna
+%%DATADIR%%/dvb-t/se-Vuollerim
 %%DATADIR%%/dvb-t/se-Ystad_Metallgatan
 %%DATADIR%%/dvb-t/se-Yttermalung
 %%DATADIR%%/dvb-t/si-Ljubljana
@@ -833,7 +1238,7 @@
 %%DATADIR%%/dvb-t/sk-Zilina
 %%DATADIR%%/dvb-t/tw-All
 %%DATADIR%%/dvb-t/ua-Kharkov
-%%DATADIR%%/dvb-t/ua-Kiev
+%%DATADIR%%/dvb-t/ua-Kyiv
 %%DATADIR%%/dvb-t/ua-Lozovaya
 %%DATADIR%%/dvb-t/ua-Odessa
 %%DATADIR%%/dvb-t/ug-All
@@ -920,195 +1325,1300 @@
 %%DATADIR%%/dvb-t/uk-WinterHill
 %%DATADIR%%/dvb-t/vn-Hanoi
 %%DATADIR%%/dvb-t/vn-Thaibinh
-%%DATADIR%%/dvbv5_dvb-t/fi-Aanekoski
-%%DATADIR%%/dvbv5_dvb-t/fi-Aanekoski_Konginkangas
-%%DATADIR%%/dvbv5_dvb-t/fi-Ahtari
-%%DATADIR%%/dvbv5_dvb-t/fi-Alajarvi
-%%DATADIR%%/dvbv5_dvb-t/fi-Anjalankoski_Ruotila
-%%DATADIR%%/dvbv5_dvb-t/fi-Enontekio_Ahovaara
-%%DATADIR%%/dvbv5_dvb-t/fi-Enontekio_Hetta
-%%DATADIR%%/dvbv5_dvb-t/fi-Enontekio_Kuttanen
-%%DATADIR%%/dvbv5_dvb-t/fi-Espoo
-%%DATADIR%%/dvbv5_dvb-t/fi-Eurajoki
-%%DATADIR%%/dvbv5_dvb-t/fi-Fiskars
-%%DATADIR%%/dvbv5_dvb-t/fi-Haapavesi
-%%DATADIR%%/dvbv5_dvb-t/fi-Hameenkyro_Kyroskoski
-%%DATADIR%%/dvbv5_dvb-t/fi-Hameenlinna_Painokangas
-%%DATADIR%%/dvbv5_dvb-t/fi-Hanko
-%%DATADIR%%/dvbv5_dvb-t/fi-Hartola
-%%DATADIR%%/dvbv5_dvb-t/fi-Heinavesi
-%%DATADIR%%/dvbv5_dvb-t/fi-Heinola
-%%DATADIR%%/dvbv5_dvb-t/fi-Hyrynsalmi
-%%DATADIR%%/dvbv5_dvb-t/fi-Hyrynsalmi_Kyparavaara
-%%DATADIR%%/dvbv5_dvb-t/fi-Hyrynsalmi_Paljakka
-%%DATADIR%%/dvbv5_dvb-t/fi-Hyvinkaa
-%%DATADIR%%/dvbv5_dvb-t/fi-Ii_Raiskio
-%%DATADIR%%/dvbv5_dvb-t/fi-Iisalmi
-%%DATADIR%%/dvbv5_dvb-t/fi-Ikaalinen
-%%DATADIR%%/dvbv5_dvb-t/fi-Ikaalinen_Riitiala
-%%DATADIR%%/dvbv5_dvb-t/fi-Inari
-%%DATADIR%%/dvbv5_dvb-t/fi-Inari_Janispaa
-%%DATADIR%%/dvbv5_dvb-t/fi-Inari_Naatamo
-%%DATADIR%%/dvbv5_dvb-t/fi-Ivalo_Saarineitamovaara
-%%DATADIR%%/dvbv5_dvb-t/fi-Jalasjarvi
-%%DATADIR%%/dvbv5_dvb-t/fi-Jamsa_Halli
-%%DATADIR%%/dvbv5_dvb-t/fi-Jamsa_Kaipola
-%%DATADIR%%/dvbv5_dvb-t/fi-Jamsa_Matkosvuori
-%%DATADIR%%/dvbv5_dvb-t/fi-Jamsa_Ouninpohja
-%%DATADIR%%/dvbv5_dvb-t/fi-Jamsankoski
-%%DATADIR%%/dvbv5_dvb-t/fi-Joensuu_Vestinkallio
-%%DATADIR%%/dvbv5_dvb-t/fi-Joroinen_Puukkola
-%%DATADIR%%/dvbv5_dvb-t/fi-Joutsa_Lankia
-%%DATADIR%%/dvbv5_dvb-t/fi-Joutseno
-%%DATADIR%%/dvbv5_dvb-t/fi-Juupajoki_Kopsamo
-%%DATADIR%%/dvbv5_dvb-t/fi-Juva
-%%DATADIR%%/dvbv5_dvb-t/fi-Jyvaskyla
-%%DATADIR%%/dvbv5_dvb-t/fi-Jyvaskyla_Vaajakoski
-%%DATADIR%%/dvbv5_dvb-t/fi-Kaavi_Sivakkavaara
-%%DATADIR%%/dvbv5_dvb-t/fi-Kajaani_Pollyvaara
-%%DATADIR%%/dvbv5_dvb-t/fi-Kalajoki
-%%DATADIR%%/dvbv5_dvb-t/fi-Kangaslampi
-%%DATADIR%%/dvbv5_dvb-t/fi-Kangasniemi_Turkinmaki
-%%DATADIR%%/dvbv5_dvb-t/fi-Kankaanpaa
-%%DATADIR%%/dvbv5_dvb-t/fi-Karigasniemi
-%%DATADIR%%/dvbv5_dvb-t/fi-Karkkila
-%%DATADIR%%/dvbv5_dvb-t/fi-Karstula
-%%DATADIR%%/dvbv5_dvb-t/fi-Karvia
-%%DATADIR%%/dvbv5_dvb-t/fi-Kaunispaa
-%%DATADIR%%/dvbv5_dvb-t/fi-Kemijarvi_Suomutunturi
-%%DATADIR%%/dvbv5_dvb-t/fi-Kerimaki
-%%DATADIR%%/dvbv5_dvb-t/fi-Keuruu
-%%DATADIR%%/dvbv5_dvb-t/fi-Keuruu_Haapamaki
-%%DATADIR%%/dvbv5_dvb-t/fi-Kihnio
-%%DATADIR%%/dvbv5_dvb-t/fi-Kiihtelysvaara
-%%DATADIR%%/dvbv5_dvb-t/fi-Kilpisjarvi
-%%DATADIR%%/dvbv5_dvb-t/fi-Kittila_Levitunturi
-%%DATADIR%%/dvbv5_dvb-t/fi-Kolari_Vuolittaja
-%%DATADIR%%/dvbv5_dvb-t/fi-Koli
-%%DATADIR%%/dvbv5_dvb-t/fi-Korpilahti_Vaarunvuori
-%%DATADIR%%/dvbv5_dvb-t/fi-Korppoo
-%%DATADIR%%/dvbv5_dvb-t/fi-Kruunupyy
-%%DATADIR%%/dvbv5_dvb-t/fi-Kuhmo_Haukela
-%%DATADIR%%/dvbv5_dvb-t/fi-Kuhmo_Lentiira
-%%DATADIR%%/dvbv5_dvb-t/fi-Kuhmo_Niva
-%%DATADIR%%/dvbv5_dvb-t/fi-Kuhmoinen
-%%DATADIR%%/dvbv5_dvb-t/fi-Kuhmoinen_Harjunsalmi
-%%DATADIR%%/dvbv5_dvb-t/fi-Kuhmoinen_Puukkoinen
-%%DATADIR%%/dvbv5_dvb-t/fi-Kuopio
-%%DATADIR%%/dvbv5_dvb-t/fi-Kurikka_Kesti
-%%DATADIR%%/dvbv5_dvb-t/fi-Kustavi_Viherlahti
-%%DATADIR%%/dvbv5_dvb-t/fi-Kuusamo_Hamppulampi
-%%DATADIR%%/dvbv5_dvb-t/fi-Kyyjarvi_Noposenaho
-%%DATADIR%%/dvbv5_dvb-t/fi-Lahti
-%%DATADIR%%/dvbv5_dvb-t/fi-Lapua
-%%DATADIR%%/dvbv5_dvb-t/fi-Laukaa
-%%DATADIR%%/dvbv5_dvb-t/fi-Laukaa_Vihtavuori
-%%DATADIR%%/dvbv5_dvb-t/fi-Lavia
-%%DATADIR%%/dvbv5_dvb-t/fi-Lohja
-%%DATADIR%%/dvbv5_dvb-t/fi-Loimaa
-%%DATADIR%%/dvbv5_dvb-t/fi-Luhanka
-%%DATADIR%%/dvbv5_dvb-t/fi-Luopioinen
-%%DATADIR%%/dvbv5_dvb-t/fi-Mantta
-%%DATADIR%%/dvbv5_dvb-t/fi-Mantyharju
-%%DATADIR%%/dvbv5_dvb-t/fi-Mikkeli
-%%DATADIR%%/dvbv5_dvb-t/fi-Muonio_Olostunturi
-%%DATADIR%%/dvbv5_dvb-t/fi-Nilsia
-%%DATADIR%%/dvbv5_dvb-t/fi-Nilsia_Keski-Siikajarvi
-%%DATADIR%%/dvbv5_dvb-t/fi-Nilsia_Pisa
-%%DATADIR%%/dvbv5_dvb-t/fi-Nokia
-%%DATADIR%%/dvbv5_dvb-t/fi-Nokia_Siuro
-%%DATADIR%%/dvbv5_dvb-t/fi-Nummi-Pusula_Hyonola
-%%DATADIR%%/dvbv5_dvb-t/fi-Nuorgam_Njallavaara
-%%DATADIR%%/dvbv5_dvb-t/fi-Nuorgam_raja
-%%DATADIR%%/dvbv5_dvb-t/fi-Nurmes_Konnanvaara
-%%DATADIR%%/dvbv5_dvb-t/fi-Nurmes_Kortevaara
-%%DATADIR%%/dvbv5_dvb-t/fi-Orivesi_Talviainen
-%%DATADIR%%/dvbv5_dvb-t/fi-Oulu
-%%DATADIR%%/dvbv5_dvb-t/fi-Padasjoki
-%%DATADIR%%/dvbv5_dvb-t/fi-Padasjoki_Arrakoski
-%%DATADIR%%/dvbv5_dvb-t/fi-Paltamo_Kivesvaara
-%%DATADIR%%/dvbv5_dvb-t/fi-Parainen_Houtskari
-%%DATADIR%%/dvbv5_dvb-t/fi-Parikkala
-%%DATADIR%%/dvbv5_dvb-t/fi-Parkano_Sopukallio
-%%DATADIR%%/dvbv5_dvb-t/fi-Pello
-%%DATADIR%%/dvbv5_dvb-t/fi-Pello_Ratasvaara
-%%DATADIR%%/dvbv5_dvb-t/fi-Perho
-%%DATADIR%%/dvbv5_dvb-t/fi-Pernaja
-%%DATADIR%%/dvbv5_dvb-t/fi-Pieksamaki_Halkokumpu
-%%DATADIR%%/dvbv5_dvb-t/fi-Pihtipudas
-%%DATADIR%%/dvbv5_dvb-t/fi-Porvoo_Suomenkyla
-%%DATADIR%%/dvbv5_dvb-t/fi-Posio
-%%DATADIR%%/dvbv5_dvb-t/fi-Pudasjarvi
-%%DATADIR%%/dvbv5_dvb-t/fi-Pudasjarvi_Iso-Syote
-%%DATADIR%%/dvbv5_dvb-t/fi-Pudasjarvi_Kangasvaara
-%%DATADIR%%/dvbv5_dvb-t/fi-Puolanka
-%%DATADIR%%/dvbv5_dvb-t/fi-Pyhatunturi
-%%DATADIR%%/dvbv5_dvb-t/fi-Pyhavuori
-%%DATADIR%%/dvbv5_dvb-t/fi-Pylkonmaki_Karankajarvi
-%%DATADIR%%/dvbv5_dvb-t/fi-Raahe_Mestauskallio
-%%DATADIR%%/dvbv5_dvb-t/fi-Raahe_Piehinki
-%%DATADIR%%/dvbv5_dvb-t/fi-Ranua_Haasionmaa
-%%DATADIR%%/dvbv5_dvb-t/fi-Ranua_Leppiaho
-%%DATADIR%%/dvbv5_dvb-t/fi-Rautavaara_Angervikko
-%%DATADIR%%/dvbv5_dvb-t/fi-Rautjarvi_Simpele
-%%DATADIR%%/dvbv5_dvb-t/fi-Ristijarvi
-%%DATADIR%%/dvbv5_dvb-t/fi-Rovaniemi
-%%DATADIR%%/dvbv5_dvb-t/fi-Rovaniemi_Kaihuanvaara
-%%DATADIR%%/dvbv5_dvb-t/fi-Rovaniemi_Karhuvaara
-%%DATADIR%%/dvbv5_dvb-t/fi-Rovaniemi_Marasenkallio
-%%DATADIR%%/dvbv5_dvb-t/fi-Rovaniemi_Rantalaki
-%%DATADIR%%/dvbv5_dvb-t/fi-Rovaniemi_Sonka
-%%DATADIR%%/dvbv5_dvb-t/fi-Rovaniemi_Sorviselka
-%%DATADIR%%/dvbv5_dvb-t/fi-Ruka
-%%DATADIR%%/dvbv5_dvb-t/fi-Ruovesi_Storminiemi
-%%DATADIR%%/dvbv5_dvb-t/fi-Saarijarvi
-%%DATADIR%%/dvbv5_dvb-t/fi-Saarijarvi_Kalmari
-%%DATADIR%%/dvbv5_dvb-t/fi-Saarijarvi_Mahlu
-%%DATADIR%%/dvbv5_dvb-t/fi-Salla_Hirvasvaara
-%%DATADIR%%/dvbv5_dvb-t/fi-Salla_Ihistysjanka
-%%DATADIR%%/dvbv5_dvb-t/fi-Salla_Naruska
-%%DATADIR%%/dvbv5_dvb-t/fi-Salla_Sallatunturi
-%%DATADIR%%/dvbv5_dvb-t/fi-Salla_Sarivaara
-%%DATADIR%%/dvbv5_dvb-t/fi-Salo_Isokyla
-%%DATADIR%%/dvbv5_dvb-t/fi-Savukoski_Martti
-%%DATADIR%%/dvbv5_dvb-t/fi-Savukoski_Tanhua
-%%DATADIR%%/dvbv5_dvb-t/fi-Siilinjarvi
-%%DATADIR%%/dvbv5_dvb-t/fi-Simo_Viantie
-%%DATADIR%%/dvbv5_dvb-t/fi-Sipoo_Norrkulla
-%%DATADIR%%/dvbv5_dvb-t/fi-Sodankyla_Pittiovaara
-%%DATADIR%%/dvbv5_dvb-t/fi-Sodankyla_Vuotso
-%%DATADIR%%/dvbv5_dvb-t/fi-Sulkava_Vaatalanmaki
-%%DATADIR%%/dvbv5_dvb-t/fi-Suomussalmi_Ala-Vuokki
-%%DATADIR%%/dvbv5_dvb-t/fi-Suomussalmi_Ammansaari
-%%DATADIR%%/dvbv5_dvb-t/fi-Suomussalmi_Juntusranta
-%%DATADIR%%/dvbv5_dvb-t/fi-Suomussalmi_Myllylahti
-%%DATADIR%%/dvbv5_dvb-t/fi-Sysma_Liikola
-%%DATADIR%%/dvbv5_dvb-t/fi-Taivalkoski
-%%DATADIR%%/dvbv5_dvb-t/fi-Taivalkoski_Taivalvaara
-%%DATADIR%%/dvbv5_dvb-t/fi-Tammela
-%%DATADIR%%/dvbv5_dvb-t/fi-Tammisaari
-%%DATADIR%%/dvbv5_dvb-t/fi-Tampere
-%%DATADIR%%/dvbv5_dvb-t/fi-Tampere_Pyynikki
-%%DATADIR%%/dvbv5_dvb-t/fi-Tervola
-%%DATADIR%%/dvbv5_dvb-t/fi-Turku
-%%DATADIR%%/dvbv5_dvb-t/fi-Utsjoki
-%%DATADIR%%/dvbv5_dvb-t/fi-Utsjoki_Nuvvus
-%%DATADIR%%/dvbv5_dvb-t/fi-Utsjoki_Outakoski
-%%DATADIR%%/dvbv5_dvb-t/fi-Utsjoki_Polvarniemi
-%%DATADIR%%/dvbv5_dvb-t/fi-Utsjoki_Rovisuvanto
-%%DATADIR%%/dvbv5_dvb-t/fi-Utsjoki_Tenola
-%%DATADIR%%/dvbv5_dvb-t/fi-Uusikaupunki_Orivo
-%%DATADIR%%/dvbv5_dvb-t/fi-Vaala
-%%DATADIR%%/dvbv5_dvb-t/fi-Vaasa
-%%DATADIR%%/dvbv5_dvb-t/fi-Valtimo
-%%DATADIR%%/dvbv5_dvb-t/fi-Vammala_Jyranvuori
-%%DATADIR%%/dvbv5_dvb-t/fi-Vammala_Roismala
-%%DATADIR%%/dvbv5_dvb-t/fi-Vammala_Savi
-%%DATADIR%%/dvbv5_dvb-t/fi-Vantaa_Hakunila
-%%DATADIR%%/dvbv5_dvb-t/fi-Varpaisjarvi_Honkamaki
-%%DATADIR%%/dvbv5_dvb-t/fi-Virrat_Lappavuori
-%%DATADIR%%/dvbv5_dvb-t/fi-Vuokatti
-%%DATADIR%%/dvbv5_dvb-t/fi-Ylitornio_Ainiovaara
-%%DATADIR%%/dvbv5_dvb-t/fi-Ylitornio_Raanujarvi
-%%DATADIR%%/dvbv5_dvb-t/fi-Yllas
-%%DATADIR%%/dvbv5_dvb-t/fi-Yllasjarvi
+%%DATADIR%%/isdb-t/ar-Argentina
+%%DATADIR%%/isdb-t/br-Brazil
+%%DATADIR%%/isdb-t/br-ac-Bujari
+%%DATADIR%%/isdb-t/br-ac-PortoAcre
+%%DATADIR%%/isdb-t/br-ac-RioBranco
+%%DATADIR%%/isdb-t/br-ac-SenadorGuiomard
+%%DATADIR%%/isdb-t/br-al-Arapiraca
+%%DATADIR%%/isdb-t/br-al-BocaDaMata
+%%DATADIR%%/isdb-t/br-al-Coruripe
+%%DATADIR%%/isdb-t/br-al-Craibas
+%%DATADIR%%/isdb-t/br-al-DelmiroGouveia
+%%DATADIR%%/isdb-t/br-al-FeiraGrande
+%%DATADIR%%/isdb-t/br-al-GirauDoPonciano
+%%DATADIR%%/isdb-t/br-al-Junqueiro
+%%DATADIR%%/isdb-t/br-al-Maceio
+%%DATADIR%%/isdb-t/br-al-Maragogi
+%%DATADIR%%/isdb-t/br-al-MatrizDeCamaragibe
+%%DATADIR%%/isdb-t/br-al-PalmeiraDosIndios
+%%DATADIR%%/isdb-t/br-al-PaoDeAcucar
+%%DATADIR%%/isdb-t/br-al-Penedo
+%%DATADIR%%/isdb-t/br-al-Piranhas
+%%DATADIR%%/isdb-t/br-al-PortoCalvo
+%%DATADIR%%/isdb-t/br-al-RioLargo
+%%DATADIR%%/isdb-t/br-al-Roteiro
+%%DATADIR%%/isdb-t/br-al-SaoSebastiao
+%%DATADIR%%/isdb-t/br-al-UniaoDosPalmares
+%%DATADIR%%/isdb-t/br-am-BocaDoAcre
+%%DATADIR%%/isdb-t/br-am-Borba
+%%DATADIR%%/isdb-t/br-am-CareiroDaVarzea
+%%DATADIR%%/isdb-t/br-am-Coari
+%%DATADIR%%/isdb-t/br-am-Iranduba
+%%DATADIR%%/isdb-t/br-am-Itacoatiara
+%%DATADIR%%/isdb-t/br-am-Labrea
+%%DATADIR%%/isdb-t/br-am-Manaus
+%%DATADIR%%/isdb-t/br-am-Parintins
+%%DATADIR%%/isdb-t/br-am-SaoGabrielDaCachoeira
+%%DATADIR%%/isdb-t/br-am-Tefe
+%%DATADIR%%/isdb-t/br-ap-Macapa
+%%DATADIR%%/isdb-t/br-ap-Santana
+%%DATADIR%%/isdb-t/br-ba-Alagoinhas
+%%DATADIR%%/isdb-t/br-ba-Alcobaca
+%%DATADIR%%/isdb-t/br-ba-Amargosa
+%%DATADIR%%/isdb-t/br-ba-AmeliaRodrigues
+%%DATADIR%%/isdb-t/br-ba-Anage
+%%DATADIR%%/isdb-t/br-ba-Anguera
+%%DATADIR%%/isdb-t/br-ba-AntonioCardoso
+%%DATADIR%%/isdb-t/br-ba-Aracatu
+%%DATADIR%%/isdb-t/br-ba-Araci
+%%DATADIR%%/isdb-t/br-ba-BaixaGrande
+%%DATADIR%%/isdb-t/br-ba-Barra
+%%DATADIR%%/isdb-t/br-ba-BarraDoChoca
+%%DATADIR%%/isdb-t/br-ba-Barreiras
+%%DATADIR%%/isdb-t/br-ba-Barrocas
+%%DATADIR%%/isdb-t/br-ba-BeloCampo
+%%DATADIR%%/isdb-t/br-ba-Biritinga
+%%DATADIR%%/isdb-t/br-ba-BomJesusDaLapa
+%%DATADIR%%/isdb-t/br-ba-Brejoes
+%%DATADIR%%/isdb-t/br-ba-Brumado
+%%DATADIR%%/isdb-t/br-ba-Caetite
+%%DATADIR%%/isdb-t/br-ba-Camacan
+%%DATADIR%%/isdb-t/br-ba-Camacari
+%%DATADIR%%/isdb-t/br-ba-CamacariMonteGordoguarajuba
+%%DATADIR%%/isdb-t/br-ba-Camamu
+%%DATADIR%%/isdb-t/br-ba-CampoFormoso
+%%DATADIR%%/isdb-t/br-ba-Canavieiras
+%%DATADIR%%/isdb-t/br-ba-Candeal
+%%DATADIR%%/isdb-t/br-ba-Candeias
+%%DATADIR%%/isdb-t/br-ba-CandidoSales
+%%DATADIR%%/isdb-t/br-ba-CapimGrosso
+%%DATADIR%%/isdb-t/br-ba-Caraibas
+%%DATADIR%%/isdb-t/br-ba-CasaNova
+%%DATADIR%%/isdb-t/br-ba-Central
+%%DATADIR%%/isdb-t/br-ba-ConceicaoDaFeira
+%%DATADIR%%/isdb-t/br-ba-ConceicaoDoCoite
+%%DATADIR%%/isdb-t/br-ba-ConceicaoDoJacuipe
+%%DATADIR%%/isdb-t/br-ba-CoracaoDeMaria
+%%DATADIR%%/isdb-t/br-ba-CruzDasAlmas
+%%DATADIR%%/isdb-t/br-ba-DiasDAvila
+%%DATADIR%%/isdb-t/br-ba-EntreRios
+%%DATADIR%%/isdb-t/br-ba-Esplanada
+%%DATADIR%%/isdb-t/br-ba-EuclidesDaCunha
+%%DATADIR%%/isdb-t/br-ba-Eunapolis
+%%DATADIR%%/isdb-t/br-ba-FeiraDeSantana
+%%DATADIR%%/isdb-t/br-ba-Gloria
+%%DATADIR%%/isdb-t/br-ba-Guanambi
+%%DATADIR%%/isdb-t/br-ba-Iacu
+%%DATADIR%%/isdb-t/br-ba-Ibotirama
+%%DATADIR%%/isdb-t/br-ba-Ichu
+%%DATADIR%%/isdb-t/br-ba-Ilheus
+%%DATADIR%%/isdb-t/br-ba-Inhambupe
+%%DATADIR%%/isdb-t/br-ba-Ipecaeta
+%%DATADIR%%/isdb-t/br-ba-Ipiau
+%%DATADIR%%/isdb-t/br-ba-Ipira
+%%DATADIR%%/isdb-t/br-ba-Irara
+%%DATADIR%%/isdb-t/br-ba-Irece
+%%DATADIR%%/isdb-t/br-ba-Itaberaba
+%%DATADIR%%/isdb-t/br-ba-Itabuna
+%%DATADIR%%/isdb-t/br-ba-Itamaraju
+%%DATADIR%%/isdb-t/br-ba-Itambe
+%%DATADIR%%/isdb-t/br-ba-Itaparica
+%%DATADIR%%/isdb-t/br-ba-Itapetinga
+%%DATADIR%%/isdb-t/br-ba-Itiricu
+%%DATADIR%%/isdb-t/br-ba-Jaborandi
+%%DATADIR%%/isdb-t/br-ba-Jacobina
+%%DATADIR%%/isdb-t/br-ba-Jaguaquara
+%%DATADIR%%/isdb-t/br-ba-Jaguarari
+%%DATADIR%%/isdb-t/br-ba-Jaguaripe
+%%DATADIR%%/isdb-t/br-ba-Jequie
+%%DATADIR%%/isdb-t/br-ba-Jeremoabo
+%%DATADIR%%/isdb-t/br-ba-Juazeiro
+%%DATADIR%%/isdb-t/br-ba-LauroDeFreitas
+%%DATADIR%%/isdb-t/br-ba-LuisEduardoMagalhaes
+%%DATADIR%%/isdb-t/br-ba-MadreDeDeus
+%%DATADIR%%/isdb-t/br-ba-ManoelVitorino
+%%DATADIR%%/isdb-t/br-ba-Maragogipe
+%%DATADIR%%/isdb-t/br-ba-MataDeSaoJoao
+%%DATADIR%%/isdb-t/br-ba-MataDeSaoJoaoPraiaDoForte
+%%DATADIR%%/isdb-t/br-ba-MonteSanto
+%%DATADIR%%/isdb-t/br-ba-Mucuri
+%%DATADIR%%/isdb-t/br-ba-Nazare
+%%DATADIR%%/isdb-t/br-ba-NovaVicosa
+%%DATADIR%%/isdb-t/br-ba-PalmasDeMonteAlto
+%%DATADIR%%/isdb-t/br-ba-Paramirim
+%%DATADIR%%/isdb-t/br-ba-PauloAfonso
+%%DATADIR%%/isdb-t/br-ba-Piripa
+%%DATADIR%%/isdb-t/br-ba-Planalto
+%%DATADIR%%/isdb-t/br-ba-Pocoes
+%%DATADIR%%/isdb-t/br-ba-Pojuca
+%%DATADIR%%/isdb-t/br-ba-PortoSeguro
+%%DATADIR%%/isdb-t/br-ba-PresidenteJanioQuadros
+%%DATADIR%%/isdb-t/br-ba-RafaelJambeiro
+%%DATADIR%%/isdb-t/br-ba-Remanso
+%%DATADIR%%/isdb-t/br-ba-RiachaoDoJacuipe
+%%DATADIR%%/isdb-t/br-ba-RibeiraDoPombal
+%%DATADIR%%/isdb-t/br-ba-RioReal
+%%DATADIR%%/isdb-t/br-ba-SalinasDaMargarida
+%%DATADIR%%/isdb-t/br-ba-Salvador
+%%DATADIR%%/isdb-t/br-ba-SantaBarbara
+%%DATADIR%%/isdb-t/br-ba-SantaCruzCabralia
+%%DATADIR%%/isdb-t/br-ba-SantaMariaDaVitoria
+%%DATADIR%%/isdb-t/br-ba-Santaluz
+%%DATADIR%%/isdb-t/br-ba-Santanopolis
+%%DATADIR%%/isdb-t/br-ba-SantoAmaro
+%%DATADIR%%/isdb-t/br-ba-SantoAntonioDeJesus
+%%DATADIR%%/isdb-t/br-ba-SantoEstevao
+%%DATADIR%%/isdb-t/br-ba-SaoDesiderio
+%%DATADIR%%/isdb-t/br-ba-SaoFelixDoCoribe
+%%DATADIR%%/isdb-t/br-ba-SaoFranciscoDoConde
+%%DATADIR%%/isdb-t/br-ba-SaoGoncaloDosCampos
+%%DATADIR%%/isdb-t/br-ba-SaoSebastiaoDoPasse
+%%DATADIR%%/isdb-t/br-ba-Saubara
+%%DATADIR%%/isdb-t/br-ba-Seabra
+%%DATADIR%%/isdb-t/br-ba-SenhorDoBonfim
+%%DATADIR%%/isdb-t/br-ba-SerraPreta
+%%DATADIR%%/isdb-t/br-ba-Serrinha
+%%DATADIR%%/isdb-t/br-ba-SimoesFilho
+%%DATADIR%%/isdb-t/br-ba-Tanhacu
+%%DATADIR%%/isdb-t/br-ba-Tanquinho
+%%DATADIR%%/isdb-t/br-ba-TeixeiraDeFreitas
+%%DATADIR%%/isdb-t/br-ba-Teofilandia
+%%DATADIR%%/isdb-t/br-ba-Tremedal
+%%DATADIR%%/isdb-t/br-ba-Ubata
+%%DATADIR%%/isdb-t/br-ba-Valenca
+%%DATADIR%%/isdb-t/br-ba-Valente
+%%DATADIR%%/isdb-t/br-ba-VeraCruz
+%%DATADIR%%/isdb-t/br-ba-VitoriaDaConquista
+%%DATADIR%%/isdb-t/br-ba-Xiquexique
+%%DATADIR%%/isdb-t/br-ce-Acarape
+%%DATADIR%%/isdb-t/br-ce-Alcantaras
+%%DATADIR%%/isdb-t/br-ce-Aquiraz
+%%DATADIR%%/isdb-t/br-ce-Aracati
+%%DATADIR%%/isdb-t/br-ce-Barbalha
+%%DATADIR%%/isdb-t/br-ce-Camocim
+%%DATADIR%%/isdb-t/br-ce-Carire
+%%DATADIR%%/isdb-t/br-ce-Chorozinho
+%%DATADIR%%/isdb-t/br-ce-Crateus
+%%DATADIR%%/isdb-t/br-ce-Crato
+%%DATADIR%%/isdb-t/br-ce-Forquilha
+%%DATADIR%%/isdb-t/br-ce-Fortaleza
+%%DATADIR%%/isdb-t/br-ce-Groairas
+%%DATADIR%%/isdb-t/br-ce-Horizonte
+%%DATADIR%%/isdb-t/br-ce-Ico
+%%DATADIR%%/isdb-t/br-ce-Iguatu
+%%DATADIR%%/isdb-t/br-ce-Itaitinga
+%%DATADIR%%/isdb-t/br-ce-Itapipoca
+%%DATADIR%%/isdb-t/br-ce-JuazeiroDoNorte
+%%DATADIR%%/isdb-t/br-ce-LimoeiroDoNorte
+%%DATADIR%%/isdb-t/br-ce-Maracanau
+%%DATADIR%%/isdb-t/br-ce-MaranguapeItapebussu
+%%DATADIR%%/isdb-t/br-ce-Massape
+%%DATADIR%%/isdb-t/br-ce-Meruoca
+%%DATADIR%%/isdb-t/br-ce-MissaoVelha
+%%DATADIR%%/isdb-t/br-ce-Pacajus
+%%DATADIR%%/isdb-t/br-ce-Quixada
+%%DATADIR%%/isdb-t/br-ce-Russas
+%%DATADIR%%/isdb-t/br-ce-SantanaDoAcarau
+%%DATADIR%%/isdb-t/br-ce-SaoGoncaloDoAmarante
+%%DATADIR%%/isdb-t/br-ce-Sobral
+%%DATADIR%%/isdb-t/br-ce-Tiangua
+%%DATADIR%%/isdb-t/br-ce-Ubajara
+%%DATADIR%%/isdb-t/br-ce-Varjota
+%%DATADIR%%/isdb-t/br-df-Brasilia
+%%DATADIR%%/isdb-t/br-df-Gama
+%%DATADIR%%/isdb-t/br-df-Taguatinga
+%%DATADIR%%/isdb-t/br-es-Anchieta
+%%DATADIR%%/isdb-t/br-es-Aracruz
+%%DATADIR%%/isdb-t/br-es-CachoeiroDoItapemirim
+%%DATADIR%%/isdb-t/br-es-Colatina
+%%DATADIR%%/isdb-t/br-es-ConceicaoDaBarra
+%%DATADIR%%/isdb-t/br-es-DomingosMartins
+%%DATADIR%%/isdb-t/br-es-GovernadorLindenbergNovoBrasil
+%%DATADIR%%/isdb-t/br-es-Guarapari
+%%DATADIR%%/isdb-t/br-es-Itapemirim
+%%DATADIR%%/isdb-t/br-es-JoaoNeiva
+%%DATADIR%%/isdb-t/br-es-Linhares
+%%DATADIR%%/isdb-t/br-es-Marataizes
+%%DATADIR%%/isdb-t/br-es-NovaVenecia
+%%DATADIR%%/isdb-t/br-es-Piuma
+%%DATADIR%%/isdb-t/br-es-RioNovoDoSul
+%%DATADIR%%/isdb-t/br-es-SaoDomingosDoNorte
+%%DATADIR%%/isdb-t/br-es-SaoMateus
+%%DATADIR%%/isdb-t/br-es-VendaNovaDoImigrante
+%%DATADIR%%/isdb-t/br-es-Vitoria
+%%DATADIR%%/isdb-t/br-go-AguasLindasDeGoias
+%%DATADIR%%/isdb-t/br-go-Alexania
+%%DATADIR%%/isdb-t/br-go-Aloandia
+%%DATADIR%%/isdb-t/br-go-AltoParaisoDeGoias
+%%DATADIR%%/isdb-t/br-go-Anapolis
+%%DATADIR%%/isdb-t/br-go-AparecidaDeGoiania
+%%DATADIR%%/isdb-t/br-go-BuritiAlegre
+%%DATADIR%%/isdb-t/br-go-Caiaponia
+%%DATADIR%%/isdb-t/br-go-CaldasNovas
+%%DATADIR%%/isdb-t/br-go-Catalao
+%%DATADIR%%/isdb-t/br-go-Cristalina
+%%DATADIR%%/isdb-t/br-go-Formosa
+%%DATADIR%%/isdb-t/br-go-Goiandira
+%%DATADIR%%/isdb-t/br-go-Goianesia
+%%DATADIR%%/isdb-t/br-go-Goiania
+%%DATADIR%%/isdb-t/br-go-Goiatuba
+%%DATADIR%%/isdb-t/br-go-Guapo
+%%DATADIR%%/isdb-t/br-go-Inhumas
+%%DATADIR%%/isdb-t/br-go-Ipora
+%%DATADIR%%/isdb-t/br-go-Itapaci
+%%DATADIR%%/isdb-t/br-go-Itumbiara
+%%DATADIR%%/isdb-t/br-go-Jatai
+%%DATADIR%%/isdb-t/br-go-Luziania
+%%DATADIR%%/isdb-t/br-go-Minacu
+%%DATADIR%%/isdb-t/br-go-Mineiros
+%%DATADIR%%/isdb-t/br-go-Morrinhos
+%%DATADIR%%/isdb-t/br-go-Ouvidor
+%%DATADIR%%/isdb-t/br-go-PalmeirasDeGoias
+%%DATADIR%%/isdb-t/br-go-Panama
+%%DATADIR%%/isdb-t/br-go-Piracanjuba
+%%DATADIR%%/isdb-t/br-go-Pirenopolis
+%%DATADIR%%/isdb-t/br-go-PiresDoRio
+%%DATADIR%%/isdb-t/br-go-PlanaltinaDeGoias
+%%DATADIR%%/isdb-t/br-go-Porangatu
+%%DATADIR%%/isdb-t/br-go-Quirinopolis
+%%DATADIR%%/isdb-t/br-go-RioVerde
+%%DATADIR%%/isdb-t/br-go-SantaHelenaDeGoias
+%%DATADIR%%/isdb-t/br-go-SantoAntonioDoDescoberto
+%%DATADIR%%/isdb-t/br-go-SaoLuisDeMontesBelos
+%%DATADIR%%/isdb-t/br-go-SaoMiguelDoAraguaia
+%%DATADIR%%/isdb-t/br-go-SaoSimao
+%%DATADIR%%/isdb-t/br-go-SenadorCanedo
+%%DATADIR%%/isdb-t/br-go-Uruacu
+%%DATADIR%%/isdb-t/br-go-ValparaisoDeGoias
+%%DATADIR%%/isdb-t/br-ma-Alcantara
+%%DATADIR%%/isdb-t/br-ma-Axixa
+%%DATADIR%%/isdb-t/br-ma-Bacabal
+%%DATADIR%%/isdb-t/br-ma-Bacabeira
+%%DATADIR%%/isdb-t/br-ma-Bacurituba
+%%DATADIR%%/isdb-t/br-ma-Balsas
+%%DATADIR%%/isdb-t/br-ma-BaraoDeGrajau
+%%DATADIR%%/isdb-t/br-ma-CachoeiraGrande
+%%DATADIR%%/isdb-t/br-ma-Cajapio
+%%DATADIR%%/isdb-t/br-ma-Caxias
+%%DATADIR%%/isdb-t/br-ma-Davinopolis
+%%DATADIR%%/isdb-t/br-ma-HumbertoDeCampos
+%%DATADIR%%/isdb-t/br-ma-Icatu
+%%DATADIR%%/isdb-t/br-ma-Imperatriz
+%%DATADIR%%/isdb-t/br-ma-JoaoLisboa
+%%DATADIR%%/isdb-t/br-ma-Morros
+%%DATADIR%%/isdb-t/br-ma-PacoDoLumiar
+%%DATADIR%%/isdb-t/br-ma-Pinheiro
+%%DATADIR%%/isdb-t/br-ma-PresidenteJuscelino
+%%DATADIR%%/isdb-t/br-ma-PrimeiraCruz
+%%DATADIR%%/isdb-t/br-ma-Raposa
+%%DATADIR%%/isdb-t/br-ma-Rosario
+%%DATADIR%%/isdb-t/br-ma-SantaRita
+%%DATADIR%%/isdb-t/br-ma-SaoBento
+%%DATADIR%%/isdb-t/br-ma-SaoJoaoBatista
+%%DATADIR%%/isdb-t/br-ma-SaoJoseDeRibamar
+%%DATADIR%%/isdb-t/br-ma-SaoLuis
+%%DATADIR%%/isdb-t/br-ma-SaoVicenteFerrer
+%%DATADIR%%/isdb-t/br-ma-SenadorLaRocque
+%%DATADIR%%/isdb-t/br-ma-Timon
+%%DATADIR%%/isdb-t/br-ma-Viana
+%%DATADIR%%/isdb-t/br-ma-ZeDoca
+%%DATADIR%%/isdb-t/br-mg-AguaComprida
+%%DATADIR%%/isdb-t/br-mg-Aguanil
+%%DATADIR%%/isdb-t/br-mg-Alfenas
+%%DATADIR%%/isdb-t/br-mg-Almenara
+%%DATADIR%%/isdb-t/br-mg-Andradas
+%%DATADIR%%/isdb-t/br-mg-Araguari
+%%DATADIR%%/isdb-t/br-mg-Arapora
+%%DATADIR%%/isdb-t/br-mg-Araxa
+%%DATADIR%%/isdb-t/br-mg-Arinos
+%%DATADIR%%/isdb-t/br-mg-Barbacena
+%%DATADIR%%/isdb-t/br-mg-Barroso
+%%DATADIR%%/isdb-t/br-mg-BeloHorizonte
+%%DATADIR%%/isdb-t/br-mg-Betim
+%%DATADIR%%/isdb-t/br-mg-Bocaiuva
+%%DATADIR%%/isdb-t/br-mg-BordaDaMata
+%%DATADIR%%/isdb-t/br-mg-BrasiliaDeMinas
+%%DATADIR%%/isdb-t/br-mg-Buritis
+%%DATADIR%%/isdb-t/br-mg-Buritizeiro
+%%DATADIR%%/isdb-t/br-mg-Cambui
+%%DATADIR%%/isdb-t/br-mg-Campanha
+%%DATADIR%%/isdb-t/br-mg-Campestre
+%%DATADIR%%/isdb-t/br-mg-CampoBelo
+%%DATADIR%%/isdb-t/br-mg-Caratinga
+%%DATADIR%%/isdb-t/br-mg-CarmoDaCachoeira
+%%DATADIR%%/isdb-t/br-mg-CarmoDeMinas
+%%DATADIR%%/isdb-t/br-mg-Cataguases
+%%DATADIR%%/isdb-t/br-mg-Chacara
+%%DATADIR%%/isdb-t/br-mg-Claraval
+%%DATADIR%%/isdb-t/br-mg-Coimbra
+%%DATADIR%%/isdb-t/br-mg-ConceicaoDasAlagoas
+%%DATADIR%%/isdb-t/br-mg-ConselheiroLafaiete
+%%DATADIR%%/isdb-t/br-mg-Contagem
+%%DATADIR%%/isdb-t/br-mg-CoracaoDeJesus
+%%DATADIR%%/isdb-t/br-mg-Coromandel
+%%DATADIR%%/isdb-t/br-mg-CoronelFabriciano
+%%DATADIR%%/isdb-t/br-mg-CruzeiroDaFortaleza
+%%DATADIR%%/isdb-t/br-mg-Curvelo
+%%DATADIR%%/isdb-t/br-mg-Delta
+%%DATADIR%%/isdb-t/br-mg-Diamantina
+%%DATADIR%%/isdb-t/br-mg-Divinopolis
+%%DATADIR%%/isdb-t/br-mg-EloiMendes
+%%DATADIR%%/isdb-t/br-mg-EwbankDaCamara
+%%DATADIR%%/isdb-t/br-mg-Formiga
+%%DATADIR%%/isdb-t/br-mg-Fronteira
+%%DATADIR%%/isdb-t/br-mg-Frutal
+%%DATADIR%%/isdb-t/br-mg-GovernadorValadares
+%%DATADIR%%/isdb-t/br-mg-Guanhaes
+%%DATADIR%%/isdb-t/br-mg-Guaxupe
+%%DATADIR%%/isdb-t/br-mg-Guimarania
+%%DATADIR%%/isdb-t/br-mg-Ibirite
+%%DATADIR%%/isdb-t/br-mg-Ipatinga
+%%DATADIR%%/isdb-t/br-mg-Itabira
+%%DATADIR%%/isdb-t/br-mg-Itajuba
+%%DATADIR%%/isdb-t/br-mg-Itapagipe
+%%DATADIR%%/isdb-t/br-mg-Itauna
+%%DATADIR%%/isdb-t/br-mg-Ituiutaba
+%%DATADIR%%/isdb-t/br-mg-Iturama
+%%DATADIR%%/isdb-t/br-mg-Janauba
+%%DATADIR%%/isdb-t/br-mg-Januaria
+%%DATADIR%%/isdb-t/br-mg-JoaoMonlevade
+%%DATADIR%%/isdb-t/br-mg-JuizDeFora
+%%DATADIR%%/isdb-t/br-mg-Lambari
+%%DATADIR%%/isdb-t/br-mg-Lavras
+%%DATADIR%%/isdb-t/br-mg-Leopoldina
+%%DATADIR%%/isdb-t/br-mg-Manhuacu
+%%DATADIR%%/isdb-t/br-mg-Mariana
+%%DATADIR%%/isdb-t/br-mg-MateusLeme
+%%DATADIR%%/isdb-t/br-mg-MonteSiao
+%%DATADIR%%/isdb-t/br-mg-MontesClaros
+%%DATADIR%%/isdb-t/br-mg-Muriae
+%%DATADIR%%/isdb-t/br-mg-NovaLima
+%%DATADIR%%/isdb-t/br-mg-NovaResende
+%%DATADIR%%/isdb-t/br-mg-OlimpioNoronha
+%%DATADIR%%/isdb-t/br-mg-Oliveira
+%%DATADIR%%/isdb-t/br-mg-OuroBranco
+%%DATADIR%%/isdb-t/br-mg-OuroFino
+%%DATADIR%%/isdb-t/br-mg-OuroPreto
+%%DATADIR%%/isdb-t/br-mg-ParaDeMinas
+%%DATADIR%%/isdb-t/br-mg-Paracatu
+%%DATADIR%%/isdb-t/br-mg-Paraguacu
+%%DATADIR%%/isdb-t/br-mg-Passos
+%%DATADIR%%/isdb-t/br-mg-PatosDeMinas
+%%DATADIR%%/isdb-t/br-mg-Patrocinio
+%%DATADIR%%/isdb-t/br-mg-PedroLeopoldo
+%%DATADIR%%/isdb-t/br-mg-Periquito
+%%DATADIR%%/isdb-t/br-mg-Pirajuba
+%%DATADIR%%/isdb-t/br-mg-Pirapora
+%%DATADIR%%/isdb-t/br-mg-Planura
+%%DATADIR%%/isdb-t/br-mg-PocosDeCaldas
+%%DATADIR%%/isdb-t/br-mg-PonteNova
+%%DATADIR%%/isdb-t/br-mg-PousoAlegre
+%%DATADIR%%/isdb-t/br-mg-Prata
+%%DATADIR%%/isdb-t/br-mg-RaulSoares
+%%DATADIR%%/isdb-t/br-mg-Sacramento
+%%DATADIR%%/isdb-t/br-mg-Salinas
+%%DATADIR%%/isdb-t/br-mg-SantaBarbara
+%%DATADIR%%/isdb-t/br-mg-SantaLuzia
+%%DATADIR%%/isdb-t/br-mg-SantaRitaDoSapucai
+%%DATADIR%%/isdb-t/br-mg-SantaVitoria
+%%DATADIR%%/isdb-t/br-mg-SaoFranciscoDeSales
+%%DATADIR%%/isdb-t/br-mg-SaoJoaoDelRei
+%%DATADIR%%/isdb-t/br-mg-SaoLourenco
+%%DATADIR%%/isdb-t/br-mg-SaoSebastiaoDoParaiso
+%%DATADIR%%/isdb-t/br-mg-SerraDoSalitre
+%%DATADIR%%/isdb-t/br-mg-SeteLagoas
+%%DATADIR%%/isdb-t/br-mg-Taiobeiras
+%%DATADIR%%/isdb-t/br-mg-TeofiloOtoni
+%%DATADIR%%/isdb-t/br-mg-Timoteo
+%%DATADIR%%/isdb-t/br-mg-TresCoracoes
+%%DATADIR%%/isdb-t/br-mg-TresPontas
+%%DATADIR%%/isdb-t/br-mg-Uba
+%%DATADIR%%/isdb-t/br-mg-Uberaba
+%%DATADIR%%/isdb-t/br-mg-Uberlandia
+%%DATADIR%%/isdb-t/br-mg-Unai
+%%DATADIR%%/isdb-t/br-mg-Varginha
+%%DATADIR%%/isdb-t/br-mg-VarzeaDaPalma
+%%DATADIR%%/isdb-t/br-mg-Vicosa
+%%DATADIR%%/isdb-t/br-ms-Amambai
+%%DATADIR%%/isdb-t/br-ms-Anastacio
+%%DATADIR%%/isdb-t/br-ms-Aquidauana
+%%DATADIR%%/isdb-t/br-ms-Bonito
+%%DATADIR%%/isdb-t/br-ms-Caarapo
+%%DATADIR%%/isdb-t/br-ms-CampoGrande
+%%DATADIR%%/isdb-t/br-ms-Corumba
+%%DATADIR%%/isdb-t/br-ms-Coxim
+%%DATADIR%%/isdb-t/br-ms-Dourados
+%%DATADIR%%/isdb-t/br-ms-Jardim
+%%DATADIR%%/isdb-t/br-ms-Ladario
+%%DATADIR%%/isdb-t/br-ms-Maracaju
+%%DATADIR%%/isdb-t/br-ms-Miranda
+%%DATADIR%%/isdb-t/br-ms-Navirai
+%%DATADIR%%/isdb-t/br-ms-NovaAndradina
+%%DATADIR%%/isdb-t/br-ms-Paranaiba
+%%DATADIR%%/isdb-t/br-ms-PontaPora
+%%DATADIR%%/isdb-t/br-ms-Rochedo
+%%DATADIR%%/isdb-t/br-ms-Sidrolandia
+%%DATADIR%%/isdb-t/br-ms-TresLagoas
+%%DATADIR%%/isdb-t/br-mt-AltaFloresta
+%%DATADIR%%/isdb-t/br-mt-Caceres
+%%DATADIR%%/isdb-t/br-mt-Cuiaba
+%%DATADIR%%/isdb-t/br-mt-Guiratinga
+%%DATADIR%%/isdb-t/br-mt-Juina
+%%DATADIR%%/isdb-t/br-mt-LucasDoRioVerde
+%%DATADIR%%/isdb-t/br-mt-Nobres
+%%DATADIR%%/isdb-t/br-mt-NovaMutum
+%%DATADIR%%/isdb-t/br-mt-PrimaveraDoLeste
+%%DATADIR%%/isdb-t/br-mt-Rondonopolis
+%%DATADIR%%/isdb-t/br-mt-Sinop
+%%DATADIR%%/isdb-t/br-mt-Sorriso
+%%DATADIR%%/isdb-t/br-mt-TangaraDaSerra
+%%DATADIR%%/isdb-t/br-pa-Abaetetuba
+%%DATADIR%%/isdb-t/br-pa-Afua
+%%DATADIR%%/isdb-t/br-pa-Alenquer
+%%DATADIR%%/isdb-t/br-pa-Altamira
+%%DATADIR%%/isdb-t/br-pa-Barcarena
+%%DATADIR%%/isdb-t/br-pa-Belem
+%%DATADIR%%/isdb-t/br-pa-Belterra
+%%DATADIR%%/isdb-t/br-pa-Cameta
+%%DATADIR%%/isdb-t/br-pa-Castanhal
+%%DATADIR%%/isdb-t/br-pa-Maraba
+%%DATADIR%%/isdb-t/br-pa-Moju
+%%DATADIR%%/isdb-t/br-pa-MojuiDosCampos
+%%DATADIR%%/isdb-t/br-pa-NovoRepartimento
+%%DATADIR%%/isdb-t/br-pa-Obidos
+%%DATADIR%%/isdb-t/br-pa-Paragominas
+%%DATADIR%%/isdb-t/br-pa-PontaDePedras
+%%DATADIR%%/isdb-t/br-pa-Santarem
+%%DATADIR%%/isdb-t/br-pa-Tucurui
+%%DATADIR%%/isdb-t/br-pb-AlagoaGrande
+%%DATADIR%%/isdb-t/br-pb-Alagoinha
+%%DATADIR%%/isdb-t/br-pb-Aparecida
+%%DATADIR%%/isdb-t/br-pb-BaiaDaTraicao
+%%DATADIR%%/isdb-t/br-pb-Bayeux
+%%DATADIR%%/isdb-t/br-pb-BomJesus
+%%DATADIR%%/isdb-t/br-pb-Caapora
+%%DATADIR%%/isdb-t/br-pb-Cabedelo
+%%DATADIR%%/isdb-t/br-pb-CachoeiraDosIndios
+%%DATADIR%%/isdb-t/br-pb-CacimbaDeDentro
+%%DATADIR%%/isdb-t/br-pb-Cajazeiras
+%%DATADIR%%/isdb-t/br-pb-CaldasBrandao
+%%DATADIR%%/isdb-t/br-pb-CampinaGrande
+%%DATADIR%%/isdb-t/br-pb-Capim
+%%DATADIR%%/isdb-t/br-pb-Catingueira
+%%DATADIR%%/isdb-t/br-pb-Condado
+%%DATADIR%%/isdb-t/br-pb-Cuitegi
+%%DATADIR%%/isdb-t/br-pb-Desterro
+%%DATADIR%%/isdb-t/br-pb-Fagundes
+%%DATADIR%%/isdb-t/br-pb-Guarabira
+%%DATADIR%%/isdb-t/br-pb-Imaculada
+%%DATADIR%%/isdb-t/br-pb-Jacarau
+%%DATADIR%%/isdb-t/br-pb-JoaoPessoa
+%%DATADIR%%/isdb-t/br-pb-Juripiranga
+%%DATADIR%%/isdb-t/br-pb-LagoaSeca
+%%DATADIR%%/isdb-t/br-pb-Lucena
+%%DATADIR%%/isdb-t/br-pb-MaeDAgua
+%%DATADIR%%/isdb-t/br-pb-Mamanguape
+%%DATADIR%%/isdb-t/br-pb-Marcacao
+%%DATADIR%%/isdb-t/br-pb-Marizopolis
+%%DATADIR%%/isdb-t/br-pb-Massaranduba
+%%DATADIR%%/isdb-t/br-pb-Matinhas
+%%DATADIR%%/isdb-t/br-pb-Matureia
+%%DATADIR%%/isdb-t/br-pb-Mulungu
+%%DATADIR%%/isdb-t/br-pb-OlhoDAgua
+%%DATADIR%%/isdb-t/br-pb-Patos
+%%DATADIR%%/isdb-t/br-pb-PedrasDeFogo
+%%DATADIR%%/isdb-t/br-pb-Pilar
+%%DATADIR%%/isdb-t/br-pb-Piloezinhos
+%%DATADIR%%/isdb-t/br-pb-Pitimbu
+%%DATADIR%%/isdb-t/br-pb-Pocinhos
+%%DATADIR%%/isdb-t/br-pb-Puxinana
+%%DATADIR%%/isdb-t/br-pb-RioTinto
+%%DATADIR%%/isdb-t/br-pb-SantaRita
+%%DATADIR%%/isdb-t/br-pb-SantaTeresinha
+%%DATADIR%%/isdb-t/br-pb-SaoFrancisco
+%%DATADIR%%/isdb-t/br-pb-SaoJoaoDoRioDoPeixe
+%%DATADIR%%/isdb-t/br-pb-SaoJoseDePiranhas
+%%DATADIR%%/isdb-t/br-pb-SaoMamede
+%%DATADIR%%/isdb-t/br-pb-Sape
+%%DATADIR%%/isdb-t/br-pb-Sousa
+%%DATADIR%%/isdb-t/br-pb-Teixeira
+%%DATADIR%%/isdb-t/br-pb-Triunfo
+%%DATADIR%%/isdb-t/br-pe-AfogadosDaIngazeira
+%%DATADIR%%/isdb-t/br-pe-Agrestina
+%%DATADIR%%/isdb-t/br-pe-Alagoinha
+%%DATADIR%%/isdb-t/br-pe-Altinho
+%%DATADIR%%/isdb-t/br-pe-Arcoverde
+%%DATADIR%%/isdb-t/br-pe-Bezerros
+%%DATADIR%%/isdb-t/br-pe-BuenosAires
+%%DATADIR%%/isdb-t/br-pe-Buique
+%%DATADIR%%/isdb-t/br-pe-Camaragibe
+%%DATADIR%%/isdb-t/br-pe-Caruaru
+%%DATADIR%%/isdb-t/br-pe-ChaGrande
+%%DATADIR%%/isdb-t/br-pe-Escada
+%%DATADIR%%/isdb-t/br-pe-FernandoDeNoronha
+%%DATADIR%%/isdb-t/br-pe-Floresta
+%%DATADIR%%/isdb-t/br-pe-Garanhuns
+%%DATADIR%%/isdb-t/br-pe-Gravata
+%%DATADIR%%/isdb-t/br-pe-Itambe
+%%DATADIR%%/isdb-t/br-pe-Jupi
+%%DATADIR%%/isdb-t/br-pe-Limoeiro
+%%DATADIR%%/isdb-t/br-pe-Macaparana
+%%DATADIR%%/isdb-t/br-pe-Moreno
+%%DATADIR%%/isdb-t/br-pe-Orobo
+%%DATADIR%%/isdb-t/br-pe-Pedra
+%%DATADIR%%/isdb-t/br-pe-Pesqueira
+%%DATADIR%%/isdb-t/br-pe-Petrolina
+%%DATADIR%%/isdb-t/br-pe-Recife
+%%DATADIR%%/isdb-t/br-pe-SantaCruzDoCapibaribe
+%%DATADIR%%/isdb-t/br-pe-SaoLourencoDaMata
+%%DATADIR%%/isdb-t/br-pe-Timbauba
+%%DATADIR%%/isdb-t/br-pe-Venturosa
+%%DATADIR%%/isdb-t/br-pe-Vicencia
+%%DATADIR%%/isdb-t/br-pe-VitoriaDeSantoAntao
+%%DATADIR%%/isdb-t/br-pi-BomJesus
+%%DATADIR%%/isdb-t/br-pi-CampoMaior
+%%DATADIR%%/isdb-t/br-pi-DemervalLobao
+%%DATADIR%%/isdb-t/br-pi-Floriano
+%%DATADIR%%/isdb-t/br-pi-LagoaDoPiaui
+%%DATADIR%%/isdb-t/br-pi-LuisCorreia
+%%DATADIR%%/isdb-t/br-pi-Parnaiba
+%%DATADIR%%/isdb-t/br-pi-Picos
+%%DATADIR%%/isdb-t/br-pi-Piripiri
+%%DATADIR%%/isdb-t/br-pi-SaoRaimundoNonato
+%%DATADIR%%/isdb-t/br-pi-Teresina
+%%DATADIR%%/isdb-t/br-pr-Adrianopolis
+%%DATADIR%%/isdb-t/br-pr-AltoParana
+%%DATADIR%%/isdb-t/br-pr-AltoPiquiri
+%%DATADIR%%/isdb-t/br-pr-AlvoradaDoSul
+%%DATADIR%%/isdb-t/br-pr-Antonina
+%%DATADIR%%/isdb-t/br-pr-Apucarana
+%%DATADIR%%/isdb-t/br-pr-Arapongas
+%%DATADIR%%/isdb-t/br-pr-Araruna
+%%DATADIR%%/isdb-t/br-pr-AssisChateaubriand
+%%DATADIR%%/isdb-t/br-pr-BoaVistaDaAparecida
+%%DATADIR%%/isdb-t/br-pr-Cafelandia
+%%DATADIR%%/isdb-t/br-pr-Cambe
+%%DATADIR%%/isdb-t/br-pr-CampoLargo
+%%DATADIR%%/isdb-t/br-pr-CampoMourao
+%%DATADIR%%/isdb-t/br-pr-Carambei
+%%DATADIR%%/isdb-t/br-pr-Cascavel
+%%DATADIR%%/isdb-t/br-pr-Castro
+%%DATADIR%%/isdb-t/br-pr-CeuAzul
+%%DATADIR%%/isdb-t/br-pr-Cianorte
+%%DATADIR%%/isdb-t/br-pr-CidadeGaucha
+%%DATADIR%%/isdb-t/br-pr-Clevelandia
+%%DATADIR%%/isdb-t/br-pr-Colombo
+%%DATADIR%%/isdb-t/br-pr-Corbelia
+%%DATADIR%%/isdb-t/br-pr-CornelioProcopio
+%%DATADIR%%/isdb-t/br-pr-Curitiba
+%%DATADIR%%/isdb-t/br-pr-Florestopolis
+%%DATADIR%%/isdb-t/br-pr-FormosaDoOeste
+%%DATADIR%%/isdb-t/br-pr-FozDoIguacu
+%%DATADIR%%/isdb-t/br-pr-FranciscoBeltrao
+%%DATADIR%%/isdb-t/br-pr-Guaraniacu
+%%DATADIR%%/isdb-t/br-pr-Guarapuava
+%%DATADIR%%/isdb-t/br-pr-Guaratuba
+%%DATADIR%%/isdb-t/br-pr-HonorioSerpa
+%%DATADIR%%/isdb-t/br-pr-Ibema
+%%DATADIR%%/isdb-t/br-pr-Ibipora
+%%DATADIR%%/isdb-t/br-pr-Imbituva
+%%DATADIR%%/isdb-t/br-pr-Irati
+%%DATADIR%%/isdb-t/br-pr-Ivaipora
+%%DATADIR%%/isdb-t/br-pr-Jacarezinho
+%%DATADIR%%/isdb-t/br-pr-Japira
+%%DATADIR%%/isdb-t/br-pr-Jataizinho
+%%DATADIR%%/isdb-t/br-pr-Kalore
+%%DATADIR%%/isdb-t/br-pr-Lapa
+%%DATADIR%%/isdb-t/br-pr-Londrina
+%%DATADIR%%/isdb-t/br-pr-ManoelRibas
+%%DATADIR%%/isdb-t/br-pr-MarechalCandidoRondon
+%%DATADIR%%/isdb-t/br-pr-Maringa
+%%DATADIR%%/isdb-t/br-pr-Matinhos
+%%DATADIR%%/isdb-t/br-pr-Medianeira
+%%DATADIR%%/isdb-t/br-pr-MoreiraSales
+%%DATADIR%%/isdb-t/br-pr-Morretes
+%%DATADIR%%/isdb-t/br-pr-NovaAurora
+%%DATADIR%%/isdb-t/br-pr-NovaEsperanca
+%%DATADIR%%/isdb-t/br-pr-Palmas
+%%DATADIR%%/isdb-t/br-pr-Palmeira
+%%DATADIR%%/isdb-t/br-pr-Paranagua
+%%DATADIR%%/isdb-t/br-pr-Paranavai
+%%DATADIR%%/isdb-t/br-pr-PatoBranco
+%%DATADIR%%/isdb-t/br-pr-Perola
+%%DATADIR%%/isdb-t/br-pr-PontaGrossa
+%%DATADIR%%/isdb-t/br-pr-PontalDoParana
+%%DATADIR%%/isdb-t/br-pr-Porecatu
+%%DATADIR%%/isdb-t/br-pr-PrimeiroDeMaio
+%%DATADIR%%/isdb-t/br-pr-Prudentopolis
+%%DATADIR%%/isdb-t/br-pr-QuatroPontes
+%%DATADIR%%/isdb-t/br-pr-RioBrancoDoSul
+%%DATADIR%%/isdb-t/br-pr-RioNegro
+%%DATADIR%%/isdb-t/br-pr-Rolandia
+%%DATADIR%%/isdb-t/br-pr-SantoAntonioDaPlatina
+%%DATADIR%%/isdb-t/br-pr-SaoMiguelDoIguacu
+%%DATADIR%%/isdb-t/br-pr-Sarandi
+%%DATADIR%%/isdb-t/br-pr-Sertanopolis
+%%DATADIR%%/isdb-t/br-pr-TeixeiraSoares
+%%DATADIR%%/isdb-t/br-pr-TelemacoBorba
+%%DATADIR%%/isdb-t/br-pr-TerraBoa
+%%DATADIR%%/isdb-t/br-pr-TerraRica
+%%DATADIR%%/isdb-t/br-pr-TerraRoxa
+%%DATADIR%%/isdb-t/br-pr-Tibagi
+%%DATADIR%%/isdb-t/br-pr-Toledo
+%%DATADIR%%/isdb-t/br-pr-TresBarrasDoParana
+%%DATADIR%%/isdb-t/br-pr-Tupassi
+%%DATADIR%%/isdb-t/br-pr-Ubirata
+%%DATADIR%%/isdb-t/br-pr-Umuarama
+%%DATADIR%%/isdb-t/br-pr-UniaoDaVitoria
+%%DATADIR%%/isdb-t/br-pr-Vere
+%%DATADIR%%/isdb-t/br-rj-AngraDosReis
+%%DATADIR%%/isdb-t/br-rj-Araruama
+%%DATADIR%%/isdb-t/br-rj-ArmacaoDeBuzios
+%%DATADIR%%/isdb-t/br-rj-ArraialDoCabo
+%%DATADIR%%/isdb-t/br-rj-BarraDoPirai
+%%DATADIR%%/isdb-t/br-rj-BarraDoPiraiCalifornia
+%%DATADIR%%/isdb-t/br-rj-BarraDoPiraiDorandia
+%%DATADIR%%/isdb-t/br-rj-BarraDoPiraiVargemAlegre
+%%DATADIR%%/isdb-t/br-rj-BarraMansa
+%%DATADIR%%/isdb-t/br-rj-CaboFrio
+%%DATADIR%%/isdb-t/br-rj-Cambuci
+%%DATADIR%%/isdb-t/br-rj-CamposDosGoytacazes
+%%DATADIR%%/isdb-t/br-rj-DuqueDeCaxias
+%%DATADIR%%/isdb-t/br-rj-EngenheiroPauloDeFrontin
+%%DATADIR%%/isdb-t/br-rj-Itaguai
+%%DATADIR%%/isdb-t/br-rj-Itaperuna
+%%DATADIR%%/isdb-t/br-rj-Itatiaia
+%%DATADIR%%/isdb-t/br-rj-Japeri
+%%DATADIR%%/isdb-t/br-rj-JaperiEngPedreira
+%%DATADIR%%/isdb-t/br-rj-Macae
+%%DATADIR%%/isdb-t/br-rj-Mangaratiba
+%%DATADIR%%/isdb-t/br-rj-Marica
+%%DATADIR%%/isdb-t/br-rj-Mesquita
+%%DATADIR%%/isdb-t/br-rj-MiguelPereira
+%%DATADIR%%/isdb-t/br-rj-Nilopolis
+%%DATADIR%%/isdb-t/br-rj-NovaFriburgo
+%%DATADIR%%/isdb-t/br-rj-NovaIguacu
+%%DATADIR%%/isdb-t/br-rj-Paracambi
+%%DATADIR%%/isdb-t/br-rj-ParaibaDoSul
+%%DATADIR%%/isdb-t/br-rj-Paraty
+%%DATADIR%%/isdb-t/br-rj-Petropolis
+%%DATADIR%%/isdb-t/br-rj-Pinheiral
+%%DATADIR%%/isdb-t/br-rj-Pirai
+%%DATADIR%%/isdb-t/br-rj-PiraiSantanesia
+%%DATADIR%%/isdb-t/br-rj-Queimados
+%%DATADIR%%/isdb-t/br-rj-Quissama
+%%DATADIR%%/isdb-t/br-rj-Resende
+%%DATADIR%%/isdb-t/br-rj-ResendeVargemGrande
+%%DATADIR%%/isdb-t/br-rj-ResendeViscondeDeMaua
+%%DATADIR%%/isdb-t/br-rj-RioBonito
+%%DATADIR%%/isdb-t/br-rj-RioClaro
+%%DATADIR%%/isdb-t/br-rj-RioDasFlores
+%%DATADIR%%/isdb-t/br-rj-RioDasOstras
+%%DATADIR%%/isdb-t/br-rj-RioDeJaneiro
+%%DATADIR%%/isdb-t/br-rj-SantoAntonioDePadua
+%%DATADIR%%/isdb-t/br-rj-SaoGoncalo
+%%DATADIR%%/isdb-t/br-rj-SaoJoaoDaBarra
+%%DATADIR%%/isdb-t/br-rj-SaoJoaoDeMeriti
+%%DATADIR%%/isdb-t/br-rj-SaoJoseDoValeDoRioPreto
+%%DATADIR%%/isdb-t/br-rj-SaoPedroDaAldeia
+%%DATADIR%%/isdb-t/br-rj-Sapucaia
+%%DATADIR%%/isdb-t/br-rj-SapucaiaAnta
+%%DATADIR%%/isdb-t/br-rj-Saquarema
+%%DATADIR%%/isdb-t/br-rj-SilvaJardim
+%%DATADIR%%/isdb-t/br-rj-Teresopolis
+%%DATADIR%%/isdb-t/br-rj-TrajanoDeMorais
+%%DATADIR%%/isdb-t/br-rj-TresRios
+%%DATADIR%%/isdb-t/br-rj-Valenca
+%%DATADIR%%/isdb-t/br-rj-ValencaBaraoDeJuparana
+%%DATADIR%%/isdb-t/br-rj-ValencaParapeuna
+%%DATADIR%%/isdb-t/br-rj-ValencaPentagna
+%%DATADIR%%/isdb-t/br-rj-Vassouras
+%%DATADIR%%/isdb-t/br-rj-VassourasAndradePinto
+%%DATADIR%%/isdb-t/br-rj-VassourasIpiranga
+%%DATADIR%%/isdb-t/br-rj-VassourasMassambara
+%%DATADIR%%/isdb-t/br-rj-VoltaRedonda
+%%DATADIR%%/isdb-t/br-rj-VoltaRedondaBRoma
+%%DATADIR%%/isdb-t/br-rn-AreiaBranca
+%%DATADIR%%/isdb-t/br-rn-Barauna
+%%DATADIR%%/isdb-t/br-rn-BomJesus
+%%DATADIR%%/isdb-t/br-rn-Caico
+%%DATADIR%%/isdb-t/br-rn-Cearamirim
+%%DATADIR%%/isdb-t/br-rn-Extremoz
+%%DATADIR%%/isdb-t/br-rn-Grossos
+%%DATADIR%%/isdb-t/br-rn-IelmoMarinho
+%%DATADIR%%/isdb-t/br-rn-Macaiba
+%%DATADIR%%/isdb-t/br-rn-MonteAlegre
+%%DATADIR%%/isdb-t/br-rn-Mossoro
+%%DATADIR%%/isdb-t/br-rn-Natal
+%%DATADIR%%/isdb-t/br-rn-NisiaFloresta
+%%DATADIR%%/isdb-t/br-rn-Parnamirim
+%%DATADIR%%/isdb-t/br-rn-SantaMaria
+%%DATADIR%%/isdb-t/br-rn-SaoGoncaloDoAmarante
+%%DATADIR%%/isdb-t/br-rn-SaoJoseDeMipibu
+%%DATADIR%%/isdb-t/br-rn-SenadorEloiDeSousa
+%%DATADIR%%/isdb-t/br-ro-Ariquemes
+%%DATADIR%%/isdb-t/br-ro-Cacoal
+%%DATADIR%%/isdb-t/br-ro-CandeiasDoJamari
+%%DATADIR%%/isdb-t/br-ro-GovernadorJorgeTeixeira
+%%DATADIR%%/isdb-t/br-ro-Jaru
+%%DATADIR%%/isdb-t/br-ro-Jiparana
+%%DATADIR%%/isdb-t/br-ro-PimentaBueno
+%%DATADIR%%/isdb-t/br-ro-PortoVelho
+%%DATADIR%%/isdb-t/br-ro-RolimDeMoura
+%%DATADIR%%/isdb-t/br-ro-Theobroma
+%%DATADIR%%/isdb-t/br-ro-Vilhena
+%%DATADIR%%/isdb-t/br-rr-BoaVista
+%%DATADIR%%/isdb-t/br-rs-Ajuricaba
+%%DATADIR%%/isdb-t/br-rs-Alegrete
+%%DATADIR%%/isdb-t/br-rs-ArroioDoSal
+%%DATADIR%%/isdb-t/br-rs-AugustoPestana
+%%DATADIR%%/isdb-t/br-rs-Bage
+%%DATADIR%%/isdb-t/br-rs-BentoGoncalves
+%%DATADIR%%/isdb-t/br-rs-BoaVistaDoCadeado
+%%DATADIR%%/isdb-t/br-rs-BoaVistaDoIncra
+%%DATADIR%%/isdb-t/br-rs-Bozano
+%%DATADIR%%/isdb-t/br-rs-CachoeiraDoSul
+%%DATADIR%%/isdb-t/br-rs-Camaqua
+%%DATADIR%%/isdb-t/br-rs-CampoBom
+%%DATADIR%%/isdb-t/br-rs-Candelaria
+%%DATADIR%%/isdb-t/br-rs-Canela
+%%DATADIR%%/isdb-t/br-rs-Cangucu
+%%DATADIR%%/isdb-t/br-rs-Canoas
+%%DATADIR%%/isdb-t/br-rs-CapaoDaCanoa
+%%DATADIR%%/isdb-t/br-rs-CapaoDoLeao
+%%DATADIR%%/isdb-t/br-rs-Carazinho
+%%DATADIR%%/isdb-t/br-rs-CarlosBarbosa
+%%DATADIR%%/isdb-t/br-rs-Catuipe
+%%DATADIR%%/isdb-t/br-rs-CaxiasDoSul
+%%DATADIR%%/isdb-t/br-rs-Cidreira
+%%DATADIR%%/isdb-t/br-rs-CoronelBarros
+%%DATADIR%%/isdb-t/br-rs-CruzAlta
+%%DATADIR%%/isdb-t/br-rs-DomPedrito
+%%DATADIR%%/isdb-t/br-rs-DomPedroDeAlcantara
+%%DATADIR%%/isdb-t/br-rs-Erechim
+%%DATADIR%%/isdb-t/br-rs-Estrela
+%%DATADIR%%/isdb-t/br-rs-Farroupilha
+%%DATADIR%%/isdb-t/br-rs-Feliz
+%%DATADIR%%/isdb-t/br-rs-FloresDaCunha
+%%DATADIR%%/isdb-t/br-rs-FredericoWestphalen
+%%DATADIR%%/isdb-t/br-rs-Garibaldi
+%%DATADIR%%/isdb-t/br-rs-GetulioVargas
+%%DATADIR%%/isdb-t/br-rs-Gramado
+%%DATADIR%%/isdb-t/br-rs-HulhaNegra
+%%DATADIR%%/isdb-t/br-rs-Igrejinha
+%%DATADIR%%/isdb-t/br-rs-Ijui
+%%DATADIR%%/isdb-t/br-rs-Imbe
+%%DATADIR%%/isdb-t/br-rs-Independencia
+%%DATADIR%%/isdb-t/br-rs-Itaqui
+%%DATADIR%%/isdb-t/br-rs-Lajeado
+%%DATADIR%%/isdb-t/br-rs-MonteAlegreDosCampos
+%%DATADIR%%/isdb-t/br-rs-Montenegro
+%%DATADIR%%/isdb-t/br-rs-MorroRedondo
+%%DATADIR%%/isdb-t/br-rs-NovaPetropolis
+%%DATADIR%%/isdb-t/br-rs-NovaSantaRita
+%%DATADIR%%/isdb-t/br-rs-NovoHamburgo
+%%DATADIR%%/isdb-t/br-rs-Osorio
+%%DATADIR%%/isdb-t/br-rs-PalmaresDoSul
+%%DATADIR%%/isdb-t/br-rs-PalmeiraDasMissoes
+%%DATADIR%%/isdb-t/br-rs-ParaisoDoSul
+%%DATADIR%%/isdb-t/br-rs-PassoFundo
+%%DATADIR%%/isdb-t/br-rs-PedrasAltas
+%%DATADIR%%/isdb-t/br-rs-Pejucara
+%%DATADIR%%/isdb-t/br-rs-Pelotas
+%%DATADIR%%/isdb-t/br-rs-PicadaCafe
+%%DATADIR%%/isdb-t/br-rs-PortoAlegre
+%%DATADIR%%/isdb-t/br-rs-RioGrande
+%%DATADIR%%/isdb-t/br-rs-RioGrandeCassino
+%%DATADIR%%/isdb-t/br-rs-SalvadorDoSul
+%%DATADIR%%/isdb-t/br-rs-Sananduva
+%%DATADIR%%/isdb-t/br-rs-SantaCruzDoSul
+%%DATADIR%%/isdb-t/br-rs-SantaMaria
+%%DATADIR%%/isdb-t/br-rs-SantaRosa
+%%DATADIR%%/isdb-t/br-rs-SantanaDoLivramento
+%%DATADIR%%/isdb-t/br-rs-SantoAngelo
+%%DATADIR%%/isdb-t/br-rs-SantoAntonioDaPatrulha
+%%DATADIR%%/isdb-t/br-rs-SantoCristo
+%%DATADIR%%/isdb-t/br-rs-SaoBorja
+%%DATADIR%%/isdb-t/br-rs-SaoGabriel
+%%DATADIR%%/isdb-t/br-rs-SaoJoseDoNorte
+%%DATADIR%%/isdb-t/br-rs-SaoLuizGonzaga
+%%DATADIR%%/isdb-t/br-rs-SaoMarcos
+%%DATADIR%%/isdb-t/br-rs-SaoSepe
+%%DATADIR%%/isdb-t/br-rs-Sapiranga
+%%DATADIR%%/isdb-t/br-rs-Sertao
+%%DATADIR%%/isdb-t/br-rs-Sinimbu
+%%DATADIR%%/isdb-t/br-rs-Taquara
+%%DATADIR%%/isdb-t/br-rs-TerraDeAreia
+%%DATADIR%%/isdb-t/br-rs-Torres
+%%DATADIR%%/isdb-t/br-rs-Tramandai
+%%DATADIR%%/isdb-t/br-rs-TresCachoeiras
+%%DATADIR%%/isdb-t/br-rs-TresCoroas
+%%DATADIR%%/isdb-t/br-rs-TresDeMaio
+%%DATADIR%%/isdb-t/br-rs-Triunfo
+%%DATADIR%%/isdb-t/br-rs-Tucunduva
+%%DATADIR%%/isdb-t/br-rs-Tupandi
+%%DATADIR%%/isdb-t/br-rs-Uruguaiana
+%%DATADIR%%/isdb-t/br-rs-Vacaria
+%%DATADIR%%/isdb-t/br-rs-VenancioAires
+%%DATADIR%%/isdb-t/br-rs-VilaNovaDoSul
+%%DATADIR%%/isdb-t/br-rs-Xangrila
+%%DATADIR%%/isdb-t/br-sc-Agronomica
+%%DATADIR%%/isdb-t/br-sc-AguasMornas
+%%DATADIR%%/isdb-t/br-sc-AntonioCarlos
+%%DATADIR%%/isdb-t/br-sc-Ararangua
+%%DATADIR%%/isdb-t/br-sc-Aurora
+%%DATADIR%%/isdb-t/br-sc-BalnearioCamboriu
+%%DATADIR%%/isdb-t/br-sc-BarraVelha
+%%DATADIR%%/isdb-t/br-sc-Blumenau
+%%DATADIR%%/isdb-t/br-sc-BomJesus
+%%DATADIR%%/isdb-t/br-sc-Bombinhas
+%%DATADIR%%/isdb-t/br-sc-Brusque
+%%DATADIR%%/isdb-t/br-sc-Cacador
+%%DATADIR%%/isdb-t/br-sc-Canoinhas
+%%DATADIR%%/isdb-t/br-sc-CapaoAlto
+%%DATADIR%%/isdb-t/br-sc-CapivariDeBaixo
+%%DATADIR%%/isdb-t/br-sc-Chapeco
+%%DATADIR%%/isdb-t/br-sc-CocalDoSul
+%%DATADIR%%/isdb-t/br-sc-Concordia
+%%DATADIR%%/isdb-t/br-sc-CorreiaPinto
+%%DATADIR%%/isdb-t/br-sc-Corupa
+%%DATADIR%%/isdb-t/br-sc-Criciuma
+%%DATADIR%%/isdb-t/br-sc-Florianopolis
+%%DATADIR%%/isdb-t/br-sc-FlorianopolisCanasvieiras
+%%DATADIR%%/isdb-t/br-sc-FlorianopolisIngleses
+%%DATADIR%%/isdb-t/br-sc-Garopaba
+%%DATADIR%%/isdb-t/br-sc-Garuva
+%%DATADIR%%/isdb-t/br-sc-Gaspar
+%%DATADIR%%/isdb-t/br-sc-GovernadorCelsoRamos
+%%DATADIR%%/isdb-t/br-sc-Guabiruba
+%%DATADIR%%/isdb-t/br-sc-Guaramirim
+%%DATADIR%%/isdb-t/br-sc-HervalDOeste
+%%DATADIR%%/isdb-t/br-sc-Icara
+%%DATADIR%%/isdb-t/br-sc-Imarui
+%%DATADIR%%/isdb-t/br-sc-Imbituba
+%%DATADIR%%/isdb-t/br-sc-Indaial
+%%DATADIR%%/isdb-t/br-sc-IporaDoOeste
+%%DATADIR%%/isdb-t/br-sc-Itajai
+%%DATADIR%%/isdb-t/br-sc-Itapema
+%%DATADIR%%/isdb-t/br-sc-Itapoa
+%%DATADIR%%/isdb-t/br-sc-Jaguaruna
+%%DATADIR%%/isdb-t/br-sc-JaraguaDoSul
+%%DATADIR%%/isdb-t/br-sc-Joacaba
+%%DATADIR%%/isdb-t/br-sc-Joinville
+%%DATADIR%%/isdb-t/br-sc-Lages
+%%DATADIR%%/isdb-t/br-sc-Laguna
+%%DATADIR%%/isdb-t/br-sc-Laurentino
+%%DATADIR%%/isdb-t/br-sc-Lontras
+%%DATADIR%%/isdb-t/br-sc-LuisAlves
+%%DATADIR%%/isdb-t/br-sc-Mafra
+%%DATADIR%%/isdb-t/br-sc-Maravilha
+%%DATADIR%%/isdb-t/br-sc-Massaranduba
+%%DATADIR%%/isdb-t/br-sc-Navegantes
+%%DATADIR%%/isdb-t/br-sc-NovaVeneza
+%%DATADIR%%/isdb-t/br-sc-OuroVerde
+%%DATADIR%%/isdb-t/br-sc-Painel
+%%DATADIR%%/isdb-t/br-sc-PassoDeTorres
+%%DATADIR%%/isdb-t/br-sc-Penha
+%%DATADIR%%/isdb-t/br-sc-Picarras
+%%DATADIR%%/isdb-t/br-sc-PortoBelo
+%%DATADIR%%/isdb-t/br-sc-PortoUniao
+%%DATADIR%%/isdb-t/br-sc-RioDoSul
+%%DATADIR%%/isdb-t/br-sc-RioNegrinho
+%%DATADIR%%/isdb-t/br-sc-SantaRosaDoSul
+%%DATADIR%%/isdb-t/br-sc-SantoAmaroDaImperatriz
+%%DATADIR%%/isdb-t/br-sc-SaoBentoDoSul
+%%DATADIR%%/isdb-t/br-sc-SaoMiguelDoeste
+%%DATADIR%%/isdb-t/br-sc-Schroeder
+%%DATADIR%%/isdb-t/br-sc-SerraAlta
+%%DATADIR%%/isdb-t/br-sc-Sombrio
+%%DATADIR%%/isdb-t/br-sc-Tijucas
+%%DATADIR%%/isdb-t/br-sc-Tubarao
+%%DATADIR%%/isdb-t/br-sc-Xanxere
+%%DATADIR%%/isdb-t/br-sc-Xaxim
+%%DATADIR%%/isdb-t/br-se-Aquidaba
+%%DATADIR%%/isdb-t/br-se-Aracaju
+%%DATADIR%%/isdb-t/br-se-Araua
+%%DATADIR%%/isdb-t/br-se-AreiaBranca
+%%DATADIR%%/isdb-t/br-se-BarraDosCoqueiros
+%%DATADIR%%/isdb-t/br-se-Boquim
+%%DATADIR%%/isdb-t/br-se-CampoDoBrito
+%%DATADIR%%/isdb-t/br-se-CanindeDeSaoFrancisco
+%%DATADIR%%/isdb-t/br-se-Capela
+%%DATADIR%%/isdb-t/br-se-Carira
+%%DATADIR%%/isdb-t/br-se-Carmopolis
+%%DATADIR%%/isdb-t/br-se-CedroDeSaoJoao
+%%DATADIR%%/isdb-t/br-se-Cristinapolis
+%%DATADIR%%/isdb-t/br-se-DivinaPastora
+%%DATADIR%%/isdb-t/br-se-Estancia
+%%DATADIR%%/isdb-t/br-se-FeiraNova
+%%DATADIR%%/isdb-t/br-se-FreiPaulo
+%%DATADIR%%/isdb-t/br-se-Gararu
+%%DATADIR%%/isdb-t/br-se-GeneralMaynard
+%%DATADIR%%/isdb-t/br-se-GrachoCardoso
+%%DATADIR%%/isdb-t/br-se-IlhaDasFlores
+%%DATADIR%%/isdb-t/br-se-Itabaiana
+%%DATADIR%%/isdb-t/br-se-Itabaianinha
+%%DATADIR%%/isdb-t/br-se-Itabi
+%%DATADIR%%/isdb-t/br-se-ItaporangaDAjuda
+%%DATADIR%%/isdb-t/br-se-Japaratuba
+%%DATADIR%%/isdb-t/br-se-Lagarto
+%%DATADIR%%/isdb-t/br-se-Laranjeiras
+%%DATADIR%%/isdb-t/br-se-Macambira
+%%DATADIR%%/isdb-t/br-se-Malhador
+%%DATADIR%%/isdb-t/br-se-Maruim
+%%DATADIR%%/isdb-t/br-se-MoitaBonita
+%%DATADIR%%/isdb-t/br-se-MonteAlegreDeSergipe
+%%DATADIR%%/isdb-t/br-se-Muribeca
+%%DATADIR%%/isdb-t/br-se-NossaSenhoraAparecida
+%%DATADIR%%/isdb-t/br-se-NossaSenhoraDaGloria
+%%DATADIR%%/isdb-t/br-se-NossaSenhoraDasDores
+%%DATADIR%%/isdb-t/br-se-NossaSenhoraDoSocorro
+%%DATADIR%%/isdb-t/br-se-Pedrinhas
+%%DATADIR%%/isdb-t/br-se-PocoRedondo
+%%DATADIR%%/isdb-t/br-se-Propria
+%%DATADIR%%/isdb-t/br-se-RiachaoDoDantas
+%%DATADIR%%/isdb-t/br-se-Riachuelo
+%%DATADIR%%/isdb-t/br-se-Ribeiropolis
+%%DATADIR%%/isdb-t/br-se-RosarioDoCatete
+%%DATADIR%%/isdb-t/br-se-Salgado
+%%DATADIR%%/isdb-t/br-se-SantaLuziaDoIntanhy
+%%DATADIR%%/isdb-t/br-se-SantoAmaroDasBrotas
+%%DATADIR%%/isdb-t/br-se-SaoCristovao
+%%DATADIR%%/isdb-t/br-se-SaoDomingos
+%%DATADIR%%/isdb-t/br-se-SaoMiguelDoAleixo
+%%DATADIR%%/isdb-t/br-se-Telha
+%%DATADIR%%/isdb-t/br-se-TomarDoGeru
+%%DATADIR%%/isdb-t/br-se-Umbauba
+%%DATADIR%%/isdb-t/br-sp-Adamantina
+%%DATADIR%%/isdb-t/br-sp-Aguai
+%%DATADIR%%/isdb-t/br-sp-AguasDaPrata
+%%DATADIR%%/isdb-t/br-sp-AguasDeLindoia
+%%DATADIR%%/isdb-t/br-sp-AguasDeSantaBarbara
+%%DATADIR%%/isdb-t/br-sp-AguasDeSaoPedro
+%%DATADIR%%/isdb-t/br-sp-Agudos
+%%DATADIR%%/isdb-t/br-sp-Altinopolis
+%%DATADIR%%/isdb-t/br-sp-Americana
+%%DATADIR%%/isdb-t/br-sp-AmericoBrasiliense
+%%DATADIR%%/isdb-t/br-sp-AmericoDeCampos
+%%DATADIR%%/isdb-t/br-sp-Amparo
+%%DATADIR%%/isdb-t/br-sp-Andradina
+%%DATADIR%%/isdb-t/br-sp-Angatuba
+%%DATADIR%%/isdb-t/br-sp-Aparecida
+%%DATADIR%%/isdb-t/br-sp-AparecidaDOeste
+%%DATADIR%%/isdb-t/br-sp-Apiai
+%%DATADIR%%/isdb-t/br-sp-Aracatuba
+%%DATADIR%%/isdb-t/br-sp-Arandu
+%%DATADIR%%/isdb-t/br-sp-Araraquara
+%%DATADIR%%/isdb-t/br-sp-Araras
+%%DATADIR%%/isdb-t/br-sp-Arealva
+%%DATADIR%%/isdb-t/br-sp-Areias
+%%DATADIR%%/isdb-t/br-sp-Assis
+%%DATADIR%%/isdb-t/br-sp-Atibaia
+%%DATADIR%%/isdb-t/br-sp-Auriflama
+%%DATADIR%%/isdb-t/br-sp-Avare
+%%DATADIR%%/isdb-t/br-sp-Barbosa
+%%DATADIR%%/isdb-t/br-sp-Bariri
+%%DATADIR%%/isdb-t/br-sp-BarraBonita
+%%DATADIR%%/isdb-t/br-sp-Barretos
+%%DATADIR%%/isdb-t/br-sp-Barrinha
+%%DATADIR%%/isdb-t/br-sp-Bastos
+%%DATADIR%%/isdb-t/br-sp-Batatais
+%%DATADIR%%/isdb-t/br-sp-Bauru
+%%DATADIR%%/isdb-t/br-sp-Bebedouro
+%%DATADIR%%/isdb-t/br-sp-Bertioga
+%%DATADIR%%/isdb-t/br-sp-Birigui
+%%DATADIR%%/isdb-t/br-sp-BoaEsperancaDoSul
+%%DATADIR%%/isdb-t/br-sp-Boituva
+%%DATADIR%%/isdb-t/br-sp-Botucatu
+%%DATADIR%%/isdb-t/br-sp-BragancaPaulista
+%%DATADIR%%/isdb-t/br-sp-Brauna
+%%DATADIR%%/isdb-t/br-sp-Brodowski
+%%DATADIR%%/isdb-t/br-sp-Brotas
+%%DATADIR%%/isdb-t/br-sp-CachoeiraPaulista
+%%DATADIR%%/isdb-t/br-sp-Caconde
+%%DATADIR%%/isdb-t/br-sp-Cafelandia
+%%DATADIR%%/isdb-t/br-sp-Cajamar
+%%DATADIR%%/isdb-t/br-sp-Cajati
+%%DATADIR%%/isdb-t/br-sp-Cajobi
+%%DATADIR%%/isdb-t/br-sp-Campinas
+%%DATADIR%%/isdb-t/br-sp-CampoLimpoPaulista
+%%DATADIR%%/isdb-t/br-sp-CamposDoJordao
+%%DATADIR%%/isdb-t/br-sp-Cananeia
+%%DATADIR%%/isdb-t/br-sp-CandidoMota
+%%DATADIR%%/isdb-t/br-sp-Capivari
+%%DATADIR%%/isdb-t/br-sp-Caraguatatuba
+%%DATADIR%%/isdb-t/br-sp-Carapicuiba
+%%DATADIR%%/isdb-t/br-sp-Cardoso
+%%DATADIR%%/isdb-t/br-sp-CasaBranca
+%%DATADIR%%/isdb-t/br-sp-CassiaDosCoqueiros
+%%DATADIR%%/isdb-t/br-sp-Catanduva
+%%DATADIR%%/isdb-t/br-sp-Cerquilho
+%%DATADIR%%/isdb-t/br-sp-CesarioLange
+%%DATADIR%%/isdb-t/br-sp-Colina
+%%DATADIR%%/isdb-t/br-sp-Colombia
+%%DATADIR%%/isdb-t/br-sp-Cravinhos
+%%DATADIR%%/isdb-t/br-sp-CristaisPaulista
+%%DATADIR%%/isdb-t/br-sp-Cruzeiro
+%%DATADIR%%/isdb-t/br-sp-Cubatao
+%%DATADIR%%/isdb-t/br-sp-Descalvado
+%%DATADIR%%/isdb-t/br-sp-Diadema
+%%DATADIR%%/isdb-t/br-sp-Dobrada
+%%DATADIR%%/isdb-t/br-sp-DoisCorregos
+%%DATADIR%%/isdb-t/br-sp-Dracena
+%%DATADIR%%/isdb-t/br-sp-Duartina
+%%DATADIR%%/isdb-t/br-sp-Dumont
+%%DATADIR%%/isdb-t/br-sp-Echapora
+%%DATADIR%%/isdb-t/br-sp-Eldorado
+%%DATADIR%%/isdb-t/br-sp-EmbuDasArtes
+%%DATADIR%%/isdb-t/br-sp-EspiritoSantoDoPinhal
+%%DATADIR%%/isdb-t/br-sp-EstivaGerbi
+%%DATADIR%%/isdb-t/br-sp-EstrelaDOeste
+%%DATADIR%%/isdb-t/br-sp-Fartura
+%%DATADIR%%/isdb-t/br-sp-FernandoPrestes
+%%DATADIR%%/isdb-t/br-sp-Fernandopolis
+%%DATADIR%%/isdb-t/br-sp-FerrazDeVasconcelos
+%%DATADIR%%/isdb-t/br-sp-Franca
+%%DATADIR%%/isdb-t/br-sp-FranciscoMorato
+%%DATADIR%%/isdb-t/br-sp-FrancoDaRocha
+%%DATADIR%%/isdb-t/br-sp-Galia
+%%DATADIR%%/isdb-t/br-sp-Garca
+%%DATADIR%%/isdb-t/br-sp-GeneralSalgado
+%%DATADIR%%/isdb-t/br-sp-Getulina
+%%DATADIR%%/isdb-t/br-sp-Guaira
+%%DATADIR%%/isdb-t/br-sp-Guapiacu
+%%DATADIR%%/isdb-t/br-sp-Guara
+%%DATADIR%%/isdb-t/br-sp-GuaraniDOeste
+%%DATADIR%%/isdb-t/br-sp-Guararema
+%%DATADIR%%/isdb-t/br-sp-Guaratingueta
+%%DATADIR%%/isdb-t/br-sp-Guariba
+%%DATADIR%%/isdb-t/br-sp-Guaruja
+%%DATADIR%%/isdb-t/br-sp-Guarulhos
+%%DATADIR%%/isdb-t/br-sp-Guzolandia
+%%DATADIR%%/isdb-t/br-sp-Holambra
+%%DATADIR%%/isdb-t/br-sp-Hortolandia
+%%DATADIR%%/isdb-t/br-sp-Iacanga
+%%DATADIR%%/isdb-t/br-sp-Iacri
+%%DATADIR%%/isdb-t/br-sp-Ibate
+%%DATADIR%%/isdb-t/br-sp-Ibitinga
+%%DATADIR%%/isdb-t/br-sp-Ibiuna
+%%DATADIR%%/isdb-t/br-sp-Icem
+%%DATADIR%%/isdb-t/br-sp-IgaracuDoTiete
+%%DATADIR%%/isdb-t/br-sp-Igarapava
+%%DATADIR%%/isdb-t/br-sp-Iguape
+%%DATADIR%%/isdb-t/br-sp-IlhaComprida
+%%DATADIR%%/isdb-t/br-sp-IlhaSolteira
+%%DATADIR%%/isdb-t/br-sp-Ilhabela
+%%DATADIR%%/isdb-t/br-sp-Indaiatuba
+%%DATADIR%%/isdb-t/br-sp-Ipero
+%%DATADIR%%/isdb-t/br-sp-Iporanga
+%%DATADIR%%/isdb-t/br-sp-Ipua
+%%DATADIR%%/isdb-t/br-sp-Itai
+%%DATADIR%%/isdb-t/br-sp-Itanhaem
+%%DATADIR%%/isdb-t/br-sp-Itapetininga
+%%DATADIR%%/isdb-t/br-sp-Itapeva
+%%DATADIR%%/isdb-t/br-sp-Itapevi
+%%DATADIR%%/isdb-t/br-sp-Itapira
+%%DATADIR%%/isdb-t/br-sp-Itapolis
+%%DATADIR%%/isdb-t/br-sp-Itaporanga
+%%DATADIR%%/isdb-t/br-sp-Itaquaquecetuba
+%%DATADIR%%/isdb-t/br-sp-Itarare
+%%DATADIR%%/isdb-t/br-sp-Itariri
+%%DATADIR%%/isdb-t/br-sp-Itirapua
+%%DATADIR%%/isdb-t/br-sp-Itu
+%%DATADIR%%/isdb-t/br-sp-Ituverava
+%%DATADIR%%/isdb-t/br-sp-Jaborandi
+%%DATADIR%%/isdb-t/br-sp-Jaboticabal
+%%DATADIR%%/isdb-t/br-sp-Jacarei
+%%DATADIR%%/isdb-t/br-sp-Jaci
+%%DATADIR%%/isdb-t/br-sp-Jacupiranga
+%%DATADIR%%/isdb-t/br-sp-Jaguariuna
+%%DATADIR%%/isdb-t/br-sp-Jales
+%%DATADIR%%/isdb-t/br-sp-Jandira
+%%DATADIR%%/isdb-t/br-sp-Jardinopolis
+%%DATADIR%%/isdb-t/br-sp-Jau
+%%DATADIR%%/isdb-t/br-sp-Jeriquara
+%%DATADIR%%/isdb-t/br-sp-JoseBonifacio
+%%DATADIR%%/isdb-t/br-sp-Jundiai
+%%DATADIR%%/isdb-t/br-sp-Lagoinha
+%%DATADIR%%/isdb-t/br-sp-LaranjalPaulista
+%%DATADIR%%/isdb-t/br-sp-Leme
+%%DATADIR%%/isdb-t/br-sp-LencoisPaulista
+%%DATADIR%%/isdb-t/br-sp-Limeira
+%%DATADIR%%/isdb-t/br-sp-Lindoia
+%%DATADIR%%/isdb-t/br-sp-Lins
+%%DATADIR%%/isdb-t/br-sp-Lorena
+%%DATADIR%%/isdb-t/br-sp-LuizAntonio
+%%DATADIR%%/isdb-t/br-sp-Macatuba
+%%DATADIR%%/isdb-t/br-sp-Mairinque
+%%DATADIR%%/isdb-t/br-sp-Mairipora
+%%DATADIR%%/isdb-t/br-sp-MarabaPaulista
+%%DATADIR%%/isdb-t/br-sp-Marilia
+%%DATADIR%%/isdb-t/br-sp-Matao
+%%DATADIR%%/isdb-t/br-sp-Mendonca
+%%DATADIR%%/isdb-t/br-sp-Miracatu
+%%DATADIR%%/isdb-t/br-sp-Mirandopolis
+%%DATADIR%%/isdb-t/br-sp-MiranteDoParanapanema
+%%DATADIR%%/isdb-t/br-sp-Mirassol
+%%DATADIR%%/isdb-t/br-sp-Mococa
+%%DATADIR%%/isdb-t/br-sp-MogiDasCruzes
+%%DATADIR%%/isdb-t/br-sp-MogiMirim
+%%DATADIR%%/isdb-t/br-sp-Mogiguacu
+%%DATADIR%%/isdb-t/br-sp-Mongagua
+%%DATADIR%%/isdb-t/br-sp-MonteAlto
+%%DATADIR%%/isdb-t/br-sp-MonteAprazivel
+%%DATADIR%%/isdb-t/br-sp-MonteAzulPaulista
+%%DATADIR%%/isdb-t/br-sp-Morungaba
+%%DATADIR%%/isdb-t/br-sp-NevesPaulista
+%%DATADIR%%/isdb-t/br-sp-NovoHorizonte
+%%DATADIR%%/isdb-t/br-sp-Nuporanga
+%%DATADIR%%/isdb-t/br-sp-Olimpia
+%%DATADIR%%/isdb-t/br-sp-Orlandia
+%%DATADIR%%/isdb-t/br-sp-OsvaldoCruz
+%%DATADIR%%/isdb-t/br-sp-Ourinhos
+%%DATADIR%%/isdb-t/br-sp-Pacaembu
+%%DATADIR%%/isdb-t/br-sp-Palestina
+%%DATADIR%%/isdb-t/br-sp-ParaguacuPaulista
+%%DATADIR%%/isdb-t/br-sp-Paraibuna
+%%DATADIR%%/isdb-t/br-sp-Parapua
+%%DATADIR%%/isdb-t/br-sp-PariqueraAcu
+%%DATADIR%%/isdb-t/br-sp-PatrocinioPaulista
+%%DATADIR%%/isdb-t/br-sp-Paulinia
+%%DATADIR%%/isdb-t/br-sp-PauloDeFaria
+%%DATADIR%%/isdb-t/br-sp-Pederneiras
+%%DATADIR%%/isdb-t/br-sp-Pedregulho
+%%DATADIR%%/isdb-t/br-sp-Pedreira
+%%DATADIR%%/isdb-t/br-sp-PedroDeToledo
+%%DATADIR%%/isdb-t/br-sp-Penapolis
+%%DATADIR%%/isdb-t/br-sp-PereiraBarreto
+%%DATADIR%%/isdb-t/br-sp-Peruibe
+%%DATADIR%%/isdb-t/br-sp-Piedade
+%%DATADIR%%/isdb-t/br-sp-PilarDoSul
+%%DATADIR%%/isdb-t/br-sp-Pindamonhangaba
+%%DATADIR%%/isdb-t/br-sp-Pindorama
+%%DATADIR%%/isdb-t/br-sp-Piquete
+%%DATADIR%%/isdb-t/br-sp-Piracicaba
+%%DATADIR%%/isdb-t/br-sp-Piraju
+%%DATADIR%%/isdb-t/br-sp-Pirajui
+%%DATADIR%%/isdb-t/br-sp-Pirangi
+%%DATADIR%%/isdb-t/br-sp-Pirassununga
+%%DATADIR%%/isdb-t/br-sp-Pitangueiras
+%%DATADIR%%/isdb-t/br-sp-Poa
+%%DATADIR%%/isdb-t/br-sp-Pompeia
+%%DATADIR%%/isdb-t/br-sp-Pongai
+%%DATADIR%%/isdb-t/br-sp-Pontal
+%%DATADIR%%/isdb-t/br-sp-PortoFeliz
+%%DATADIR%%/isdb-t/br-sp-PortoFerreira
+%%DATADIR%%/isdb-t/br-sp-PraiaGrande
+%%DATADIR%%/isdb-t/br-sp-PresidenteAlves
+%%DATADIR%%/isdb-t/br-sp-PresidenteBernardes
+%%DATADIR%%/isdb-t/br-sp-PresidenteEpitacio
+%%DATADIR%%/isdb-t/br-sp-PresidentePrudente
+%%DATADIR%%/isdb-t/br-sp-PresidenteVenceslau
+%%DATADIR%%/isdb-t/br-sp-Rancharia
+%%DATADIR%%/isdb-t/br-sp-RedencaoDaSerra
+%%DATADIR%%/isdb-t/br-sp-Reginopolis
+%%DATADIR%%/isdb-t/br-sp-Registro
+%%DATADIR%%/isdb-t/br-sp-Restinga
+%%DATADIR%%/isdb-t/br-sp-RibeiraoCorrente
+%%DATADIR%%/isdb-t/br-sp-RibeiraoPreto
+%%DATADIR%%/isdb-t/br-sp-Rinopolis
+%%DATADIR%%/isdb-t/br-sp-RioClaro
+%%DATADIR%%/isdb-t/br-sp-Roseira
+%%DATADIR%%/isdb-t/br-sp-Sabino
+%%DATADIR%%/isdb-t/br-sp-SalesOliveira
+%%DATADIR%%/isdb-t/br-sp-Salto
+%%DATADIR%%/isdb-t/br-sp-SantaBarbaraDOeste
+%%DATADIR%%/isdb-t/br-sp-SantaCruzDaConceicao
+%%DATADIR%%/isdb-t/br-sp-SantaCruzDaEsperanca
+%%DATADIR%%/isdb-t/br-sp-SantaCruzDasPalmeiras
+%%DATADIR%%/isdb-t/br-sp-SantaCruzDoRioPardo
+%%DATADIR%%/isdb-t/br-sp-SantaErnestina
+%%DATADIR%%/isdb-t/br-sp-SantaFeDoSul
+%%DATADIR%%/isdb-t/br-sp-SantaGertrudes
+%%DATADIR%%/isdb-t/br-sp-SantaLucia
+%%DATADIR%%/isdb-t/br-sp-SantaMariaDaSerra
+%%DATADIR%%/isdb-t/br-sp-SantaRitaDoPassaQuatro
+%%DATADIR%%/isdb-t/br-sp-SantaRosaDeViterbo
+%%DATADIR%%/isdb-t/br-sp-SantoAnastacio
+%%DATADIR%%/isdb-t/br-sp-SantoAndre
+%%DATADIR%%/isdb-t/br-sp-Santos
+%%DATADIR%%/isdb-t/br-sp-SaoBentoDoSapucai
+%%DATADIR%%/isdb-t/br-sp-SaoCarlos
+%%DATADIR%%/isdb-t/br-sp-SaoJoaoDaBoaVista
+%%DATADIR%%/isdb-t/br-sp-SaoJoaoDoPauDAlho
+%%DATADIR%%/isdb-t/br-sp-SaoJoaquimDaBarra
+%%DATADIR%%/isdb-t/br-sp-SaoJoseDaBelaVista
+%%DATADIR%%/isdb-t/br-sp-SaoJoseDoRioPardo
+%%DATADIR%%/isdb-t/br-sp-SaoJoseDoRioPreto
+%%DATADIR%%/isdb-t/br-sp-SaoJoseDosCampos
+%%DATADIR%%/isdb-t/br-sp-SaoLuisDoParaitinga
+%%DATADIR%%/isdb-t/br-sp-SaoManuel
+%%DATADIR%%/isdb-t/br-sp-SaoMiguelArcanjo
+%%DATADIR%%/isdb-t/br-sp-SaoPaulo
+%%DATADIR%%/isdb-t/br-sp-SaoPedro
+%%DATADIR%%/isdb-t/br-sp-SaoRoque
+%%DATADIR%%/isdb-t/br-sp-SaoSebastiao
+%%DATADIR%%/isdb-t/br-sp-SaoSebastiaoBoicucanga
+%%DATADIR%%/isdb-t/br-sp-SaoSebastiaoMaresias
+%%DATADIR%%/isdb-t/br-sp-SaoSimao
+%%DATADIR%%/isdb-t/br-sp-SaoVicente
+%%DATADIR%%/isdb-t/br-sp-SerraAzul
+%%DATADIR%%/isdb-t/br-sp-SerraNegra
+%%DATADIR%%/isdb-t/br-sp-Serrana
+%%DATADIR%%/isdb-t/br-sp-Sertaozinho
+%%DATADIR%%/isdb-t/br-sp-SeteBarras
+%%DATADIR%%/isdb-t/br-sp-Socorro
+%%DATADIR%%/isdb-t/br-sp-Sorocaba
+%%DATADIR%%/isdb-t/br-sp-Sumare
+%%DATADIR%%/isdb-t/br-sp-Suzano
+%%DATADIR%%/isdb-t/br-sp-Taciba
+%%DATADIR%%/isdb-t/br-sp-Taiacu
+%%DATADIR%%/isdb-t/br-sp-Taiuva
+%%DATADIR%%/isdb-t/br-sp-Tambau
+%%DATADIR%%/isdb-t/br-sp-Tanabi
+%%DATADIR%%/isdb-t/br-sp-Tapirai
+%%DATADIR%%/isdb-t/br-sp-Taquaritinga
+%%DATADIR%%/isdb-t/br-sp-Taquarituba
+%%DATADIR%%/isdb-t/br-sp-Tatui
+%%DATADIR%%/isdb-t/br-sp-Taubate
+%%DATADIR%%/isdb-t/br-sp-Tejupa
+%%DATADIR%%/isdb-t/br-sp-TeodoroSampaio
+%%DATADIR%%/isdb-t/br-sp-TerraRoxa
+%%DATADIR%%/isdb-t/br-sp-Tiete
+%%DATADIR%%/isdb-t/br-sp-Torrinha
+%%DATADIR%%/isdb-t/br-sp-Tupa
+%%DATADIR%%/isdb-t/br-sp-TupiPaulista
+%%DATADIR%%/isdb-t/br-sp-Ubatuba
+%%DATADIR%%/isdb-t/br-sp-Urupes
+%%DATADIR%%/isdb-t/br-sp-Valinhos
+%%DATADIR%%/isdb-t/br-sp-Valparaiso
+%%DATADIR%%/isdb-t/br-sp-VargemGrandeDoSul
+%%DATADIR%%/isdb-t/br-sp-VarzeaPaulista
+%%DATADIR%%/isdb-t/br-sp-Viradouro
+%%DATADIR%%/isdb-t/br-sp-Votorantim
+%%DATADIR%%/isdb-t/br-sp-Votuporanga
+%%DATADIR%%/isdb-t/br-to-AliancaDoTocantins
+%%DATADIR%%/isdb-t/br-to-Aragominas
+%%DATADIR%%/isdb-t/br-to-Araguaina
+%%DATADIR%%/isdb-t/br-to-Babaculandia
+%%DATADIR%%/isdb-t/br-to-BrejinhoDeNazare
+%%DATADIR%%/isdb-t/br-to-ChapadaDeAreia
+%%DATADIR%%/isdb-t/br-to-Darcinopolis
+%%DATADIR%%/isdb-t/br-to-Duere
+%%DATADIR%%/isdb-t/br-to-Fatima
+%%DATADIR%%/isdb-t/br-to-Figueiropolis
+%%DATADIR%%/isdb-t/br-to-Filadelfia
+%%DATADIR%%/isdb-t/br-to-Gurupi
+%%DATADIR%%/isdb-t/br-to-MiracemaDoTocantins
+%%DATADIR%%/isdb-t/br-to-Miranorte
+%%DATADIR%%/isdb-t/br-to-MonteSantoDoTocantins
+%%DATADIR%%/isdb-t/br-to-OliveiraDeFatima
+%%DATADIR%%/isdb-t/br-to-Palmas
+%%DATADIR%%/isdb-t/br-to-ParaisoDoTocantins
+%%DATADIR%%/isdb-t/br-to-Peixe
+%%DATADIR%%/isdb-t/br-to-PortoNacional
+%%DATADIR%%/isdb-t/br-to-SaoMiguelDoTocantins
+%%DATADIR%%/isdb-t/br-to-SitioNovoDoTocantins
+%%DATADIR%%/isdb-t/br-to-Tocantinopolis
diff --git a/multimedia/dvdstyler/Makefile b/multimedia/dvdstyler/Makefile
index 290e62c273e8..5219a30001c7 100644
--- a/multimedia/dvdstyler/Makefile
+++ b/multimedia/dvdstyler/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dvdstyler
 PORTVERSION=	2.9.6
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	SF
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 482c5c155662..e4b3b4239882 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ffmpeg
-PORTVERSION=	3.3.3
+PORTVERSION=	3.3.4
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://ffmpeg.org/releases/
diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo
index 6716db1a8f7b..c31fccbd8fac 100644
--- a/multimedia/ffmpeg/distinfo
+++ b/multimedia/ffmpeg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502831570
-SHA256 (ffmpeg-3.3.3.tar.xz) = d2a9002cdc6b533b59728827186c044ad02ba64841f1b7cd6c21779875453a1e
-SIZE (ffmpeg-3.3.3.tar.xz) = 8285032
+TIMESTAMP = 1505177492
+SHA256 (ffmpeg-3.3.4.tar.xz) = 98b97e1b908dfeb6aeb6d407e5a5eacdfc253a40c2d195f5867ed2d1d46ea957
+SIZE (ffmpeg-3.3.4.tar.xz) = 8282960
diff --git a/multimedia/ffmpegthumbnailer/Makefile b/multimedia/ffmpegthumbnailer/Makefile
index 54394aa2520a..aee91ab63fc9 100644
--- a/multimedia/ffmpegthumbnailer/Makefile
+++ b/multimedia/ffmpegthumbnailer/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ffmpegthumbnailer
 PORTVERSION=	2.2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia graphics
 
 MAINTAINER=	clutton@zoho.com
diff --git a/multimedia/ffms2/Makefile b/multimedia/ffms2/Makefile
index cfdad1e57370..7d0ed04e1b1c 100644
--- a/multimedia/ffms2/Makefile
+++ b/multimedia/ffms2/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	ffms2
 DISTVERSION=	2.23
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/multimedia/gstreamer1-vaapi/Makefile b/multimedia/gstreamer1-vaapi/Makefile
index c08f6a5827a5..2c03d5e84fb3 100644
--- a/multimedia/gstreamer1-vaapi/Makefile
+++ b/multimedia/gstreamer1-vaapi/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gstreamer1-vaapi
 PORTVERSION=	1.12.2
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	https://gstreamer.freedesktop.org/src/gstreamer-vaapi/
 DISTNAME=	gstreamer-vaapi-${PORTVERSION}
diff --git a/multimedia/gstreamermm/Makefile b/multimedia/gstreamermm/Makefile
index 4f7c2e7f0ef5..36a23f73b047 100644
--- a/multimedia/gstreamermm/Makefile
+++ b/multimedia/gstreamermm/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	gstreamermm
 PORTVERSION=	0.10.10.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	GNOME
 
diff --git a/multimedia/handbrake/Makefile b/multimedia/handbrake/Makefile
index c83429e8b52e..04ed03330d49 100644
--- a/multimedia/handbrake/Makefile
+++ b/multimedia/handbrake/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	handbrake
 PORTVERSION=	1.0.7
+PORTREVISION=	1
 CATEGORIES=	multimedia
 DIST_SUBDIR=	${PORTNAME}
 
diff --git a/multimedia/kf5-kmediaplayer/Makefile b/multimedia/kf5-kmediaplayer/Makefile
index 1d3d2c4a978a..9111373a2579 100644
--- a/multimedia/kf5-kmediaplayer/Makefile
+++ b/multimedia/kf5-kmediaplayer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	kmediaplayer
 PORTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	multimedia kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/multimedia/kissdx/Makefile b/multimedia/kissdx/Makefile
index c00a3a8d212b..dce9484c6b11 100644
--- a/multimedia/kissdx/Makefile
+++ b/multimedia/kissdx/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kissdx
 PORTVERSION=	0.13.10a
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	multimedia net
 MASTER_SITES=	http://paragi.dk/kiss/
 
diff --git a/multimedia/kodi/Makefile b/multimedia/kodi/Makefile
index 5ce369a241ad..3fd1c1ca8206 100644
--- a/multimedia/kodi/Makefile
+++ b/multimedia/kodi/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kodi
 DISTVERSION=	17.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia java
 
 MAINTAINER=	mickael.maillot@gmail.com
diff --git a/multimedia/kvazaar/Makefile b/multimedia/kvazaar/Makefile
index ea104a52338c..593017820961 100644
--- a/multimedia/kvazaar/Makefile
+++ b/multimedia/kvazaar/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	kvazaar
 DISTVERSIONPREFIX=	v
 DISTVERSION?=	1.1.0
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	multimedia
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/multimedia/libcec/Makefile b/multimedia/libcec/Makefile
index 69529bd43591..dadffff14dc1 100644
--- a/multimedia/libcec/Makefile
+++ b/multimedia/libcec/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libcec
 PORTVERSION=	4.0.2
+PORTREVISION=	1
 DISTVERSIONPREFIX=	${PORTNAME}-
 CATEGORIES=	multimedia
 
diff --git a/multimedia/libde265/Makefile b/multimedia/libde265/Makefile
index 559ee13fe5b4..95b1e80eab7e 100644
--- a/multimedia/libde265/Makefile
+++ b/multimedia/libde265/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libde265
 PORTVERSION=	1.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	multimedia
 
diff --git a/multimedia/libmediainfo/Makefile b/multimedia/libmediainfo/Makefile
index b5de46bf8aae..6c7483a73b3a 100644
--- a/multimedia/libmediainfo/Makefile
+++ b/multimedia/libmediainfo/Makefile
@@ -2,9 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	libmediainfo
-PORTVERSION=	0.7.98
+PORTVERSION=	0.7.99
+PORTREVISION=	1
 CATEGORIES=	multimedia
-MASTER_SITES=	http://mediaarea.net/download/binary/mediainfo/${PORTVERSION}/ \
+MASTER_SITES=	https://mediaarea.net/download/binary/mediainfo/${PORTVERSION}/ \
 		LOCAL/sunpoet
 DISTNAME=	MediaInfo_CLI_${PORTVERSION}_GNU_FromSource
 
diff --git a/multimedia/libmediainfo/distinfo b/multimedia/libmediainfo/distinfo
index 1f8fa20f461f..a32d31511454 100644
--- a/multimedia/libmediainfo/distinfo
+++ b/multimedia/libmediainfo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502473867
-SHA256 (MediaInfo_CLI_0.7.98_GNU_FromSource.tar.xz) = 2b4fb7a485e8be5051165e551e86a6702f02c3f45fc8448fbb2e4776f75a7383
-SIZE (MediaInfo_CLI_0.7.98_GNU_FromSource.tar.xz) = 2790656
+TIMESTAMP = 1505291584
+SHA256 (MediaInfo_CLI_0.7.99_GNU_FromSource.tar.xz) = 876bbafe37dc557b4f360f712830523494ce59d8d7210cf0ea8d788590e14768
+SIZE (MediaInfo_CLI_0.7.99_GNU_FromSource.tar.xz) = 2793892
diff --git a/multimedia/libva-intel-driver/Makefile b/multimedia/libva-intel-driver/Makefile
index 36b66cc8c694..7f2e5cec07c1 100644
--- a/multimedia/libva-intel-driver/Makefile
+++ b/multimedia/libva-intel-driver/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libva-intel-driver
 PORTVERSION=	1.8.3
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 MAINTAINER=	madpilot@FreeBSD.org
diff --git a/multimedia/libvpx/Makefile b/multimedia/libvpx/Makefile
index 8fdcda8f2c3b..a4f1d24d746e 100644
--- a/multimedia/libvpx/Makefile
+++ b/multimedia/libvpx/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	libvpx
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.6.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/multimedia/libzen/Makefile b/multimedia/libzen/Makefile
index 6598ebcdc918..605da9ddb8e3 100644
--- a/multimedia/libzen/Makefile
+++ b/multimedia/libzen/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	libzen
-PORTVERSION=	0.7.98
+PORTVERSION=	0.7.99
 CATEGORIES=	multimedia
-MASTER_SITES=	http://mediaarea.net/download/binary/mediainfo/${PORTVERSION}/ \
+MASTER_SITES=	https://mediaarea.net/download/binary/mediainfo/${PORTVERSION}/ \
 		LOCAL/sunpoet
 DISTNAME=	MediaInfo_CLI_${PORTVERSION}_GNU_FromSource
 
diff --git a/multimedia/libzen/distinfo b/multimedia/libzen/distinfo
index b0a4b1f41acd..a32d31511454 100644
--- a/multimedia/libzen/distinfo
+++ b/multimedia/libzen/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502473871
-SHA256 (MediaInfo_CLI_0.7.98_GNU_FromSource.tar.xz) = 2b4fb7a485e8be5051165e551e86a6702f02c3f45fc8448fbb2e4776f75a7383
-SIZE (MediaInfo_CLI_0.7.98_GNU_FromSource.tar.xz) = 2790656
+TIMESTAMP = 1505291584
+SHA256 (MediaInfo_CLI_0.7.99_GNU_FromSource.tar.xz) = 876bbafe37dc557b4f360f712830523494ce59d8d7210cf0ea8d788590e14768
+SIZE (MediaInfo_CLI_0.7.99_GNU_FromSource.tar.xz) = 2793892
diff --git a/multimedia/lives/Makefile b/multimedia/lives/Makefile
index 99e49d6ba801..f92485497ff7 100644
--- a/multimedia/lives/Makefile
+++ b/multimedia/lives/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	lives
 PORTVERSION=	2.8.7
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://lives-video.com/releases/
 DISTNAME=	LiVES-${PORTVERSION}
diff --git a/multimedia/mediainfo/Makefile b/multimedia/mediainfo/Makefile
index 1a522764fec4..1be5abb4c743 100644
--- a/multimedia/mediainfo/Makefile
+++ b/multimedia/mediainfo/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	mediainfo
-PORTVERSION=	0.7.98
+PORTVERSION=	0.7.99
 CATEGORIES=	multimedia
-MASTER_SITES=	http://mediaarea.net/download/binary/${PORTNAME}/${PORTVERSION}/ \
+MASTER_SITES=	https://mediaarea.net/download/binary/${PORTNAME}/${PORTVERSION}/ \
 		LOCAL/sunpoet
 DISTNAME=	MediaInfo_CLI_${PORTVERSION}_GNU_FromSource
 
diff --git a/multimedia/mediainfo/distinfo b/multimedia/mediainfo/distinfo
index 4250fa854efa..a32d31511454 100644
--- a/multimedia/mediainfo/distinfo
+++ b/multimedia/mediainfo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502473876
-SHA256 (MediaInfo_CLI_0.7.98_GNU_FromSource.tar.xz) = 2b4fb7a485e8be5051165e551e86a6702f02c3f45fc8448fbb2e4776f75a7383
-SIZE (MediaInfo_CLI_0.7.98_GNU_FromSource.tar.xz) = 2790656
+TIMESTAMP = 1505291584
+SHA256 (MediaInfo_CLI_0.7.99_GNU_FromSource.tar.xz) = 876bbafe37dc557b4f360f712830523494ce59d8d7210cf0ea8d788590e14768
+SIZE (MediaInfo_CLI_0.7.99_GNU_FromSource.tar.xz) = 2793892
diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile
index 73a087d71fc2..c19f3e67aa76 100644
--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mjpegtools
 PORTVERSION=	2.1.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME:S/tools//}/${PORTNAME}/${PORTVERSION}
 
diff --git a/multimedia/mkvalidator/Makefile b/multimedia/mkvalidator/Makefile
index 609fe217d8a4..fefc4af561b4 100644
--- a/multimedia/mkvalidator/Makefile
+++ b/multimedia/mkvalidator/Makefile
@@ -12,6 +12,7 @@ LICENSE=	BSD3CLAUSE BSD4CLAUSE GPLv2
 LICENSE_COMB=	multi
 
 BROKEN_powerpc64=	does not compile: mkvtree.c: error: dereferencing pointer to incomplete type
+BROKEN_sparc64=	build broken on big endian architectures
 
 BUILD_WRKSRC=	${WRKSRC}/${PORTNAME}
 
@@ -25,8 +26,6 @@ LIBS+=		-L${ICONV_PREFIX}/lib ${ICONV_LIB}
 
 PLIST_FILES=	bin/mkvalidator bin/mkvtree
 
-BROKEN_sparc64=	Build broken on big endian architectures
-
 MAKE_JOBS_UNSAFE=	yes
 
 post-patch:
diff --git a/multimedia/mkvalidator/files/patch-corec-tools-coremake-gcc_linux_arm.build b/multimedia/mkvalidator/files/patch-corec-tools-coremake-gcc_linux_arm.build
index 9c8b008c6d9a..8ac983c6ade2 100644
--- a/multimedia/mkvalidator/files/patch-corec-tools-coremake-gcc_linux_arm.build
+++ b/multimedia/mkvalidator/files/patch-corec-tools-coremake-gcc_linux_arm.build
@@ -1,6 +1,6 @@
---- corec/tools/coremake/gcc_linux_arm.build.orig	2012-12-16 11:29:34.000000000 +0100
-+++ corec/tools/coremake/gcc_linux_arm.build	2015-04-11 19:30:30.119705652 +0200
-@@ -19,8 +19,8 @@
+--- corec/tools/coremake/gcc_linux_arm.build.orig	2012-12-16 10:29:34 UTC
++++ corec/tools/coremake/gcc_linux_arm.build
+@@ -19,8 +19,8 @@ SVNDIR = linux_arm
  
  #define GLIBC
  
diff --git a/multimedia/mkvalidator/files/patch-corec__corec__helpers__file__file_libc.c b/multimedia/mkvalidator/files/patch-corec__corec__helpers__file__file_libc.c
index b726b7608e2b..33e12b57236d 100644
--- a/multimedia/mkvalidator/files/patch-corec__corec__helpers__file__file_libc.c
+++ b/multimedia/mkvalidator/files/patch-corec__corec__helpers__file__file_libc.c
@@ -1,5 +1,5 @@
---- ./corec/corec/helpers/file/file_libc.c.orig	2011-09-25 11:25:46.000000000 +0200
-+++ ./corec/corec/helpers/file/file_libc.c	2011-09-28 16:25:02.262950715 +0200
+--- corec/corec/helpers/file/file_libc.c.orig	2012-12-16 10:29:34 UTC
++++ corec/corec/helpers/file/file_libc.c
 @@ -40,7 +40,7 @@
  #include <unistd.h>
  #include <dirent.h>
diff --git a/multimedia/mkvalidator/files/patch-corec__corec__portab.h b/multimedia/mkvalidator/files/patch-corec__corec__portab.h
index 8a1147a35f23..fd066306fdf0 100644
--- a/multimedia/mkvalidator/files/patch-corec__corec__portab.h
+++ b/multimedia/mkvalidator/files/patch-corec__corec__portab.h
@@ -1,5 +1,5 @@
---- ./corec/corec/portab.h.orig	2011-09-25 11:25:46.000000000 +0200
-+++ ./corec/corec/portab.h	2011-09-28 16:25:47.730826509 +0200
+--- corec/corec/portab.h.orig	2012-12-16 10:29:34 UTC
++++ corec/corec/portab.h
 @@ -159,6 +159,9 @@
  
  #elif defined(__linux__) || defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index 37b3645aa2e6..abc28293379d 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mkvtoolnix
 PORTVERSION=	15.0.0
+PORTREVISION=	1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://www.bunkus.org/videotools/mkvtoolnix/sources/ \
 		https://mkvtoolnix.download/sources/
diff --git a/multimedia/mpc-qt/Makefile b/multimedia/mpc-qt/Makefile
index 7fd830b8f897..1dc4e4aa05af 100644
--- a/multimedia/mpc-qt/Makefile
+++ b/multimedia/mpc-qt/Makefile
@@ -2,7 +2,8 @@
 
 PORTNAME=	mpc-qt
 DISTVERSIONPREFIX=	v
-DISTVERSION=	17.09
+DISTVERSION=	17.09-12
+DISTVERSIONSUFFIX=	-g485ba78
 CATEGORIES=	multimedia audio
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/multimedia/mpc-qt/distinfo b/multimedia/mpc-qt/distinfo
index 85b7bcfdffbf..ca26e397b395 100644
--- a/multimedia/mpc-qt/distinfo
+++ b/multimedia/mpc-qt/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1504088766
-SHA256 (cmdrkotori-mpc-qt-v17.09_GH0.tar.gz) = 88842c320a5331db9aa68102241d19a104693ceedb66192b02e728c7cc8fcc6d
-SIZE (cmdrkotori-mpc-qt-v17.09_GH0.tar.gz) = 167992
+TIMESTAMP = 1504521873
+SHA256 (cmdrkotori-mpc-qt-v17.09-12-g485ba78_GH0.tar.gz) = bed5309ae7a46cee27ae88f45c49a7b691510cf212da15c173a2d34c665421b6
+SIZE (cmdrkotori-mpc-qt-v17.09-12-g485ba78_GH0.tar.gz) = 172717
 SHA256 (Argon--mpv-stats-1.1-24-g6a37a6d_GH0.tar.gz) = 4b180ea8f4f45bb8d822745b32d22d61b09204a2d192543429a562801f3af650
 SIZE (Argon--mpv-stats-1.1-24-g6a37a6d_GH0.tar.gz) = 15179
diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile
index 6007c13ff514..70acb370264e 100644
--- a/multimedia/mpv/Makefile
+++ b/multimedia/mpv/Makefile
@@ -2,15 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	mpv
-PORTVERSION=	0.26.0
+PORTVERSION=	0.27.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES=	8c82555e41a6.patch:-p1
-
 MAINTAINER=	cpm@FreeBSD.org
 COMMENT=	Free and open-source general-purpose video player
 
@@ -47,7 +43,7 @@ CONFIGURE_ARGS=	--docdir="${EXAMPLESDIR}" \
 
 OPTIONS_DEFINE=		ARCHIVE ASS DOCS LCMS2 LUAJIT MANPAGES TEST UCHARDET ZSH
 OPTIONS_DEFAULT=	ARCHIVE ASS DVDREAD DVDNAV MANPAGES OPENGL UCHARDET \
-			V4L VAAPI VDPAU X11 YTDL ZSH
+			V4L VAAPI VDPAU X11 YTDL
 OPTIONS_GROUP=		IN VO AO
 OPTIONS_GROUP_IN=	CDIO DVDREAD DVDNAV LIBBLURAY V4L YTDL SMB
 OPTIONS_GROUP_VO=	CACA OPENGL VAAPI VDPAU X11
@@ -132,7 +128,7 @@ UCHARDET_CONFIGURE_OFF=		--disable-uchardet
 
 V4L_BUILD_DEPENDS=		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 V4L_LIB_DEPENDS=		libv4l2.so:multimedia/libv4l
-V4L_CONFIGURE_ON=		--enable-tv
+V4L_CONFIGURE_ON=		--enable-tv --enable-dvbin
 
 VAAPI_LIB_DEPENDS=		libva.so:multimedia/libva
 VAAPI_CONFIGURE_OFF=		--disable-vaapi
diff --git a/multimedia/mpv/distinfo b/multimedia/mpv/distinfo
index f3628162f7b4..13f1bb47bebd 100644
--- a/multimedia/mpv/distinfo
+++ b/multimedia/mpv/distinfo
@@ -1,7 +1,5 @@
-TIMESTAMP = 1500726366
-SHA256 (mpv-player-mpv-v0.26.0_GH0.tar.gz) = daf3ef358d5f260f2269f7caabce27f446c291457ec330077152127133b71b46
-SIZE (mpv-player-mpv-v0.26.0_GH0.tar.gz) = 2916212
+TIMESTAMP = 1505307678
+SHA256 (mpv-player-mpv-v0.27.0_GH0.tar.gz) = 341d8bf18b75c1f78d5b681480b5b7f5c8b87d97a0d4f53a5648ede9c219a49c
+SIZE (mpv-player-mpv-v0.27.0_GH0.tar.gz) = 2956816
 SHA256 (waf-project-waf-waf-1.9.8_GH0.tar.gz) = b487efec83ea33cf8df0495cc5730e245f8dc8784e68aebf3dcf07c6712c5913
 SIZE (waf-project-waf-waf-1.9.8_GH0.tar.gz) = 628874
-SHA256 (8c82555e41a6.patch) = aa9ec8d66775157b2a90b040bbdd03a60bad5eff522321b8d55ccb8b833470b6
-SIZE (8c82555e41a6.patch) = 946
diff --git a/multimedia/nxtvepg/Makefile b/multimedia/nxtvepg/Makefile
index 41f1999e5ffc..bfe7be368bb3 100644
--- a/multimedia/nxtvepg/Makefile
+++ b/multimedia/nxtvepg/Makefile
@@ -10,6 +10,10 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Viewer for Nextview Electronic TV Programme Guide (needs bktr driver)
 
+DEPRECATED=		This port depends on Tcl/Tk 8.4 , which is no longer\
+			maintained. Please port it to 8.5+
+EXPIRATION_DATE=	2017-10-15
+
 NOT_FOR_ARCHS=	sparc64
 USES=		gmake tk:84
 USE_XORG=	x11 xmu
diff --git a/multimedia/obs-studio/Makefile b/multimedia/obs-studio/Makefile
index 18462f59259d..31b682eaa887 100644
--- a/multimedia/obs-studio/Makefile
+++ b/multimedia/obs-studio/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	obs-studio
 PORTVERSION=	20.0.1
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/multimedia/oggvideotools/Makefile b/multimedia/oggvideotools/Makefile
index 160ae073b5d4..e12ae17d2fc0 100644
--- a/multimedia/oggvideotools/Makefile
+++ b/multimedia/oggvideotools/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	oggvideotools
 PORTVERSION=	0.9.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${DISTNAME}
 
diff --git a/multimedia/pHash/Makefile b/multimedia/pHash/Makefile
index 42f42547795b..ba8106092db5 100644
--- a/multimedia/pHash/Makefile
+++ b/multimedia/pHash/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pHash
 PORTVERSION=	0.9.6
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	multimedia devel
 MASTER_SITES=	http://phash.org/releases/ \
 		http://www.cyberbotx.com/pHash/
diff --git a/multimedia/plexmediaserver-plexpass/Makefile b/multimedia/plexmediaserver-plexpass/Makefile
index 858de8ad87e2..bd63f84d6cff 100644
--- a/multimedia/plexmediaserver-plexpass/Makefile
+++ b/multimedia/plexmediaserver-plexpass/Makefile
@@ -1,13 +1,13 @@
 # Created by: KalleDK <plexmaintainer@k-moeller.dk>
 # $FreeBSD$
 
-PORTVERSION=	1.8.2.4209
+PORTVERSION=	1.8.4.4249
 PORTREVISION=	0
 PKGNAMESUFFIX=	-plexpass
 
 MAINTAINER=	feld@FreeBSD.org
 
-PLEX_BUILD=	b1d4aa012
+PLEX_BUILD=	3497d6779
 
 USE_RC_SUBR=	${PORTNAME}_plexpass
 
diff --git a/multimedia/plexmediaserver-plexpass/distinfo b/multimedia/plexmediaserver-plexpass/distinfo
index 5832252ce20a..5ccb2185c581 100644
--- a/multimedia/plexmediaserver-plexpass/distinfo
+++ b/multimedia/plexmediaserver-plexpass/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504202346
-SHA256 (PlexMediaServer-1.8.2.4209-b1d4aa012-freebsd-amd64.tar.bz2) = 07e84f273c5bc8ca7c17c9a858a1682cdf081fafc295c0ba02aa8aad3315793f
-SIZE (PlexMediaServer-1.8.2.4209-b1d4aa012-freebsd-amd64.tar.bz2) = 85604812
+TIMESTAMP = 1504832306
+SHA256 (PlexMediaServer-1.8.4.4249-3497d6779-freebsd-amd64.tar.bz2) = d48c43ead970a7c227e49cc8db741609298edce16b765e62e9a738327876d47e
+SIZE (PlexMediaServer-1.8.4.4249-3497d6779-freebsd-amd64.tar.bz2) = 85403266
diff --git a/multimedia/plexmediaserver-plexpass/pkg-plist b/multimedia/plexmediaserver-plexpass/pkg-plist
index adaaf9fc1305..3ecf21570ceb 100644
--- a/multimedia/plexmediaserver-plexpass/pkg-plist
+++ b/multimedia/plexmediaserver-plexpass/pkg-plist
@@ -1457,13 +1457,11 @@
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/img/desktop/ios/startup-iphone-portrait@2x.png
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/img/desktop/ios/startup-iphone5-portrait@2x.png
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/index.html
-%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/js/main-0-112e300e3d124ec05f6a-plex-3.14.1-2f399c1.js
-%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/js/vendors-1-f5ff042617091386d6a7-plex-3.14.1-2f399c1.js
-%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/main.d97149241b0a39e8f645824b418a30b8.css
-%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/main.v3.59282ce80ac2696e9f28ed512c3563cd.css
+%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/js/main-0-30205f137753d0a20df0-plex-3.20.5-d2e4fde.js
+%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/js/vendors-1-e9cc46758dcf94ba1c5e-plex-3.20.5-d2e4fde.js
+%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/main.8883144fb7acc2430ef50eda6c1a41c8.css
+%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/main.v3.3a6aa4986f36a5810792d74118deda14.css
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/setup.html
-%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/swf/jwplayer/jwplayer.swf
-%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/swf/jwplayer/plex.xml
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/translations/af.json
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/translations/ar.json
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/translations/bg.json
diff --git a/multimedia/plexmediaserver/Makefile b/multimedia/plexmediaserver/Makefile
index 498aa67b64ba..a72c9ce23737 100644
--- a/multimedia/plexmediaserver/Makefile
+++ b/multimedia/plexmediaserver/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	plexmediaserver
-PORTVERSION?=	1.8.1.4139
+PORTVERSION?=	1.8.4.4249
 PORTREVISION?=	0
 CATEGORIES=	multimedia
 MASTER_SITES=	https://downloads.plex.tv/plex-media-server/${PORTVERSION}-${PLEX_BUILD}/
@@ -12,7 +12,7 @@ MAINTAINER?=	feld@FreeBSD.org
 COMMENT=	Plex Media Server component
 
 USES=		cpe tar:bzip2
-PLEX_BUILD?=	c789b3fbb
+PLEX_BUILD?=	3497d6779
 NO_BUILD=	yes
 WRKSRC=	${WRKDIR}/PlexMediaServer-${PORTVERSION}-${PLEX_BUILD}
 
diff --git a/multimedia/plexmediaserver/distinfo b/multimedia/plexmediaserver/distinfo
index 206f05bfc53e..5ccb2185c581 100644
--- a/multimedia/plexmediaserver/distinfo
+++ b/multimedia/plexmediaserver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503599812
-SHA256 (PlexMediaServer-1.8.1.4139-c789b3fbb-freebsd-amd64.tar.bz2) = 72642f38ded1a1c83e0a83ff86a8feef96f5c39e534a36812a7bf9512fbd2abb
-SIZE (PlexMediaServer-1.8.1.4139-c789b3fbb-freebsd-amd64.tar.bz2) = 85463265
+TIMESTAMP = 1504832306
+SHA256 (PlexMediaServer-1.8.4.4249-3497d6779-freebsd-amd64.tar.bz2) = d48c43ead970a7c227e49cc8db741609298edce16b765e62e9a738327876d47e
+SIZE (PlexMediaServer-1.8.4.4249-3497d6779-freebsd-amd64.tar.bz2) = 85403266
diff --git a/multimedia/plexmediaserver/pkg-plist b/multimedia/plexmediaserver/pkg-plist
index adaaf9fc1305..3ecf21570ceb 100644
--- a/multimedia/plexmediaserver/pkg-plist
+++ b/multimedia/plexmediaserver/pkg-plist
@@ -1457,13 +1457,11 @@
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/img/desktop/ios/startup-iphone-portrait@2x.png
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/img/desktop/ios/startup-iphone5-portrait@2x.png
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/index.html
-%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/js/main-0-112e300e3d124ec05f6a-plex-3.14.1-2f399c1.js
-%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/js/vendors-1-f5ff042617091386d6a7-plex-3.14.1-2f399c1.js
-%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/main.d97149241b0a39e8f645824b418a30b8.css
-%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/main.v3.59282ce80ac2696e9f28ed512c3563cd.css
+%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/js/main-0-30205f137753d0a20df0-plex-3.20.5-d2e4fde.js
+%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/js/vendors-1-e9cc46758dcf94ba1c5e-plex-3.20.5-d2e4fde.js
+%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/main.8883144fb7acc2430ef50eda6c1a41c8.css
+%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/main.v3.3a6aa4986f36a5810792d74118deda14.css
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/setup.html
-%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/swf/jwplayer/jwplayer.swf
-%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/swf/jwplayer/plex.xml
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/translations/af.json
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/translations/ar.json
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/translations/bg.json
diff --git a/multimedia/rage/Makefile b/multimedia/rage/Makefile
index 3fba3d22fba3..f18d796d1584 100644
--- a/multimedia/rage/Makefile
+++ b/multimedia/rage/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	rage
 PORTVERSION=	0.2.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia enlightenment
 MASTER_SITES=	http://download.enlightenment.org/rel/apps/${PORTNAME}/
 
diff --git a/multimedia/subtitleeditor/Makefile b/multimedia/subtitleeditor/Makefile
index 3d7a9bb3d0b8..2bf0fac3c2c2 100644
--- a/multimedia/subtitleeditor/Makefile
+++ b/multimedia/subtitleeditor/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	subtitleeditor
 PORTVERSION=	0.41.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://download.gna.org/${PORTNAME}/${PORTVERSION:C/\.[0-9]*$//}/
 
diff --git a/multimedia/tvheadend/Makefile b/multimedia/tvheadend/Makefile
index d11dfe41fdc2..428274f938d0 100644
--- a/multimedia/tvheadend/Makefile
+++ b/multimedia/tvheadend/Makefile
@@ -2,17 +2,18 @@
 # $FreeBSD$
 
 PORTNAME=	tvheadend
-PORTVERSION=	4.0.8
+PORTVERSION=	4.2.3
 DISTVERSIONPREFIX=	v
-PORTREVISION=	5
 CATEGORIES=	multimedia
 
 MAINTAINER=	decke@FreeBSD.org
-COMMENT=	TV streaming server supporting DVB, IPTV and V4L
+COMMENT=	TV streaming server supporting DVB, IPTV, SAT>IP and more
 
 LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BUILD_DEPENDS=	bash:shells/bash \
+		cmake:devel/cmake \
 		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		liburiparser.so:net/uriparser
@@ -22,9 +23,9 @@ BROKEN_mips=		fails to configure: No C compiler found
 BROKEN_mips64=		fails to configure: No C compiler found
 BROKEN_powerpc64=	fails to configure: No C compiler found
 
+USES=		execinfo gettext gmake pkgconfig python shebangfix ssl
 USE_GITHUB=	yes
 
-USES=		execinfo gmake pkgconfig python shebangfix
 GNU_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
 USE_RC_SUBR=	${PORTNAME}
@@ -45,7 +46,8 @@ SUB_LIST+=	TVHUSER="${TVHUSER}" \
 		TVHGROUP="${TVHGROUP}"
 
 CONFIGURE_ENV+=	PLATFORM=freebsd
-CONFIGURE_ARGS+=--disable-dvbscan --disable-zlib
+CONFIGURE_ARGS+=--disable-dvbscan --disable-zlib --disable-hdhomerun_static \
+		--disable-bintray_cache --disable-ffmpeg_static --disable-pie
 CFLAGS+=	-I${LOCALBASE}/include -Wno-conversion -Wno-int-to-pointer-cast
 LDFLAGS+=	-L${LOCALBASE}/lib -lexecinfo -lssl -lcrypto -lz
 
@@ -73,27 +75,15 @@ TRANSCODING_CONFIGURE_ENABLE=	libav
 
 XMLTV_RUN_DEPENDS=	p5-xmltv>=0:textproc/p5-xmltv
 
-# CLANG also needs -Wno-microsoft which GCC 4.2 does not know
-CFLAGS+=	-Wno-microsoft \
-		-Wno-tautological-constant-out-of-range-compare
+.include <bsd.port.pre.mk>
 
 post-patch:
-	@${REINPLACE_CMD} 's|0.0.0~unknown|${PORTVERSION}-${GH_TAGNAME}|' \
-		${WRKSRC}/support/version
-	@${REINPLACE_CMD} 's|-g||' \
-		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} 's|-ldl||' \
 		${WRKSRC}/Makefile
-	# ignore gcc warnings on FreeBSD 9.X, and clang warnings on FreeBSD 10+
 	@${REINPLACE_CMD} 's|-Werror||' \
 		${WRKSRC}/Makefile
-	# Remove -Wunused-result because gcc 4.2 on FreeBSD 9.x does not know it
-	@${REINPLACE_CMD} 's|-Wunused-result||' \
-		${WRKSRC}/Makefile
-	# to suppress clang CC flags on FreeBSD 10+
-	# @${REINPLACE_CMD} 's|clang|clang-options-disabled|' \
-	# to enable clang CC flags, because clang is identified as 'cc' on FreeBSD 10+
-	@${REINPLACE_CMD} 's|clang|cc|' \
-		${WRKSRC}/Makefile
 
-.include <bsd.port.mk>
+post-install:
+	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/tvheadend
+
+.include <bsd.port.post.mk>
diff --git a/multimedia/tvheadend/distinfo b/multimedia/tvheadend/distinfo
index f98a5e03de79..e89ae6a24ab3 100644
--- a/multimedia/tvheadend/distinfo
+++ b/multimedia/tvheadend/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1464777173
-SHA256 (tvheadend-tvheadend-v4.0.8_GH0.tar.gz) = 04f485c25fcca604165622679e9e7be7aee7575d67f326f5ed8b4ceff63d8f4c
-SIZE (tvheadend-tvheadend-v4.0.8_GH0.tar.gz) = 15826229
+TIMESTAMP = 1501062908
+SHA256 (tvheadend-tvheadend-v4.2.3_GH0.tar.gz) = 2d289a1a8a0a960feba1da2da97c977a2b714d87adfdfaf00a53142e39d808e6
+SIZE (tvheadend-tvheadend-v4.2.3_GH0.tar.gz) = 21518785
diff --git a/multimedia/tvheadend/files/patch-Makefile.webui b/multimedia/tvheadend/files/patch-Makefile.webui
index a0306169e1c0..d0d4b7b7b136 100644
--- a/multimedia/tvheadend/files/patch-Makefile.webui
+++ b/multimedia/tvheadend/files/patch-Makefile.webui
@@ -1,6 +1,6 @@
---- Makefile.webui.orig	2015-09-25 13:57:59 UTC
-+++ Makefile.webui
-@@ -153,22 +153,22 @@ define GO_JS
+--- Makefile.webui.orig	2017-01-20 19:41:51.000000000 +0100
++++ Makefile.webui	2017-02-08 10:35:04.215801000 +0100
+@@ -189,22 +189,22 @@
  	$(VV)$(CSS_PY) --in="$^" utf-check
  	$(VV)cat $^ > $@.tmp
  	$(VV)$(RUN_JS) < $@.tmp > $@.tmp2
@@ -26,4 +26,4 @@
 +	@stat -f "%-35N %7b" $@
  endef
  
- all:
+ define merge-po
diff --git a/multimedia/tvheadend/files/patch-ffmpeg30 b/multimedia/tvheadend/files/patch-ffmpeg30
deleted file mode 100644
index 8c49fd0e7aa7..000000000000
--- a/multimedia/tvheadend/files/patch-ffmpeg30
+++ /dev/null
@@ -1,425 +0,0 @@
-https://github.com/tvheadend/tvheadend/commit/ea02889c149e3d2b80dcaed3d9ad976145bb92b0
-https://github.com/tvheadend/tvheadend/commit/c63371c8bf51928a6c965bdf17dd73555b7b9d54
-
---- Makefile.orig	2015-12-16 17:33:33 UTC
-+++ Makefile
-@@ -60,7 +60,7 @@ CFLAGS  += -I${ROOTDIR}/libav_static/bui
- LDFLAGS_FFDIR = ${ROOTDIR}/libav_static/build/ffmpeg/lib
- LDFLAGS += ${LDFLAGS_FFDIR}/libavresample.a
- LDFLAGS += ${LDFLAGS_FFDIR}/libswresample.a
--LDFLAGS += ${LDFLAGS_FFDIR}/libswscale.a
-+LDFLAGS += ${LDFLAGS_FFDIR}/libavfilter.a
- LDFLAGS += ${LDFLAGS_FFDIR}/libavutil.a
- LDFLAGS += ${LDFLAGS_FFDIR}/libavformat.a
- LDFLAGS += ${LDFLAGS_FFDIR}/libavcodec.a
---- Makefile.ffmpeg.orig	2015-12-16 17:33:33 UTC
-+++ Makefile.ffmpeg
-@@ -60,7 +60,7 @@ FFMPEG_URL      = http://ffmpeg.org/rele
- FFMPEG_SHA1     = 65470c9b967485f72f81758a7bad44cf7a1763db
- 
- EXTLIBS         = libx264 libvorbis libvpx
--COMPONENTS      = avutil avformat avcodec swresample swscale avresample
-+COMPONENTS      = avutil avformat avcodec swresample avfilter avresample
- PROTOCOLS       = file
- DECODERS        = mpeg2video mp2 ac3 eac3 h264 h264_vdpau aac aac_latm vorbis libvorbis
- ENCODERS        = mpeg2video mp2 libx264 libvpx_vp8 libvpx_vp9 aac libaacplus vorbis libvorbis
---- configure.orig	2015-12-16 17:33:33 UTC
-+++ configure
-@@ -395,7 +395,7 @@ else
-         has_libav=false
-       fi
- 
--      if $has_libav && ! check_pkg libswscale ">=2.3.100"; then
-+      if $has_libav && ! check_pkg libavfilter ">=4.0.0"; then
-         has_libav=false
-       fi
- 
-@@ -421,7 +421,7 @@ else
-         has_libav=false
-       fi
- 
--      if $has_libav && ! check_pkg libswscale ">=2.1.2"; then
-+      if $has_libav && ! check_pkg libavfilter ">=4.0.0"; then
-         has_libav=false
-       fi
- 
---- src/libav.c.orig	2015-12-16 17:33:33 UTC
-+++ src/libav.c
-@@ -186,4 +186,5 @@ libav_init(void)
-   av_log_set_callback(libav_log_callback);
-   av_log_set_level(AV_LOG_VERBOSE);
-   av_register_all();
-+  avfilter_register_all();
- }
---- src/libav.h.orig	2015-12-16 17:33:33 UTC
-+++ src/libav.h
-@@ -21,6 +21,7 @@
- 
- 
- #include <libavformat/avformat.h>
-+#include <libavfilter/avfilter.h>
- #include "tvheadend.h"
- 
- /*
---- src/plumbing/transcoding.c.orig	2015-12-16 17:33:33 UTC
-+++ src/plumbing/transcoding.c
-@@ -19,12 +19,14 @@
- #include <unistd.h>
- #include <libavformat/avformat.h>
- #include <libavcodec/avcodec.h>
--#include <libswscale/swscale.h>
-+#include <libavfilter/avfiltergraph.h>
-+#include <libavfilter/buffersink.h>
-+#include <libavfilter/buffersrc.h>
-+#include <libavutil/opt.h>
- #include <libavresample/avresample.h>
- #include <libavutil/opt.h>
- #include <libavutil/audio_fifo.h>
- #include <libavutil/dict.h>
--#include <libavutil/audioconvert.h>
- 
- #if LIBAVUTIL_VERSION_MICRO >= 100 /* FFMPEG */
- #define USING_FFMPEG 1
-@@ -91,9 +93,12 @@ typedef struct video_stream {
-   AVCodec                   *vid_ocodec;
- 
-   AVFrame                   *vid_dec_frame;
--  struct SwsContext         *vid_scaler;
-   AVFrame                   *vid_enc_frame;
- 
-+  AVFilterGraph             *flt_graph;
-+  AVFilterContext           *flt_bufsrcctx;
-+  AVFilterContext           *flt_bufsinkctx;
-+
-   int16_t                    vid_width;
-   int16_t                    vid_height;
- 
-@@ -952,6 +957,114 @@ send_video_packet(transcoder_t *t, trans
- 
- }
- 
-+/* create a simple deinterlacer-scaler video filter chain */
-+static int
-+create_video_filter(video_stream_t *vs, transcoder_t *t,
-+                    AVCodecContext *ictx, AVCodecContext *octx)
-+{
-+  AVFilterInOut *flt_inputs, *flt_outputs;
-+  AVFilter *flt_bufsrc, *flt_bufsink;
-+  char opt[128];
-+  int err;
-+
-+  err = 1;
-+  flt_inputs = flt_outputs = NULL;
-+  flt_bufsrc = flt_bufsink = NULL;
-+
-+  if (vs->flt_graph)
-+    avfilter_graph_free(&vs->flt_graph);
-+
-+  vs->flt_graph = avfilter_graph_alloc();
-+  if (!vs->flt_graph)
-+    return err;
-+
-+  flt_inputs = avfilter_inout_alloc();
-+  if (!flt_inputs)
-+    goto out_err;
-+
-+  flt_outputs = avfilter_inout_alloc();
-+  if (!flt_outputs)
-+    goto out_err;
-+
-+  flt_bufsrc = avfilter_get_by_name("buffer");
-+  flt_bufsink = avfilter_get_by_name("buffersink");
-+  if (!flt_bufsrc || !flt_bufsink) {
-+    tvherror("transcode", "%04X: libav default buffers unknown", shortid(t));
-+    goto out_err;
-+  }
-+
-+  memset(opt, 0, sizeof(opt));
-+  snprintf(opt, sizeof(opt), "video_size=%dx%d:pix_fmt=%d:time_base=%d/%d:pixel_aspect=%d/%d",
-+           ictx->width,
-+           ictx->height,
-+           ictx->pix_fmt,
-+           ictx->time_base.num,
-+           ictx->time_base.den,
-+           ictx->sample_aspect_ratio.num,
-+           ictx->sample_aspect_ratio.den);
-+
-+  err = avfilter_graph_create_filter(&vs->flt_bufsrcctx, flt_bufsrc, "in",
-+                                     opt, NULL, vs->flt_graph);
-+  if (err < 0) {
-+    tvherror("transcode", "%04X: fltchain IN init error", shortid(t));
-+    goto out_err;
-+  }
-+
-+  err = avfilter_graph_create_filter(&vs->flt_bufsinkctx, flt_bufsink,
-+                                     "out", NULL, NULL, vs->flt_graph);
-+  if (err < 0) {
-+    tvherror("transcode", "%04X: fltchain OUT init error", shortid(t));
-+    goto out_err;
-+  }
-+
-+  flt_outputs->name = av_strdup("in");
-+  flt_outputs->filter_ctx = vs->flt_bufsrcctx;
-+  flt_outputs->pad_idx = 0;
-+  flt_outputs->next = NULL;
-+  flt_inputs->name = av_strdup("out");
-+  flt_inputs->filter_ctx = vs->flt_bufsinkctx;
-+  flt_inputs->pad_idx = 0;
-+  flt_inputs->next = NULL;
-+
-+  /* add filters: yadif to deinterlace and a scaler */
-+  memset(opt, 0, sizeof(opt));
-+  snprintf(opt, sizeof(opt), "yadif,scale=%dx%d",
-+           octx->width,
-+           octx->height);
-+  err = avfilter_graph_parse_ptr(vs->flt_graph,
-+                                 opt,
-+                                 &flt_inputs,
-+                                 &flt_outputs,
-+                                 NULL);
-+  if (err < 0) {
-+    tvherror("transcode", "%04X: failed to init filter chain", shortid(t));
-+    goto out_err;
-+  }
-+
-+  err = avfilter_graph_config(vs->flt_graph, NULL);
-+  if (err < 0) {
-+    tvherror("transcode", "%04X: failed to config filter chain", shortid(t));
-+    goto out_err;
-+  }
-+
-+  avfilter_inout_free(&flt_inputs);
-+  avfilter_inout_free(&flt_outputs);
-+
-+  return 0;  /* all OK */
-+
-+out_err:
-+  if (flt_inputs)
-+    avfilter_inout_free(&flt_inputs);
-+  if (flt_outputs)
-+    avfilter_inout_free(&flt_outputs);
-+  if (vs->flt_graph) {
-+    avfilter_graph_free(&vs->flt_graph);
-+    vs->flt_graph = NULL;
-+  }
-+
-+  return err;
-+}
-+
- /**
-  *
-  */
-@@ -962,9 +1075,7 @@ transcoder_stream_video(transcoder_t *t,
-   AVCodecContext *ictx, *octx;
-   AVDictionary *opts;
-   AVPacket packet, packet2;
--  AVPicture deint_pic;
--  uint8_t *buf, *deint;
--  int length, len, ret, got_picture, got_output, got_ref;
-+  int length, ret, got_picture, got_output, got_ref;
-   video_stream_t *vs = (video_stream_t*)ts;
-   streaming_message_t *sm;
-   th_pkt_t *pkt2;
-@@ -980,7 +1091,6 @@ transcoder_stream_video(transcoder_t *t,
-   icodec = vs->vid_icodec;
-   ocodec = vs->vid_ocodec;
- 
--  buf = deint = NULL;
-   opts = NULL;
- 
-   got_ref = 0;
-@@ -1061,7 +1171,7 @@ transcoder_stream_video(transcoder_t *t,
-     switch (ts->ts_type) {
-     case SCT_MPEG2VIDEO:
-       octx->codec_id       = AV_CODEC_ID_MPEG2VIDEO;
--      octx->pix_fmt        = PIX_FMT_YUV420P;
-+      octx->pix_fmt        = AV_PIX_FMT_YUV420P;
-       octx->flags         |= CODEC_FLAG_GLOBAL_HEADER;
- 
-       // Default settings for quantizer. Best quality unless changed by the streaming profile.
-@@ -1089,7 +1199,7 @@ transcoder_stream_video(transcoder_t *t,
- 
-     case SCT_VP8:
-       octx->codec_id       = AV_CODEC_ID_VP8;
--      octx->pix_fmt        = PIX_FMT_YUV420P;
-+      octx->pix_fmt        = AV_PIX_FMT_YUV420P;
- 
-       av_dict_set(&opts, "quality", "realtime", 0);
- 
-@@ -1120,7 +1230,7 @@ transcoder_stream_video(transcoder_t *t,
- 
-     case SCT_H264:
-       octx->codec_id       = AV_CODEC_ID_H264;
--      octx->pix_fmt        = PIX_FMT_YUV420P;
-+      octx->pix_fmt        = AV_PIX_FMT_YUV420P;
-       octx->flags          |= CODEC_FLAG_GLOBAL_HEADER;
- 
-       // Qscale difference between I-frames and P-frames. 
-@@ -1177,79 +1287,53 @@ transcoder_stream_video(transcoder_t *t,
-       transcoder_stream_invalidate(ts);
-       goto cleanup;
-     }
--  }
--
--  len = avpicture_get_size(ictx->pix_fmt, ictx->width, ictx->height);
--  deint = av_malloc(len);
- 
--  avpicture_fill(&deint_pic,
--		 deint, 
--		 ictx->pix_fmt, 
--		 ictx->width, 
--		 ictx->height);
--
--  if (avpicture_deinterlace(&deint_pic,
--			    (AVPicture *)vs->vid_dec_frame,
--			    ictx->pix_fmt,
--			    ictx->width,
--			    ictx->height) < 0) {
--    tvherror("transcode", "%04X: Cannot deinterlace frame", shortid(t));
--    transcoder_stream_invalidate(ts);
--    goto cleanup;
-+    if (create_video_filter(vs, t, ictx, octx)) {
-+      tvherror("transcode", "%04X: Video filter creation failed",
-+               shortid(t));
-+      transcoder_stream_invalidate(ts);
-+      goto cleanup;
-+    }
-   }
- 
--  len = avpicture_get_size(octx->pix_fmt, octx->width, octx->height);
--  buf = av_malloc(len + FF_INPUT_BUFFER_PADDING_SIZE);
--  memset(buf, 0, len);
--
--  avpicture_fill((AVPicture *)vs->vid_enc_frame, 
--                 buf, 
--                 octx->pix_fmt,
--                 octx->width, 
--                 octx->height);
-- 
--  vs->vid_scaler = sws_getCachedContext(vs->vid_scaler,
--				    ictx->width,
--				    ictx->height,
--				    ictx->pix_fmt,
--				    octx->width,
--				    octx->height,
--				    octx->pix_fmt,
--				    1,
--				    NULL,
--				    NULL,
--				    NULL);
-- 
--  if (sws_scale(vs->vid_scaler, 
--		(const uint8_t * const*)deint_pic.data, 
--		deint_pic.linesize, 
--		0, 
--		ictx->height, 
--		vs->vid_enc_frame->data, 
--		vs->vid_enc_frame->linesize) < 0) {
--    tvherror("transcode", "%04X: Cannot scale frame", shortid(t));
-+  /* push decoded frame into filter chain */
-+  if (av_buffersrc_add_frame(vs->flt_bufsrcctx, vs->vid_dec_frame) < 0) {
-+    tvherror("transcode", "%04X: filter input error", shortid(t));
-     transcoder_stream_invalidate(ts);
-     goto cleanup;
-   }
- 
--  vs->vid_enc_frame->format  = octx->pix_fmt;
--  vs->vid_enc_frame->width   = octx->width;
--  vs->vid_enc_frame->height  = octx->height;
-+  /* and pull out a filtered frame */
-+  while (1) {
-+	ret = av_buffersink_get_frame(vs->flt_bufsinkctx, vs->vid_enc_frame);
-+	if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF)
-+		break;
-+	if (ret < 0) {
-+		tvherror("transcode", "%04X: filter output error", shortid(t));
-+		transcoder_stream_invalidate(ts);
-+		goto cleanup;
-+	}
- 
--  vs->vid_enc_frame->pkt_pts = vs->vid_dec_frame->pkt_pts;
--  vs->vid_enc_frame->pkt_dts = vs->vid_dec_frame->pkt_dts;
-+	vs->vid_enc_frame->format  = octx->pix_fmt;
-+	vs->vid_enc_frame->width   = octx->width;
-+	vs->vid_enc_frame->height  = octx->height;
- 
--  if (vs->vid_dec_frame->reordered_opaque != AV_NOPTS_VALUE)
--    vs->vid_enc_frame->pts = vs->vid_dec_frame->reordered_opaque;
-+	vs->vid_enc_frame->pkt_pts = vs->vid_dec_frame->pkt_pts;
-+	vs->vid_enc_frame->pkt_dts = vs->vid_dec_frame->pkt_dts;
- 
--  else if (ictx->coded_frame && ictx->coded_frame->pts != AV_NOPTS_VALUE)
--    vs->vid_enc_frame->pts = vs->vid_dec_frame->pts;
-+	if (vs->vid_dec_frame->reordered_opaque != AV_NOPTS_VALUE)
-+		vs->vid_enc_frame->pts = vs->vid_dec_frame->reordered_opaque;
- 
--  ret = avcodec_encode_video2(octx, &packet2, vs->vid_enc_frame, &got_output);
--  if (ret < 0) {
--    tvherror("transcode", "%04X: Error encoding frame", shortid(t));
--    transcoder_stream_invalidate(ts);
--    goto cleanup;
-+	else if (ictx->coded_frame && ictx->coded_frame->pts != AV_NOPTS_VALUE)
-+		vs->vid_enc_frame->pts = vs->vid_dec_frame->pts;
-+
-+	ret = avcodec_encode_video2(octx, &packet2, vs->vid_enc_frame, &got_output);
-+	if (ret < 0) {
-+		tvherror("transcode", "%04X: Error encoding frame", shortid(t));
-+		transcoder_stream_invalidate(ts);
-+		goto cleanup;
-+	}
-+	av_frame_unref(vs->vid_enc_frame);
-   }
- 
-   if (got_output)
-@@ -1263,12 +1347,6 @@ transcoder_stream_video(transcoder_t *t,
- 
-   av_free_packet(&packet);
- 
--  if(buf)
--    av_free(buf);
--
--  if(deint)
--    av_free(deint);
--
-   if(opts)
-     av_dict_free(&opts);
- 
-@@ -1548,15 +1626,17 @@ transcoder_destroy_video(transcoder_t *t
-   if(vs->vid_dec_frame)
-     av_free(vs->vid_dec_frame);
- 
--  if(vs->vid_scaler)
--    sws_freeContext(vs->vid_scaler);
--
-   if(vs->vid_enc_frame)
-     av_free(vs->vid_enc_frame);
- 
-   if (vs->vid_first_pkt)
-     pkt_ref_dec(vs->vid_first_pkt);
- 
-+  if (vs->flt_graph) {
-+    avfilter_graph_free(&vs->flt_graph);
-+    vs->flt_graph = NULL;
-+  }
-+
-   free(ts);
- }
- 
-@@ -1603,11 +1683,13 @@ transcoder_init_video(transcoder_t *t, s
-   vs->vid_ictx->thread_count =
-     vs->vid_octx->thread_count = transcoder_thread_count(t, sct);
- 
--  vs->vid_dec_frame = avcodec_alloc_frame();
--  vs->vid_enc_frame = avcodec_alloc_frame();
-+  vs->vid_dec_frame = av_frame_alloc();
-+  vs->vid_enc_frame = av_frame_alloc();
- 
--  avcodec_get_frame_defaults(vs->vid_dec_frame);
--  avcodec_get_frame_defaults(vs->vid_enc_frame);
-+  av_frame_unref(vs->vid_dec_frame);
-+  av_frame_unref(vs->vid_enc_frame);
-+
-+  vs->flt_graph = NULL;		/* allocated in packet processor */
- 
-   LIST_INSERT_HEAD(&t->t_stream_list, (transcoder_stream_t*)vs, ts_link);
- 
diff --git a/multimedia/tvheadend/files/patch-src_http.c b/multimedia/tvheadend/files/patch-src_http.c
deleted file mode 100644
index 0dd6f568c038..000000000000
--- a/multimedia/tvheadend/files/patch-src_http.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/http.c.orig	2015-09-25 13:57:59 UTC
-+++ src/http.c
-@@ -30,6 +30,7 @@
- #include <netinet/in.h>
- #include <netinet/tcp.h>
- #include <arpa/inet.h>
-+#include <sys/socket.h>
- 
- #include "tvheadend.h"
- #include "tcp.h"
diff --git a/multimedia/tvheadend/files/patch-src_main.c b/multimedia/tvheadend/files/patch-src_main.c
new file mode 100644
index 000000000000..48f8d7644e6b
--- /dev/null
+++ b/multimedia/tvheadend/files/patch-src_main.c
@@ -0,0 +1,62 @@
+Avoid build error with recent clang on FreeBSD 12-CURRENT.
+
+CC              src/main.o
+In file included from src/main.c:51:
+In file included from
+/usr/ports/multimedia/tvheadend/work/tvheadend-4.2.2/src/dvr/dvr.h:27:
+/usr/local/include/profile.h:24:28: error: typedef redefinition with
+different types ('struct _profile_t *' vs
+      'struct profile')
+typedef struct _profile_t *profile_t;
+                           ^
+/usr/ports/multimedia/tvheadend/work/tvheadend-4.2.2/src/profile.h:148:3:
+note: previous definition is here
+} profile_t;
+  ^
+In file included from src/main.c:51:
+In file included from
+/usr/ports/multimedia/tvheadend/work/tvheadend-4.2.2/src/dvr/dvr.h:27:
+/usr/local/include/profile.h:45:20: error: conflicting types for
+'profile_init'
+long KRB5_CALLCONV profile_init
+                   ^
+/usr/ports/multimedia/tvheadend/work/tvheadend-4.2.2/src/profile.h:197:6:
+note: previous declaration is here
+void profile_init(void);
+     ^
+In file included from src/main.c:51:
+In file included from
+/usr/ports/multimedia/tvheadend/work/tvheadend-4.2.2/src/dvr/dvr.h:27:
+/usr/local/include/profile.h:71:20: error: conflicting types for
+'profile_release'
+void KRB5_CALLCONV profile_release
+                   ^
+/usr/ports/multimedia/tvheadend/work/tvheadend-4.2.2/src/profile.h:159:20:
+note: previous definition is here
+static inline void profile_release( profile_t *pro )
+                   ^
+3 errors generated.
+gmake[2]: *** [Makefile:631:
+/usr/ports/multimedia/tvheadend/work/tvheadend-4.2.2/build.freebsd/src/main.o]
+Error 1
+gmake[2]: Leaving directory
+
+Reported by:	Rainer Hurling <rhurlin@gwdg.de>
+--- src/main.c.orig	2017-07-01 07:22:23.000000000 +0000
++++ src/main.c	2017-08-23 15:27:26.427162000 +0000
+@@ -48,6 +48,7 @@
+ #include "subscriptions.h"
+ #include "service_mapper.h"
+ #include "descrambler.h"
++#include "profile.h"
+ #include "dvr/dvr.h"
+ #include "htsp_server.h"
+ #include "satip/server.h"
+@@ -68,7 +69,6 @@
+ #include "intlconv.h"
+ #include "dbus.h"
+ #include "libav.h"
+-#include "profile.h"
+ #include "bouquet.h"
+ #include "tvhtime.h"
+ #include "packet.h"
diff --git a/multimedia/tvheadend/files/patch-src_satip_server.c b/multimedia/tvheadend/files/patch-src_satip_server.c
deleted file mode 100644
index 2fde225c1256..000000000000
--- a/multimedia/tvheadend/files/patch-src_satip_server.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/satip/server.c.orig	2015-09-25 13:57:59 UTC
-+++ src/satip/server.c
-@@ -17,6 +17,8 @@
-  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
- 
-+#include <sys/socket.h>
-+
- #include "tvheadend.h"
- #include "upnp.h"
- #include "settings.h"
diff --git a/multimedia/tvheadend/files/patch-src_spawn.c b/multimedia/tvheadend/files/patch-src_spawn.c
deleted file mode 100644
index 53f4e59bcb65..000000000000
--- a/multimedia/tvheadend/files/patch-src_spawn.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/spawn.c.orig	2015-09-25 13:57:59 UTC
-+++ src/spawn.c
-@@ -28,6 +28,7 @@
- #include <syslog.h>
- #include <fcntl.h>
- #include <dirent.h>
-+#include <signal.h>
- 
- #include "tvheadend.h"
- #include "tvhpoll.h"
diff --git a/multimedia/tvheadend/files/patch-src_tcp.c b/multimedia/tvheadend/files/patch-src_tcp.c
new file mode 100644
index 000000000000..ff2c9f9c4ea1
--- /dev/null
+++ b/multimedia/tvheadend/files/patch-src_tcp.c
@@ -0,0 +1,64 @@
+- DSCP cannot be modified on FreeBSD yet
+src/tcp.c:61:14: error: use of undeclared identifier 'IPTOS_DSCP_MASK'
+  v = dscp & IPTOS_DSCP_MASK;
+
+- Change include order for FreeBSD
+In file included from src/tcp.c:33:
+/usr/include/netinet/ip.h:69:17: error: field has incomplete type 'struct in_addr'
+        struct  in_addr ip_src,ip_dst;  /* source and dest address */
+                        ^
+/usr/include/netinet/ip.h:69:9: note: forward declaration of 'struct in_addr'
+        struct  in_addr ip_src,ip_dst;  /* source and dest address */
+                ^
+/usr/include/netinet/ip.h:69:24: error: field has incomplete type 'struct in_addr'
+        struct  in_addr ip_src,ip_dst;  /* source and dest address */
+                               ^
+/usr/include/netinet/ip.h:69:9: note: forward declaration of 'struct in_addr'
+        struct  in_addr ip_src,ip_dst;  /* source and dest address */
+                ^
+/usr/include/netinet/ip.h:181:19: error: field has incomplete type 'struct in_addr'
+                        struct in_addr ipt_addr;
+                                       ^
+/usr/include/netinet/ip.h:69:9: note: forward declaration of 'struct in_addr'
+        struct  in_addr ip_src,ip_dst;  /* source and dest address */
+                ^
+/usr/include/netinet/ip.h:216:17: error: field has incomplete type 'struct in_addr'
+        struct  in_addr ippseudo_src;   /* source internet address */
+                        ^
+/usr/include/netinet/ip.h:69:9: note: forward declaration of 'struct in_addr'
+        struct  in_addr ip_src,ip_dst;  /* source and dest address */
+                ^
+/usr/include/netinet/ip.h:217:17: error: field has incomplete type 'struct in_addr'
+        struct  in_addr ippseudo_dst;   /* destination internet address */
+                        ^
+/usr/include/netinet/ip.h:69:9: note: forward declaration of 'struct in_addr'
+        struct  in_addr ip_src,ip_dst;  /* source and dest address */
+                ^
+--- src/tcp.c.orig	2017-01-20 19:41:51.000000000 +0100
++++ src/tcp.c	2017-02-08 11:15:26.836727000 +0100
+@@ -30,8 +30,8 @@
+ #include <fcntl.h>
+ #include <errno.h>
+ #include <signal.h>
+-#include <netinet/ip.h>
+ #include <netinet/in.h>
++#include <netinet/ip.h>
+ #include <netinet/tcp.h>
+ #include <arpa/inet.h>
+ 
+@@ -56,6 +56,7 @@
+ int
+ socket_set_dscp(int sockfd, uint32_t dscp, char *errbuf, size_t errbufsize)
+ {
++#ifdef IPTOS_DSCP_MASK
+   int r, v;
+ 
+   v = dscp & IPTOS_DSCP_MASK;
+@@ -65,6 +66,7 @@
+       snprintf(errbuf, errbufsize, "IP_TOS failed: %s", strerror(errno));
+     return -1;
+   }
++#endif
+   return 0;
+ }
+ 
diff --git a/multimedia/tvheadend/files/patch-src_wrappers.c b/multimedia/tvheadend/files/patch-src_wrappers.c
new file mode 100644
index 000000000000..5aca192cf560
--- /dev/null
+++ b/multimedia/tvheadend/files/patch-src_wrappers.c
@@ -0,0 +1,30 @@
+--- src/wrappers.c.orig	2017-05-16 11:15:24.000000000 +0000
++++ src/wrappers.c	2017-06-21 18:00:42.352871000 +0000
+@@ -290,6 +290,19 @@
+   } while (r > 0);
+ }
+ 
++#ifdef PLATFORM_FREEBSD
++int64_t
++tvh_usleep(int64_t us)
++{
++  return usleep(us);
++}
++
++int64_t
++tvh_usleep_abs(int64_t us)
++{
++  return usleep(us - getfastmonoclock());
++}
++#else
+ int64_t
+ tvh_usleep(int64_t us)
+ {
+@@ -323,6 +336,7 @@
+     return val;
+   return r ? -r : 0;
+ }
++#endif
+ 
+ /*
+  * qsort
diff --git a/multimedia/tvheadend/pkg-descr b/multimedia/tvheadend/pkg-descr
index 26672c58139f..e6bd4ea7cd60 100644
--- a/multimedia/tvheadend/pkg-descr
+++ b/multimedia/tvheadend/pkg-descr
@@ -1,5 +1,6 @@
-A TV streaming server for Linux and FreeBSD supporting
-DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, and Analog video
-(V4L) as input sources.
+A TV streaming server and recorder for Linux, FreeBSD and
+Android supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, ISDB-T,
+IPTV, SAT>IP, HDHomeRune and other formats through the unix
+pipe as input sources.
 
 WWW: https://tvheadend.org/
diff --git a/multimedia/tvheadend/pkg-message b/multimedia/tvheadend/pkg-message
index 690fd5c24bce..df2cfb153c02 100644
--- a/multimedia/tvheadend/pkg-message
+++ b/multimedia/tvheadend/pkg-message
@@ -2,9 +2,10 @@
 
 For the first start in your /etc/rc.conf:
   tvheadend_enable="YES"
-  tvheadend_flags="-C"
 
-The second line can be removed after the first start.
+If you plan to use webcamd you need to add tvheadend to the webcamd group.
+
+  pw usermod tvheadend -G webcamd
 
 Patches, feedback and help are always welcome!
 
diff --git a/multimedia/tvheadend/pkg-plist b/multimedia/tvheadend/pkg-plist
index d78c9b9174ff..b3925c61daf6 100644
--- a/multimedia/tvheadend/pkg-plist
+++ b/multimedia/tvheadend/pkg-plist
@@ -1,5 +1,6 @@
 bin/tvheadend
 man/man1/tvheadend.1.gz
+%%DATADIR%%/data/conf/descrambler
 %%DATADIR%%/data/conf/epggrab/opentv/dict/skyeng
 %%DATADIR%%/data/conf/epggrab/opentv/dict/skyit
 %%DATADIR%%/data/conf/epggrab/opentv/dict/skynz
@@ -13,81 +14,6 @@ man/man1/tvheadend.1.gz
 %%DATADIR%%/data/conf/epggrab/opentv/prov/skyuk
 %%DATADIR%%/data/conf/fastscan
 %%DATADIR%%/data/conf/satellites
-%%DATADIR%%/docs/docresources/accessconfig.png
-%%DATADIR%%/docs/docresources/accessconfigexample.png
-%%DATADIR%%/docs/docresources/autorec.png
-%%DATADIR%%/docs/docresources/autorecpopup.png
-%%DATADIR%%/docs/docresources/channeltab.png
-%%DATADIR%%/docs/docresources/configcapmt.png
-%%DATADIR%%/docs/docresources/configcwc.png
-%%DATADIR%%/docs/docresources/configdvbmux.png
-%%DATADIR%%/docs/docresources/configdvbmuxsched.png
-%%DATADIR%%/docs/docresources/configdvbnetwork.png
-%%DATADIR%%/docs/docresources/configdvbservices.png
-%%DATADIR%%/docs/docresources/configdvbtab.png
-%%DATADIR%%/docs/docresources/configdvrtab1.png
-%%DATADIR%%/docs/docresources/configdvrtab2.png
-%%DATADIR%%/docs/docresources/configdvrtab3.png
-%%DATADIR%%/docs/docresources/configgeneraltab1.png
-%%DATADIR%%/docs/docresources/configgeneraltab2.png
-%%DATADIR%%/docs/docresources/configtabs.png
-%%DATADIR%%/docs/docresources/configtimeshifttab.png
-%%DATADIR%%/docs/docresources/configtvadapters.png
-%%DATADIR%%/docs/docresources/configtvhlog.png
-%%DATADIR%%/docs/docresources/dvrautorecentries.png
-%%DATADIR%%/docs/docresources/dvrlog.png
-%%DATADIR%%/docs/docresources/dvrlog2.png
-%%DATADIR%%/docs/docresources/dvrlog3.png
-%%DATADIR%%/docs/docresources/dvrlog4.png
-%%DATADIR%%/docs/docresources/dvrlogentry.png
-%%DATADIR%%/docs/docresources/epg.png
-%%DATADIR%%/docs/docresources/epg2.png
-%%DATADIR%%/docs/docresources/epg3.png
-%%DATADIR%%/docs/docresources/failedrecordings1.png
-%%DATADIR%%/docs/docresources/failedrecordings2.png
-%%DATADIR%%/docs/docresources/finishedrecordings1.png
-%%DATADIR%%/docs/docresources/finishedrecordings2.png
-%%DATADIR%%/docs/docresources/muxbylocation.png
-%%DATADIR%%/docs/docresources/tagstab.png
-%%DATADIR%%/docs/docresources/timeschedules.png
-%%DATADIR%%/docs/docresources/tvheadendlogo.png
-%%DATADIR%%/docs/docresources/upcomingrecordings1.png
-%%DATADIR%%/docs/docresources/upcomingrecordings2.png
-%%DATADIR%%/docs/docresources/xmltvtab.png
-%%DATADIR%%/docs/html/autorec.html
-%%DATADIR%%/docs/html/config.html
-%%DATADIR%%/docs/html/config_access.html
-%%DATADIR%%/docs/html/config_bouquet.html
-%%DATADIR%%/docs/html/config_caclient.html
-%%DATADIR%%/docs/html/config_channels.html
-%%DATADIR%%/docs/html/config_dvb.html
-%%DATADIR%%/docs/html/config_dvr.html
-%%DATADIR%%/docs/html/config_epggrab.html
-%%DATADIR%%/docs/html/config_esfilter.html
-%%DATADIR%%/docs/html/config_iptv.html
-%%DATADIR%%/docs/html/config_misc.html
-%%DATADIR%%/docs/html/config_muxes.html
-%%DATADIR%%/docs/html/config_muxsched.html
-%%DATADIR%%/docs/html/config_networks.html
-%%DATADIR%%/docs/html/config_services.html
-%%DATADIR%%/docs/html/config_streamprofile.html
-%%DATADIR%%/docs/html/config_tags.html
-%%DATADIR%%/docs/html/config_timeshift.html
-%%DATADIR%%/docs/html/config_tvadapters.html
-%%DATADIR%%/docs/html/config_tvhlog.html
-%%DATADIR%%/docs/html/dvr.html
-%%DATADIR%%/docs/html/dvr_autorec.html
-%%DATADIR%%/docs/html/dvr_failed.html
-%%DATADIR%%/docs/html/dvr_finished.html
-%%DATADIR%%/docs/html/dvr_timerec.html
-%%DATADIR%%/docs/html/dvr_upcoming.html
-%%DATADIR%%/docs/html/dvrlog.html
-%%DATADIR%%/docs/html/epg.html
-%%DATADIR%%/docs/html/faq.html
-%%DATADIR%%/docs/html/features.html
-%%DATADIR%%/docs/html/install.html
-%%DATADIR%%/docs/html/overview.html
-%%DATADIR%%/docs/html/sysreq.html
 %%DATADIR%%/src/webui/static/app/acleditor.js
 %%DATADIR%%/src/webui/static/app/caclient.js
 %%DATADIR%%/src/webui/static/app/chconf.js
@@ -98,21 +24,30 @@ man/man1/tvheadend.1.gz
 %%DATADIR%%/src/webui/static/app/epg.js
 %%DATADIR%%/src/webui/static/app/epggrab.js
 %%DATADIR%%/src/webui/static/app/esfilter.js
+%%DATADIR%%/src/webui/static/app/ext-access.css
+%%DATADIR%%/src/webui/static/app/ext-blue.css
+%%DATADIR%%/src/webui/static/app/ext-gray.css
 %%DATADIR%%/src/webui/static/app/ext.css
 %%DATADIR%%/src/webui/static/app/extensions.js
+%%DATADIR%%/src/webui/static/app/i18n-post.js
+%%DATADIR%%/src/webui/static/app/i18n.js
 %%DATADIR%%/src/webui/static/app/idnode.js
+%%DATADIR%%/src/webui/static/app/marked.js
 %%DATADIR%%/src/webui/static/app/mpegts.js
 %%DATADIR%%/src/webui/static/app/namespace.js
 %%DATADIR%%/src/webui/static/app/servicemapper.js
 %%DATADIR%%/src/webui/static/app/status.js
-%%DATADIR%%/src/webui/static/app/tableeditor.js
 %%DATADIR%%/src/webui/static/app/timeshift.js
 %%DATADIR%%/src/webui/static/app/tvadapters.js
 %%DATADIR%%/src/webui/static/app/tvheadend.js
 %%DATADIR%%/src/webui/static/app/tvhlog.js
+%%DATADIR%%/src/webui/static/app/wizard.js
 %%DATADIR%%/src/webui/static/checkcolumn/CheckColumn.js
 %%DATADIR%%/src/webui/static/extjs/adapter/ext/ext-base-debug.js
 %%DATADIR%%/src/webui/static/extjs/adapter/ext/ext-base.js
+%%DATADIR%%/src/webui/static/extjs/examples/ux/Spinner.js
+%%DATADIR%%/src/webui/static/extjs/examples/ux/SpinnerField.js
+%%DATADIR%%/src/webui/static/extjs/examples/ux/css/Spinner.css
 %%DATADIR%%/src/webui/static/extjs/examples/ux/gridfilters/GridFilters.js
 %%DATADIR%%/src/webui/static/extjs/examples/ux/gridfilters/css/GridFilters.css
 %%DATADIR%%/src/webui/static/extjs/examples/ux/gridfilters/css/RangeMenu.css
@@ -130,6 +65,8 @@ man/man1/tvheadend.1.gz
 %%DATADIR%%/src/webui/static/extjs/examples/ux/gridfilters/images/sort_filtered_desc.gif
 %%DATADIR%%/src/webui/static/extjs/examples/ux/gridfilters/menu/ListMenu.js
 %%DATADIR%%/src/webui/static/extjs/examples/ux/gridfilters/menu/RangeMenu.js
+%%DATADIR%%/src/webui/static/extjs/examples/ux/images/spinner-split.gif
+%%DATADIR%%/src/webui/static/extjs/examples/ux/images/spinner.gif
 %%DATADIR%%/src/webui/static/extjs/ext-all-debug.js
 %%DATADIR%%/src/webui/static/extjs/ext-all.js
 %%DATADIR%%/src/webui/static/extjs/resources/css/debug.css
@@ -1018,19 +955,28 @@ man/man1/tvheadend.1.gz
 %%DATADIR%%/src/webui/static/extjs/resources/images/yourtheme/window/right-corners.psd
 %%DATADIR%%/src/webui/static/extjs/resources/images/yourtheme/window/top-bottom.png
 %%DATADIR%%/src/webui/static/extjs/resources/images/yourtheme/window/top-bottom.psd
-%%DATADIR%%/src/webui/static/htslogo.png
 %%DATADIR%%/src/webui/static/icons/abort.png
 %%DATADIR%%/src/webui/static/icons/accept.png
+%%DATADIR%%/src/webui/static/icons/acl.png
 %%DATADIR%%/src/webui/static/icons/add.png
+%%DATADIR%%/src/webui/static/icons/application_form.png
+%%DATADIR%%/src/webui/static/icons/arrow_branch.png
 %%DATADIR%%/src/webui/static/icons/arrow_down.png
 %%DATADIR%%/src/webui/static/icons/arrow_join.png
+%%DATADIR%%/src/webui/static/icons/arrow_left.png
 %%DATADIR%%/src/webui/static/icons/arrow_out.png
+%%DATADIR%%/src/webui/static/icons/arrow_right.png
 %%DATADIR%%/src/webui/static/icons/arrow_switch.png
 %%DATADIR%%/src/webui/static/icons/arrow_up.png
 %%DATADIR%%/src/webui/static/icons/auto_rec.png
+%%DATADIR%%/src/webui/static/icons/award_star_bronze_3.png
+%%DATADIR%%/src/webui/static/icons/award_star_gold_3.png
+%%DATADIR%%/src/webui/static/icons/award_star_silver_3.png
+%%DATADIR%%/src/webui/static/icons/baseconf.png
+%%DATADIR%%/src/webui/static/icons/bell.png
 %%DATADIR%%/src/webui/static/icons/bouquets.png
+%%DATADIR%%/src/webui/static/icons/brick.png
 %%DATADIR%%/src/webui/static/icons/broadcast_details.png
-%%DATADIR%%/src/webui/static/icons/bullet_add.png
 %%DATADIR%%/src/webui/static/icons/cancel.png
 %%DATADIR%%/src/webui/static/icons/cancel_button.png
 %%DATADIR%%/src/webui/static/icons/channel_tags.png
@@ -1051,6 +997,7 @@ man/man1/tvheadend.1.gz
 %%DATADIR%%/src/webui/static/icons/epg.png
 %%DATADIR%%/src/webui/static/icons/exclamation.png
 %%DATADIR%%/src/webui/static/icons/eye.png
+%%DATADIR%%/src/webui/static/icons/fetch_images.png
 %%DATADIR%%/src/webui/static/icons/film.png
 %%DATADIR%%/src/webui/static/icons/film_edit.png
 %%DATADIR%%/src/webui/static/icons/film_key.png
@@ -1059,7 +1006,10 @@ man/man1/tvheadend.1.gz
 %%DATADIR%%/src/webui/static/icons/general.png
 %%DATADIR%%/src/webui/static/icons/group.png
 %%DATADIR%%/src/webui/static/icons/help.png
+%%DATADIR%%/src/webui/static/icons/imdb.png
+%%DATADIR%%/src/webui/static/icons/imgcacheconf.png
 %%DATADIR%%/src/webui/static/icons/information.png
+%%DATADIR%%/src/webui/static/icons/ip_block.png
 %%DATADIR%%/src/webui/static/icons/key.png
 %%DATADIR%%/src/webui/static/icons/layers.png
 %%DATADIR%%/src/webui/static/icons/linked.gif
@@ -1068,6 +1018,7 @@ man/man1/tvheadend.1.gz
 %%DATADIR%%/src/webui/static/icons/networks.png
 %%DATADIR%%/src/webui/static/icons/newspaper.png
 %%DATADIR%%/src/webui/static/icons/other_filters.png
+%%DATADIR%%/src/webui/static/icons/pass.png
 %%DATADIR%%/src/webui/static/icons/pci.png
 %%DATADIR%%/src/webui/static/icons/plugin.png
 %%DATADIR%%/src/webui/static/icons/progress-bg-green.gif
@@ -1076,11 +1027,13 @@ man/man1/tvheadend.1.gz
 %%DATADIR%%/src/webui/static/icons/rec.png
 %%DATADIR%%/src/webui/static/icons/recordingtab.png
 %%DATADIR%%/src/webui/static/icons/reseticon.png
+%%DATADIR%%/src/webui/static/icons/satipsrvconf.png
 %%DATADIR%%/src/webui/static/icons/save.png
 %%DATADIR%%/src/webui/static/icons/scheduled.png
 %%DATADIR%%/src/webui/static/icons/service_mapper.png
 %%DATADIR%%/src/webui/static/icons/services.png
 %%DATADIR%%/src/webui/static/icons/sound.png
+%%DATADIR%%/src/webui/static/icons/sound_mute.png
 %%DATADIR%%/src/webui/static/icons/stop.png
 %%DATADIR%%/src/webui/static/icons/stop_rec.png
 %%DATADIR%%/src/webui/static/icons/stream.png
@@ -1090,6 +1043,7 @@ man/man1/tvheadend.1.gz
 %%DATADIR%%/src/webui/static/icons/tag_blue.png
 %%DATADIR%%/src/webui/static/icons/teletext.png
 %%DATADIR%%/src/webui/static/icons/television.png
+%%DATADIR%%/src/webui/static/icons/thetvdb.png
 %%DATADIR%%/src/webui/static/icons/tick.png
 %%DATADIR%%/src/webui/static/icons/time_schedules.png
 %%DATADIR%%/src/webui/static/icons/timeshift.png
@@ -1099,11 +1053,207 @@ man/man1/tvheadend.1.gz
 %%DATADIR%%/src/webui/static/icons/wand.png
 %%DATADIR%%/src/webui/static/icons/watch_tv.png
 %%DATADIR%%/src/webui/static/icons/world.png
+%%DATADIR%%/src/webui/static/icons/world_add.png
 %%DATADIR%%/src/webui/static/icons/wrench.png
 %%DATADIR%%/src/webui/static/img/bg-header.png
+%%DATADIR%%/src/webui/static/img/doc/access_entry/new.png
+%%DATADIR%%/src/webui/static/img/doc/access_entry/tab.png
+%%DATADIR%%/src/webui/static/img/doc/before_begin/schematic.png
+%%DATADIR%%/src/webui/static/img/doc/bouquet/add.png
+%%DATADIR%%/src/webui/static/img/doc/bouquet/detach.png
+%%DATADIR%%/src/webui/static/img/doc/bouquet/tab.png
+%%DATADIR%%/src/webui/static/img/doc/caclient/tab.png
+%%DATADIR%%/src/webui/static/img/doc/caclient_capmt/tab.png
+%%DATADIR%%/src/webui/static/img/doc/channel/add.png
+%%DATADIR%%/src/webui/static/img/doc/channel/tab.png
+%%DATADIR%%/src/webui/static/img/doc/channeltag/tab.png
+%%DATADIR%%/src/webui/static/img/doc/config/tab.png
+%%DATADIR%%/src/webui/static/img/doc/debugging/tab.png
+%%DATADIR%%/src/webui/static/img/doc/dvrautorec/add.png
+%%DATADIR%%/src/webui/static/img/doc/dvrautorec/tab.png
+%%DATADIR%%/src/webui/static/img/doc/dvrconfig/tab.png
+%%DATADIR%%/src/webui/static/img/doc/dvrentry/add.png
+%%DATADIR%%/src/webui/static/img/doc/dvrentry/tab.png
+%%DATADIR%%/src/webui/static/img/doc/dvrtimerec/add.png
+%%DATADIR%%/src/webui/static/img/doc/dvrtimerec/tab.png
+%%DATADIR%%/src/webui/static/img/doc/epg/autorec.png
+%%DATADIR%%/src/webui/static/img/doc/epg/series_link.png
+%%DATADIR%%/src/webui/static/img/doc/epg/tab.png
+%%DATADIR%%/src/webui/static/img/doc/epgconf/tab.png
+%%DATADIR%%/src/webui/static/img/doc/epggrabber_channel/tab.png
+%%DATADIR%%/src/webui/static/img/doc/epggrabber_modules/tab.png
+%%DATADIR%%/src/webui/static/img/doc/filters/example.png
+%%DATADIR%%/src/webui/static/img/doc/filters/tab.png
+%%DATADIR%%/src/webui/static/img/doc/icons/abort.png
+%%DATADIR%%/src/webui/static/img/doc/icons/accept.png
+%%DATADIR%%/src/webui/static/img/doc/icons/acl.png
+%%DATADIR%%/src/webui/static/img/doc/icons/add.png
+%%DATADIR%%/src/webui/static/img/doc/icons/application_form.png
+%%DATADIR%%/src/webui/static/img/doc/icons/arrow_branch.png
+%%DATADIR%%/src/webui/static/img/doc/icons/arrow_down.png
+%%DATADIR%%/src/webui/static/img/doc/icons/arrow_join.png
+%%DATADIR%%/src/webui/static/img/doc/icons/arrow_left.png
+%%DATADIR%%/src/webui/static/img/doc/icons/arrow_out.png
+%%DATADIR%%/src/webui/static/img/doc/icons/arrow_right.png
+%%DATADIR%%/src/webui/static/img/doc/icons/arrow_switch.png
+%%DATADIR%%/src/webui/static/img/doc/icons/arrow_up.png
+%%DATADIR%%/src/webui/static/img/doc/icons/auto_rec.png
+%%DATADIR%%/src/webui/static/img/doc/icons/award_star_bronze_3.png
+%%DATADIR%%/src/webui/static/img/doc/icons/award_star_gold_3.png
+%%DATADIR%%/src/webui/static/img/doc/icons/award_star_silver_3.png
+%%DATADIR%%/src/webui/static/img/doc/icons/baseconf.png
+%%DATADIR%%/src/webui/static/img/doc/icons/bell.png
+%%DATADIR%%/src/webui/static/img/doc/icons/bouquets.png
+%%DATADIR%%/src/webui/static/img/doc/icons/brick.png
+%%DATADIR%%/src/webui/static/img/doc/icons/broadcast_details.png
+%%DATADIR%%/src/webui/static/img/doc/icons/cancel.png
+%%DATADIR%%/src/webui/static/img/doc/icons/cancel_button.png
+%%DATADIR%%/src/webui/static/img/doc/icons/channel_tags.png
+%%DATADIR%%/src/webui/static/img/doc/icons/channels.png
+%%DATADIR%%/src/webui/static/img/doc/icons/clean.png
+%%DATADIR%%/src/webui/static/img/doc/icons/clock.png
+%%DATADIR%%/src/webui/static/img/doc/icons/connections.png
+%%DATADIR%%/src/webui/static/img/doc/icons/control_pause.png
+%%DATADIR%%/src/webui/static/img/doc/icons/control_play.png
+%%DATADIR%%/src/webui/static/img/doc/icons/control_stop.png
+%%DATADIR%%/src/webui/static/img/doc/icons/debug.png
+%%DATADIR%%/src/webui/static/img/doc/icons/delete.png
+%%DATADIR%%/src/webui/static/img/doc/icons/download.png
+%%DATADIR%%/src/webui/static/img/doc/icons/drive.png
+%%DATADIR%%/src/webui/static/img/doc/icons/dvr.png
+%%DATADIR%%/src/webui/static/img/doc/icons/dvrprofiles.png
+%%DATADIR%%/src/webui/static/img/doc/icons/edit.png
+%%DATADIR%%/src/webui/static/img/doc/icons/epg.png
+%%DATADIR%%/src/webui/static/img/doc/icons/exclamation.png
+%%DATADIR%%/src/webui/static/img/doc/icons/eye.png
+%%DATADIR%%/src/webui/static/img/doc/icons/fetch_images.png
+%%DATADIR%%/src/webui/static/img/doc/icons/film.png
+%%DATADIR%%/src/webui/static/img/doc/icons/film_edit.png
+%%DATADIR%%/src/webui/static/img/doc/icons/film_key.png
+%%DATADIR%%/src/webui/static/img/doc/icons/find.png
+%%DATADIR%%/src/webui/static/img/doc/icons/full_screen.png
+%%DATADIR%%/src/webui/static/img/doc/icons/general.png
+%%DATADIR%%/src/webui/static/img/doc/icons/group.png
+%%DATADIR%%/src/webui/static/img/doc/icons/help.png
+%%DATADIR%%/src/webui/static/img/doc/icons/imdb.png
+%%DATADIR%%/src/webui/static/img/doc/icons/imgcacheconf.png
+%%DATADIR%%/src/webui/static/img/doc/icons/information.png
+%%DATADIR%%/src/webui/static/img/doc/icons/ip_block.png
+%%DATADIR%%/src/webui/static/img/doc/icons/key.png
+%%DATADIR%%/src/webui/static/img/doc/icons/layers.png
+%%DATADIR%%/src/webui/static/img/doc/icons/linked.gif
+%%DATADIR%%/src/webui/static/img/doc/icons/mux_schedulers.png
+%%DATADIR%%/src/webui/static/img/doc/icons/muxes.png
+%%DATADIR%%/src/webui/static/img/doc/icons/networks.png
+%%DATADIR%%/src/webui/static/img/doc/icons/newspaper.png
+%%DATADIR%%/src/webui/static/img/doc/icons/other_filters.png
+%%DATADIR%%/src/webui/static/img/doc/icons/pass.png
+%%DATADIR%%/src/webui/static/img/doc/icons/pci.png
+%%DATADIR%%/src/webui/static/img/doc/icons/plugin.png
+%%DATADIR%%/src/webui/static/img/doc/icons/progress-bg-green.gif
+%%DATADIR%%/src/webui/static/img/doc/icons/progress-bg-orange.gif
+%%DATADIR%%/src/webui/static/img/doc/icons/progress-bg-red.gif
+%%DATADIR%%/src/webui/static/img/doc/icons/rec.png
+%%DATADIR%%/src/webui/static/img/doc/icons/recordingtab.png
+%%DATADIR%%/src/webui/static/img/doc/icons/reseticon.png
+%%DATADIR%%/src/webui/static/img/doc/icons/satipsrvconf.png
+%%DATADIR%%/src/webui/static/img/doc/icons/save.png
+%%DATADIR%%/src/webui/static/img/doc/icons/scheduled.png
+%%DATADIR%%/src/webui/static/img/doc/icons/service_mapper.png
+%%DATADIR%%/src/webui/static/img/doc/icons/services.png
+%%DATADIR%%/src/webui/static/img/doc/icons/sound.png
+%%DATADIR%%/src/webui/static/img/doc/icons/sound_mute.png
+%%DATADIR%%/src/webui/static/img/doc/icons/stop.png
+%%DATADIR%%/src/webui/static/img/doc/icons/stop_rec.png
+%%DATADIR%%/src/webui/static/img/doc/icons/stream.png
+%%DATADIR%%/src/webui/static/img/doc/icons/subscriptions.png
+%%DATADIR%%/src/webui/static/img/doc/icons/subtitle.png
+%%DATADIR%%/src/webui/static/img/doc/icons/tag.png
+%%DATADIR%%/src/webui/static/img/doc/icons/tag_blue.png
+%%DATADIR%%/src/webui/static/img/doc/icons/teletext.png
+%%DATADIR%%/src/webui/static/img/doc/icons/television.png
+%%DATADIR%%/src/webui/static/img/doc/icons/thetvdb.png
+%%DATADIR%%/src/webui/static/img/doc/icons/tick.png
+%%DATADIR%%/src/webui/static/img/doc/icons/time_schedules.png
+%%DATADIR%%/src/webui/static/img/doc/icons/timeshift.png
+%%DATADIR%%/src/webui/static/img/doc/icons/tv_cards.png
+%%DATADIR%%/src/webui/static/img/doc/icons/undo.png
+%%DATADIR%%/src/webui/static/img/doc/icons/upcoming_rec.png
+%%DATADIR%%/src/webui/static/img/doc/icons/wand.png
+%%DATADIR%%/src/webui/static/img/doc/icons/watch_tv.png
+%%DATADIR%%/src/webui/static/img/doc/icons/world.png
+%%DATADIR%%/src/webui/static/img/doc/icons/world_add.png
+%%DATADIR%%/src/webui/static/img/doc/icons/wrench.png
+%%DATADIR%%/src/webui/static/img/doc/imagecache/tab.png
+%%DATADIR%%/src/webui/static/img/doc/index/logo.png
+%%DATADIR%%/src/webui/static/img/doc/ipblocking/tab.png
+%%DATADIR%%/src/webui/static/img/doc/linuxdvb_frontend_dvbc/tab.png
+%%DATADIR%%/src/webui/static/img/doc/linuxdvb_frontend_dvbs/tab.png
+%%DATADIR%%/src/webui/static/img/doc/linuxdvb_frontend_dvbt/tab.png
+%%DATADIR%%/src/webui/static/img/doc/mpegts_mux/tab.png
+%%DATADIR%%/src/webui/static/img/doc/mpegts_mux_sched/tab.png
+%%DATADIR%%/src/webui/static/img/doc/mpegts_network/tab.png
+%%DATADIR%%/src/webui/static/img/doc/mpegts_service/add_service.png
+%%DATADIR%%/src/webui/static/img/doc/mpegts_service/map_all.png
+%%DATADIR%%/src/webui/static/img/doc/mpegts_service/map_selected.png
+%%DATADIR%%/src/webui/static/img/doc/mpegts_service/service_filter.png
+%%DATADIR%%/src/webui/static/img/doc/mpegts_service/service_info.png
+%%DATADIR%%/src/webui/static/img/doc/mpegts_service/tab.png
+%%DATADIR%%/src/webui/static/img/doc/overview/screenshot.png
+%%DATADIR%%/src/webui/static/img/doc/passwd/add.png
+%%DATADIR%%/src/webui/static/img/doc/passwd/tab.png
+%%DATADIR%%/src/webui/static/img/doc/profile/tab.png
+%%DATADIR%%/src/webui/static/img/doc/satip_client/tab.png
+%%DATADIR%%/src/webui/static/img/doc/satip_server/tab.png
+%%DATADIR%%/src/webui/static/img/doc/service_mapper/dialog.png
+%%DATADIR%%/src/webui/static/img/doc/status_connections/tab.png
+%%DATADIR%%/src/webui/static/img/doc/status_service_mapper/tab.png
+%%DATADIR%%/src/webui/static/img/doc/status_stream/tab.png
+%%DATADIR%%/src/webui/static/img/doc/status_subscriptions/tab.png
+%%DATADIR%%/src/webui/static/img/doc/timeshift/tab.png
+%%DATADIR%%/src/webui/static/img/doc/tv_adapters/params.png
+%%DATADIR%%/src/webui/static/img/doc/tv_adapters/tree.png
+%%DATADIR%%/src/webui/static/img/epg.png
 %%DATADIR%%/src/webui/static/img/error.png
 %%DATADIR%%/src/webui/static/img/logo.png
+%%DATADIR%%/src/webui/static/img/logobig.png
+%%DATADIR%%/src/webui/static/img/logomid.png
 %%DATADIR%%/src/webui/static/img/spinner_black_bg.gif
+%%DATADIR%%/src/webui/static/intl/tvh.ach.js.gz
+%%DATADIR%%/src/webui/static/intl/tvh.ady.js.gz
+%%DATADIR%%/src/webui/static/intl/tvh.ar.js.gz
+%%DATADIR%%/src/webui/static/intl/tvh.bg.js.gz
+%%DATADIR%%/src/webui/static/intl/tvh.cs.js.gz
+%%DATADIR%%/src/webui/static/intl/tvh.da.js.gz
+%%DATADIR%%/src/webui/static/intl/tvh.de.js.gz
+%%DATADIR%%/src/webui/static/intl/tvh.en_GB.js.gz
+%%DATADIR%%/src/webui/static/intl/tvh.en_US.js.gz
+%%DATADIR%%/src/webui/static/intl/tvh.es.js.gz
+%%DATADIR%%/src/webui/static/intl/tvh.et.js.gz
+%%DATADIR%%/src/webui/static/intl/tvh.fa.js.gz
+%%DATADIR%%/src/webui/static/intl/tvh.fi.js.gz
+%%DATADIR%%/src/webui/static/intl/tvh.fr.js.gz
+%%DATADIR%%/src/webui/static/intl/tvh.he.js.gz
+%%DATADIR%%/src/webui/static/intl/tvh.hr.js.gz
+%%DATADIR%%/src/webui/static/intl/tvh.hu.js.gz
+%%DATADIR%%/src/webui/static/intl/tvh.it.js.gz
+%%DATADIR%%/src/webui/static/intl/tvh.ko.js.gz
+%%DATADIR%%/src/webui/static/intl/tvh.lt.js.gz
+%%DATADIR%%/src/webui/static/intl/tvh.lv.js.gz
+%%DATADIR%%/src/webui/static/intl/tvh.nl.js.gz
+%%DATADIR%%/src/webui/static/intl/tvh.no.js.gz
+%%DATADIR%%/src/webui/static/intl/tvh.pl.js.gz
+%%DATADIR%%/src/webui/static/intl/tvh.pt.js.gz
+%%DATADIR%%/src/webui/static/intl/tvh.ro.js.gz
+%%DATADIR%%/src/webui/static/intl/tvh.ru.js.gz
+%%DATADIR%%/src/webui/static/intl/tvh.sk.js.gz
+%%DATADIR%%/src/webui/static/intl/tvh.sl.js.gz
+%%DATADIR%%/src/webui/static/intl/tvh.sq.js.gz
+%%DATADIR%%/src/webui/static/intl/tvh.sv.js.gz
+%%DATADIR%%/src/webui/static/intl/tvh.tr.js.gz
+%%DATADIR%%/src/webui/static/intl/tvh.uk.js.gz
+%%DATADIR%%/src/webui/static/intl/tvh.zh-Hans.js.gz
+%%DATADIR%%/src/webui/static/intl/tvh.zh.js.gz
 %%DATADIR%%/src/webui/static/livegrid/livegrid-all.js
 %%DATADIR%%/src/webui/static/livegrid/resources/css/ext-ux-livegrid.css
 %%DATADIR%%/src/webui/static/livegrid/resources/images/loading.gif
@@ -1126,7 +1276,9 @@ man/man1/tvheadend.1.gz
 %%DATADIR%%/src/webui/static/tv.js
 %%DATADIR%%/src/webui/static/tvh-tv.css.gz
 %%DATADIR%%/src/webui/static/tvh-tv.js.gz
-%%DATADIR%%/src/webui/static/tvh.css.gz
+%%DATADIR%%/src/webui/static/tvh.access.css.gz
+%%DATADIR%%/src/webui/static/tvh.blue.css.gz
+%%DATADIR%%/src/webui/static/tvh.gray.css.gz
 %%DATADIR%%/src/webui/static/tvh.js.gz
 %%DATADIR%%/src/webui/static/xcheckbox/xcheckbox.css
 %%DATADIR%%/src/webui/static/xcheckbox/xcheckbox.js
diff --git a/multimedia/vapoursynth/Makefile b/multimedia/vapoursynth/Makefile
index 5fa1f5d59009..7051ff738fd3 100644
--- a/multimedia/vapoursynth/Makefile
+++ b/multimedia/vapoursynth/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	vapoursynth
 PORTVERSION=	R38
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/multimedia/vdr-plugin-softhddevice/Makefile b/multimedia/vdr-plugin-softhddevice/Makefile
index 8f03dfad49e9..8a90026f15e3 100644
--- a/multimedia/vdr-plugin-softhddevice/Makefile
+++ b/multimedia/vdr-plugin-softhddevice/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	vdr-plugin-softhddevice
 PORTVERSION=	0.5.1
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	multimedia
 MASTER_SITES=	http://projects.vdr-developer.org/attachments/download/1000/
 DISTNAME=	${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
diff --git a/multimedia/vdr/Makefile b/multimedia/vdr/Makefile
index 9da5c4da6c80..bf0a954cb6d8 100644
--- a/multimedia/vdr/Makefile
+++ b/multimedia/vdr/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	vdr
 PORTVERSION=	1.7.29
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.tvdr.de/vdr/Developer/
 DIST_SUBDIR=	vdr
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index b602fc7150fa..5c2e4bde021a 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	vlc
 DISTVERSION=	2.2.6
+PORTREVISION=	1
 PORTEPOCH=	4
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \
diff --git a/multimedia/xanim/Makefile b/multimedia/xanim/Makefile
index 5ded02b54d55..bf3ddd05cbdc 100644
--- a/multimedia/xanim/Makefile
+++ b/multimedia/xanim/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xanim
 PORTVERSION=	2.92.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia graphics
 MASTER_SITES=	ftp://ftp.nstu.ru/pub/mirrors/xanim.va.pubnix.com/:main \
 		LOCAL/dinoex:main,DEFAULT \
diff --git a/net-im/Makefile b/net-im/Makefile
index 5b76f006ba64..11bbcec8878c 100644
--- a/net-im/Makefile
+++ b/net-im/Makefile
@@ -144,6 +144,7 @@
     SUBDIR += py-telepot
     SUBDIR += py-toxcore-c
     SUBDIR += py-twistedWords
+    SUBDIR += py-unmessage
     SUBDIR += py-xmpppy
     SUBDIR += py-xmpppy-irc
     SUBDIR += py-xmpppy-yahoo
diff --git a/net-im/corebird/Makefile b/net-im/corebird/Makefile
index 23796f76fc19..1357affd553c 100644
--- a/net-im/corebird/Makefile
+++ b/net-im/corebird/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	corebird
 PORTVERSION=	1.5.1
+PORTREVISION=	1
 CATEGORIES=	net-im
 
 MAINTAINER=	cpm@FreeBSD.org
diff --git a/net-im/diligent/Makefile b/net-im/diligent/Makefile
index 8ec0ad8c6fd5..0a0aae030598 100644
--- a/net-im/diligent/Makefile
+++ b/net-im/diligent/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	diligent
 PORTVERSION=	0.2.7
-PORTREVISION=	3
+PORTREVISION=	4
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net-im
 
diff --git a/net-im/jabber.el/Makefile b/net-im/jabber.el/Makefile
index 3ee11ad36a97..3518c63a6ff1 100644
--- a/net-im/jabber.el/Makefile
+++ b/net-im/jabber.el/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	jabber.el
 PORTVERSION=	0.8.92
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-im elisp
 MASTER_SITES=	SF/emacs-jabber/emacs-jabber%20beta%20versions/${PORTVERSION}
 DISTNAME=		emacs-jabber-${PORTVERSION}
diff --git a/net-im/jabberd/Makefile b/net-im/jabberd/Makefile
index a96aa60c1c90..4684c53f6fe7 100644
--- a/net-im/jabberd/Makefile
+++ b/net-im/jabberd/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	jabberd
 PORTVERSION=	2.6.1
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	https://github.com/jabberd2/jabberd2/releases/download/${PORTNAME}-${DISTVERSION}/ \
 		LOCAL/matthew/${PORTNAME}
diff --git a/net-im/ktp-common-internals/Makefile b/net-im/ktp-common-internals/Makefile
index 50f7f93645e0..151629ba5645 100644
--- a/net-im/ktp-common-internals/Makefile
+++ b/net-im/ktp-common-internals/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	ktp-common-internals
 PORTVERSION=	${KTP_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im kde
 MASTER_SITES=	KDE/${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
 
diff --git a/net-im/ktp-text-ui/Makefile b/net-im/ktp-text-ui/Makefile
index fa6ba878d35d..d281b1c8b835 100644
--- a/net-im/ktp-text-ui/Makefile
+++ b/net-im/ktp-text-ui/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	ktp-text-ui
 PORTVERSION=	${KTP_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im kde
 MASTER_SITES=	KDE/${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
 
diff --git a/net-im/libaccounts-qt5/Makefile b/net-im/libaccounts-qt5/Makefile
index ff819b909b17..df7cd2a954e5 100644
--- a/net-im/libaccounts-qt5/Makefile
+++ b/net-im/libaccounts-qt5/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libaccounts-qt5
 PORTVERSION=	1.13
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-im
 MASTER_SITES=	https://drive.google.com/uc?export=download&id=0B8fX9XOwH_g4cTRCaktXNDRmMXM&dummy= \
 		LOCAL/rakuco
diff --git a/net-im/py-slackclient/Makefile b/net-im/py-slackclient/Makefile
index 154eaf637893..ab3fdc17bc67 100644
--- a/net-im/py-slackclient/Makefile
+++ b/net-im/py-slackclient/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	slackclient
-PORTVERSION=	1.0.6
+PORTVERSION=	1.0.9
 CATEGORIES=	net-im python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
diff --git a/net-im/py-slackclient/distinfo b/net-im/py-slackclient/distinfo
index d5352bd5b734..4473c49a5be0 100644
--- a/net-im/py-slackclient/distinfo
+++ b/net-im/py-slackclient/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1498381259
-SHA256 (slackhq-python-slackclient-1.0.6_GH0.tar.gz) = 35c51b1dff28cd28f6c95246b876add1bf425c4510f6e1e58d1444c9b9660ceb
-SIZE (slackhq-python-slackclient-1.0.6_GH0.tar.gz) = 381657
+TIMESTAMP = 1504344080
+SHA256 (slackhq-python-slackclient-1.0.9_GH0.tar.gz) = 6538c17d1c14ac7072189296fe434539c8f1e1c8904401a4ab190291e9d5ac25
+SIZE (slackhq-python-slackclient-1.0.9_GH0.tar.gz) = 279917
diff --git a/net-im/py-unmessage/Makefile b/net-im/py-unmessage/Makefile
new file mode 100644
index 000000000000..0bf946631c6b
--- /dev/null
+++ b/net-im/py-unmessage/Makefile
@@ -0,0 +1,29 @@
+# Created by: Yuri Victorovich
+# $FreeBSD$
+
+PORTNAME=	unmessage
+PORTVERSION=	0.2.0
+CATEGORIES=	net-im net-p2p python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	yuri@rawbw.com
+COMMENT=	Privacy enhanced instant messenger
+
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+RUN_DEPENDS=	tor:security/tor \
+		${PYTHON_PKGNAMEPREFIX}opuslib>=1.1.0:audio/py-opuslib \
+		${PYTHON_PKGNAMEPREFIX}pyaudio>=0.2.10:audio/py-pyaudio \
+		${PYTHON_PKGNAMEPREFIX}pyaxo>=0.7.3:security/py-pyaxo \
+		${PYTHON_PKGNAMEPREFIX}pynacl>=1.0.1:security/py-pynacl \
+		${PYTHON_PKGNAMEPREFIX}pyperclip>=1.5.27:devel/py-pyperclip \
+		${PYTHON_PKGNAMEPREFIX}twisted>=16.6.0:devel/py-twisted \
+		${PYTHON_PKGNAMEPREFIX}txtorcon>=0.19.0:security/py-txtorcon
+
+USES=		python:2.7
+USE_PYTHON=	distutils autoplist
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/net-im/py-unmessage/distinfo b/net-im/py-unmessage/distinfo
new file mode 100644
index 000000000000..8de86c2f3618
--- /dev/null
+++ b/net-im/py-unmessage/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1504481628
+SHA256 (unmessage-0.2.0.tar.gz) = c55f504ae55d19cbde8565bc668d3c420d6336df0442dd8dd31daf6e3888a7be
+SIZE (unmessage-0.2.0.tar.gz) = 62725
diff --git a/net-im/py-unmessage/pkg-descr b/net-im/py-unmessage/pkg-descr
new file mode 100644
index 000000000000..19055fb3cce6
--- /dev/null
+++ b/net-im/py-unmessage/pkg-descr
@@ -0,0 +1,15 @@
+unMessage is a peer-to-peer instant messaging application designed to enhance
+privacy and anonymity.
+
+Features:
+* Transport makes use of Twisted, Tor Onion Services and txtorcon
+* Encryption is performed using the Double Ratchet Algorithm implemented in
+  pyaxo (using PyNaCl)
+* Authentication makes use of the Socialist Millionaire Protocol implemented
+  in Cryptully
+* Transport metadata is minimized by Tor and application metadata by the
+  unMessage protocol
+* User interfaces are created with Tkinter (graphical) and curses
+  (command-line)
+
+WWW: https://github.com/AnemoneLabs/unmessage
diff --git a/net-im/qTox/Makefile b/net-im/qTox/Makefile
index 5fafe789725e..ba680d5a2607 100644
--- a/net-im/qTox/Makefile
+++ b/net-im/qTox/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	qTox
 PORTVERSION=	1.11.0
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net-im net-p2p
 
diff --git a/net-im/ricochet/Makefile b/net-im/ricochet/Makefile
index f7ceaafd27f7..6cecec1f2c5e 100644
--- a/net-im/ricochet/Makefile
+++ b/net-im/ricochet/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	ricochet
 PORTVERSION=	1.1.4
 DISTVERSIONPREFIX=	v
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	net-im net-p2p
 
 MAINTAINER=	yuri@rawbw.com
diff --git a/net-im/ring-daemon/Makefile b/net-im/ring-daemon/Makefile
index e3e1a04801e5..7f089eebbba8 100644
--- a/net-im/ring-daemon/Makefile
+++ b/net-im/ring-daemon/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	ring-daemon
 PORTVERSION=	0.160516
 DISTVERSIONPREFIX=	v
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-im net-p2p
 
 MAINTAINER=	yuri@rawbw.com
diff --git a/net-im/ring-gnome/Makefile b/net-im/ring-gnome/Makefile
index e8fbc8cf6151..994361615c2c 100644
--- a/net-im/ring-gnome/Makefile
+++ b/net-im/ring-gnome/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ring-gnome
 PORTVERSION=	0.160516
-PORTREVISION=	6
+PORTREVISION=	7
 #DISTVERSIONPREFIX=	v
 CATEGORIES=	net-im net-p2p
 
diff --git a/net-im/ring-libclient/Makefile b/net-im/ring-libclient/Makefile
index f22b2cf0de7f..5094d33ee04c 100644
--- a/net-im/ring-libclient/Makefile
+++ b/net-im/ring-libclient/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ring-libclient
 PORTVERSION=	0.160516
-PORTREVISION=	3
+PORTREVISION=	4
 #DISTVERSIONPREFIX=	v
 CATEGORIES=	net-im net-p2p
 
diff --git a/net-im/teamwords/Makefile b/net-im/teamwords/Makefile
index 3a811f435cee..cb0a6fd819de 100644
--- a/net-im/teamwords/Makefile
+++ b/net-im/teamwords/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	teamwords
 PORTVERSION=	0.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net-im
 
diff --git a/net-im/tox/Makefile b/net-im/tox/Makefile
index 1d11f7553932..6319640f2194 100644
--- a/net-im/tox/Makefile
+++ b/net-im/tox/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	toxcore
 PORTVERSION=	0.1.8
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 PORTEPOCH=	1
 CATEGORIES=	net-im net-p2p
diff --git a/net-im/uTox/Makefile b/net-im/uTox/Makefile
index 2946c0f0dca9..00bd2e641fb6 100644
--- a/net-im/uTox/Makefile
+++ b/net-im/uTox/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	uTox
 PORTVERSION=	0.11.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im net-p2p
 
 MAINTAINER=	portmaster@BSDforge.com
diff --git a/net-mgmt/Makefile b/net-mgmt/Makefile
index 5f3f7cec8097..23181f684e02 100644
--- a/net-mgmt/Makefile
+++ b/net-mgmt/Makefile
@@ -195,14 +195,15 @@
     SUBDIR += ng_ipacct
     SUBDIR += nitpicker
     SUBDIR += nrpe
-    SUBDIR += nrpe3
     SUBDIR += nrpe-ssl
+    SUBDIR += nrpe3
     SUBDIR += nsca
     SUBDIR += nsca-client
     SUBDIR += nsca-ng
     SUBDIR += nsca-ng-client
     SUBDIR += nsca27
     SUBDIR += nsca27-client
+    SUBDIR += nstat
     SUBDIR += nstreams
     SUBDIR += observium
     SUBDIR += ocsinventory-agent
@@ -294,6 +295,7 @@
     SUBDIR += pushgateway
     SUBDIR += py-ipcalc
     SUBDIR += py-ipy
+    SUBDIR += py-pdagent
     SUBDIR += py-pyang
     SUBDIR += py-pysmi
     SUBDIR += py-pyzabbix
diff --git a/net-mgmt/cacti/Makefile b/net-mgmt/cacti/Makefile
index 90346d89bb7c..47fe19f5ee06 100644
--- a/net-mgmt/cacti/Makefile
+++ b/net-mgmt/cacti/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cacti
-PORTVERSION=	1.1.21
+PORTVERSION=	1.1.22
 CATEGORIES=	net-mgmt www
 MASTER_SITES=	http://www.cacti.net/downloads/ \
 		ftp://ftpmirror.uk/freebsd-ports/cacti/
diff --git a/net-mgmt/cacti/distinfo b/net-mgmt/cacti/distinfo
index c9b9a817dc69..78a447e3893e 100644
--- a/net-mgmt/cacti/distinfo
+++ b/net-mgmt/cacti/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504666425
-SHA256 (cacti-1.1.21.tar.gz) = e649fea4e8fc9900620af213218989e229aa25a1e1fb10dcde1844b1a2ae3bc0
-SIZE (cacti-1.1.21.tar.gz) = 8905650
+TIMESTAMP = 1505214823
+SHA256 (cacti-1.1.22.tar.gz) = 416fe4b264275bd52c4f3e2f4d7c2bab4c36541e0e5211f98503620b81c7738a
+SIZE (cacti-1.1.22.tar.gz) = 8910667
diff --git a/net-mgmt/chillispot/Makefile b/net-mgmt/chillispot/Makefile
index fde6736629aa..c02907ff0e3b 100644
--- a/net-mgmt/chillispot/Makefile
+++ b/net-mgmt/chillispot/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	chillispot
 PORTVERSION=	1.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.chillispot.info/download/ \
 		http://www.geeklan.co.uk/files/ \
diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile
index 7fe5bcaab72d..ed2ee4ed887c 100644
--- a/net-mgmt/collectd5/Makefile
+++ b/net-mgmt/collectd5/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	collectd
 PORTVERSION=	5.7.2
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	https://collectd.org/files/ \
 		http://collectd.org/files/
@@ -27,6 +28,8 @@ OPTIONS_GROUP_INPUT=	CHRONY CURL CURL_JSON CURL_XML DBI IPMI JSON \
 			SIGROK SNMP STATSD TOKYOTYRANT VARNISH XML \
 			XMMS ZOOKEEPER
 
+OPTIONS_DEFAULT=	DEBUG GCRYPT PING
+
 CGI_DESC=		Install collection.cgi (requires rrdtool)
 CHRONY_DESC=		Enable chronyd plugin
 CURL_DESC=		Enable curl-based plugins (apache, nginx, etc)
diff --git a/net-mgmt/hawk/Makefile b/net-mgmt/hawk/Makefile
index 9932ad1ccd5e..d87911bf3832 100644
--- a/net-mgmt/hawk/Makefile
+++ b/net-mgmt/hawk/Makefile
@@ -20,7 +20,7 @@ USES=		perl5
 USE_MYSQL=	server
 USE_PHP=	mysql
 WANT_PHP_MOD=	yes
-IGNORE_WITH_PHP=	70
+IGNORE_WITH_PHP=	70 71
 
 NO_BUILD=	yes
 USE_RC_SUBR=	hawk
diff --git a/net-mgmt/icinga2/Makefile b/net-mgmt/icinga2/Makefile
index a88b44774681..4e2024f15f96 100644
--- a/net-mgmt/icinga2/Makefile
+++ b/net-mgmt/icinga2/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	icinga2
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.7.0
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	lme@FreeBSD.org
diff --git a/net-mgmt/icinga2/files/patch-itl_command-plugins.conf b/net-mgmt/icinga2/files/patch-itl_command-plugins.conf
new file mode 100644
index 000000000000..8bd964a47a6a
--- /dev/null
+++ b/net-mgmt/icinga2/files/patch-itl_command-plugins.conf
@@ -0,0 +1,13 @@
+--- itl/command-plugins.conf.orig	2017-08-02 13:58:38 UTC
++++ itl/command-plugins.conf
+@@ -1630,6 +1630,10 @@ object CheckCommand "procs" {
+ 			set_if = "$procs_nokthreads$"
+ 			description = "Only scan for non kernel threads"
+ 		}
++		"-j" = {
++			value = "$procs_jid$"
++			description = "Only scan for processes within that jail ID"
++		}
+ 	}
+ 
+ 	vars.procs_traditional = false
diff --git a/net-mgmt/mk-livestatus/Makefile b/net-mgmt/mk-livestatus/Makefile
index 640d133dd71b..485d6b75cea3 100644
--- a/net-mgmt/mk-livestatus/Makefile
+++ b/net-mgmt/mk-livestatus/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mk-livestatus
 PORTVERSION=	1.2.8p16
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://mathias-kettner.de/download/
 DIST_SUBDIR=	check_mk
diff --git a/net-mgmt/monitoring-plugins/Makefile b/net-mgmt/monitoring-plugins/Makefile
index 0cbec71f0457..28bfca70ab6b 100644
--- a/net-mgmt/monitoring-plugins/Makefile
+++ b/net-mgmt/monitoring-plugins/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	monitoring-plugins
 PORTVERSION=	2.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-mgmt
 MASTER_SITES=	https://www.monitoring-plugins.org/download/ LOCAL/mat/${PORTNAME}
 
diff --git a/net-mgmt/monitoring-plugins/files/patch-plugins-scripts_check__mailq.pl b/net-mgmt/monitoring-plugins/files/patch-plugins-scripts_check__mailq.pl
new file mode 100644
index 000000000000..fad32d64cdd6
--- /dev/null
+++ b/net-mgmt/monitoring-plugins/files/patch-plugins-scripts_check__mailq.pl
@@ -0,0 +1,56 @@
+From 94acff9f2616fbca8fd31292d374d9ce8a45263a Mon Sep 17 00:00:00 2001
+From: Filias Heidt <fh@netzkommune.de>
+Date: Fri, 9 Jun 2017 14:46:00 +0200
+Subject: [PATCH] add support for opensmtpd
+
+--- plugins-scripts/check_mailq.pl.orig	2016-11-29 08:45:08 UTC
++++ plugins-scripts/check_mailq.pl
+@@ -550,6 +550,39 @@ elsif ( $mailq eq "nullmailer" ) {
+ 	}
+ } # end of ($mailq eq "nullmailer")
+ 
++elsif ( $mailq eq "opensmtp" ) {
++	## open mailq
++	if ( defined $utils::PATH_TO_MAILQ && -x $utils::PATH_TO_MAILQ ) {
++		if (! open (MAILQ, "$sudo $utils::PATH_TO_MAILQ | " ) ) {
++			print "ERROR: could not open $utils::PATH_TO_MAILQ \n";
++			exit $ERRORS{'UNKNOWN'};
++		}
++	}elsif( defined $utils::PATH_TO_MAILQ){
++		unless (-x $utils::PATH_TO_MAILQ) {
++			print "ERROR: $utils::PATH_TO_MAILQ is not executable by (uid $>:gid($)))\n";
++			exit $ERRORS{'UNKNOWN'};
++		}
++	} else {
++		print "ERROR: \$utils::PATH_TO_MAILQ is not defined\n";
++		exit $ERRORS{'UNKNOWN'};
++	}
++
++	$msg_q++ while (<MAILQ>);
++
++	close(MAILQ) ;
++	if ($msg_q < $opt_w) {
++		$msg = "OK: $mailq mailq ($msg_q) is below threshold ($opt_w/$opt_c)";
++		$state = $ERRORS{'OK'};
++	}elsif ($msg_q >= $opt_w  && $msg_q < $opt_c) {
++		$msg = "WARNING: $mailq mailq is $msg_q (threshold w = $opt_w)";
++		$state = $ERRORS{'WARNING'};
++	}else {
++		$msg = "CRITICAL: $mailq mailq is $msg_q (threshold c = $opt_c)";
++		$state = $ERRORS{'CRITICAL'};
++	}
++} # end of ($mailq eq "opensmtp")
++
++
+ # Perfdata support
+ print "$msg|unsent=$msg_q;$opt_w;$opt_c;0\n";
+ exit $state;
+@@ -610,7 +643,7 @@ sub process_arguments(){
+ 	}
+ 
+ 	if (defined $opt_M) {
+-		if ($opt_M =~ /^(sendmail|qmail|postfix|exim|nullmailer)$/) {
++		if ($opt_M =~ /^(sendmail|qmail|postfix|exim|nullmailer|opensmtp)$/) {
+ 			$mailq = $opt_M ;
+ 		}elsif( $opt_M eq ''){
+ 			$mailq = 'sendmail';
diff --git a/net-mgmt/nagios-plugins/Makefile b/net-mgmt/nagios-plugins/Makefile
index e415a99e76e6..81f05262db81 100644
--- a/net-mgmt/nagios-plugins/Makefile
+++ b/net-mgmt/nagios-plugins/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	nagios-plugins
 PORTVERSION=	2.2.1
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	https://www.nagios-plugins.org/download/ \
diff --git a/net-mgmt/nagios-plugins/files/patch-plugins-scripts_check__mailq.pl b/net-mgmt/nagios-plugins/files/patch-plugins-scripts_check__mailq.pl
new file mode 100644
index 000000000000..06e51e89c987
--- /dev/null
+++ b/net-mgmt/nagios-plugins/files/patch-plugins-scripts_check__mailq.pl
@@ -0,0 +1,57 @@
+commit d56818f5121b05439c7b7a1655d96ab39e066797
+Author: Filias Heidt <fh@netzkommune.de>
+Date:   2017-04-24 11:00:43 +0200
+
+    add support for opensmtpd
+
+--- plugins-scripts/check_mailq.pl.orig	2017-04-19 16:03:12 UTC
++++ plugins-scripts/check_mailq.pl
+@@ -558,6 +558,39 @@ elsif ( $mailq eq "nullmailer" ) {
+ 	}
+ } # end of ($mailq eq "nullmailer")
+ 
++elsif ( $mailq eq "opensmtp" ) {
++	## open mailq
++	if ( defined $utils::PATH_TO_MAILQ && -x $utils::PATH_TO_MAILQ ) {
++		if (! open (MAILQ, "$sudo $utils::PATH_TO_MAILQ | " ) ) {
++			print "ERROR: could not open $utils::PATH_TO_MAILQ \n";
++			exit $ERRORS{'UNKNOWN'};
++		}
++	}elsif( defined $utils::PATH_TO_MAILQ){
++		unless (-x $utils::PATH_TO_MAILQ) {
++			print "ERROR: $utils::PATH_TO_MAILQ is not executable by (uid $>:gid($)))\n";
++			exit $ERRORS{'UNKNOWN'};
++		}
++	} else {
++		print "ERROR: \$utils::PATH_TO_MAILQ is not defined\n";
++		exit $ERRORS{'UNKNOWN'};
++	}
++
++	$msg_q++ while (<MAILQ>);
++
++	close(MAILQ) ;
++	if ($msg_q < $opt_w) {
++		$msg = "OK: $mailq mailq ($msg_q) is below threshold ($opt_w/$opt_c)";
++		$state = $ERRORS{'OK'};
++	}elsif ($msg_q >= $opt_w  && $msg_q < $opt_c) {
++		$msg = "WARNING: $mailq mailq is $msg_q (threshold w = $opt_w)";
++		$state = $ERRORS{'WARNING'};
++	}else {
++		$msg = "CRITICAL: $mailq mailq is $msg_q (threshold c = $opt_c)";
++		$state = $ERRORS{'CRITICAL'};
++	}
++} # end of ($mailq eq "opensmtp")
++
++
+ # Perfdata support
+ print "$msg|unsent=$msg_q;$opt_w;$opt_c;0\n";
+ exit $state;
+@@ -618,7 +651,7 @@ sub process_arguments(){
+ 	}
+ 
+ 	if (defined $opt_M) {
+-		if ($opt_M =~ /^(sendmail|qmail|postfix|exim|nullmailer)$/) {
++		if ($opt_M =~ /^(sendmail|qmail|postfix|exim|nullmailer|opensmtp)$/) {
+ 			$mailq = $opt_M ;
+ 		}elsif( $opt_M eq ''){
+ 			$mailq = 'sendmail';
diff --git a/net-mgmt/nagios4/Makefile b/net-mgmt/nagios4/Makefile
index b8e91d1b5c0b..ebcaf0c65da8 100644
--- a/net-mgmt/nagios4/Makefile
+++ b/net-mgmt/nagios4/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nagios
-PORTVERSION=	4.3.3
+PORTVERSION=	4.3.4
 PORTEPOCH=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	https://assets.nagios.com/downloads/nagioscore/releases/ \
diff --git a/net-mgmt/nagios4/distinfo b/net-mgmt/nagios4/distinfo
index 51df37335fb8..10ad969f0ab7 100644
--- a/net-mgmt/nagios4/distinfo
+++ b/net-mgmt/nagios4/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504003722
-SHA256 (nagios-4.3.3.tar.gz) = 1fc4c72f76c720884dd3b538dc423b44f3bdde24e014f4212e58046a1fc114b6
-SIZE (nagios-4.3.3.tar.gz) = 11101531
+TIMESTAMP = 1505214102
+SHA256 (nagios-4.3.4.tar.gz) = c90b7812d9e343db12be19a572e15c415c5d6353a91c5e226e432c2d4aaa44f1
+SIZE (nagios-4.3.4.tar.gz) = 11101966
diff --git a/net-mgmt/nagios4/files/patch-configure b/net-mgmt/nagios4/files/patch-configure
index 7137aed9632d..d4a0b896dd2a 100644
--- a/net-mgmt/nagios4/files/patch-configure
+++ b/net-mgmt/nagios4/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2017-05-09 17:03:31 UTC
+--- configure.orig	2017-08-24 21:43:48 UTC
 +++ configure
-@@ -4776,7 +4776,6 @@ cat >>confdefs.h <<_ACEOF
+@@ -4777,7 +4777,6 @@ cat >>confdefs.h <<_ACEOF
  #define DEFAULT_NAGIOS_GROUP "$nagios_grp"
  _ACEOF
  
@@ -8,7 +8,7 @@
  
  
  
-@@ -4797,7 +4796,6 @@ fi
+@@ -4798,7 +4797,6 @@ fi
  
  
  
diff --git a/net-mgmt/nagios4/files/patch-html_main.php b/net-mgmt/nagios4/files/patch-html_main.php
index a3425cb99018..112ed948e67b 100644
--- a/net-mgmt/nagios4/files/patch-html_main.php
+++ b/net-mgmt/nagios4/files/patch-html_main.php
@@ -1,9 +1,9 @@
---- html/main.php.orig	2017-08-12 20:22:49 UTC
+--- html/main.php.orig	2017-08-24 21:43:48 UTC
 +++ html/main.php
 @@ -141,31 +141,6 @@ $this_year = '2017';
  	<div class="product">Nagios<sup><span style="font-size: small;">&reg;</span></sup> Core<sup><span style="font-size: small;">&trade;</span></sup></div>
  	<div class="version">Version <?php echo $this_version; ?></div>
- 	<div class="releasedate">August 12, 2017</div>
+ 	<div class="releasedate">August 24, 2017</div>
 -	<div class="checkforupdates"><a href="https://www.nagios.org/checkforupdates/?version=<?php echo $this_version; ?>&amp;product=nagioscore" target="_blank">Check for updates</a></div>
 -</div>
 -
diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
index 53d672e33efd..aa120c40e13d 100644
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -24,7 +24,7 @@ OPTIONS_DEFINE=	IPV6 MFD_REWRITES PERL PERL_EMBEDDED PYTHON DUMMY TKMIB \
 OPTIONS_DEFAULT=PERL PERL_EMBEDDED DUMMY SMUX
 OPTIONS_SUB=	yes
 
-MFD_REWRITES_DESC=	Build with 64-bit Interface Counters
+MFD_REWRITES_DESC=	Use new MFD rewrites of mib modules
 PERL_EMBEDDED_DESC=	Build embedded perl
 DUMMY_DESC=		Enable dummy values as placeholders
 TKMIB_DESC=		Install graphical MIB browser
diff --git a/net-mgmt/nstat/Makefile b/net-mgmt/nstat/Makefile
new file mode 100644
index 000000000000..5ce691dfb33b
--- /dev/null
+++ b/net-mgmt/nstat/Makefile
@@ -0,0 +1,35 @@
+# $FreeBSD$
+
+PORTNAME=	nstat
+PORTVERSION=	1.0
+PORTREVISION=	1
+CATEGORIES=	net-mgmt
+MASTER_SITES=	# empty
+DISTFILES=	# empty
+
+MAINTAINER=	swills@FreeBSD.org
+COMMENT=	Replacement for bw/netstat/vmstat/pcm-memory.x
+
+RUN_DEPENDS=	pcm.x:sysutils/intel-pcm
+
+NO_FETCH=	yes
+
+PLIST_FILES=	bin/nstat \
+		man/man1/nstat.1.gz
+
+do-extract:
+	@${MKDIR} ${WRKSRC}
+	@(cd ${FILESDIR} && ${CP} -R . ${WRKSRC})
+
+do-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/nstat ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/nstat.1.gz ${STAGEDIR}${PREFIX}/man/man1
+
+.include <bsd.port.pre.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} <= 1200027
+BROKEN=		Does not build without clock_nanosleep
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/net-mgmt/nstat/files/Makefile b/net-mgmt/nstat/files/Makefile
new file mode 100644
index 000000000000..51dd29d499c9
--- /dev/null
+++ b/net-mgmt/nstat/files/Makefile
@@ -0,0 +1,4 @@
+PROG=	nstat
+WARNS=	2
+
+.include <bsd.prog.mk>
diff --git a/net-mgmt/nstat/files/nstat.1 b/net-mgmt/nstat/files/nstat.1
new file mode 100644
index 000000000000..27857331c748
--- /dev/null
+++ b/net-mgmt/nstat/files/nstat.1
@@ -0,0 +1,58 @@
+.\" Copyright (c) 2017
+.\"		Netflix Inc.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd May 22, 2017
+.Dt NSTAT 1
+.Os
+.Sh NAME
+.Nm nstat
+.Nd Display various stats.
+.Sh SYNOPSIS
+.Nm
+.Op Fl m 
+.Op wait
+.Sh DESCRIPTION
+The
+.Nm
+utility will display system stats similar to netstat and vmstat. 
+
+.Pp
+The options are as follows:
+.Bl -tag -width indent
+.Fl m
+run pcm-memory.x and report memory bandwidth statistics
+.Pp
+.Sh EXAMPLES
+The command:
+.Dl netstat -m 10
+will print what the system is doing every 10
+seconds, including reporting memory bandwith.
+
+.Sh SEE ALSO
+.Xr netstat 1 ,
+.Xr vmstat 8 ,
+.Xr pcm-memory.x 1
+
diff --git a/net-mgmt/nstat/files/nstat.c b/net-mgmt/nstat/files/nstat.c
new file mode 100644
index 000000000000..ddc620d0fe34
--- /dev/null
+++ b/net-mgmt/nstat/files/nstat.c
@@ -0,0 +1,423 @@
+/*-
+ * Copyright (c) 2017
+ *      Netflix Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *
+ */
+
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/sysctl.h>
+#include <sys/time.h>
+
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sysexits.h>
+#include <unistd.h>
+
+#include <net/if.h>
+#include <net/if_types.h>
+#include <net/if_mib.h>
+
+#include <netinet/tcp_fsm.h>
+
+#include <sys/resource.h>
+#include <sys/ttycom.h>
+#include <sys/vmmeter.h>
+
+
+/* why is this only defined in the kernel */
+#define	timespecadd(vvp, uvp)						\
+	do {								\
+		(vvp)->tv_sec += (uvp)->tv_sec;				\
+		(vvp)->tv_nsec += (uvp)->tv_nsec;			\
+		if ((vvp)->tv_nsec >= 1000000000) {			\
+			(vvp)->tv_sec++;				\
+			(vvp)->tv_nsec -= 1000000000;			\
+		}							\
+	} while (0)
+
+
+#define SWAP_CPU() { cpu_tmp = cpu; cpu = cpu_prev; cpu_prev = cpu_tmp; }
+double
+get_cpu(void)
+{
+	static long cpu_time[CPUSTATES];
+	static long cpu_time_too[CPUSTATES];
+	static long *cpu = cpu_time, *cpu_prev = cpu_time_too, *cpu_tmp;
+	long busy, idle;
+	size_t len;
+	int i, status;
+
+	SWAP_CPU();
+	len = sizeof(cpu_time);
+	status = sysctlbyname("kern.cp_time", cpu, &len, NULL, 0);
+	if (status) {
+		err(EX_OSERR, "Cant get CPU time");
+	}
+	for (busy = 0, i = 0; i < CPUSTATES; i++) {
+		if (i != CP_IDLE)
+			busy += cpu[i] - cpu_prev[i];
+	}
+	idle = cpu[CP_IDLE] - cpu_prev[CP_IDLE];
+
+	return ((double)busy / (double)(busy + idle) * 100.0);
+}
+
+#define SWAP_VM() { vmm_tmp = vmm; vmm = vmm_prev; vmm_prev = vmm_tmp; }
+struct my_vmmeter {
+	uint64_t v_syscall;
+	uint64_t v_swtch;
+	uint64_t v_intr;
+	uint64_t v_free_count;
+};
+
+void
+get_vmm(u_int *syscall, u_int *csw, u_int *irq, double *free)
+{
+	static struct my_vmmeter vmm_arr[2];
+	static struct my_vmmeter *vmm = &vmm_arr[0], *vmm_prev = &vmm_arr[1],
+	    *vmm_tmp;
+	size_t len;
+	int status;
+
+	SWAP_VM();
+	len = sizeof(vmm->v_syscall);
+	status = sysctlbyname("vm.stats.sys.v_syscall",
+	    &vmm->v_syscall, &len, NULL, 0);
+	status |= sysctlbyname("vm.stats.sys.v_swtch",
+	    &vmm->v_swtch, &len, NULL, 0);
+	status |= sysctlbyname("vm.stats.sys.v_intr",
+	    &vmm->v_intr, &len, NULL, 0);
+	status |= sysctlbyname("vm.stats.vm.v_free_count",
+	    &vmm->v_free_count, &len, NULL, 0);
+	if (status) {
+		err(EX_OSERR, "Cant get CPU time");
+	}
+	*syscall = vmm->v_syscall - vmm_prev->v_syscall;
+	*csw = vmm->v_swtch - vmm_prev->v_swtch;
+	*irq = vmm->v_intr - vmm_prev->v_intr;
+	*free = ((double)vmm->v_free_count * 4096.0) /
+	    (1024.0 * 1024.0 * 1024.0);
+
+}
+
+static int
+find_if(char *wanted)
+{
+	size_t len;
+	int if_maxidx, i;
+	int name[6];
+	char ifn[128];
+
+	name[0] = CTL_NET;
+	name[1] = PF_LINK;
+	name[2] = NETLINK_GENERIC;
+	name[3] = IFMIB_SYSTEM;
+	name[4] = IFMIB_IFCOUNT;
+
+	len = sizeof(if_maxidx);
+	if (sysctl(name, 5, &if_maxidx, &len, 0, 0) < 0)
+		err(EX_OSERR, "can't get ifcnt");
+
+
+	for (i = 0; i <= if_maxidx; i++) {
+		name[3] = IFMIB_IFDATA;
+		name[4] = i;
+		name[5] = IFDATA_DRIVERNAME;
+		len = sizeof(ifn);
+		if (sysctl(name, 6, ifn, &len, 0, 0) < 0) {
+			if (errno == ENOENT)
+				continue;
+			err(EX_OSERR, "can't get ifname");
+		}
+		if (0 == strncmp(wanted, ifn, len))
+			return (i);
+	}
+	printf("Could not find %s\n", wanted);
+	exit(ENOENT);
+}
+
+static void
+get_nic_stats(int if_idx, struct ifmibdata *ifm)
+{
+	size_t len;
+	int name[6];
+
+	name[0] = CTL_NET;
+	name[1] = PF_LINK;
+	name[2] = NETLINK_GENERIC;
+	name[3] = IFMIB_IFDATA;
+	name[4] = if_idx;
+	name[5] = IFDATA_GENERAL;
+	len = sizeof(*ifm);
+	if (sysctl(name, 6, ifm, &len, 0, 0) < 0)
+		err(EX_OSERR, "could not get nic stats");
+}
+
+static char *
+find_ifname(void)
+{
+	static char ifbuf[80];
+	FILE *pipe;
+	char *p;
+
+
+	pipe = popen("netstat -4rn | grep default", "r");
+	if (pipe == NULL)
+		err(EX_OSERR, "could not run netsat");
+	(void)fread(ifbuf, sizeof(ifbuf) - 1, 1, pipe);
+	pclose(pipe);
+	p = &ifbuf[sizeof(ifbuf) - 1];
+	while (*p != ' ') {
+		if (*p == '\n')
+			*p = '\0';
+		p--;
+		if (p == ifbuf)
+			err(EX_DATAERR, "can't read def rt");
+	}
+	/* we are point to a space, point to 1st ifname char */
+	return (p + 1);
+}
+
+static int
+find_rows(void)
+{
+	struct winsize sz;
+	int rows;
+
+	rows = 24;
+	if (isatty(STDOUT_FILENO)) {
+		if (0 == ioctl(STDOUT_FILENO, TIOCGWINSZ, &sz))
+			rows = sz.ws_row;
+	}
+	return (rows);
+}
+
+static void
+get_pcm_mem(double interval, double *r, double *w, double *rw)
+{
+	static FILE * pipe = NULL;
+	static int pipe_fd;
+	char *open_str;
+	char buf[256];
+	char *p;
+	int sem_cnt, ret_found;
+	ssize_t bytes;
+
+	if (pipe == NULL) {
+		open_str = alloca(80);
+		snprintf(open_str, 80,
+		    "pcm-memory.x -csv %f  2>/dev/null", interval * 0.99);
+		pipe = popen(open_str, "r");
+		if (pipe == NULL)
+			err(EX_OSERR, "pipe");
+		/* read one-time CSV hdrs */
+		(void)fread(buf, sizeof(buf) - 1, 1, pipe);
+		pipe_fd = fileno(pipe);
+		fcntl(pipe_fd, F_SETFL, O_NONBLOCK);
+	}
+	bzero(buf, sizeof(buf));
+	bytes = read(pipe_fd, buf, sizeof(buf));
+	if (bytes == 0)
+		err(EX_OSERR,
+		    "pcm-memory.x exited - kldload cpuctl?");
+
+	if (bytes == -1) {
+		if (errno == EAGAIN)
+			return;
+		err(EX_OSERR, "read from pcm-memory.x failed");
+	}
+
+	p = &buf[bytes];
+	/*
+	 * the CSV is formatted as: ...; ....;  readbw; writebw;  rwbw\n
+	 *
+	 * So we start at the end of the buffer, and look backwards for a
+	 * return.  Once found, we then count back 3 semi-colons, and then
+	 * pass it to sscanf
+	 */
+
+	ret_found = 0;
+	sem_cnt = 0;
+	while (p != buf && sem_cnt < 3) {
+		p--;
+		if (!ret_found && *p != '\n')
+			continue;
+		ret_found = 1;
+		if (*p == ';')
+			sem_cnt++;
+	}
+	if (sem_cnt == 3) {
+		p++;
+		sscanf(p, "%lf; %lf; %lf", r, w, rw);
+	}
+}
+
+long
+get_tcp_est()
+{
+	uint64_t tcps[TCP_NSTATES];
+	size_t len = sizeof(tcps);
+	int status;
+
+	status = sysctlbyname("net.inet.tcp.states", tcps, &len, NULL, 0);
+	if (status != 0)
+		err(EX_OSERR, "could not fetch tcp states");
+
+	return ((long)tcps[TCPS_ESTABLISHED]);
+}
+
+#define SWAP_IFM() { ifm_tmp = ifm; ifm = ifm_prev; ifm_prev = ifm_tmp; }
+
+
+static void
+print_hdr(int do_pcm_mem)
+{
+	printf("  InMpps OMpps  InGbs  OGbs err TCP Est %%CPU syscalls csw     irq GBfree");
+	if (do_pcm_mem)
+		printf("   MemRd     MemWr    MemRW");
+	printf("\n");
+
+}
+
+static void
+usage(char *name)
+{
+	fprintf(stderr,
+	    "usage: %s [-m] [-I interface] [wait]\n", name);
+	exit(1);
+}
+
+int
+main(int argc, char **argv)
+{
+	struct ifmibdata ifmd[2];
+	struct ifmibdata *ifm, *ifm_prev, *ifm_tmp;
+	char *ifname = NULL;
+	int c, if_idx;
+	double o_gbps, i_gbps, o_mpps, i_mpps;
+	long errs, est;
+	double interval = 1.0;
+	int rows = find_rows() - 1;
+	int row = 0;
+	int do_pcm_mem = 0;
+	u_int syscalls, csw, irq;
+	double free_mem;
+	double mem_rd = 0.0, mem_wr = 0.0, mem_rw = 0.0;
+	struct timespec interval_ts, deadline_ts;
+
+
+	while ((c = getopt(argc, argv, "mI:")) != -1) {
+		switch (c) {
+		case 'm':
+			do_pcm_mem = 1;
+			break;
+		case 'I':
+			ifname = optarg;
+			break;
+		default:
+			usage(argv[0]);
+		}
+	}
+	argc -= optind;
+	argv += optind;
+
+	if (*argv)
+		interval = atof(*argv);
+
+	interval_ts.tv_sec = (time_t)interval;
+	interval_ts.tv_nsec = (interval - (time_t)interval) * 1000000000;
+
+	if (ifname == NULL)
+		ifname = find_ifname();
+
+	if_idx = find_if(ifname);
+	ifm = &ifmd[0];
+	ifm_prev = &ifmd[1];
+
+	/*
+	 * preload all the counters so 1st interval looks reasonable
+	 */
+
+	if (do_pcm_mem)
+		get_pcm_mem(interval, &mem_rd, &mem_wr, &mem_rw);
+	get_nic_stats(if_idx, ifm);
+	est = get_tcp_est();
+	get_vmm(&syscalls, &csw, &irq, &free_mem);
+	(void)get_cpu();
+	usleep(interval * 1000 * 1000);
+	clock_gettime(CLOCK_UPTIME, &deadline_ts);
+	while (1) {
+		if (row == 0)
+			print_hdr(do_pcm_mem);
+		SWAP_IFM();
+		get_nic_stats(if_idx, ifm);
+		i_gbps = ifm->ifmd_data.ifi_ibytes -
+		    ifm_prev->ifmd_data.ifi_ibytes;
+		i_gbps = (8.0 * i_gbps) / (1000.0 * 1000.0 * 1000.0 * interval);
+		o_gbps = ifm->ifmd_data.ifi_obytes -
+		    ifm_prev->ifmd_data.ifi_obytes;
+		o_gbps = (8.0 * o_gbps) / (1000.0 * 1000.0 * 1000.0 * interval);
+		i_mpps = ifm->ifmd_data.ifi_ipackets -
+		    ifm_prev->ifmd_data.ifi_ipackets;
+		i_mpps = i_mpps / (1000 * 1000 * interval);
+		o_mpps = ifm->ifmd_data.ifi_opackets -
+		    ifm_prev->ifmd_data.ifi_opackets;
+		o_mpps = o_mpps / (1000 * 1000 * interval);
+
+		/* all errs .. should be rare, don't clutter output */
+		errs = ifm->ifmd_data.ifi_oerrors -
+		    ifm_prev->ifmd_data.ifi_oerrors;
+		errs += ifm->ifmd_data.ifi_ierrors -
+		    ifm_prev->ifmd_data.ifi_ierrors;
+		errs += ifm->ifmd_data.ifi_oqdrops -
+		    ifm_prev->ifmd_data.ifi_oqdrops;
+		errs += ifm->ifmd_data.ifi_iqdrops -
+		    ifm_prev->ifmd_data.ifi_iqdrops;
+
+		est = get_tcp_est();
+		get_vmm(&syscalls, &csw, &irq, &free_mem);
+		printf("%6.2lf %6.2lf %6.2lf %6.2lf %2ld %6ld   %4.2lf %6.0f %6.0f %6.0f %5.2lf",
+		    i_mpps, o_mpps, i_gbps, o_gbps, errs, est, get_cpu(),
+		    syscalls / interval, csw / interval, irq / interval,
+		    free_mem);
+
+		if (do_pcm_mem) {
+			get_pcm_mem(interval, &mem_rd, &mem_wr, &mem_rw);
+			printf("  %8.2f  %8.2f %8.2f", mem_rd, mem_wr, mem_rw);
+		}
+		printf("\n");
+		if (++row == rows)
+			row = 0;
+
+		timespecadd(&deadline_ts, &interval_ts);
+		clock_nanosleep(CLOCK_UPTIME, TIMER_ABSTIME, &deadline_ts, NULL);
+	}
+}
diff --git a/net-mgmt/nstat/pkg-descr b/net-mgmt/nstat/pkg-descr
new file mode 100644
index 000000000000..c7f1eff8d693
--- /dev/null
+++ b/net-mgmt/nstat/pkg-descr
@@ -0,0 +1,4 @@
+nstat is a replacement for the most frequently used parts of vmstat, netstat
+(bw), and pmc-memory.x The advantage of using nstat is that it can run all in a
+single session, rather than having to use 3 terminal sessions to monitor a
+machine.
diff --git a/net-mgmt/py-ipy/Makefile b/net-mgmt/py-ipy/Makefile
index 24c02a866ffe..84fb571aad30 100644
--- a/net-mgmt/py-ipy/Makefile
+++ b/net-mgmt/py-ipy/Makefile
@@ -8,12 +8,15 @@ MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	IPy-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python module for handling IPv4 and IPv6 Addresses and Networks
 
-USES=		python
-USE_PYTHON=	distutils autoplist
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 NO_ARCH=	yes
+USE_PYTHON=	autoplist concurrent distutils
+USES=		python
 
 do-test:
 	${PYTHON_CMD} ${WRKSRC}/test/test_IPy.py
diff --git a/net-mgmt/py-pdagent/Makefile b/net-mgmt/py-pdagent/Makefile
new file mode 100644
index 000000000000..51fde1b2342c
--- /dev/null
+++ b/net-mgmt/py-pdagent/Makefile
@@ -0,0 +1,39 @@
+# Created by: Mark Felder <feld@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	pdagent
+DISTVERSION=	v1.4
+CATEGORIES=	net-mgmt python
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	feld@FreeBSD.org
+COMMENT=	PagerDuty Agent software
+
+LICENSE=	BSD3CLAUSE
+
+USES=		python:2.7 shebangfix
+SHEBANG_FILES=	bin/*
+NO_ARCH=	yes
+NO_BUILD=	yes
+
+USE_RC_SUBR=	pdagentd
+
+USE_GITHUB=	YES
+GH_ACCOUNT=	PagerDuty
+
+SUB_LIST+=	PYTHON_CMD="${PYTHON_CMD}"
+
+BINFILES=	pd-queue pd-send pdagentd.py
+
+do-patch:
+	${REINPLACE_CMD} -e 's|/var/lib/pdagent|/var/db/pdagent|' -e 's|/etc|${ETCDIR}|' ${WRKSRC}/pdagent/confdirs.py
+
+do-install:
+	${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR} ${STAGEDIR}/${ETCDIR}
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} pdagent ${STAGEDIR}${PYTHON_SITELIBDIR})
+.for i in ${BINFILES}
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/${i} ${STAGEDIR}/${PREFIX}/bin/${i}
+.endfor
+	${INSTALL_DATA} ${WRKSRC}/conf/pdagent.conf ${STAGEDIR}/${ETCDIR}/pdagent.conf.sample
+
+.include <bsd.port.mk>
diff --git a/net-mgmt/py-pdagent/distinfo b/net-mgmt/py-pdagent/distinfo
new file mode 100644
index 000000000000..10e10fd825ef
--- /dev/null
+++ b/net-mgmt/py-pdagent/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1505398696
+SHA256 (PagerDuty-pdagent-v1.4_GH0.tar.gz) = 69f79d9c912db8e2fa9fed7c0f5f0113968739df316b6a79eec9ac94c368046f
+SIZE (PagerDuty-pdagent-v1.4_GH0.tar.gz) = 248170
diff --git a/net-mgmt/py-pdagent/files/pdagentd.in b/net-mgmt/py-pdagent/files/pdagentd.in
new file mode 100644
index 000000000000..a33879d0cdfa
--- /dev/null
+++ b/net-mgmt/py-pdagent/files/pdagentd.in
@@ -0,0 +1,48 @@
+#!/bin/sh
+#
+# Author: Mark Felder <feld@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+# PROVIDE: pdagentd
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+
+# Add the following lines to /etc/rc.conf to enable pdagentd:
+# pdagentd_enable="YES"
+
+. /etc/rc.subr
+
+name="pdagentd"
+rcvar=pdagentd_enable
+
+load_rc_config $name
+
+: ${pdagentd_enable="NO"}
+: ${pdagentd_user:="nobody"}
+: ${pdagentd_group:="nogroup"}
+
+pidfile="/var/run/pdagent/pdagentd.pid"
+command="%%PREFIX%%/bin/pdagentd.py"
+start_precmd=pdagentd_precmd
+procname=%%PYTHON_CMD%%
+
+pdagent_mkdirs="/var/db/pdagent /var/db/pdagent/outqueue /var/db/pdagent/db /var/db/pdagent/outqueue/pdq \
+		/var/db/pdagent/outqueue/tmp /var/db/pdagent/outqueue/suc /var/db/pdagent/outqueue/err"
+
+pdagentd_precmd()
+{
+	for i in ${pdagent_mkdirs}; do
+		install -d -o ${pdagentd_user} -g ${pdagentd_group} -m 775 ${i}
+	done
+
+	if [ ! -d /var/log/pdagent ]; then
+		install -d -o ${pdagentd_user} /var/log/pdagent
+	fi
+	if [ ! -d /var/run/pdagent ]; then
+		install -d -o ${pdagentd_user} /var/run/pdagent
+	fi
+}
+
+run_rc_command "$1"
diff --git a/net-mgmt/py-pdagent/pkg-descr b/net-mgmt/py-pdagent/pkg-descr
new file mode 100644
index 000000000000..b3fb8a966ae0
--- /dev/null
+++ b/net-mgmt/py-pdagent/pkg-descr
@@ -0,0 +1,4 @@
+The PagerDuty Agent is a program that lets you easily integrate your
+monitoring system with PagerDuty.
+
+WWW: https://github.com/PagerDuty/pdagent
diff --git a/net-mgmt/py-pdagent/pkg-plist b/net-mgmt/py-pdagent/pkg-plist
new file mode 100644
index 000000000000..ece07e69ba7f
--- /dev/null
+++ b/net-mgmt/py-pdagent/pkg-plist
@@ -0,0 +1,21 @@
+bin/pd-queue
+bin/pd-send
+bin/pdagentd.py
+@sample etc/pdagent/pdagent.conf.sample
+%%PYTHON_SITELIBDIR%%/pdagent/__init__.py
+%%PYTHON_SITELIBDIR%%/pdagent/confdirs.py
+%%PYTHON_SITELIBDIR%%/pdagent/config.py
+%%PYTHON_SITELIBDIR%%/pdagent/constants.py
+%%PYTHON_SITELIBDIR%%/pdagent/heartbeat.py
+%%PYTHON_SITELIBDIR%%/pdagent/jsonstore.py
+%%PYTHON_SITELIBDIR%%/pdagent/pdagentutil.py
+%%PYTHON_SITELIBDIR%%/pdagent/pdqueue.py
+%%PYTHON_SITELIBDIR%%/pdagent/pdthread.py
+%%PYTHON_SITELIBDIR%%/pdagent/root_certs/ca_certs.pem
+%%PYTHON_SITELIBDIR%%/pdagent/sendevent.py
+%%PYTHON_SITELIBDIR%%/pdagent/thirdparty/__init__.py
+%%PYTHON_SITELIBDIR%%/pdagent/thirdparty/argparse.py
+%%PYTHON_SITELIBDIR%%/pdagent/thirdparty/daemon.py
+%%PYTHON_SITELIBDIR%%/pdagent/thirdparty/filelock.py
+%%PYTHON_SITELIBDIR%%/pdagent/thirdparty/httpswithverify.py
+%%PYTHON_SITELIBDIR%%/pdagent/thirdparty/ssl_match_hostname.py
diff --git a/net-mgmt/resource-agents/Makefile b/net-mgmt/resource-agents/Makefile
index c314a00c4e88..7921f228bb85 100644
--- a/net-mgmt/resource-agents/Makefile
+++ b/net-mgmt/resource-agents/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	resource-agents
 PORTVERSION=	4.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=v
 CATEGORIES=	net-mgmt
 
diff --git a/net-mgmt/seafile-gui/Makefile b/net-mgmt/seafile-gui/Makefile
index 55e0a3cad79a..edc722eab8fc 100644
--- a/net-mgmt/seafile-gui/Makefile
+++ b/net-mgmt/seafile-gui/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	seafile-gui
 DISTVERSIONPREFIX=	v
 DISTVERSION=	${SEAFILE_CLIENT_VER}
+PORTREVISION=	1
 CATEGORIES=	net-mgmt devel
 
 MAINTAINER=	ultima@FreeBSD.org
diff --git a/net-mgmt/zabbix34-server/Makefile b/net-mgmt/zabbix34-server/Makefile
index 2e35bc42b4e6..97404068d069 100644
--- a/net-mgmt/zabbix34-server/Makefile
+++ b/net-mgmt/zabbix34-server/Makefile
@@ -25,6 +25,7 @@ ZABBIX_BUILD=	${PKGNAMESUFFIX:S/^-//}
 
 .if ${ZABBIX_BUILD} != "frontend" # frontend only needs the version/distribution settings
 .if ${ZABBIX_BUILD} != "agent"
+LIB_DEPENDS+=	libevent.so:devel/libevent
 USE_RC_SUBR=	zabbix_${ZABBIX_BUILD}
 .else
 USE_RC_SUBR=	zabbix_${ZABBIX_BUILD}d
@@ -42,7 +43,6 @@ PLIST_SUB=	PROXY=""
 .endif
 
 .if ${ZABBIX_BUILD} == "server"
-LIB_DEPENDS+=	libevent.so:devel/libevent
 PLIST_SUB+=	SERVER=""
 .else
 PLIST_SUB+=	SERVER="@comment "
diff --git a/net-p2p/bitcoin/Makefile b/net-p2p/bitcoin/Makefile
index 3c6fc3ec003b..8f3f27f8cf24 100644
--- a/net-p2p/bitcoin/Makefile
+++ b/net-p2p/bitcoin/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	bitcoin
 PORTVERSION=	0.14.2
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-p2p finance
 
 MAINTAINER=	robbak@robbak.com
diff --git a/net-p2p/cpuminer/Makefile b/net-p2p/cpuminer/Makefile
index 21bb825caa38..bcd1d425df57 100644
--- a/net-p2p/cpuminer/Makefile
+++ b/net-p2p/cpuminer/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cpuminer
-PORTVERSION=	2.4.5
+PORTVERSION=	2.5.0
 PORTREVISION=	1
 CATEGORIES=	net-p2p math
 MASTER_SITES=	SF/cpuminer
diff --git a/net-p2p/cpuminer/distinfo b/net-p2p/cpuminer/distinfo
index 336a0a681e12..5cbc3bf21e65 100644
--- a/net-p2p/cpuminer/distinfo
+++ b/net-p2p/cpuminer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1485550652
-SHA256 (pooler-cpuminer-2.4.5.tar.gz) = 1008013462c517ffd80a8c0f2b26a8532d69e5772759c413fd2ad5c5b6590a8c
-SIZE (pooler-cpuminer-2.4.5.tar.gz) = 256186
+TIMESTAMP = 1504804857
+SHA256 (pooler-cpuminer-2.5.0.tar.gz) = ea16761a952b8f0fbba22fd16d48bb5e20abc48a10af99a00c70c332b3cb54f5
+SIZE (pooler-cpuminer-2.5.0.tar.gz) = 257872
diff --git a/net-p2p/deluge-cli/Makefile b/net-p2p/deluge-cli/Makefile
index ae34b3385170..60314318cd4a 100644
--- a/net-p2p/deluge-cli/Makefile
+++ b/net-p2p/deluge-cli/Makefile
@@ -2,10 +2,9 @@
 
 PORTNAME=	deluge
 PORTVERSION=	1.3.15
-PORTREVISION=	1
-PKGNAMESUFFIX=	-cli
+PORTREVISION=	2
 CATEGORIES=	net-p2p python
-MASTER_SITES=	http://download.deluge-torrent.org/source/
+PKGNAMESUFFIX=	-cli
 
 MAINTAINER=	rm@FreeBSD.org
 COMMENT=	CLI part of bittorrent client using Python and libtorrent-rasterbar
@@ -19,14 +18,19 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xdg>=0.18:devel/py-xdg \
 		${PYTHON_PKGNAMEPREFIX}openssl>=0.8:security/py-openssl \
 		${PYTHON_PKGNAMEPREFIX}chardet>=1.0.1:textproc/py-chardet \
 		${PYTHON_PKGNAMEPREFIX}mako>=0.2.5:textproc/py-mako \
+		${PYTHON_PKGNAMEPREFIX}service_identity>=0:security/py-service_identity \
 		${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted
 
-USE_RC_SUBR=	deluged deluge_web
-SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD}
+USES=		gettext python:-2.7
+USE_PYTHON=	autoplist distutils
+USE_GITHUB=	yes
+GH_ACCOUNT=	deluge-torrent
+GH_TAGNAME=	${PORTNAME}-${PORTVERSION}
 
 NO_ARCH=	yes
-USES=		gettext python:-2.7 tar:xz
-USE_PYTHON=	autoplist distutils
+
+USE_RC_SUBR=	deluged deluge_web
+SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD}
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/net-p2p/deluge-cli/distinfo b/net-p2p/deluge-cli/distinfo
index 9e45fbd96bac..bbab8dd8ffda 100644
--- a/net-p2p/deluge-cli/distinfo
+++ b/net-p2p/deluge-cli/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1494603858
-SHA256 (deluge-1.3.15.tar.xz) = a96405140e3cbc569e6e056165e289a5e9ec66e036c327f3912c73d049ccf92c
-SIZE (deluge-1.3.15.tar.xz) = 1467368
+TIMESTAMP = 1504107560
+SHA256 (deluge-torrent-deluge-1.3.15-deluge-1.3.15_GH0.tar.gz) = 6f2accf55bd97828f81ea13d5f29087103eb4f95b6be957323e23174cdc86826
+SIZE (deluge-torrent-deluge-1.3.15-deluge-1.3.15_GH0.tar.gz) = 3036240
diff --git a/net-p2p/deluge-cli/pkg-descr b/net-p2p/deluge-cli/pkg-descr
index e006cdc2016c..2556c73bfa75 100644
--- a/net-p2p/deluge-cli/pkg-descr
+++ b/net-p2p/deluge-cli/pkg-descr
@@ -5,4 +5,4 @@ desktop environments such as Gnome and Xfce.
 Deluge uses Rasterbar's version of libtorrent as the main ingredient in its
 bittorrent protocol backend.
 
-WWW: http://deluge-torrent.org/
+WWW: http://deluge-torrent.org
diff --git a/net-p2p/dogecoin/Makefile b/net-p2p/dogecoin/Makefile
index 8465aebf3693..31c8d230b40f 100644
--- a/net-p2p/dogecoin/Makefile
+++ b/net-p2p/dogecoin/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	dogecoin
 PORTVERSION=	1.8.2
 DISTVERSIONPREFIX=	v
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	net-p2p finance
 
 MAINTAINER=	swills@FreeBSD.org
diff --git a/net-p2p/eiskaltdcpp-daemon/Makefile b/net-p2p/eiskaltdcpp-daemon/Makefile
index a83b331e4ecd..9b3e3ffe5dff 100644
--- a/net-p2p/eiskaltdcpp-daemon/Makefile
+++ b/net-p2p/eiskaltdcpp-daemon/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	eiskaltdcpp
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-p2p
 PKGNAMESUFFIX=	-daemon
 
diff --git a/net-p2p/eiskaltdcpp-gtk/Makefile b/net-p2p/eiskaltdcpp-gtk/Makefile
index ebfd7f9da1f4..0286f90d9234 100644
--- a/net-p2p/eiskaltdcpp-gtk/Makefile
+++ b/net-p2p/eiskaltdcpp-gtk/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	eiskaltdcpp
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-p2p
 PKGNAMESUFFIX=	-gtk
 
diff --git a/net-p2p/eiskaltdcpp-lib/Makefile b/net-p2p/eiskaltdcpp-lib/Makefile
index 874693bb8279..a2e1744a45c0 100644
--- a/net-p2p/eiskaltdcpp-lib/Makefile
+++ b/net-p2p/eiskaltdcpp-lib/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	eiskaltdcpp
 PORTVERSION=	2.2.10
 DISTVERSIONPREFIX=	v
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net-p2p
 PKGNAMESUFFIX?=	-lib
 
diff --git a/net-p2p/eiskaltdcpp-qt/Makefile b/net-p2p/eiskaltdcpp-qt/Makefile
index e62bc67a1214..720c937b1cb4 100644
--- a/net-p2p/eiskaltdcpp-qt/Makefile
+++ b/net-p2p/eiskaltdcpp-qt/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	eiskaltdcpp
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-p2p
 PKGNAMESUFFIX=	-qt
 
diff --git a/net-p2p/libtorrent-rasterbar-python/Makefile b/net-p2p/libtorrent-rasterbar-python/Makefile
index d488fd7cbe0e..fc84a3b4bdee 100644
--- a/net-p2p/libtorrent-rasterbar-python/Makefile
+++ b/net-p2p/libtorrent-rasterbar-python/Makefile
@@ -1,7 +1,6 @@
 # Created by: Doug Barton <dougb@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	1
 CATEGORIES=	net-p2p python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
diff --git a/net-p2p/libtorrent-rasterbar/Makefile b/net-p2p/libtorrent-rasterbar/Makefile
index 3ef7fb79ae88..60521b4f9e3b 100644
--- a/net-p2p/libtorrent-rasterbar/Makefile
+++ b/net-p2p/libtorrent-rasterbar/Makefile
@@ -2,11 +2,14 @@
 # $FreeBSD$
 
 PORTNAME=	libtorrent-rasterbar
-PORTVERSION=	1.1.3
+PORTVERSION=	1.1.4
 PORTREVISION=	1
 CATEGORIES?=	net-p2p ipv6
 MASTER_SITES=	https://github.com/arvidn/libtorrent/releases/download/libtorrent-${PORTVERSION:S/./_/g}/
 
+PATCH_SITES=	https://github.com/arvidn/libtorrent/commit/
+PATCHFILES=	7eb3cf6bc6db.patch:-p1
+
 MAINTAINER=	rezny@FreeBSD.org
 COMMENT?=	C++ library implementing a BitTorrent client
 
diff --git a/net-p2p/libtorrent-rasterbar/distinfo b/net-p2p/libtorrent-rasterbar/distinfo
index 5eb721d361da..2d828f4a25c1 100644
--- a/net-p2p/libtorrent-rasterbar/distinfo
+++ b/net-p2p/libtorrent-rasterbar/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1492892114
-SHA256 (libtorrent-rasterbar-1.1.3.tar.gz) = 44196a89932c26528f5db19289d0f0f4130730a61dccc61c9f1eac9ad3e881d8
-SIZE (libtorrent-rasterbar-1.1.3.tar.gz) = 3912760
+TIMESTAMP = 1500241161
+SHA256 (libtorrent-rasterbar-1.1.4.tar.gz) = ccf42367803a6df7edcf4756d1f7d0a9ce6158ec33b851b3b58fd470ac4eeba6
+SIZE (libtorrent-rasterbar-1.1.4.tar.gz) = 3917557
+SHA256 (7eb3cf6bc6db.patch) = d343654786f02112b0787d999f3c569bcb9bb31dfc2be52aa26007b5f5e3ca0b
+SIZE (7eb3cf6bc6db.patch) = 1180
diff --git a/net-p2p/libtorrent-rasterbar/files/patch-bindings_python_compile__flags.in b/net-p2p/libtorrent-rasterbar/files/patch-bindings_python_compile__flags.in
index ce17900b0f14..9d9fb85cc6da 100644
--- a/net-p2p/libtorrent-rasterbar/files/patch-bindings_python_compile__flags.in
+++ b/net-p2p/libtorrent-rasterbar/files/patch-bindings_python_compile__flags.in
@@ -1,5 +1,5 @@
---- bindings/python/compile_flags.in.orig	2016-05-24 02:57:40 UTC
+--- bindings/python/compile_flags.in.orig	2017-07-02 16:18:10 UTC
 +++ bindings/python/compile_flags.in
 @@ -1 +1 @@
---I@top_srcdir@/include @COMPILETIME_OPTIONS@ @CPPFLAGS@ @BOOST_CPPFLAGS@ @OPENSSL_INCLUDES@
+--I@top_srcdir@/include @COMPILETIME_OPTIONS@ @CPPFLAGS@ @BOOST_CPPFLAGS@ @PYTHON_CXXFLAGS@ @OPENSSL_INCLUDES@
 +-I@top_srcdir@/include @COMPILETIME_OPTIONS@ @CPPFLAGS@ -std=c++11 @BOOST_CPPFLAGS@ @OPENSSL_INCLUDES@
diff --git a/net-p2p/libtorrent-rasterbar/files/patch-include_libtorrent_config.hpp b/net-p2p/libtorrent-rasterbar/files/patch-include_libtorrent_config.hpp
index d0287ea1de8f..1bfab5affcf5 100644
--- a/net-p2p/libtorrent-rasterbar/files/patch-include_libtorrent_config.hpp
+++ b/net-p2p/libtorrent-rasterbar/files/patch-include_libtorrent_config.hpp
@@ -1,6 +1,6 @@
---- include/libtorrent/config.hpp.orig	2016-08-23 04:28:09 UTC
+--- include/libtorrent/config.hpp.orig	2017-07-02 16:18:10 UTC
 +++ include/libtorrent/config.hpp
-@@ -180,12 +180,6 @@ POSSIBILITY OF SUCH DAMAGE.
+@@ -195,12 +195,6 @@ POSSIBILITY OF SUCH DAMAGE.
  #define TORRENT_USE_EXECINFO 1
  #endif
  
@@ -8,7 +8,7 @@
 -// FreeBSD has a reasonable iconv signature
 -// unless we're on glibc
 -#ifndef __GLIBC__
--# define TORRENT_ICONV_ARG (const char**)
+-# define TORRENT_ICONV_ARG(x) (x)
 -#endif
  #endif // __APPLE__
  
diff --git a/net-p2p/libtorrent-rasterbar/pkg-plist b/net-p2p/libtorrent-rasterbar/pkg-plist
index 8b6b7cedcd88..5f036f48f570 100644
--- a/net-p2p/libtorrent-rasterbar/pkg-plist
+++ b/net-p2p/libtorrent-rasterbar/pkg-plist
@@ -79,6 +79,7 @@ include/libtorrent/file.hpp
 include/libtorrent/file_pool.hpp
 include/libtorrent/file_storage.hpp
 include/libtorrent/fingerprint.hpp
+include/libtorrent/fwd.hpp
 include/libtorrent/gzip.hpp
 include/libtorrent/hasher.hpp
 include/libtorrent/heterogeneous_queue.hpp
diff --git a/net-p2p/libtorrent/Makefile b/net-p2p/libtorrent/Makefile
index d447e504acbd..ab4d1da4b504 100644
--- a/net-p2p/libtorrent/Makefile
+++ b/net-p2p/libtorrent/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	libtorrent
 PORTVERSION=	0.13.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-p2p
 MASTER_SITES=	http://rtorrent.net/downloads/
 
diff --git a/net-p2p/mktorrent/Makefile b/net-p2p/mktorrent/Makefile
index 08397e1a706f..901baa96950e 100644
--- a/net-p2p/mktorrent/Makefile
+++ b/net-p2p/mktorrent/Makefile
@@ -2,17 +2,20 @@
 # $FreeBSD$
 
 PORTNAME=	mktorrent
-PORTVERSION=	1.0
+PORTVERSION=	1.1
+DISTVERSIONPREFIX=	v
 PORTREVISION=	1
 CATEGORIES=	net-p2p
-MASTER_SITES=	SF
 
-MAINTAINER=	dgerow@afflictions.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Command-line utility for creating BitTorrent metainfo files
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	Rudde
+
 MAKEFILE=	BSDmakefile
 MAKE_ARGS=	USE_LONG_OPTIONS=1
 
diff --git a/net-p2p/mktorrent/distinfo b/net-p2p/mktorrent/distinfo
index c4e7890d4ae9..8b102c281671 100644
--- a/net-p2p/mktorrent/distinfo
+++ b/net-p2p/mktorrent/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mktorrent-1.0.tar.gz) = 6f8e562af6366e0d9bde76e434f740b55722c6c3c555860dbe80083f9d1d119f
-SIZE (mktorrent-1.0.tar.gz) = 23089
+TIMESTAMP = 1504769841
+SHA256 (Rudde-mktorrent-v1.1_GH0.tar.gz) = d0f47500192605d01b5a2569c605e51ed319f557d24cfcbcb23a26d51d6138c9
+SIZE (Rudde-mktorrent-v1.1_GH0.tar.gz) = 23314
diff --git a/net-p2p/mktorrent/files/patch-init.c b/net-p2p/mktorrent/files/patch-init.c
index 1ab23cf6e8cc..d54ad940705f 100644
--- a/net-p2p/mktorrent/files/patch-init.c
+++ b/net-p2p/mktorrent/files/patch-init.c
@@ -1,82 +1,6 @@
---- init.c.orig	2009-08-25 18:53:22 UTC
+--- init.c.orig	2017-09-07 14:49:58 UTC
 +++ init.c
-@@ -277,7 +277,7 @@ static void print_help()
- 	  "Options:\n"
- #ifdef USE_LONG_OPTIONS
- 	  "-a, --announce=<url>[,<url>]* : specify the full announce URLs\n"
--	  "                                at least one is required\n"
-+	  "                                at least one is required on private torrent\n"
- 	  "                                additional -a adds backup trackers\n"
- 	  "-c, --comment=<comment>       : add a comment to the metainfo\n"
- 	  "-d, --no-date                 : don't write the creation date\n"
-@@ -298,7 +298,7 @@ static void print_help()
- 	  "                                additional -w adds more URLs\n"
- #else
- 	  "-a <url>[,<url>]* : specify the full announce URLs\n"
--	  "                    at least one is required\n"
-+	  "                    at least one is required on private torrent\n"
- 	  "                    additional -a adds backup trackers\n"
- 	  "-c <comment>      : add a comment to the metainfo\n"
- 	  "-d                : don't write the creation date\n"
-@@ -343,7 +343,7 @@ static void print_announce_list(llist_t 
-  */
- static void print_web_seed_list(slist_t *list)
- {
--	printf("  Web Seed URL: ");
-+	printf("  Web Seed URLs: ");
- 
- 	if (list == NULL) {
- 		printf("none\n");
-@@ -361,17 +361,20 @@ static void print_web_seed_list(slist_t 
- static void dump_options(metafile_t *m)
- {
- 	printf("Options:\n"
--	       "  Announce URLs:\n");
-+	       "  Announce URLs:");
- 
--	print_announce_list(m->announce_list);
-+	if (m->announce_list) {
-+		printf("\n");
-+		print_announce_list(m->announce_list);
-+	} else
-+		printf(" none\n");
- 
--	printf("  Torrent name: %s\n"
--	       "  Metafile:     %s\n"
--	       "  Piece length: %u\n"
--	       "  Be verbose:   yes\n",
-+	printf("  Torrent name:  %s\n"
-+	       "  Metafile:      %s\n"
-+	       "  Piece length:  %u\n",
- 	       m->torrent_name, m->metainfo_file_path, m->piece_length);
- 
--	printf("  Write date:   ");
-+	printf("  Write date:    ");
- 	if (m->no_creation_date)
- 		printf("no\n");
- 	else
-@@ -379,11 +382,17 @@ static void dump_options(metafile_t *m)
- 
- 	print_web_seed_list(m->web_seed_list);
- 
--	printf("  Comment:      ");
-+	printf("  Comment:       ");
- 	if (m->comment == NULL)
--		printf("none\n\n");
-+		printf("none\n");
- 	else
--		printf("\"%s\"\n\n", m->comment);
-+		printf("\"%s\"\n", m->comment);
-+
-+	printf("  Private:       ");
-+	if (m->private)
-+		printf("yes\n\n");
-+	else
-+		printf("no\n\n");
- }
- 
- /*
-@@ -495,22 +504,25 @@ EXPORT void init(metafile_t *m, int argc
+@@ -512,10 +512,10 @@ EXPORT void init(metafile_t *m, int argc
  
  	/* set the correct piece length.
  	   default is 2^18 = 256kb. */
@@ -89,24 +13,3 @@
  		exit(EXIT_FAILURE);
  	}
  	m->piece_length = 1 << m->piece_length;
- 
--	/* user must specify at least one announce URL as it wouldn't make
--	 * any sense to have a default for this */
-+	/* user must specify at least one announce URL when private flag set
-+	   as it wouldn't make any sense to have a default for this */
- 	if (m->announce_list == NULL) {
--		fprintf(stderr, "Must specify an announce URL. "
--			"Use -h for help.\n");
--		exit(EXIT_FAILURE);
-+		if (m->private == 1) {
-+			fprintf(stderr, "Must specify an announce URL. "
-+					"Use -h for help.\n");
-+			exit(EXIT_FAILURE);
-+		}
-+	} else {
-+		announce_last->next = NULL;
- 	}
--	announce_last->next = NULL;
- 
- 	/* ..and a file or directory from which to create the torrent */
- 	if (optind >= argc) {
diff --git a/net-p2p/mktorrent/files/patch-output.c b/net-p2p/mktorrent/files/patch-output.c
deleted file mode 100644
index d9ca4ee8babb..000000000000
--- a/net-p2p/mktorrent/files/patch-output.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- output.c.orig	2009-08-25 18:53:22 UTC
-+++ output.c
-@@ -119,15 +119,20 @@ EXPORT void write_metainfo(FILE *f, meta
- 	printf("Writing metainfo file... ");
- 	fflush(stdout);
- 
--	/* every metainfo file is one big dictonary
--	   and the first entry is the announce URL */
--	fprintf(f, "d8:announce%lu:%s",
--		(unsigned long)strlen(m->announce_list->l->s),
--		m->announce_list->l->s);
--	/* write the announce-list entry if we have
--	   more than one announce URL */
--	if (m->announce_list->next || m->announce_list->l->next)
--		write_announce_list(f, m->announce_list);
-+	/* every metainfo file is one big dictonary */
-+	fprintf(f, "d");
-+
-+	/* first entry is the announce URL (optional) */
-+	if (m->announce_list != NULL) {
-+		fprintf(f, "8:announce%lu:%s",
-+			(unsigned long)strlen(m->announce_list->l->s),
-+			m->announce_list->l->s);
-+		/* write the announce-list entry if we have
-+		   more than one announce URL */
-+		if (m->announce_list->next || m->announce_list->l->next)
-+			write_announce_list(f, m->announce_list);
-+	}
-+
- 	/* add the comment if one is specified */
- 	if (m->comment != NULL)
- 		fprintf(f, "7:comment%lu:%s",
diff --git a/net-p2p/mktorrent/pkg-descr b/net-p2p/mktorrent/pkg-descr
index 2c2cdfa5227a..2448b52d1bbe 100644
--- a/net-p2p/mktorrent/pkg-descr
+++ b/net-p2p/mktorrent/pkg-descr
@@ -2,4 +2,4 @@ mktorrent is a simple command-line utility to create BitTorrent
 metainfo files.  It supports multiple trackers, private trackers,
 custom comments, and is multi-threaded to support multiple CPUs.
 
-WWW: http://mktorrent.sourceforge.net/
+WWW: https://github.com/Rudde/mktorrent
diff --git a/net-p2p/namecoin/Makefile b/net-p2p/namecoin/Makefile
index d2e50d036770..5f02e0d53d1f 100644
--- a/net-p2p/namecoin/Makefile
+++ b/net-p2p/namecoin/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	namecoin
 PORTVERSION=	0.3.80
 DISTVERSIONPREFIX=	nc
-PORTREVISION=	10
+PORTREVISION=	11
 PORTEPOCH=	1
 CATEGORIES=	net-p2p dns
 
diff --git a/net-p2p/qbittorrent/Makefile b/net-p2p/qbittorrent/Makefile
index 65b0472c2599..8be008f1ccdc 100644
--- a/net-p2p/qbittorrent/Makefile
+++ b/net-p2p/qbittorrent/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	qbittorrent
 PORTVERSION=	3.3.15
+PORTREVISION=	1
 CATEGORIES=	net-p2p ipv6
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
diff --git a/net-p2p/radarr/Makefile b/net-p2p/radarr/Makefile
index 71394f20aeee..bb62db157b70 100644
--- a/net-p2p/radarr/Makefile
+++ b/net-p2p/radarr/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	radarr
-PORTVERSION=	0.2.0.778
-PORTREVISION=	1
+PORTVERSION=	0.2.0.846
+PORTREVISION=	0
 CATEGORIES=	net-p2p
 MASTER_SITES=	https://github.com/Radarr/Radarr/releases/download/v${PORTVERSION}/
 DISTNAME=	Radarr.develop.${PORTVERSION}.linux
diff --git a/net-p2p/radarr/distinfo b/net-p2p/radarr/distinfo
index 6cfa0897b76a..3fb70f827190 100644
--- a/net-p2p/radarr/distinfo
+++ b/net-p2p/radarr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1498061380
-SHA256 (Radarr.develop.0.2.0.778.linux.tar.gz) = 2500cd1d42acb216c8c235aaa8c544c24e52a9aa85562bdeb2a369689bb68504
-SIZE (Radarr.develop.0.2.0.778.linux.tar.gz) = 7148901
+TIMESTAMP = 1504831922
+SHA256 (Radarr.develop.0.2.0.846.linux.tar.gz) = 7e6e78872c57497f718179abd18ad303cd9e279200eaaaabb84919a75401f9d2
+SIZE (Radarr.develop.0.2.0.846.linux.tar.gz) = 7370245
diff --git a/net-p2p/rtorrent/Makefile b/net-p2p/rtorrent/Makefile
index de6dbc0e250e..4d14aea82202 100644
--- a/net-p2p/rtorrent/Makefile
+++ b/net-p2p/rtorrent/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	rtorrent
 PORTVERSION=	0.9.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-p2p
 MASTER_SITES=	http://rtorrent.net/downloads/
 
diff --git a/net-p2p/transmission-qt4/Makefile b/net-p2p/transmission-qt4/Makefile
index 50b51396bec9..1c92cf6923fb 100644
--- a/net-p2p/transmission-qt4/Makefile
+++ b/net-p2p/transmission-qt4/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	5
+PORTREVISION=	6
 PKGNAMESUFFIX=	-qt4
 
 MAINTAINER=	crees@FreeBSD.org
diff --git a/net-p2p/transmission-qt5/Makefile b/net-p2p/transmission-qt5/Makefile
index 43b019586679..4221eab555a9 100644
--- a/net-p2p/transmission-qt5/Makefile
+++ b/net-p2p/transmission-qt5/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMESUFFIX=	-qt5
 
 MAINTAINER=	crees@FreeBSD.org
diff --git a/net-p2p/zetacoin/Makefile b/net-p2p/zetacoin/Makefile
index 70c39a4dd9ed..8faac8cc45c1 100644
--- a/net-p2p/zetacoin/Makefile
+++ b/net-p2p/zetacoin/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	zetacoin
 PORTVERSION=	0.11.2.3
 DISTVERSIONPREFIX=	v
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	net-p2p finance
 
 MAINTAINER=	daniel@morante.net
diff --git a/net/Makefile b/net/Makefile
index bc8716dab677..c9d044d2abfc 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -136,6 +136,7 @@
     SUBDIR += exaddos
     SUBDIR += fb
     SUBDIR += findmtu
+    SUBDIR += flower
     SUBDIR += flowgrep
     SUBDIR += fonulator
     SUBDIR += foreman-proxy
@@ -294,6 +295,7 @@
     SUBDIR += jsch
     SUBDIR += jumpgate
     SUBDIR += jwhois
+    SUBDIR += kafka
     SUBDIR += kafkacat
     SUBDIR += kamailio
     SUBDIR += kdenetwork4
diff --git a/net/belle-sip/Makefile b/net/belle-sip/Makefile
index e6b60f343fdb..897402187de3 100644
--- a/net/belle-sip/Makefile
+++ b/net/belle-sip/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	belle-sip
 PORTVERSION=	1.5.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net java
 MASTER_SITES=	SAVANNAH/linphone/${PORTNAME}/ \
 		http://www.antlr3.org/download/:source2
diff --git a/net/belle-sip/pkg-descr b/net/belle-sip/pkg-descr
index 71b8f9354c29..e5281c4a9622 100644
--- a/net/belle-sip/pkg-descr
+++ b/net/belle-sip/pkg-descr
@@ -3,12 +3,12 @@ oriented API.
 
 * RFC3261 compliant implementation of SIP parser, writer, transactions and
   dialog layers
-* http client api
+* HTTP client API
 * support of client TLS certificate
 * fully asynchronous transport layer (UDP, TCP, TLS)
 * fully asynchronous DNS resolution with SRV
 * full dual-stack IPv6 support
-* SIP transaction state machines with lastest corrections (RFC6026)
+* SIP transaction state machines with latest corrections (RFC6026)
 * automatic management of request refreshes with network disconnection
   resiliency thanks to the "refresher" object
 * supported platforms: Linux, Mac OSX, Windows XP+, iOS, Android,
diff --git a/net/flower/Makefile b/net/flower/Makefile
new file mode 100644
index 000000000000..795cb195be74
--- /dev/null
+++ b/net/flower/Makefile
@@ -0,0 +1,34 @@
+# Created by: Ed Schouten <ed@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	flower
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.9
+CATEGORIES=	net
+
+MAINTAINER=	ed@FreeBSD.org
+COMMENT=	Label-based networking daemon
+
+LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+LIB_DEPENDS=	libarpc.so:devel/arpc \
+		libjsoncpp.so:devel/jsoncpp
+
+USES=		cmake localbase:ldflags tar:xz
+USE_GITHUB=	yes
+GH_ACCOUNT=	NuxiNL
+
+CFLAGS+=	-I${LOCALBASE}/include/jsoncpp
+
+.include <bsd.port.pre.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100511
+IGNORE=		requires various C++17 features
+.endif
+
+# Require the unit tests to pass prior to installing.
+post-build:
+	@trap '' PIPE && ${WRKSRC}/flower_unittests
+
+.include <bsd.port.post.mk>
diff --git a/net/flower/distinfo b/net/flower/distinfo
new file mode 100644
index 000000000000..baf4e8eb6da2
--- /dev/null
+++ b/net/flower/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1504764102
+SHA256 (NuxiNL-flower-v0.9_GH0.tar.gz) = e712081eb5794245f4e27e591b1a1ea296c1bd6f2941afc2536c04be01355b10
+SIZE (NuxiNL-flower-v0.9_GH0.tar.gz) = 1306944
diff --git a/net/flower/pkg-descr b/net/flower/pkg-descr
new file mode 100644
index 000000000000..71b8b9dc92e3
--- /dev/null
+++ b/net/flower/pkg-descr
@@ -0,0 +1,13 @@
+Flower is a label-based networking daemon.
+
+CloudABI applications are not permitted to call bind or connect on
+sockets directly, as that would conflict with CloudABI's security model.
+Instead, they can send RPCs to fulfill such requests to a separate
+daemon, called Flower.
+
+Like CloudABI, Flower makes use of a capability-based security model.
+This makes it easy to spawn applications in such a way that they can
+only have a limited view of the network, without requiring separate
+users or complex access control policies.
+
+WWW: https://github.com/NuxiNL/flower
diff --git a/net/flower/pkg-plist b/net/flower/pkg-plist
new file mode 100644
index 000000000000..4f9fd50cc8d4
--- /dev/null
+++ b/net/flower/pkg-plist
@@ -0,0 +1,19 @@
+bin/flower_cat
+bin/flower_egress_connect
+bin/flower_ingress_accept
+bin/flower_resolver_getaddrinfo
+bin/flower_switchboard
+include/flower/cat/configuration.proto
+include/flower/cat/configuration.ad.h
+include/flower/ingress/accept/configuration.proto
+include/flower/ingress/accept/configuration.ad.h
+include/flower/protocol/egress.proto
+include/flower/protocol/egress.ad.h
+include/flower/protocol/resolver.proto
+include/flower/protocol/resolver.ad.h
+include/flower/protocol/server.proto
+include/flower/protocol/server.ad.h
+include/flower/protocol/switchboard.proto
+include/flower/protocol/switchboard.ad.h
+include/flower/switchboard/configuration.proto
+include/flower/switchboard/configuration.ad.h
diff --git a/net/freerdp/Makefile b/net/freerdp/Makefile
index c4163c837fb7..0b1d97743d40 100644
--- a/net/freerdp/Makefile
+++ b/net/freerdp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	freerdp
 DISTVERSION=	2.0.0-rc0
+PORTREVISION=	1
 CATEGORIES=	net comms ipv6
 
 MAINTAINER=	kevans@FreeBSD.org
diff --git a/net/freerdp1/Makefile b/net/freerdp1/Makefile
index 887188b8e095..197151681ca4 100644
--- a/net/freerdp1/Makefile
+++ b/net/freerdp1/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	freerdp
 PORTVERSION=	1.2.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net comms ipv6
 PKGNAMESUFFIX=	1
 
diff --git a/net/glusterfs/Makefile b/net/glusterfs/Makefile
index d6db7d49cc81..cf8cc0ef0076 100644
--- a/net/glusterfs/Makefile
+++ b/net/glusterfs/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	glusterfs
 PORTVERSION=	3.11.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://bits.gluster.org/pub/gluster/glusterfs/src/
 
diff --git a/net/gnatsd/Makefile b/net/gnatsd/Makefile
index 696db1987119..511760d45aa3 100644
--- a/net/gnatsd/Makefile
+++ b/net/gnatsd/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	gnatsd
 PORTVERSION=	1.0.2
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net
 
@@ -20,7 +21,7 @@ USE_RC_SUBR=	gnatsd.sh
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc
-	${INSTALL_SCRIPT} ${FILESDIR}/gnatsd.conf ${STAGEDIR}${PREFIX}/etc/gnatsd.conf.sample
+	${INSTALL_DATA} ${FILESDIR}/gnatsd.conf ${STAGEDIR}${PREFIX}/etc/gnatsd.conf.sample
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/server && ${COPYTREE_SHARE} configs ${STAGEDIR}${DOCSDIR}
diff --git a/net/gnome-online-accounts/Makefile b/net/gnome-online-accounts/Makefile
index 6a039eeda612..68922955b375 100644
--- a/net/gnome-online-accounts/Makefile
+++ b/net/gnome-online-accounts/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gnome-online-accounts
 PORTVERSION=	3.24.1
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	GNOME
 
diff --git a/net/gupnp/Makefile b/net/gupnp/Makefile
index 1a76fde75b27..533290ecff14 100644
--- a/net/gupnp/Makefile
+++ b/net/gupnp/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gupnp
 PORTVERSION=	1.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	GNOME
 
diff --git a/net/iaxmodem/Makefile b/net/iaxmodem/Makefile
index 5ee6e8380782..a6f307c70519 100644
--- a/net/iaxmodem/Makefile
+++ b/net/iaxmodem/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	iaxmodem
 PORTVERSION=	1.2.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net comms
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
diff --git a/net/ipxe/Makefile b/net/ipxe/Makefile
index cccaaf4b8e1f..a08d74c16156 100644
--- a/net/ipxe/Makefile
+++ b/net/ipxe/Makefile
@@ -5,7 +5,7 @@
 
 PORTNAME=	ipxe
 PORTVERSION=	20161208
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 
 MAINTAINER=	tobik@FreeBSD.org
diff --git a/net/kafka/Makefile b/net/kafka/Makefile
new file mode 100644
index 000000000000..efea8b6c3ff2
--- /dev/null
+++ b/net/kafka/Makefile
@@ -0,0 +1,104 @@
+# $FreeBSD$
+
+PORTNAME=	kafka
+PORTVERSION=	0.11.0.0
+CATEGORIES=	net java
+MASTER_SITES=	APACHE/${PORTNAME}/${PORTVERSION}
+DISTNAME=	${PORTNAME}_2.12-${PORTVERSION}
+
+MAINTAINER=	timp87@gmail.com
+COMMENT=	Distributed streaming platform
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	bash:shells/bash
+
+USES=		tar:tgz shebangfix
+
+SHEBANG_FILES=	bin/*.sh
+
+OPTIONS_DEFINE=	DOCS
+
+USERS=		kafka
+GROUPS=		kafka
+
+DATADIR=	${JAVASHAREDIR}/${PORTNAME}
+KAFKA_DATADIR=	/var/db/${PORTNAME}
+KAFKA_LOGDIR=	/var/log/${PORTNAME}
+KAFKA_RUNDIR=	/var/run/${PORTNAME}
+KAFKA_BINS=	connect-distributed.sh connect-standalone.sh kafka-acls.sh \
+		kafka-broker-api-versions.sh kafka-configs.sh \
+		kafka-console-consumer.sh kafka-console-producer.sh \
+		kafka-consumer-groups.sh kafka-consumer-offset-checker.sh \
+		kafka-consumer-perf-test.sh kafka-delete-records.sh \
+		kafka-mirror-maker.sh kafka-preferred-replica-election.sh \
+		kafka-producer-perf-test.sh kafka-reassign-partitions.sh \
+		kafka-replay-log-producer.sh kafka-replica-verification.sh \
+		kafka-run-class.sh kafka-server-start.sh kafka-server-stop.sh \
+		kafka-simple-consumer-shell.sh \
+		kafka-streams-application-reset.sh kafka-topics.sh \
+		kafka-verifiable-consumer.sh kafka-verifiable-producer.sh
+KAFKA_CONFIGS=	connect-console-sink.properties \
+		connect-console-source.properties \
+		connect-distributed.properties connect-file-sink.properties \
+		connect-file-source.properties connect-log4j.properties \
+		connect-standalone.properties consumer.properties \
+		log4j.properties producer.properties server.properties \
+		tools-log4j.properties
+
+SUB_FILES=	kafka
+SUB_LIST=	JAVA=${JAVA} \
+		ETCDIR=${ETCDIR} \
+		USERS=${USERS} \
+		GROUPS=${GROUPS} \
+		KAFKA_RUNDIR=${KAFKA_RUNDIR} \
+		KAFKA_LOGDIR=${KAFKA_LOGDIR}
+
+PLIST_SUB=	PORTVERSION=${PORTVERSION} \
+		USERS=${USERS} \
+		GROUPS=${GROUPS} \
+		KAFKA_DATADIR=${KAFKA_DATADIR} \
+		KAFKA_RUNDIR=${KAFKA_RUNDIR} \
+		KAFKA_LOGDIR=${KAFKA_LOGDIR} \
+		ETCDIR=${ETCDIR}
+
+NO_BUILD=	yes
+NO_ARCH=	yes
+USE_JAVA=	yes
+JAVA_VERSION=	1.8+
+#JAVA_VENDOR=	openjdk
+JAVA_RUN=	yes
+USE_RC_SUBR=	kafka
+
+post-patch:
+	@${REINPLACE_CMD} "s|JAVA=\"java\"|JAVA=\"${JAVA}\"|" ${WRKSRC}/bin/kafka-run-class.sh
+	@${REINPLACE_CMD} "/LOG_DIR=/s|\$$base_dir/logs|${KAFKA_LOGDIR}|" ${WRKSRC}/bin/kafka-run-class.sh
+	@${REINPLACE_CMD} "s|\$$base_dir.*/config|${ETCDIR}|" ${WRKSRC}/bin/*.sh
+	@${REINPLACE_CMD} "s|ps ax|ps axww|" ${WRKSRC}/bin/kafka-server-stop.sh
+	@${REINPLACE_CMD} "/log.dirs/s|=.*|=${KAFKA_DATADIR}|" ${WRKSRC}/config/server.properties
+
+do-install:
+	${MKDIR} ${STAGEDIR}${ETCDIR}
+	${MKDIR} ${STAGEDIR}${KAFKA_DATADIR}
+	${MKDIR} ${STAGEDIR}${KAFKA_LOGDIR}
+	${MKDIR} ${STAGEDIR}${KAFKA_RUNDIR}
+	${MKDIR} ${STAGEDIR}${DATADIR}/bin
+.for f in ${KAFKA_BINS}
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${STAGEDIR}${DATADIR}/bin/
+.endfor
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} libs ${STAGEDIR}${DATADIR} "-not ( \
+		-name kafka_*-javadoc\.jar -or -name kafka_*-scaladoc\.jar -or \
+		-name kafka_*-sources\.jar -or -name kafka_*-test\.jar -or \
+		-name *\.asc \
+		)" \
+	)
+.for f in ${KAFKA_CONFIGS}
+	${INSTALL_DATA} ${WRKSRC}/config/${f} ${STAGEDIR}${ETCDIR}/${f}.sample
+.endfor
+
+do-install-DOCS-on:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${EXTRACT_CMD} -xf ${WRKSRC}/site-docs/${PORTNAME}_2.12-${PORTVERSION}-site-docs.tgz -C ${STAGEDIR}${DOCSDIR}
+
+.include <bsd.port.mk>
diff --git a/net/kafka/distinfo b/net/kafka/distinfo
new file mode 100644
index 000000000000..581389cbd20d
--- /dev/null
+++ b/net/kafka/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1500285144
+SHA256 (kafka_2.12-0.11.0.0.tgz) = ab6310dd0d9fce1e6e8045b51b471fb35c3e197714e6e6b03bc5864898785f2d
+SIZE (kafka_2.12-0.11.0.0.tgz) = 36644420
diff --git a/net/kafka/files/kafka.in b/net/kafka/files/kafka.in
new file mode 100644
index 000000000000..70f28df363f7
--- /dev/null
+++ b/net/kafka/files/kafka.in
@@ -0,0 +1,74 @@
+#!/bin/sh
+# $FreeBSD$
+#
+# PROVIDE: kafka
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add kafka_enable="YES" to /etc/rc.conf to enable Kafka:
+#
+# Additional variables you can define are:
+#
+# kafka_user:		Username to run Kafka
+#			Default: %%USERS%%
+# kafka_group:		Groupname to run Kafka
+#			Default: %%GROUPS%%
+# kafka_config:		Configuration file to run Kafka
+#			Default: %%ETCDIR%%/server.properties
+# kafka_log4jprofile:	Profile for Kafka logging
+#			Default: %%ETCDIR%%/log4j.properties
+# kafka_logdir:		Directory to store Kafka logs
+#			Default: %%KAFKA_LOGDIR%%
+# kafka_jvmopts:	Options passed to JVM to start Kafka
+#			Default: None
+# kafka_pidfile:	Full path of the Kafka process PID file
+#			Default: %%KAFKA_RUNDIR%%/kafka.pid
+# kafka_outfile:	File to store Kafka's stdout and stderr
+#			Default: $kafka_logdir/kafkaServer.out
+
+. /etc/rc.subr
+
+name=kafka
+rcvar=kafka_enable
+
+load_rc_config "${name}"
+
+: ${kafka_enable:=NO}
+: ${kafka_user:=%%USERS%%}
+: ${kafka_group:=%%GROUPS%%}
+: ${kafka_config:=%%ETCDIR%%/server.properties}
+: ${kafka_log4jpropfile:=%%ETCDIR%%/log4j.properties}
+: ${kafka_logdir:=%%KAFKA_LOGDIR%%}
+: ${kafka_jvmopts:=}
+: ${kafka_outfile:=$kafka_logdir/kafkaServer.out}
+: ${kafka_pidfile:=%%KAFKA_RUNDIR%%/kafka.pid}
+
+JAVA=%%JAVA%%
+
+CLASSPATH=":%%DATADIR%%/libs/*"
+
+kafka_logopts="-Dkafka.logs.dir=${kafka_logdir} -Dlog4j.configuration=file:${kafka_log4jpropfile}"
+kafka_main="$kafka_jvmopts $kafka_logopts -cp $CLASSPATH"
+pidfile=${kafka_pidfile}
+procname=${JAVA}
+required_files="${kafka_config} ${kafka_log4jpropfile}"
+
+daemon_head=""
+daemon_tail=" > $kafka_outfile 2>&1 < /dev/null"
+
+if [ -z $kafka_outfile ]; then
+	daemon_head="-f"
+	daemon_tail=""
+fi
+
+command="/usr/sbin/daemon"
+command_args="${daemon_head} -p ${pidfile} ${JAVA} ${kafka_main} kafka.Kafka ${kafka_config} ${daemon_tail}"
+
+start_precmd="kafka_init"
+
+kafka_init()
+{
+	chown ${kafka_user}:${kafka_group} ${pidfile%/*} ${kafka_logdir} ${kafka_outfile}
+}
+
+run_rc_command "$1"
diff --git a/net/kafka/files/patch-bin_kafka-run-class.sh b/net/kafka/files/patch-bin_kafka-run-class.sh
new file mode 100644
index 000000000000..a0d2cc8ed9dd
--- /dev/null
+++ b/net/kafka/files/patch-bin_kafka-run-class.sh
@@ -0,0 +1,16 @@
+--- bin/kafka-run-class.sh.orig	2017-07-14 16:36:53 UTC
++++ bin/kafka-run-class.sh
+@@ -125,12 +125,7 @@ do
+ done
+ 
+ # classpath addition for release
+-for file in "$base_dir"/libs/*;
+-do
+-  if should_include_file "$file"; then
+-    CLASSPATH="$CLASSPATH":"$file"
+-  fi
+-done
++CLASSPATH="$CLASSPATH":"$base_dir"/libs/*
+ 
+ for file in "$base_dir"/core/build/libs/kafka_${SCALA_BINARY_VERSION}*.jar;
+ do
diff --git a/net/kafka/pkg-descr b/net/kafka/pkg-descr
new file mode 100644
index 000000000000..6cdbd6b69fb0
--- /dev/null
+++ b/net/kafka/pkg-descr
@@ -0,0 +1,5 @@
+Kafka is used for building real-time data pipelines and streaming apps.
+It is horizontally scalable, fault-tolerant, wicked fast,
+and runs in production in thousands of companies.
+
+WWW: https://kafka.apache.org/
diff --git a/net/kafka/pkg-plist b/net/kafka/pkg-plist
new file mode 100644
index 000000000000..5b112de2c427
--- /dev/null
+++ b/net/kafka/pkg-plist
@@ -0,0 +1,156 @@
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/api.html
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/configuration.html
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/connect.html
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/design.html
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/documentation.html
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/documentation/streams.html
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/ecosystem.html
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/admin_client_config.html
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/connect_config.html
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/connect_transforms.html
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/consumer_config.html
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/consumer_metrics.html
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/kafka_config.html
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/producer_config.html
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/protocol_api_keys.html
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/protocol_errors.html
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/protocol_messages.html
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/streams_config.html
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/topic_config.html
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/images/consumer-groups.png
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/images/kafka-apis.png
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/images/kafka_log.png
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/images/kafka_multidc.png
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/images/kafka_multidc_complex.png
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/images/log_anatomy.png
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/images/log_cleaner_anatomy.png
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/images/log_compaction.png
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/images/log_consumer.png
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/images/mirror-maker.png
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/images/producer_consumer.png
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/images/streams-architecture-overview.jpg
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/images/streams-architecture-states.jpg
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/images/streams-architecture-tasks.jpg
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/images/streams-architecture-threads.jpg
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/images/streams-architecture-topology.jpg
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/images/streams-concepts-topology.jpg
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/images/streams-table-duality-01.png
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/images/streams-table-duality-02.png
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/images/streams-table-duality-03.png
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/images/streams-table-updates-01.png
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/images/streams-table-updates-02.png
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/images/tracking_high_level.png
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/implementation.html
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/introduction.html
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/js/templateData.js
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/migration.html
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/ops.html
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/protocol.html
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/quickstart.html
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/security.html
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/streams.html
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/toc.html
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/upgrade.html
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/uses.html
+%%DATADIR%%/bin/connect-distributed.sh
+%%DATADIR%%/bin/connect-standalone.sh
+%%DATADIR%%/bin/kafka-acls.sh
+%%DATADIR%%/bin/kafka-broker-api-versions.sh
+%%DATADIR%%/bin/kafka-configs.sh
+%%DATADIR%%/bin/kafka-console-consumer.sh
+%%DATADIR%%/bin/kafka-console-producer.sh
+%%DATADIR%%/bin/kafka-consumer-groups.sh
+%%DATADIR%%/bin/kafka-consumer-offset-checker.sh
+%%DATADIR%%/bin/kafka-consumer-perf-test.sh
+%%DATADIR%%/bin/kafka-delete-records.sh
+%%DATADIR%%/bin/kafka-mirror-maker.sh
+%%DATADIR%%/bin/kafka-preferred-replica-election.sh
+%%DATADIR%%/bin/kafka-producer-perf-test.sh
+%%DATADIR%%/bin/kafka-reassign-partitions.sh
+%%DATADIR%%/bin/kafka-replay-log-producer.sh
+%%DATADIR%%/bin/kafka-replica-verification.sh
+%%DATADIR%%/bin/kafka-run-class.sh
+%%DATADIR%%/bin/kafka-server-start.sh
+%%DATADIR%%/bin/kafka-server-stop.sh
+%%DATADIR%%/bin/kafka-simple-consumer-shell.sh
+%%DATADIR%%/bin/kafka-streams-application-reset.sh
+%%DATADIR%%/bin/kafka-topics.sh
+%%DATADIR%%/bin/kafka-verifiable-consumer.sh
+%%DATADIR%%/bin/kafka-verifiable-producer.sh
+%%DATADIR%%/libs/aopalliance-repackaged-2.5.0-b05.jar
+%%DATADIR%%/libs/argparse4j-0.7.0.jar
+%%DATADIR%%/libs/commons-lang3-3.5.jar
+%%DATADIR%%/libs/connect-api-%%PORTVERSION%%.jar
+%%DATADIR%%/libs/connect-file-%%PORTVERSION%%.jar
+%%DATADIR%%/libs/connect-json-%%PORTVERSION%%.jar
+%%DATADIR%%/libs/connect-runtime-%%PORTVERSION%%.jar
+%%DATADIR%%/libs/connect-transforms-%%PORTVERSION%%.jar
+%%DATADIR%%/libs/guava-20.0.jar
+%%DATADIR%%/libs/hk2-api-2.5.0-b05.jar
+%%DATADIR%%/libs/hk2-locator-2.5.0-b05.jar
+%%DATADIR%%/libs/hk2-utils-2.5.0-b05.jar
+%%DATADIR%%/libs/jackson-annotations-2.8.5.jar
+%%DATADIR%%/libs/jackson-core-2.8.5.jar
+%%DATADIR%%/libs/jackson-databind-2.8.5.jar
+%%DATADIR%%/libs/jackson-jaxrs-base-2.8.5.jar
+%%DATADIR%%/libs/jackson-jaxrs-json-provider-2.8.5.jar
+%%DATADIR%%/libs/jackson-module-jaxb-annotations-2.8.5.jar
+%%DATADIR%%/libs/javassist-3.21.0-GA.jar
+%%DATADIR%%/libs/javax.annotation-api-1.2.jar
+%%DATADIR%%/libs/javax.inject-1.jar
+%%DATADIR%%/libs/javax.inject-2.5.0-b05.jar
+%%DATADIR%%/libs/javax.servlet-api-3.1.0.jar
+%%DATADIR%%/libs/javax.ws.rs-api-2.0.1.jar
+%%DATADIR%%/libs/jersey-client-2.24.jar
+%%DATADIR%%/libs/jersey-common-2.24.jar
+%%DATADIR%%/libs/jersey-container-servlet-2.24.jar
+%%DATADIR%%/libs/jersey-container-servlet-core-2.24.jar
+%%DATADIR%%/libs/jersey-guava-2.24.jar
+%%DATADIR%%/libs/jersey-media-jaxb-2.24.jar
+%%DATADIR%%/libs/jersey-server-2.24.jar
+%%DATADIR%%/libs/jetty-continuation-9.2.15.v20160210.jar
+%%DATADIR%%/libs/jetty-http-9.2.15.v20160210.jar
+%%DATADIR%%/libs/jetty-io-9.2.15.v20160210.jar
+%%DATADIR%%/libs/jetty-security-9.2.15.v20160210.jar
+%%DATADIR%%/libs/jetty-server-9.2.15.v20160210.jar
+%%DATADIR%%/libs/jetty-servlet-9.2.15.v20160210.jar
+%%DATADIR%%/libs/jetty-servlets-9.2.15.v20160210.jar
+%%DATADIR%%/libs/jetty-util-9.2.15.v20160210.jar
+%%DATADIR%%/libs/jopt-simple-5.0.3.jar
+%%DATADIR%%/libs/kafka-clients-%%PORTVERSION%%.jar
+%%DATADIR%%/libs/kafka-log4j-appender-%%PORTVERSION%%.jar
+%%DATADIR%%/libs/kafka-streams-%%PORTVERSION%%.jar
+%%DATADIR%%/libs/kafka-streams-examples-%%PORTVERSION%%.jar
+%%DATADIR%%/libs/kafka-tools-%%PORTVERSION%%.jar
+%%DATADIR%%/libs/kafka_2.12-%%PORTVERSION%%.jar
+%%DATADIR%%/libs/log4j-1.2.17.jar
+%%DATADIR%%/libs/lz4-1.3.0.jar
+%%DATADIR%%/libs/maven-artifact-3.5.0.jar
+%%DATADIR%%/libs/metrics-core-2.2.0.jar
+%%DATADIR%%/libs/osgi-resource-locator-1.0.1.jar
+%%DATADIR%%/libs/plexus-utils-3.0.24.jar
+%%DATADIR%%/libs/reflections-0.9.11.jar
+%%DATADIR%%/libs/rocksdbjni-5.0.1.jar
+%%DATADIR%%/libs/scala-library-2.12.2.jar
+%%DATADIR%%/libs/scala-parser-combinators_2.12-1.0.4.jar
+%%DATADIR%%/libs/slf4j-api-1.7.25.jar
+%%DATADIR%%/libs/slf4j-log4j12-1.7.25.jar
+%%DATADIR%%/libs/snappy-java-1.1.2.6.jar
+%%DATADIR%%/libs/validation-api-1.1.0.Final.jar
+%%DATADIR%%/libs/zkclient-0.10.jar
+%%DATADIR%%/libs/zookeeper-3.4.10.jar
+@dir(%%USERS%%,%%GROUPS%%,755) %%KAFKA_DATADIR%%
+@dir(%%USERS%%,%%GROUPS%%,755) %%KAFKA_LOGDIR%%
+@dir(%%USERS%%,%%GROUPS%%,755) %%KAFKA_RUNDIR%%
+@sample %%ETCDIR%%/connect-console-sink.properties.sample
+@sample %%ETCDIR%%/connect-console-source.properties.sample
+@sample %%ETCDIR%%/connect-distributed.properties.sample
+@sample %%ETCDIR%%/connect-file-sink.properties.sample
+@sample %%ETCDIR%%/connect-file-source.properties.sample
+@sample %%ETCDIR%%/connect-log4j.properties.sample
+@sample %%ETCDIR%%/connect-standalone.properties.sample
+@sample %%ETCDIR%%/consumer.properties.sample
+@sample %%ETCDIR%%/log4j.properties.sample
+@sample %%ETCDIR%%/producer.properties.sample
+@sample %%ETCDIR%%/server.properties.sample
+@sample %%ETCDIR%%/tools-log4j.properties.sample
diff --git a/net/kea/Makefile b/net/kea/Makefile
index 4eafab5c033b..4d80a357fb5b 100644
--- a/net/kea/Makefile
+++ b/net/kea/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	kea
 PORTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	net ipv6
 MASTER_SITES=	ISC/kea/${PORTVERSION}
 
diff --git a/net/kf5-kxmlrpcclient/Makefile b/net/kf5-kxmlrpcclient/Makefile
index e3dae356a242..e5017f5a4dbf 100644
--- a/net/kf5-kxmlrpcclient/Makefile
+++ b/net/kf5-kxmlrpcclient/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	kxmlrpcclient
 PORTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	net kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/net/l2tpd/Makefile b/net/l2tpd/Makefile
index 2577029f9629..361f7820d895 100644
--- a/net/l2tpd/Makefile
+++ b/net/l2tpd/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	l2tpd
 PORTVERSION=	0.69
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net
 MASTER_SITES=	SF/${PORTNAME}/L2TPd/${PORTVERSION}
 
diff --git a/net/libtnl/Makefile b/net/libtnl/Makefile
index 6b253bacb1c3..94d8cb32f291 100644
--- a/net/libtnl/Makefile
+++ b/net/libtnl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libtnl
 PORTVERSION=	1.5.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net devel
 MASTER_SITES=	SF/opentnl/TNL%20Source/${PORTVERSION}
 DISTNAME=	tnl-${PORTVERSION}-source
diff --git a/net/mediatomb/Makefile b/net/mediatomb/Makefile
index dba5761caff3..fe50d74ae09b 100644
--- a/net/mediatomb/Makefile
+++ b/net/mediatomb/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mediatomb
 PORTVERSION=	0.12.1
-PORTREVISION=	17
+PORTREVISION=	18
 CATEGORIES=	net multimedia
 MASTER_SITES=	SF/${PORTNAME}/MediaTomb/${PORTVERSION}
 
diff --git a/net/mpich/Makefile b/net/mpich/Makefile
index 10b3b28f4de6..3f23cee4ca38 100644
--- a/net/mpich/Makefile
+++ b/net/mpich/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	mpich
 PORTVERSION=	3.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net parallel
 MASTER_SITES=	http://www.mpich.org/static/downloads/${DISTVERSION}/
 
diff --git a/net/mpich2/Makefile b/net/mpich2/Makefile
index 009a720f43e0..b86343acf858 100644
--- a/net/mpich2/Makefile
+++ b/net/mpich2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mpich2
 DISTVERSION=	1.5
-PORTREVISION=	6
+PORTREVISION=	8
 PORTEPOCH=	5
 CATEGORIES=	net java parallel
 MASTER_SITES=	http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${DISTVERSION}/
diff --git a/net/ndisc6/Makefile b/net/ndisc6/Makefile
index d4c3f2959e0a..b438291eba58 100644
--- a/net/ndisc6/Makefile
+++ b/net/ndisc6/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ndisc6
 PORTVERSION=	1.0.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://www.remlab.net/files/ndisc6/ \
 		http://people.via.ecp.fr/~rem/www.remlab.net/files/ndisc6/
diff --git a/net/ndpi/Makefile b/net/ndpi/Makefile
index dc141ff57217..e43d0c90adaf 100644
--- a/net/ndpi/Makefile
+++ b/net/ndpi/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ndpi
 PORTVERSION=	2.0.2017.05.23
+PORTREVISION=	1
 CATEGORIES=	net
 
 MAINTAINER=	madpilot@FreeBSD.org
diff --git a/net/nepenthes/Makefile b/net/nepenthes/Makefile
index dfb89c8f9c4b..bc43265fef8d 100644
--- a/net/nepenthes/Makefile
+++ b/net/nepenthes/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	nepenthes
 PORTVERSION=	0.2.2
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	net
 MASTER_SITES=	SF/${PORTNAME}/Nepenthes%20development/${PORTVERSION}
 
diff --git a/net/net6/Makefile b/net/net6/Makefile
index 709548cc3ef9..c0f83ad338f5 100644
--- a/net/net6/Makefile
+++ b/net/net6/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	net6
 PORTVERSION=	1.3.14
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net devel
 MASTER_SITES=	http://releases.0x539.de/net6/
 
diff --git a/net/ohphone/Makefile b/net/ohphone/Makefile
index 3564eef9ba53..2d456916c55c 100644
--- a/net/ohphone/Makefile
+++ b/net/ohphone/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ohphone
 PORTVERSION=	1.4.5
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.frm2.tum.de/pub/jpulz/FreeBSD/distfiles/
 
diff --git a/net/openbsc/Makefile b/net/openbsc/Makefile
index 96e993e563cb..3d4f3d783b83 100644
--- a/net/openbsc/Makefile
+++ b/net/openbsc/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	openbsc
 PORTVERSION=	0.15.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	http://git.osmocom.org/${PORTNAME}/snapshot/ \
 		http://chaosophia.net/downloads/osmocom/${PORTNAME}/
diff --git a/net/openh323/Makefile b/net/openh323/Makefile
index 732fdafef7bf..54eee9390be6 100644
--- a/net/openh323/Makefile
+++ b/net/openh323/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	openh323
 PORTVERSION=	1.19.0.1
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	net
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-v${PORTVERSION:S/./_/g}-src
diff --git a/net/openmpi/Makefile b/net/openmpi/Makefile
index ca6a31821d2e..a21c7cc0ed41 100644
--- a/net/openmpi/Makefile
+++ b/net/openmpi/Makefile
@@ -5,6 +5,7 @@
 
 PORTNAME=	openmpi
 PORTVERSION=	1.10.7
+PORTREVISION=	1
 CATEGORIES=	net parallel
 MASTER_SITES=	http://www.open-mpi.org/software/ompi/v${PORTVERSION:R}/downloads/
 
diff --git a/net/openmpi2/Makefile b/net/openmpi2/Makefile
index ea19293a057c..541da43764c5 100644
--- a/net/openmpi2/Makefile
+++ b/net/openmpi2/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	openmpi
 PORTVERSION=	2.1.1
+PORTREVISION=	1
 CATEGORIES=	net parallel
 MASTER_SITES=	http://www.open-mpi.org/software/ompi/v${PORTVERSION:R}/downloads/
 PKGNAMESUFFIX=	2
diff --git a/net/openntpd/Makefile b/net/openntpd/Makefile
index fc01766f601a..98243188ac7c 100644
--- a/net/openntpd/Makefile
+++ b/net/openntpd/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	openntpd
-PORTVERSION=	6.2p1
-PORTREVISION=	1
+PORTVERSION=	6.2p2
 PORTEPOCH=	2
 CATEGORIES=	net
 MASTER_SITES=	OPENBSD/OpenNTPD
diff --git a/net/openntpd/distinfo b/net/openntpd/distinfo
index 901133fd9fbd..c6d00f38a02b 100644
--- a/net/openntpd/distinfo
+++ b/net/openntpd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500146749
-SHA256 (openntpd-6.2p1.tar.gz) = 05e1668f89969a6ae064f411cb1d864ca3acb27ebd8fac963e6443ea0788d0bc
-SIZE (openntpd-6.2p1.tar.gz) = 437376
+TIMESTAMP = 1504817543
+SHA256 (openntpd-6.2p2.tar.gz) = 5808a4137b008a4db20907e1a482f474734b120f254e3c5feb90db15e0820fb2
+SIZE (openntpd-6.2p2.tar.gz) = 437527
diff --git a/net/openntpd/files/patch-src_ntpd.8 b/net/openntpd/files/patch-src_ntpd.8
index 050631b2c2c3..61a3b8eed88c 100644
--- a/net/openntpd/files/patch-src_ntpd.8
+++ b/net/openntpd/files/patch-src_ntpd.8
@@ -1,4 +1,4 @@
---- src/ntpd.8.orig	2016-05-30 22:50:02 UTC
+--- src/ntpd.8.orig	2017-09-07 19:12:02 UTC
 +++ src/ntpd.8
 @@ -56,7 +56,7 @@ Use
  .Ar file
@@ -9,7 +9,7 @@
  .It Fl n
  Configtest mode.
  Only check the configuration file for validity.
-@@ -99,19 +99,19 @@ will be logged.
+@@ -99,18 +99,18 @@ will be logged.
  After the local clock is synchronized,
  .Nm
  adjusts the clock frequency using the
@@ -18,13 +18,12 @@
  system call to compensate for systematic drift.
  .Pp
  .Nm
- is usually started at boot time, and can be enabled by
- setting
+-is started at boot time by default via
 -.Va ntpd_flags
++is usually started at boot time, and can be enabled by setting
 +.Va openntpd_flags
  in
--.Pa /etc/rc.conf.local .
-+.Pa /etc/rc.conf .
+ .Pa /etc/rc.conf .
  See
  .Xr rc 8
  and
@@ -33,7 +32,7 @@
  for more information on the boot process
  and enabling daemons.
  .Pp
-@@ -124,8 +124,8 @@ and its initial clock drift from
+@@ -123,8 +123,8 @@ and its initial clock drift from
  .Pa /var/db/ntpd.drift .
  Clock drift is periodically written to the drift file thereafter.
  .Sh FILES
@@ -44,7 +43,7 @@
  Default configuration file.
  .It Pa /var/db/ntpd.drift
  Drift file.
-@@ -135,12 +135,12 @@ Socket file for communication with
+@@ -134,12 +134,12 @@ Socket file for communication with
  .El
  .Sh SEE ALSO
  .Xr date 1 ,
diff --git a/net/openntpd/files/patch-src_parse.y b/net/openntpd/files/patch-src_parse.y
deleted file mode 100644
index 0f1a3b912131..000000000000
--- a/net/openntpd/files/patch-src_parse.y
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/parse.y.orig	2017-08-11 19:19:57 UTC
-+++ src/parse.y
-@@ -136,6 +136,8 @@ main		: LISTEN ON address listen_opts	{
- 			struct sockaddr_in sin4;
- 			struct sockaddr_in6 sin6;
- 
-+			memset(&sin4, 0, sizeof(sin4));
-+			memset(&sin6, 0, sizeof(sin6));
- 			sin4.sin_family = AF_INET;
- 			sin6.sin6_family = AF_INET6;
- #ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
-@@ -144,9 +146,9 @@ main		: LISTEN ON address listen_opts	{
- #endif
- 
- 			if (inet_pton(AF_INET, $3, &sin4.sin_addr) == 1)
--				memcpy(&query_addr4, &sin4, sizeof(struct in_addr));
-+				memcpy(&query_addr4, &sin4, sizeof(struct sockaddr_in));
- 			else if (inet_pton(AF_INET6, $3, &sin6.sin6_addr) == 1)
--				memcpy(&query_addr6, &sin6, sizeof(struct in6_addr));
-+				memcpy(&query_addr6, &sin6, sizeof(struct sockaddr_in6));
- 			else {
- 				yyerror("invalid IPv4 or IPv6 address: %s\n",
- 				    $3);
diff --git a/net/opensips/Makefile b/net/opensips/Makefile
index 626751026864..656a2e62b3b5 100644
--- a/net/opensips/Makefile
+++ b/net/opensips/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=		opensips
 PORTVERSION=		2.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=		net
 MASTER_SITES=		http://opensips.org/pub/opensips/${PORTVERSION}/
 
diff --git a/net/p5-Net-SMPP/pkg-descr b/net/p5-Net-SMPP/pkg-descr
index 5460eb7efe82..ea3898d0abb2 100644
--- a/net/p5-Net-SMPP/pkg-descr
+++ b/net/p5-Net-SMPP/pkg-descr
@@ -1,6 +1,6 @@
 Implements Short Message Peer to Peer protocol, which is frequently used to
 pass short messages between mobile operators implementing short message
-service (SMS). This is applicable to both european GSM and american CDMA/TDMA
+service (SMS). This is applicable to both European GSM and American CDMA/TDMA
 systems.
 
 WWW: http://search.cpan.org/dist/Net-SMPP/
diff --git a/net/quagga/Makefile b/net/quagga/Makefile
index a9a999229d9e..6e6e6ab546b6 100644
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	quagga
 PORTVERSION=	1.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net ipv6
 MASTER_SITES=	SAVANNAH
 
diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile
index 8da237a105c1..39b269edf854 100644
--- a/net/rabbitmq/Makefile
+++ b/net/rabbitmq/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	rabbitmq
-PORTVERSION=	3.6.11
+PORTVERSION=	3.6.12
 CATEGORIES=	net
 MASTER_SITES=	http://www.rabbitmq.com/releases/rabbitmq-server/v${PORTVERSION}/
 DISTNAME=	${PORTNAME}-server-${PORTVERSION}
diff --git a/net/rabbitmq/distinfo b/net/rabbitmq/distinfo
index 36335ea6b511..1b4ec5b66a54 100644
--- a/net/rabbitmq/distinfo
+++ b/net/rabbitmq/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503485780
-SHA256 (rabbitmq-server-3.6.11.tar.xz) = 849cb7109d0744954573022b6981c29213fa474360319de1845f0d84da3f3034
-SIZE (rabbitmq-server-3.6.11.tar.xz) = 1436156
+TIMESTAMP = 1505160341
+SHA256 (rabbitmq-server-3.6.12.tar.xz) = c8e5a8ed5aae6167aa0050f41bd9f26d50eb16efd8abd1a1b0b01fcbccb458b9
+SIZE (rabbitmq-server-3.6.12.tar.xz) = 1437948
diff --git a/net/rubygem-azure-core/Makefile b/net/rubygem-azure-core/Makefile
index 078c6f665d6b..ae0fee970ff8 100644
--- a/net/rubygem-azure-core/Makefile
+++ b/net/rubygem-azure-core/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	azure-core
-PORTVERSION=	0.1.11
+PORTVERSION=	0.1.12
 CATEGORIES=	net rubygems
 MASTER_SITES=	RG
 
diff --git a/net/rubygem-azure-core/distinfo b/net/rubygem-azure-core/distinfo
index 8109c69a6506..c6d646e1dd52 100644
--- a/net/rubygem-azure-core/distinfo
+++ b/net/rubygem-azure-core/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503492008
-SHA256 (rubygem/azure-core-0.1.11.gem) = b88e13d9989ff7e2ba9b6343aad4bdba64ad2c2c91f7e9f2e0a21e5299ceed91
-SIZE (rubygem/azure-core-0.1.11.gem) = 22528
+TIMESTAMP = 1505229719
+SHA256 (rubygem/azure-core-0.1.12.gem) = f5d14c15b3f676e95285f0b455b8043dc044993f03f37307f2b1cb416dd41451
+SIZE (rubygem/azure-core-0.1.12.gem) = 22528
diff --git a/net/rubygem-azure/Makefile b/net/rubygem-azure/Makefile
index 2487897938d3..632306a000a3 100644
--- a/net/rubygem-azure/Makefile
+++ b/net/rubygem-azure/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	azure
-PORTVERSION=	0.7.9
+PORTVERSION=	0.7.10
 CATEGORIES=	net rubygems
 MASTER_SITES=	RG
 
@@ -17,7 +17,7 @@ RUN_DEPENDS=	rubygem-addressable>=2.3:www/rubygem-addressable \
 		rubygem-faraday>=0.9:www/rubygem-faraday \
 		rubygem-faraday_middleware>=0.10:www/rubygem-faraday_middleware \
 		rubygem-mime-types>=1:misc/rubygem-mime-types \
-		rubygem-nokogiri>=1.7:textproc/rubygem-nokogiri \
+		rubygem-nokogiri>=1.6:textproc/rubygem-nokogiri \
 		rubygem-systemu>=2.6:devel/rubygem-systemu \
 		rubygem-thor>=0.19:devel/rubygem-thor
 
diff --git a/net/rubygem-azure/distinfo b/net/rubygem-azure/distinfo
index 06644f957773..b6ae482a8b4d 100644
--- a/net/rubygem-azure/distinfo
+++ b/net/rubygem-azure/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1492694973
-SHA256 (rubygem/azure-0.7.9.gem) = 7be4c6ecc793b982808b264eb7ce9529a4abc6da8dd3275343e9a994d77b241c
-SIZE (rubygem/azure-0.7.9.gem) = 96768
+TIMESTAMP = 1504891841
+SHA256 (rubygem/azure-0.7.10.gem) = 73562416ceb367dd92eb0f3122b76552e86c080ce0bebad4b562c3cb2c48bea7
+SIZE (rubygem/azure-0.7.10.gem) = 96768
diff --git a/net/rubygem-gitaly/Makefile b/net/rubygem-gitaly/Makefile
index 02c3ae7d4321..b87356f1b0ff 100644
--- a/net/rubygem-gitaly/Makefile
+++ b/net/rubygem-gitaly/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gitaly
-PORTVERSION=	0.6.0
+PORTVERSION=	0.8.0
 CATEGORIES=	net rubygems
 MASTER_SITES=	RG
 
@@ -13,8 +13,9 @@ LICENSE_FILE=	${WRKSRC}/ruby/LICENSE.txt
 
 BUILD_DEPENDS=	rubygem-bundler>=1.12:sysutils/rubygem-bundler \
 		rubygem-rake>=10.0:devel/rubygem-rake
-RUN_DEPENDS=	rubygem-google-protobuf>=3.1:devel/rubygem-google-protobuf \
-		rubygem-grpc>=1.0:net/rubygem-grpc
+RUN_DEPENDS=	rubygem-google-protobuf>=3.4.0.2:devel/rubygem-google-protobuf \
+		rubygem-grpc>=1.0:net/rubygem-grpc \
+		gitaly>=0.11.2:devel/gitaly
 
 NO_ARCH=	yes
 USES=		gem
diff --git a/net/rubygem-gitaly/distinfo b/net/rubygem-gitaly/distinfo
index d7d83477950d..94a9826ba46b 100644
--- a/net/rubygem-gitaly/distinfo
+++ b/net/rubygem-gitaly/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499603796
-SHA256 (rubygem/gitaly-0.6.0.gem) = 3373d4606d8409dd7fcd0fa46e35ada402e9f11d3ecebfe44a9a5d1214e013d3
-SIZE (rubygem/gitaly-0.6.0.gem) = 8192
+TIMESTAMP = 1502874279
+SHA256 (rubygem/gitaly-0.8.0.gem) = 512a5921a5974312d81b6cf23dd816bf41c2b079bc1fda4c564aee4e981a3a90
+SIZE (rubygem/gitaly-0.8.0.gem) = 8192
diff --git a/net/skstream/Makefile b/net/skstream/Makefile
index 6ba1f6978622..d75c4bda9824 100644
--- a/net/skstream/Makefile
+++ b/net/skstream/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	skstream
 PORTVERSION=	0.3.9
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net
 MASTER_SITES=	SF/worldforge/${PORTNAME}%20%28network%20lib%29/${PORTVERSION}
 
diff --git a/net/sobby/Makefile b/net/sobby/Makefile
index c8b782bbae80..0fbf361a1260 100644
--- a/net/sobby/Makefile
+++ b/net/sobby/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	sobby
 PORTVERSION=	0.4.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://releases.0x539.de/sobby/
 
diff --git a/net/spoofer/Makefile b/net/spoofer/Makefile
index 69503d795fb5..c6f8b620c121 100644
--- a/net/spoofer/Makefile
+++ b/net/spoofer/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	spoofer
 PORTVERSION=	1.2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	http://www.caida.org/projects/spoofer/downloads/
 
diff --git a/net/tramp/Makefile b/net/tramp/Makefile
index 1bdb8c271f22..aaf306aa4568 100644
--- a/net/tramp/Makefile
+++ b/net/tramp/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	tramp
 PORTVERSION=	2.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net elisp
 MASTER_SITES=	GNU
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/net/uget/Makefile b/net/uget/Makefile
index 9639ca2b8191..981263ca83d1 100644
--- a/net/uget/Makefile
+++ b/net/uget/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	uget
 PORTVERSION=	2.0.9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	SF/urlget/${PORTNAME}%20%28stable%29/${PORTVERSION}
 
diff --git a/net/xpvm/Makefile b/net/xpvm/Makefile
index 4e7923edf1c6..78271ecfbb67 100644
--- a/net/xpvm/Makefile
+++ b/net/xpvm/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xpvm
 PORTVERSION=	1.2.5
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	net parallel
 MASTER_SITES=	NL/pvm3/xpvm
 DISTNAME=	XPVM.src.${PORTVERSION}
@@ -11,6 +11,10 @@ DISTNAME=	XPVM.src.${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphical console and monitor for PVM
 
+DEPRECATED=		This port depends on Tcl/Tk 8.4 , which is no longer\
+			maintained. Please port it to 8.5+
+EXPIRATION_DATE=	2017-10-15
+
 LIB_DEPENDS=	libpvm3.so:net/pvm
 
 USES=		tk:84 tar:tgz
diff --git a/net/yami4/Makefile b/net/yami4/Makefile
index 795ef6095728..fa1ad5e47238 100644
--- a/net/yami4/Makefile
+++ b/net/yami4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	yami4
 PORTVERSION=	1.10.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://www.inspirel.com/yami4/files/
 DISTNAME=	yami4-gpl-1.10.0
diff --git a/net/zerotier/Makefile b/net/zerotier/Makefile
index 34adcafc9192..cc65e8e670dd 100644
--- a/net/zerotier/Makefile
+++ b/net/zerotier/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	zerotier
 PORTVERSION=	1.2.4
+PORTREVISION=	1
 CATEGORIES=	net
 
 MAINTAINER=	dch@skunkwerks.at
diff --git a/news/nget/Makefile b/news/nget/Makefile
index 6c8f7a00b6ce..dbee15eb356b 100644
--- a/news/nget/Makefile
+++ b/news/nget/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	nget
 PORTVERSION=	0.27.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	news
 MASTER_SITES=	SF
 DISTNAME=	nget-${PORTVERSION}+uulib
diff --git a/news/nzbget/Makefile b/news/nzbget/Makefile
index 4563399be0b4..2a15fbdf0074 100644
--- a/news/nzbget/Makefile
+++ b/news/nzbget/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	nzbget
 PORTVERSION=	19.1
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	news
 
diff --git a/palm/jpilot/Makefile b/palm/jpilot/Makefile
index 248bc84e251d..8e07a213465e 100644
--- a/palm/jpilot/Makefile
+++ b/palm/jpilot/Makefile
@@ -5,7 +5,7 @@
 
 PORTNAME=	jpilot
 PORTVERSION=	1.8.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES+=	palm comms
 MASTER_SITES=	http://www.mirrorservice.org/sites/master.us.finkmirrors.net/distfiles/ \
 		http://jpilot.org/
diff --git a/polish/hunspell/Makefile b/polish/hunspell/Makefile
index ac68cb1b91f7..b668deaa4ab0 100644
--- a/polish/hunspell/Makefile
+++ b/polish/hunspell/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	hunspell
-PORTVERSION=	20170824
+PORTVERSION=	20170914
 CATEGORIES=	polish textproc
 MASTER_SITES=	https://sjp.pl/slownik/ort/ \
 		LOCAL/sunpoet/${PORTNAME}
diff --git a/polish/hunspell/distinfo b/polish/hunspell/distinfo
index f0bb7cc767f4..1626fea029cc 100644
--- a/polish/hunspell/distinfo
+++ b/polish/hunspell/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504539945
-SHA256 (hunspell/sjp-myspell-pl-20170824.zip) = c5513ddb6426727c8fd89908072e94ae02530c2ea98a82b966d3991a1183ffcd
-SIZE (hunspell/sjp-myspell-pl-20170824.zip) = 1187711
+TIMESTAMP = 1505418304
+SHA256 (hunspell/sjp-myspell-pl-20170914.zip) = 626da060e2efb1159af08f6a3c53d670cae308cffdb4589cdcc520ea1642dd37
+SIZE (hunspell/sjp-myspell-pl-20170914.zip) = 1187937
diff --git a/polish/kadu/Makefile b/polish/kadu/Makefile
index 9133d99710e7..0cd74f633b03 100644
--- a/polish/kadu/Makefile
+++ b/polish/kadu/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kadu
 PORTVERSION=	4.3
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	polish net-im
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/:kadu \
diff --git a/polish/qnapi/Makefile b/polish/qnapi/Makefile
index 63ade9df73ed..18f109020174 100644
--- a/polish/qnapi/Makefile
+++ b/polish/qnapi/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	qnapi
 PORTVERSION=	0.2.3
+PORTREVISION=	1
 CATEGORIES=	polish multimedia
 
 MAINTAINER=	pawel@FreeBSD.org
diff --git a/ports-mgmt/freebsd-bugzilla-cli/Makefile b/ports-mgmt/freebsd-bugzilla-cli/Makefile
index f6f469a35e9c..713880d83bf4 100644
--- a/ports-mgmt/freebsd-bugzilla-cli/Makefile
+++ b/ports-mgmt/freebsd-bugzilla-cli/Makefile
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	freebsd-bugzilla-cli
-PORTVERSION=	0.15.0
+PORTVERSION=	0.15.1
 CATEGORIES=	ports-mgmt
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Interact with the FreeBSD bugzilla instance
 
 LICENSE=	APACHE20
diff --git a/ports-mgmt/freebsd-bugzilla-cli/distinfo b/ports-mgmt/freebsd-bugzilla-cli/distinfo
index b48c5a19f95d..977675264cce 100644
--- a/ports-mgmt/freebsd-bugzilla-cli/distinfo
+++ b/ports-mgmt/freebsd-bugzilla-cli/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1478612517
-SHA256 (pgollucci-freebsd-bugzilla-cli-0.15.0_GH0.tar.gz) = 594a3b103297fb93a496ff6808380b40e551c5770960c3f892582e0a018f5a37
-SIZE (pgollucci-freebsd-bugzilla-cli-0.15.0_GH0.tar.gz) = 16380
+TIMESTAMP = 1504867792
+SHA256 (pgollucci-freebsd-bugzilla-cli-0.15.1_GH0.tar.gz) = e23dbfd11d9ff7013d411cb8ce8ba6dd0cee4715d2e57ee250fd6e177f1b848d
+SIZE (pgollucci-freebsd-bugzilla-cli-0.15.1_GH0.tar.gz) = 16429
diff --git a/ports-mgmt/octopkg/Makefile b/ports-mgmt/octopkg/Makefile
index 0997f118b745..b9e7373d3b8e 100644
--- a/ports-mgmt/octopkg/Makefile
+++ b/ports-mgmt/octopkg/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octopkg
 PORTVERSION=	0.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	ports-mgmt
 
diff --git a/ports-mgmt/portal/Makefile b/ports-mgmt/portal/Makefile
index d0b1c44b121d..9a1debcceda4 100644
--- a/ports-mgmt/portal/Makefile
+++ b/ports-mgmt/portal/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	portal
 PORTVERSION=	0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ports-mgmt
 
 MAINTAINER=	culot@FreeBSD.org
diff --git a/ports-mgmt/portrac/Makefile b/ports-mgmt/portrac/Makefile
index bb9ffc995e16..c6f21bc22608 100644
--- a/ports-mgmt/portrac/Makefile
+++ b/ports-mgmt/portrac/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	portrac
 PORTVERSION=	0.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	http://e-soul.org/distfiles/ \
 		http://home.e-soul.org/~mgp/distfiles/
diff --git a/ports-mgmt/redports-node/Makefile b/ports-mgmt/redports-node/Makefile
index 42d2f2e97d50..c261bd8cc8aa 100644
--- a/ports-mgmt/redports-node/Makefile
+++ b/ports-mgmt/redports-node/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	ports-mgmt
 MASTER_SITES=	https://api.redports.org/downloads/
 DISTFILES=	${PORTNAME}-${DISTVERSION}.phar ${PORTNAME}-${DISTVERSION}.phar.pubkey
 
-MAINTAINER=	decke@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Redports building node
 
 LICENSE=	BSD2CLAUSE
@@ -16,6 +16,9 @@ RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss \
 		poudriere:ports-mgmt/poudriere \
 		${LOCALBASE}/bin/ccache:devel/ccache
 
+DEPRECATED=	Upstream is dead so port is not useable anymore.
+EXPIRATION_DATE=	2017-09-30
+
 NO_BUILD=	yes
 USE_PHP=	curl hash json openssl pcntl phar
 USE_RC_SUBR=	redportsnode
diff --git a/print/auctex/Makefile b/print/auctex/Makefile
index a87c37870a24..8b88b067cc8d 100644
--- a/print/auctex/Makefile
+++ b/print/auctex/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	auctex
 PORTVERSION=	11.90
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print elisp
 MASTER_SITES=	GNU
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/print/cups-filters/Makefile b/print/cups-filters/Makefile
index fbe8882f2901..d3b5af6b0d56 100644
--- a/print/cups-filters/Makefile
+++ b/print/cups-filters/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	cups-filters
 PORTVERSION=	1.16.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	http://www.openprinting.org/download/cups-filters/
 
diff --git a/print/gribouy/Makefile b/print/gribouy/Makefile
index 24acf787e43e..0c1ac8fc164e 100644
--- a/print/gribouy/Makefile
+++ b/print/gribouy/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gribouy
 PORTVERSION=	0.0.8
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	print gnome
 MASTER_SITES=	LOCAL/bland
 
diff --git a/print/harfbuzz/Makefile b/print/harfbuzz/Makefile
index f00f251ebdf2..7ba7b59fe588 100644
--- a/print/harfbuzz/Makefile
+++ b/print/harfbuzz/Makefile
@@ -2,7 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	harfbuzz
-PORTVERSION=	1.4.8
+PORTVERSION=	1.5.1
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://www.freedesktop.org/software/harfbuzz/release/
 
@@ -21,7 +22,7 @@ CONFIGURE_ARGS=	--with-graphite2 --with-gobject=yes
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
-PLIST_SUB+=	LIBVER=0.10400.8
+PLIST_SUB+=	LIBVER=0.10501.0
 
 HARFBUZZ_SLAVE?=	no
 
diff --git a/print/harfbuzz/distinfo b/print/harfbuzz/distinfo
index 691562f2ac0a..375e0d989fd4 100644
--- a/print/harfbuzz/distinfo
+++ b/print/harfbuzz/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502222624
-SHA256 (harfbuzz-1.4.8.tar.bz2) = ccec4930ff0bb2d0c40aee203075447954b64a8c2695202413cc5e428c907131
-SIZE (harfbuzz-1.4.8.tar.bz2) = 1587622
+TIMESTAMP = 1504634806
+SHA256 (harfbuzz-1.5.1.tar.bz2) = 56838dfdad2729b8866763c82d623354d138a4d99d9ffb710c7d377b5cfc7c51
+SIZE (harfbuzz-1.5.1.tar.bz2) = 1615704
diff --git a/print/harfbuzz/pkg-descr b/print/harfbuzz/pkg-descr
index 0fd7e6e6162c..bc8accc5ef44 100644
--- a/print/harfbuzz/pkg-descr
+++ b/print/harfbuzz/pkg-descr
@@ -1,3 +1,3 @@
 HarfBuzz is an OpenType text shaping engine.
 
-WWW: http://www.freedesktop.org/wiki/Software/HarfBuzz
+WWW: https://www.freedesktop.org/wiki/Software/HarfBuzz/
diff --git a/print/harfbuzz/pkg-plist b/print/harfbuzz/pkg-plist
index 919619b3c6f7..c64a85bea939 100644
--- a/print/harfbuzz/pkg-plist
+++ b/print/harfbuzz/pkg-plist
@@ -60,6 +60,9 @@ share/gtk-doc/html/harfbuzz/api-index-1-1-2.html
 share/gtk-doc/html/harfbuzz/api-index-1-1-3.html
 share/gtk-doc/html/harfbuzz/api-index-1-2-3.html
 share/gtk-doc/html/harfbuzz/api-index-1-3-3.html
+share/gtk-doc/html/harfbuzz/api-index-1-4-2.html
+share/gtk-doc/html/harfbuzz/api-index-1-4-3.html
+share/gtk-doc/html/harfbuzz/api-index-1-5-0.html
 share/gtk-doc/html/harfbuzz/api-index-full.html
 share/gtk-doc/html/harfbuzz/buffers-language-script-and-direction.html
 share/gtk-doc/html/harfbuzz/building.html
diff --git a/print/hyperlatex/Makefile b/print/hyperlatex/Makefile
index 897198fb1e60..89a6a6a7ec18 100644
--- a/print/hyperlatex/Makefile
+++ b/print/hyperlatex/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Hyperlatex
 DISTVERSION=	2.9a
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	print
 MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME:tl}/2.9a
 
diff --git a/print/libgnomeprintmm/Makefile b/print/libgnomeprintmm/Makefile
index b8f5fe19c171..f9f5fe7e5403 100644
--- a/print/libgnomeprintmm/Makefile
+++ b/print/libgnomeprintmm/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libgnomeprintmm
 PORTVERSION=	2.5.1
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	print gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/print/libmspub01/Makefile b/print/libmspub01/Makefile
index 453191cd6bcb..6dedbb5448f5 100644
--- a/print/libmspub01/Makefile
+++ b/print/libmspub01/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	libmspub
 PORTVERSION=	0.1.2
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	print graphics devel
 MASTER_SITES=	http://dev-www.libreoffice.org/src/${PORTNAME}/
 PKGNAMESUFFIX=	01
diff --git a/print/pdfstitch/Makefile b/print/pdfstitch/Makefile
index 5527957a9955..2f3c45ea0f3b 100644
--- a/print/pdfstitch/Makefile
+++ b/print/pdfstitch/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pdfstitch
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.4
+DISTVERSION=	0.5
 CATEGORIES=	print
 
 MAINTAINER=	ports@textmail.me
diff --git a/print/pdfstitch/distinfo b/print/pdfstitch/distinfo
index efbbe7f1469e..312266886f08 100644
--- a/print/pdfstitch/distinfo
+++ b/print/pdfstitch/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502780467
-SHA256 (sur5r-pdfstitch-v0.4_GH0.tar.gz) = 380ce7b4a28e7fa4b9e2027a2bfa46ffe645da07b1ef26dbf1b5d04288148def
-SIZE (sur5r-pdfstitch-v0.4_GH0.tar.gz) = 14606
+TIMESTAMP = 1504512867
+SHA256 (sur5r-pdfstitch-v0.5_GH0.tar.gz) = 4e22d113e9d210f44439150f71ffc761ee6e2cc626e636e2e8a310f26063ebdc
+SIZE (sur5r-pdfstitch-v0.5_GH0.tar.gz) = 14741
diff --git a/print/pdftk/Makefile b/print/pdftk/Makefile
index 8fa00d3a5091..81c2879c4a44 100644
--- a/print/pdftk/Makefile
+++ b/print/pdftk/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pdftk
 PORTVERSION=	2.02
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	print
 MASTER_SITES=	http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/ LOCAL/mat/pdftk
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
diff --git a/print/rubygem-rbpdf/Makefile b/print/rubygem-rbpdf/Makefile
index 6fff91dd9acc..a89a6b734e01 100644
--- a/print/rubygem-rbpdf/Makefile
+++ b/print/rubygem-rbpdf/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	rbpdf
-PORTVERSION=	1.19.2
+PORTVERSION=	1.19.3
 CATEGORIES=	print rubygems
 MASTER_SITES=	RG
 
diff --git a/print/rubygem-rbpdf/distinfo b/print/rubygem-rbpdf/distinfo
index a92f19f92bdf..b1cb2d79eee2 100644
--- a/print/rubygem-rbpdf/distinfo
+++ b/print/rubygem-rbpdf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1491715125
-SHA256 (rubygem/rbpdf-1.19.2.gem) = 9195daf16f92c57b4ba45e77fb435101274c8bbd770e9f933f0dcacc5aca5373
-SIZE (rubygem/rbpdf-1.19.2.gem) = 524800
+TIMESTAMP = 1505127738
+SHA256 (rubygem/rbpdf-1.19.3.gem) = ee84b5ebb5b307a0d617a536295d14d2ba2a6deea79b84dfc7e0879b58c2d92d
+SIZE (rubygem/rbpdf-1.19.3.gem) = 295424
diff --git a/print/texlive-base/Makefile b/print/texlive-base/Makefile
index 2f72b56f3489..e31348df397e 100644
--- a/print/texlive-base/Makefile
+++ b/print/texlive-base/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	texlive
 PORTVERSION=	20150521
-PORTREVISION=	18
+PORTREVISION=	21
 CATEGORIES=	print
 MASTER_SITES=	TEX_CTAN/systems/texlive/Source/
 PKGNAMESUFFIX=	-base
diff --git a/science/Makefile b/science/Makefile
index 6d68b0d83e1a..e18f95ee9ba2 100644
--- a/science/Makefile
+++ b/science/Makefile
@@ -14,6 +14,7 @@
     SUBDIR += R-cran-eco
     SUBDIR += R-cran-epicalc
     SUBDIR += R-cran-etm
+    SUBDIR += R-cran-kernlab
     SUBDIR += R-cran-snow
     SUBDIR += R-cran-som
     SUBDIR += R-cran-udunits2
diff --git a/science/R-cran-kernlab/Makefile b/science/R-cran-kernlab/Makefile
new file mode 100644
index 000000000000..cfaf8b7fa84c
--- /dev/null
+++ b/science/R-cran-kernlab/Makefile
@@ -0,0 +1,16 @@
+# Created by: TAKATSU Tomonari <tota@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	kernlab
+DISTVERSION=	0.9-25
+CATEGORIES=	science
+DISTNAME=	${PORTNAME}_${DISTVERSION}
+
+MAINTAINER=	tota@FreeBSD.org
+COMMENT=	Kernel-Based Machine Learning Lab
+
+LICENSE=	GPLv2
+
+USES=		cran:auto-plist,compiles
+
+.include <bsd.port.mk>
diff --git a/science/R-cran-kernlab/distinfo b/science/R-cran-kernlab/distinfo
new file mode 100644
index 000000000000..3cb033808cb9
--- /dev/null
+++ b/science/R-cran-kernlab/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1505025454
+SHA256 (kernlab_0.9-25.tar.gz) = b9de072754bb03c02c4d6a5ca20f2290fd090de328b55ab334ac0b397ac2ca62
+SIZE (kernlab_0.9-25.tar.gz) = 1170281
diff --git a/science/R-cran-kernlab/pkg-descr b/science/R-cran-kernlab/pkg-descr
new file mode 100644
index 000000000000..5d88394f2cfc
--- /dev/null
+++ b/science/R-cran-kernlab/pkg-descr
@@ -0,0 +1,7 @@
+Kernel-based machine learning methods for classification, regression,
+clustering, novelty detection, quantile regression and dimensionality
+reduction. Among other methods 'kernlab' includes Support Vector
+Machines, Spectral Clustering, Kernel PCA, Gaussian Processes and
+a QP solver.
+
+WWW: https://cran.r-project.org/web/packages/kernlab/
diff --git a/science/cdf/Makefile b/science/cdf/Makefile
index 4e19a6582d94..f882671087a3 100644
--- a/science/cdf/Makefile
+++ b/science/cdf/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cdf3
 PORTVERSION=	3.3.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	science
 MASTER_SITES=	LOCAL/thierry/${PORTNAME} \
 		ftp://cdaweb.gsfc.nasa.gov/pub/cdf/dist/cdf${VER}/unix/
diff --git a/science/cdo/Makefile b/science/cdo/Makefile
index 7660f8e7e1fa..c23b165f8eee 100644
--- a/science/cdo/Makefile
+++ b/science/cdo/Makefile
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	cdo
-PORTVERSION=	1.8.2
+PORTVERSION=	1.9.0
 PORTREVISION=	1
 CATEGORIES=	science
-MASTER_SITES=	https://code.zmaw.de/attachments/download/14686/ \
+MASTER_SITES=	https://code.zmaw.de/attachments/download/15187/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
@@ -35,9 +35,11 @@ CONFIGURE_ARGS=	--disable-data \
 		--with-zlib=/usr
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
+MAKE_JOBS_UNSAFE=	yes
 TEST_TARGET=	check
+USE_CXXSTD=	c++11
 USE_LDCONFIG=	yes
-USES=		execinfo gmake libtool localbase pathfix
+USES=		compiler:c++11-lib execinfo gmake libtool localbase pathfix
 
 CGRIBEX_CONFIGURE_WITH=	cgribex
 CGRIBEX_LIB_DEPENDS=	libcgribex.so:science/cgribex
diff --git a/science/cdo/distinfo b/science/cdo/distinfo
index d254f207a8d6..fa197c3f1c75 100644
--- a/science/cdo/distinfo
+++ b/science/cdo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495463430
-SHA256 (cdo-1.8.2.tar.gz) = 6ca6c1263af2237737728ac937a275f8aa27680507636a6b6320f347c69a369a
-SIZE (cdo-1.8.2.tar.gz) = 9373890
+TIMESTAMP = 1503779403
+SHA256 (cdo-1.9.0.tar.gz) = df367f8c3abf4ab085bcfc61e0205b28a5ecc69b7b83ba398b4d3c874dd69008
+SIZE (cdo-1.9.0.tar.gz) = 9447614
diff --git a/science/cdo/files/patch-src-cdo_pthread.c b/science/cdo/files/patch-src-cdo_pthread.cc
index 3db08949172d..930db89d9583 100644
--- a/science/cdo/files/patch-src-cdo_pthread.c
+++ b/science/cdo/files/patch-src-cdo_pthread.cc
@@ -1,5 +1,5 @@
---- src/cdo_pthread.c.orig	2017-01-19 08:25:24 UTC
-+++ src/cdo_pthread.c
+--- src/cdo_pthread.cc.orig	2017-07-03 08:59:29 UTC
++++ src/cdo_pthread.cc
 @@ -32,8 +32,10 @@ void print_pthread_info()
  {
  #if defined(HAVE_LIBPTHREAD)
diff --git a/science/cdo/files/patch-src-pthread_debug.c b/science/cdo/files/patch-src-pthread_debug.cc
index 9447b5aba3d2..87effb3d2694 100644
--- a/science/cdo/files/patch-src-pthread_debug.c
+++ b/science/cdo/files/patch-src-pthread_debug.cc
@@ -1,5 +1,5 @@
---- src/pthread_debug.c.orig	2016-06-10 08:14:45 UTC
-+++ src/pthread_debug.c
+--- src/pthread_debug.cc.orig	2017-07-03 08:59:29 UTC
++++ src/pthread_debug.cc
 @@ -76,6 +76,7 @@ void print_pthread_attr(const char *call
  }
  
diff --git a/science/cdo/files/patch-src-pthread_debug.h b/science/cdo/files/patch-src-pthread_debug.h
index 7c6565e31156..5875c1a3d8d3 100644
--- a/science/cdo/files/patch-src-pthread_debug.h
+++ b/science/cdo/files/patch-src-pthread_debug.h
@@ -1,7 +1,18 @@
---- src/pthread_debug.h.orig	2016-04-18 08:41:42 UTC
+--- src/pthread_debug.h.orig	2017-06-16 08:43:18 UTC
 +++ src/pthread_debug.h
-@@ -15,8 +15,10 @@ void Pthread_cond_signal(const char *cal
- void Pthread_cond_wait(const char *caller, pthread_cond_t *cond, pthread_mutex_t *mutex);
+@@ -8,15 +8,17 @@ int Pthread_create(const char *caller, p
+ 
+ int Pthread_join(const char *caller, pthread_t th, void **thread_return);
+ 
+-void Pthread_mutex_lock(const char *caller, pthread_mutex_t *mutex);
+-void Pthread_mutex_unlock(const char *caller, pthread_mutex_t *mutex);
++int Pthread_mutex_lock(const char *caller, pthread_mutex_t *mutex);
++int Pthread_mutex_unlock(const char *caller, pthread_mutex_t *mutex);
+ 
+-void Pthread_cond_signal(const char *caller, pthread_cond_t *cond);
+-void Pthread_cond_wait(const char *caller, pthread_cond_t *cond, pthread_mutex_t *mutex);
++int Pthread_cond_signal(const char *caller, pthread_cond_t *cond);
++int Pthread_cond_wait(const char *caller, pthread_cond_t *cond, pthread_mutex_t *mutex);
  
  void print_pthread_attr(const char *caller, pthread_attr_t *attr);
 +#if defined (PTHREAD_MUTEXATTR_CONDATTR)
diff --git a/science/cgnslib/Makefile b/science/cgnslib/Makefile
index d95d0e5e001f..33f156a308c4 100644
--- a/science/cgnslib/Makefile
+++ b/science/cgnslib/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cgnslib
 DISTVERSION=	3.2.1
-PORTREVISION=	9
+PORTREVISION=	10
 PORTEPOCH=	1
 CATEGORIES=	science
 MASTER_SITES=	SF/cgns/${PORTNAME}_${PORTVERSION:R}/
diff --git a/science/clhep/Makefile b/science/clhep/Makefile
index 51a7d47459f1..829090622f7e 100644
--- a/science/clhep/Makefile
+++ b/science/clhep/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	clhep
 PORTVERSION=	2.3.1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science
 MASTER_SITES=	http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/
 
diff --git a/science/dcl/Makefile b/science/dcl/Makefile
index 3f61fdf00387..ed8dd31ede6e 100644
--- a/science/dcl/Makefile
+++ b/science/dcl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dcl
 PORTVERSION=	5.4.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	science graphics
 MASTER_SITES=	http://www.gfd-dennou.org/library/dcl/ \
 		http://dennou-h.gfd-dennou.org/library/dcl/ \
diff --git a/science/dlpoly-classic/Makefile b/science/dlpoly-classic/Makefile
index 7a8c4b21db43..b349ea1dae8d 100644
--- a/science/dlpoly-classic/Makefile
+++ b/science/dlpoly-classic/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dlpoly
 PORTVERSION=	1.8
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	science java
 MASTER_SITES=	http://ccpforge.cse.rl.ac.uk/gf/download/frsrelease/238/2028/
 PKGNAMESUFFIX=	classic
diff --git a/science/fvcom/Makefile b/science/fvcom/Makefile
index 92e12f668613..b48dc125ae53 100644
--- a/science/fvcom/Makefile
+++ b/science/fvcom/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	fvcom
 PORTVERSION=	2.7.1
-PORTREVISION?=	8
+PORTREVISION?=	10
 CATEGORIES=	science
 MASTER_SITES=	http://fvcom.smast.umassd.edu/FVCOM/index.html/
 DISTNAME=	sourcecode1
diff --git a/science/fvm/Makefile b/science/fvm/Makefile
index a32e8dfd02ce..917fea173ffb 100644
--- a/science/fvm/Makefile
+++ b/science/fvm/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	fvm
 PORTVERSION=	0.15.5
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	science parallel
 MASTER_SITES=	http://code-saturne.org/releases/
 
diff --git a/science/getdp/Makefile b/science/getdp/Makefile
index 3f7b9a27c8bc..b1b31816a177 100644
--- a/science/getdp/Makefile
+++ b/science/getdp/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	getdp
 PORTVERSION=	2.11.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 MASTER_SITES=	http://www.geuz.org/getdp/src/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
diff --git a/science/ghemical/Makefile b/science/ghemical/Makefile
index 66b60f67ff6b..3d686002e8fe 100644
--- a/science/ghemical/Makefile
+++ b/science/ghemical/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ghemical
 PORTVERSION=	3.0.0
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	science
 MASTER_SITES=	http://bioinformatics.org/ghemical/download/%SUBDIR%/
 MASTER_SITE_SUBDIR=	release20111012 current
diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile
index a61991f37e5c..7dba7b6dd000 100644
--- a/science/gnudatalanguage/Makefile
+++ b/science/gnudatalanguage/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gnudatalanguage
 DISTVERSION=	0.9.7
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	science lang
 MASTER_SITES=	SF/${PORTNAME}/gdl/${PORTVERSION}
 .if defined(BUILD_PYTHON_MODULE)
diff --git a/science/gromacs/Makefile b/science/gromacs/Makefile
index f9411f48a9f0..7e03b23e7b53 100644
--- a/science/gromacs/Makefile
+++ b/science/gromacs/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gromacs
 PORTVERSION=	5.0.6
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	science
 MASTER_SITES=	ftp://ftp.gromacs.org/pub/gromacs/
 
diff --git a/science/harminv/Makefile b/science/harminv/Makefile
index 491363bc6e83..2c0d68d5b1d2 100644
--- a/science/harminv/Makefile
+++ b/science/harminv/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	harminv
 PORTVERSION=	1.3.1
-PORTREVISION=	9
+PORTREVISION=	11
 CATEGORIES=	science
 MASTER_SITES=	http://ab-initio.mit.edu/harminv/
 
diff --git a/science/hdf/Makefile b/science/hdf/Makefile
index 9deb7cf9efaa..44241c39c031 100644
--- a/science/hdf/Makefile
+++ b/science/hdf/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	hdf
 PORTVERSION=	4.2.11
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	science archivers graphics
 MASTER_SITES=	http://www.hdfgroup.org/ftp/HDF/releases/HDF${PORTVERSION}/src/ \
diff --git a/science/hdf5-18/Makefile b/science/hdf5-18/Makefile
index 14279d3b16a1..841940794408 100644
--- a/science/hdf5-18/Makefile
+++ b/science/hdf5-18/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	hdf5
 PORTVERSION=	1.8.19
+PORTREVISION=	1
 CATEGORIES=	science archivers graphics
 MASTER_SITES=	https://support.hdfgroup.org/ftp/HDF5/current18/src/	\
 		http://support.hdfgroup.org/ftp/HDF5/current18/src/	\
diff --git a/science/hdf5/Makefile b/science/hdf5/Makefile
index 3be62ea1126b..ce7709cf18b5 100644
--- a/science/hdf5/Makefile
+++ b/science/hdf5/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	hdf5
 PORTVERSION=	1.10.1
+PORTREVISION=	1
 CATEGORIES=	science archivers graphics
 MASTER_SITES=	https://www.hdfgroup.org/ftp/HDF5/releases/hdf5-${PORTVERSION:R}/${DISTNAME}/src/ \
 MASTER_SITES=	https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${PORTVERSION:R}/${DISTNAME}/src/ \
diff --git a/science/hypre/Makefile b/science/hypre/Makefile
index d3a47365fa25..81801a579492 100644
--- a/science/hypre/Makefile
+++ b/science/hypre/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	hypre
 DISTVERSION=	2.11.2
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	https://computation.llnl.gov/projects/hypre-scalable-linear-solvers-multigrid-methods/download/
 
diff --git a/science/isaac-cfd/Makefile b/science/isaac-cfd/Makefile
index fd2fc4786d97..390e1b910bee 100644
--- a/science/isaac-cfd/Makefile
+++ b/science/isaac-cfd/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	isaac
 PORTVERSION=	4.2
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	science
 MASTER_SITES=	SF/${PORTNAME}-cfd/${PORTNAME}-cfd/ISAAC%20Version%20${PORTVERSION}
 DISTFILES=	${PORTNAME}src.4_2${EXTRACT_SUFX} ${PORTNAME}mk.4_2${EXTRACT_SUFX}
diff --git a/science/libctl/Makefile b/science/libctl/Makefile
index 864a1ff1db37..f87334a9e8b6 100644
--- a/science/libctl/Makefile
+++ b/science/libctl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libctl
 PORTVERSION=	3.2.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science math
 MASTER_SITES=	http://ab-initio.mit.edu/libctl/
 
diff --git a/science/libgeodecomp/Makefile b/science/libgeodecomp/Makefile
index 3297f5959e4c..bfc3699b5aa6 100644
--- a/science/libgeodecomp/Makefile
+++ b/science/libgeodecomp/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=		libgeodecomp
 PORTVERSION=		0.4.0
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=		science devel
 MASTER_SITES=		http://www.libgeodecomp.org/archive/
 
diff --git a/science/libghemical/Makefile b/science/libghemical/Makefile
index 429f05dc7b93..71a4b9ac46ff 100644
--- a/science/libghemical/Makefile
+++ b/science/libghemical/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libghemical
 PORTVERSION=	3.0.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	science
 MASTER_SITES=	http://bioinformatics.org/ghemical/download/release20111012/	\
 		http://bioinformatics.org/ghemical/download/current/
diff --git a/science/libint/Makefile b/science/libint/Makefile
index 249444af0855..2b1913c32c2b 100644
--- a/science/libint/Makefile
+++ b/science/libint/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	libint
 DISTVERSIONPREFIX=	release-
 DISTVERSION=	1-1-6
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	science
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/science/libxc/Makefile b/science/libxc/Makefile
index 469b80b5503b..ca80011078d5 100644
--- a/science/libxc/Makefile
+++ b/science/libxc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libxc
 PORTVERSION=	3.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science
 MASTER_SITES=	http://www.tddft.org/programs/octopus/download/libxc/
 
diff --git a/science/massxpert/Makefile b/science/massxpert/Makefile
index 491d3a5b9fe5..952272ff8737 100644
--- a/science/massxpert/Makefile
+++ b/science/massxpert/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	massxpert
 PORTVERSION=	3.4.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	science
 MASTER_SITES=	http://download.tuxfamily.org/massxpert/source/
 
diff --git a/science/mbdyn/Makefile b/science/mbdyn/Makefile
index 543f675615e4..5d16ed09c818 100644
--- a/science/mbdyn/Makefile
+++ b/science/mbdyn/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mbdyn
 PORTVERSION=	1.7.2
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	https://www.mbdyn.org/userfiles/downloads/
 
diff --git a/science/meep/Makefile b/science/meep/Makefile
index 886fdc97af64..1d6cde080109 100644
--- a/science/meep/Makefile
+++ b/science/meep/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	meep
 PORTVERSION=	1.2.1
-PORTREVISION=	7
+PORTREVISION=	9
 CATEGORIES=	science
 MASTER_SITES=	http://ab-initio.mit.edu/meep/
 
diff --git a/science/mpb/Makefile b/science/mpb/Makefile
index bb6a3982c693..5e6e96fe9f12 100644
--- a/science/mpb/Makefile
+++ b/science/mpb/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mpb
 PORTVERSION=	1.5
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	science
 MASTER_SITES=	http://ab-initio.mit.edu/mpb/
 
diff --git a/science/mpqc/Makefile b/science/mpqc/Makefile
index 2f7180056efa..84f3665bbf08 100644
--- a/science/mpqc/Makefile
+++ b/science/mpqc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mpqc
 PORTVERSION=	2.3.1
-PORTREVISION=	29
+PORTREVISION=	30
 CATEGORIES=	science parallel
 MASTER_SITES=	SF
 
diff --git a/science/ncs/Makefile b/science/ncs/Makefile
index 620a04e68578..a4d0bba911d5 100644
--- a/science/ncs/Makefile
+++ b/science/ncs/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ncs
 PORTVERSION=	2.0.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science parallel
 MASTER_SITES=	http://code-saturne.org/releases/
 
diff --git a/science/netcdf-fortran/Makefile b/science/netcdf-fortran/Makefile
index 4915ea29708e..b5ebc3376f46 100644
--- a/science/netcdf-fortran/Makefile
+++ b/science/netcdf-fortran/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	netcdf-fortran
 PORTVERSION=	4.4.4
-PORTREVISION=	2
+PORTREVISION=	3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	science
 
diff --git a/science/openkim/Makefile b/science/openkim/Makefile
index 2535a011abc6..e82142798f5d 100644
--- a/science/openkim/Makefile
+++ b/science/openkim/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	openkim
 PORTVERSION=	1.1.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	science
 MASTER_SITES=	http://s3.openkim.org/openkim-api/
 DISTNAME=	${PORTNAME}-api-v${PORTVERSION}
diff --git a/science/pnetcdf/Makefile b/science/pnetcdf/Makefile
index 4eade2321451..0768463709ac 100644
--- a/science/pnetcdf/Makefile
+++ b/science/pnetcdf/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pnetcdf
 PORTVERSION=	1.8.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science parallel
 MASTER_SITES=	http://cucis.ece.northwestern.edu/projects/PnetCDF/Release/ \
 		LOCAL/sunpoet
diff --git a/science/psychopy/Makefile b/science/psychopy/Makefile
index 52fa350a263d..61cfe3f21eae 100644
--- a/science/psychopy/Makefile
+++ b/science/psychopy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	psychopy
 PORTVERSION=	1.85.1
+PORTREVISION=	1
 CATEGORIES=	science python
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/science/py-cdo/Makefile b/science/py-cdo/Makefile
index e7f57719b25b..bfb470acfd6b 100644
--- a/science/py-cdo/Makefile
+++ b/science/py-cdo/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cdo
-PORTVERSION=	1.3.3
+PORTVERSION=	1.3.4
 CATEGORIES=	science python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/science/py-cdo/distinfo b/science/py-cdo/distinfo
index edbaf31c9011..bf428aac2045 100644
--- a/science/py-cdo/distinfo
+++ b/science/py-cdo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1488010797
-SHA256 (cdo-1.3.3.tar.gz) = 33653e582a8e62df2da9c8be2832618a85e20dc59ef92db53540a1740f0b387e
-SIZE (cdo-1.3.3.tar.gz) = 11840
+TIMESTAMP = 1504799652
+SHA256 (cdo-1.3.4.tar.gz) = 2f086a4141f8448947ebcd11532faad42a5836d57b63edf3e1f054ea6feab289
+SIZE (cdo-1.3.4.tar.gz) = 13500
diff --git a/science/py-obspy/Makefile b/science/py-obspy/Makefile
index 8fe8efd13d1a..e8d13f2be6b6 100644
--- a/science/py-obspy/Makefile
+++ b/science/py-obspy/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	obspy
 PORTVERSION=	1.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/science/py-scikit-learn/Makefile b/science/py-scikit-learn/Makefile
index e6e2851be1ae..e70b4428af35 100644
--- a/science/py-scikit-learn/Makefile
+++ b/science/py-scikit-learn/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	scikit-learn
 PORTVERSION=	0.17
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/science/py-scikit-sparse/Makefile b/science/py-scikit-sparse/Makefile
index fb51989efb4d..19fee0e164f8 100644
--- a/science/py-scikit-sparse/Makefile
+++ b/science/py-scikit-sparse/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	scikit-sparse
 PORTVERSION=	0.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	science python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/science/py-scipy/Makefile b/science/py-scipy/Makefile
index 782b0deabbea..8c2d7fe381b4 100644
--- a/science/py-scipy/Makefile
+++ b/science/py-scipy/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	scipy
 PORTVERSION=	0.19.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science python
 MASTER_SITES=	http://docs.scipy.org/doc/${DISTNAME}/:doc \
 		CHEESESHOP:source \
diff --git a/science/rubygem-cdo/Makefile b/science/rubygem-cdo/Makefile
index 8c3ab8b864c3..5939bffbb7c3 100644
--- a/science/rubygem-cdo/Makefile
+++ b/science/rubygem-cdo/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cdo
-PORTVERSION=	1.3.3
+PORTVERSION=	1.3.4
 CATEGORIES=	science rubygems
 MASTER_SITES=	RG
 
diff --git a/science/rubygem-cdo/distinfo b/science/rubygem-cdo/distinfo
index fd36eb818b9a..4653239e7c6b 100644
--- a/science/rubygem-cdo/distinfo
+++ b/science/rubygem-cdo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1488010802
-SHA256 (rubygem/cdo-1.3.3.gem) = bfbb0f4864ca8623ef95f6c04baa777b510a79d3b2646215c02ceed81d8e2173
-SIZE (rubygem/cdo-1.3.3.gem) = 22528
+TIMESTAMP = 1504799659
+SHA256 (rubygem/cdo-1.3.4.gem) = f4e88c83f8408b17df121999934fd3912d24a362ae9db841f8ec751b9fb503c1
+SIZE (rubygem/cdo-1.3.4.gem) = 23040
diff --git a/science/silo/Makefile b/science/silo/Makefile
index dca2463f0602..4c8bdc4caab7 100644
--- a/science/silo/Makefile
+++ b/science/silo/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	silo
 PORTVERSION=	4.10.2
-PORTREVISION=	4
+PORTREVISION=	5
 DISTVERSIONSUFFIX=	-bsd
 CATEGORIES=	science
 MASTER_SITES=	http://wci.llnl.gov/content/assets/docs/simulation/computer-codes/${PORTNAME}/silo-${PORTVERSION}/
diff --git a/science/v_sim/Makefile b/science/v_sim/Makefile
index 422ddc3b9ece..5ec4f09fce6c 100644
--- a/science/v_sim/Makefile
+++ b/science/v_sim/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	v_sim
 PORTVERSION=	3.7.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	science
 MASTER_SITES=	http://inac.cea.fr/L_Sim/V_Sim/download/
 
diff --git a/security/1password-client/Makefile b/security/1password-client/Makefile
new file mode 100644
index 000000000000..68705df8ad74
--- /dev/null
+++ b/security/1password-client/Makefile
@@ -0,0 +1,40 @@
+# Created by: Adam Weinberger <adamw@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	1password-client
+PORTVERSION=	0.1.1
+CATEGORIES=	security
+MASTER_SITES=	https://cache.agilebits.com/dist/1P/op/pkg/v${PORTVERSION}/
+
+MAINTAINER=	adamw@FreeBSD.org
+COMMENT=	1Password CLI client
+
+ONLY_FOR_ARCHS=	amd64 arm i386
+
+USES=		zip
+NO_WRKSUBDIR=	yes
+NO_BUILD=	yes
+
+PLIST_FILES=	bin/op
+CONFLICTS_INSTALL=	security/op
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/op ${STAGEDIR}${PREFIX}/bin
+
+.include <bsd.port.pre.mk>
+
+.if   ${ARCH} == "amd64"
+DISTNAME=	op_freebsd_amd64_v${PORTVERSION}
+.elif ${ARCH} == "aarch64"
+DISTNAME=	op_freebsd_arm_v${PORTVERSION}
+.elif ${ARCH} == "i386"
+DISTNAME=	op_freebsd_386_v${PORTVERSION}
+.endif
+
+.if ${.TARGETS} == "makesum"
+DISTFILES=	op_freebsd_amd64_v${PORTVERSION}${EXTRACT_SUFX} \
+		op_freebsd_arm_v${PORTVERSION}${EXTRACT_SUFX} \
+		op_freebsd_386_v${PORTVERSION}${EXTRACT_SUFX}
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/security/1password-client/distinfo b/security/1password-client/distinfo
new file mode 100644
index 000000000000..f0b85b89d16d
--- /dev/null
+++ b/security/1password-client/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1505416917
+SHA256 (op_freebsd_amd64_v0.1.1.zip) = e2a89e2a1d6040eff22a9b1ea347a49354fcc20ffa0b92b35617dfc1e92229df
+SIZE (op_freebsd_amd64_v0.1.1.zip) = 2190494
+SHA256 (op_freebsd_arm_v0.1.1.zip) = e55c9c340ca81e51206eefa96e91c92335a9b6287a343568a83bfd09598d855b
+SIZE (op_freebsd_arm_v0.1.1.zip) = 2043540
+SHA256 (op_freebsd_386_v0.1.1.zip) = 9819f73fb0929a1804b77544f6420ea90ea8d2d9e4674a899a77cf99a271dda4
+SIZE (op_freebsd_386_v0.1.1.zip) = 2028919
diff --git a/security/1password-client/pkg-descr b/security/1password-client/pkg-descr
new file mode 100644
index 000000000000..2cafee44ef3a
--- /dev/null
+++ b/security/1password-client/pkg-descr
@@ -0,0 +1,4 @@
+This is a command-line interface to the 1Password password management
+service.
+
+WWW: https://support.1password.com/command-line-getting-started/
diff --git a/security/Makefile b/security/Makefile
index 711798474ed4..9b6c542ebd18 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -4,6 +4,7 @@
     COMMENT = Security tools
 
     SUBDIR += 0d1n
+    SUBDIR += 1password-client
     SUBDIR += ADMsmb
     SUBDIR += ADMsnmp
     SUBDIR += R-cran-ROAuth
@@ -79,7 +80,6 @@
     SUBDIR += clamav
     SUBDIR += clamav-milter
     SUBDIR += clamav-unofficial-sigs
-    SUBDIR += clambc
     SUBDIR += clamcour
     SUBDIR += clamd-stream-client
     SUBDIR += clamfs
@@ -181,8 +181,8 @@
     SUBDIR += gnupg20
     SUBDIR += gnupg22
     SUBDIR += gnutls
-    SUBDIR += go.crypto
     SUBDIR += go-cve-dictionary
+    SUBDIR += go.crypto
     SUBDIR += goptlib
     SUBDIR += gorilla
     SUBDIR += govpn
@@ -926,6 +926,7 @@
     SUBDIR += py-pow
     SUBDIR += py-pyaes
     SUBDIR += py-pyaff4
+    SUBDIR += py-pyaxo
     SUBDIR += py-pyclamd
     SUBDIR += py-pycrypto
     SUBDIR += py-pycryptodome
@@ -964,6 +965,7 @@
     SUBDIR += py-tuf
     SUBDIR += py-twistedConch
     SUBDIR += py-twofish
+    SUBDIR += py-txtorcon
     SUBDIR += py-virustotal-api
     SUBDIR += py-volatility
     SUBDIR += py-vulndb
diff --git a/security/R-cran-openssl/Makefile b/security/R-cran-openssl/Makefile
index f20790c9a19e..adb9c5f742a7 100644
--- a/security/R-cran-openssl/Makefile
+++ b/security/R-cran-openssl/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	openssl
-PORTVERSION=	0.9.6
+PORTVERSION=	0.9.7
 CATEGORIES=	security
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
diff --git a/security/R-cran-openssl/distinfo b/security/R-cran-openssl/distinfo
index a823d8a4e9ca..8be318518f62 100644
--- a/security/R-cran-openssl/distinfo
+++ b/security/R-cran-openssl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1483162512
-SHA256 (openssl_0.9.6.tar.gz) = 6dd6d1cade4004962d516ad761fff0812beec0232318b385d286761423a5dc39
-SIZE (openssl_0.9.6.tar.gz) = 1239339
+TIMESTAMP = 1504832546
+SHA256 (openssl_0.9.7.tar.gz) = 697d9e86f99270163744538dc3dc4d19d00af89a8570a1d304b110e1d2650e9d
+SIZE (openssl_0.9.7.tar.gz) = 1243577
diff --git a/security/acme.sh/Makefile b/security/acme.sh/Makefile
index f95f03fce78b..ae8367b5a19b 100644
--- a/security/acme.sh/Makefile
+++ b/security/acme.sh/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	acme.sh
 PORTVERSION=	2.7.4
+PORTREVISION=	1
 CATEGORIES=	security
 
 MAINTAINER=	dvl@FreeBSD.org
diff --git a/security/acme.sh/files/pkg-message.in b/security/acme.sh/files/pkg-message.in
index 55c67e8b571d..65228ba5c30a 100644
--- a/security/acme.sh/files/pkg-message.in
+++ b/security/acme.sh/files/pkg-message.in
@@ -16,4 +16,17 @@ included are the deploy scripts.
 A newsyslog.conf sample file is provided at %%EXAMPLESDIR%%/acme.sh
 and you could create a symlink from that to %%PREFIX%%/etc/newsyslog.conf.d/
 
+Your sample cronjob looks like this:
+
+############################################################################
+$ sudo crontab -l -u acme
+# use /bin/sh to run commands, overriding the default set by cron
+SHELL=/bin/sh
+# mail any output to here, no matter whose crontab this is
+MAILTO=dan@example.org
+
+7 22 * * * /usr/local/sbin/acme.sh --cron --home /var/db/acme/.acme.sh > /dev/null
+############################################################################
+
+Change x & y to some minute and hour of the day.
 
diff --git a/security/arpCounterattack/Makefile b/security/arpCounterattack/Makefile
index 93b67898de10..d3b395e9151d 100644
--- a/security/arpCounterattack/Makefile
+++ b/security/arpCounterattack/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	arpCounterattack
 PORTVERSION=	1.2.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security
 MASTER_SITES=	http://isis.poly.edu/~bk/${PORTNAME}/ \
 		http://bk.macroblock.net/${PORTNAME}/
diff --git a/security/bro/Makefile b/security/bro/Makefile
index 7ea4748b897f..50b0281fd3c7 100644
--- a/security/bro/Makefile
+++ b/security/bro/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	bro
 PORTVERSION=	2.5.1
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	https://www.bro.org/downloads/:source1 \
 		https://codeload.github.com/${GH_ACCOUNT}/${GH_PROJECT}/tar.gz/${PORTVERSION2}?dummy=/:source2
diff --git a/security/bruteforceblocker/pkg-descr b/security/bruteforceblocker/pkg-descr
index d4940134e94b..09c6b646811a 100644
--- a/security/bruteforceblocker/pkg-descr
+++ b/security/bruteforceblocker/pkg-descr
@@ -1,11 +1,11 @@
-BruteForceBlocker is a perl script, that works along with pf - OpenBSD's
-firewall (Which is also available on FreeBSD since version 5.2 is out).
-It's main purpose is to block SSH bruteforce attacks via firewall.
+BruteForceBlocker is a Perl script that works along with pf - OpenBSD's
+firewall (which is also available on FreeBSD since version 5.2 is out).
+Its main purpose is to block SSH bruteforce attacks via firewall.
 When this script is running, it checks sshd logs from syslog and looks
-for Failed Login attempts - mostly some annoying script attacks, and
+for failed login attempts - mostly some annoying script attacks, and
 counts number of such attempts. When given IP reaches configured limit
 of fails, script puts this IP to the pf's table and blocks any further
-traffic to the that box from given IP (This also depends on
+traffic to the that box from given IP (this also depends on
 configuration done in pf.conf).
 
 WWW: http://danger.rulez.sk/projects/bruteforceblocker/
diff --git a/security/ca_root_nss/Makefile b/security/ca_root_nss/Makefile
index f46d21e6b9d6..b654baf858c8 100644
--- a/security/ca_root_nss/Makefile
+++ b/security/ca_root_nss/Makefile
@@ -32,7 +32,7 @@ PLIST_SUB+=	CERTDIR=${CERTDIR}
 # !!!  Please DO NOT submit patches for new version until it has !!!
 # !!!  been committed there first.                               !!!
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-VERSION_NSS=	3.32
+VERSION_NSS=	3.32.1
 #NSS_SUFFIX=	-with-ckbi-1.98
 CERTDATA_TXT_PATH=	nss-${VERSION_NSS}/nss/lib/ckfw/builtins/certdata.txt
 BUNDLE_PROCESSOR=	MAca-bundle.pl
diff --git a/security/ca_root_nss/distinfo b/security/ca_root_nss/distinfo
index 0c282210efff..89d3354d3959 100644
--- a/security/ca_root_nss/distinfo
+++ b/security/ca_root_nss/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501164572
-SHA256 (nss-3.32.tar.gz) = 35c6f381cc96bb25e4f924469f6ba3e57b3a16e0c2fb7e295a284a00d57ed335
-SIZE (nss-3.32.tar.gz) = 9493574
+TIMESTAMP = 1505146642
+SHA256 (nss-3.32.1.tar.gz) = 4de59ca7f5bf4a56fbcfdbb4a054f254ba9f408f56476957404a091048624652
+SIZE (nss-3.32.1.tar.gz) = 9494609
diff --git a/security/certificate-transparency/Makefile b/security/certificate-transparency/Makefile
index 4df93a823183..43b3728ca80a 100644
--- a/security/certificate-transparency/Makefile
+++ b/security/certificate-transparency/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	certificate-transparency
 PORTVERSION=	20161015
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	security
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/security/cl-md5-sbcl/Makefile b/security/cl-md5-sbcl/Makefile
index 2830d9346724..fefb5d52c8e2 100644
--- a/security/cl-md5-sbcl/Makefile
+++ b/security/cl-md5-sbcl/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	md5
 PORTVERSION=	1.8.5
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	security lisp
 PKGNAMEPREFIX=	cl-
 DISTFILES=	# none
diff --git a/security/clambc/Makefile b/security/clambc/Makefile
deleted file mode 100644
index 5fa27bdd12c0..000000000000
--- a/security/clambc/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# Created by: Ryan Steinmetz <zi@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	clambc
-DISTVERSION=	0.98.5rc1
-PORTREVISION=	3
-CATEGORIES=	security
-MASTER_SITES=	SF/clamav/${PORTNAME:tl}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Bytecode signature compiler for ClamAV
-
-LICENSE=	GPLv2
-
-DEPRECATED=	Practically unmaintained, featuring issues elsewhere solved 6 years ago
-EXPIRATION_DATE=2017-09-13
-
-NOT_FOR_ARCHS=		aarch64
-NOT_FOR_ARCHS_REASON=	fails to configure: error: Can not set target to build
-
-USES=		gmake libtool perl5
-ALL_TARGET=	clambc-only
-GNU_CONFIGURE=	yes
-CONFIGURE_OUTSOURCE=	yes
-USE_GCC=	5	# fails to build with GCC 6+
-USE_LDCONFIG=	yes
-USE_PERL5=	build
-CONFIGURE_SCRIPT=llvm/configure
-CONFIGURE_ARGS=	--enable-optimized --enable-targets=host-only \
-		--disable-bindings --enable-bindings=none
-
-WRKSRC=		${WRKDIR}/clamav-bytecode-compiler-${DISTNAME}
-
-MAKE_JOBS_UNSAFE=	yes
-
-do-install:
-	@${MKDIR} ${STAGEDIR}${DATADIR}/include/
-	@${RM} ${WRKSRC}/clang/lib/Headers/CMakeLists.txt \
-		${WRKSRC}/clang/lib/Headers/Makefile
-	(cd ${WRKSRC}/clang/lib/Headers/ && ${COPYTREE_SHARE} . \
-		${STAGEDIR}${DATADIR}/include/)
-	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/Release/bin/clambc-compiler \
-		${STAGEDIR}${PREFIX}/bin/
-
-.include <bsd.port.mk>
diff --git a/security/clambc/distinfo b/security/clambc/distinfo
deleted file mode 100644
index 0a3783083498..000000000000
--- a/security/clambc/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (clambc-0.98.5rc1.tar.gz) = bed439949f4259791c80d069ea58c97637bdfaefe352dd0d8f27eb9e2df9b491
-SIZE (clambc-0.98.5rc1.tar.gz) = 17867376
diff --git a/security/clambc/files/patch-clang_lib_Driver_ToolChains.cpp b/security/clambc/files/patch-clang_lib_Driver_ToolChains.cpp
deleted file mode 100644
index 9aac0d7c3f9e..000000000000
--- a/security/clambc/files/patch-clang_lib_Driver_ToolChains.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- clang/lib/Driver/ToolChains.cpp.orig	2014-11-10 18:04:47 UTC
-+++ clang/lib/Driver/ToolChains.cpp
-@@ -895,7 +895,7 @@ Tool &AuroraUX::SelectTool(const Compila
- 
- Linux::Linux(const HostInfo &Host, const llvm::Triple& Triple)
-   : Generic_GCC(Host, Triple) {
--  getFilePaths().push_back(getDriver().Dir + "/../lib/clang/1.0/");
-+  getFilePaths().push_back(getDriver().Dir + "/../share/clambc/");
-   getFilePaths().push_back("/lib/");
-   getFilePaths().push_back("/usr/lib/");
- 
diff --git a/security/clambc/files/patch-clang_lib_Frontend_CompilerInvocation.cpp b/security/clambc/files/patch-clang_lib_Frontend_CompilerInvocation.cpp
deleted file mode 100644
index 6e1dbfa85c82..000000000000
--- a/security/clambc/files/patch-clang_lib_Frontend_CompilerInvocation.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- clang/lib/Frontend/CompilerInvocation.cpp.orig	2014-11-10 18:04:47 UTC
-+++ clang/lib/Frontend/CompilerInvocation.cpp
-@@ -993,9 +993,8 @@ std::string CompilerInvocation::GetResourcesPath(const char *Argv0,
-     P.eraseComponent();  // Remove /bin   from foo/bin
- 
-     // Get foo/lib/clang/<version>/include
--    P.appendComponent("lib");
--    P.appendComponent("clang");
--    P.appendComponent(CLANG_VERSION_STRING);
-+    P.appendComponent("share");
-+    P.appendComponent("clambc");
-   }
- 
-   return P.str();
diff --git a/security/clambc/files/patch-clang_lib_Headers_CMakeLists.txt b/security/clambc/files/patch-clang_lib_Headers_CMakeLists.txt
deleted file mode 100644
index fedd33c13121..000000000000
--- a/security/clambc/files/patch-clang_lib_Headers_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- clang/lib/Headers/CMakeLists.txt.orig	2014-11-10 18:04:47 UTC
-+++ clang/lib/Headers/CMakeLists.txt
-@@ -17,7 +17,7 @@ set(files
- if (MSVC_IDE OR XCODE)
-   set(output_dir ${LLVM_BINARY_DIR}/bin/lib/clang/${CLANG_VERSION}/include)
- else ()
--  set(output_dir ${LLVM_BINARY_DIR}/lib/clang/${CLANG_VERSION}/include)
-+  set(output_dir ${LLVM_BINARY_DIR}/share/clambc)
- endif ()
- 
- 
diff --git a/security/clambc/files/patch-clang_lib_Headers_Makefile b/security/clambc/files/patch-clang_lib_Headers_Makefile
deleted file mode 100644
index 7947f673f196..000000000000
--- a/security/clambc/files/patch-clang_lib_Headers_Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
---- clang/lib/Headers/Makefile.orig	2014-11-10 18:04:47 UTC
-+++ clang/lib/Headers/Makefile
-@@ -12,7 +12,7 @@ include $(LEVEL)/Makefile.common
- 
- CLANG_VERSION := $(shell cat $(PROJ_SRC_DIR)/../../VER)
- 
--HeaderDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION)/include
-+HeaderDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/share/clambc
- 
- HEADERS := $(notdir $(wildcard $(PROJ_SRC_DIR)/*.h))
- 
-@@ -26,7 +26,7 @@ $(OBJHEADERS): $(HeaderDir)/%.h: $(PROJ_SRC_DIR)/%.h $(HeaderDir)/.dir
- # Hook into the standard Makefile rules.
- all-local:: $(OBJHEADERS)
- 
--PROJ_headers := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(CLANG_VERSION)/include
-+PROJ_headers := $(DESTDIR)$(PROJ_prefix)/share/clambc
- 
- INSTHEADERS := $(addprefix $(PROJ_headers)/, $(HEADERS))
- 
diff --git a/security/clambc/files/patch-clang_lib_Runtime_Makefile b/security/clambc/files/patch-clang_lib_Runtime_Makefile
deleted file mode 100644
index 3f5fe559e68b..000000000000
--- a/security/clambc/files/patch-clang_lib_Runtime_Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
---- clang/lib/Runtime/Makefile.orig	2014-11-10 18:04:47 UTC
-+++ clang/lib/Runtime/Makefile
-@@ -17,8 +17,8 @@ LEVEL = ../../../..
- include $(LEVEL)/Makefile.common
- 
- CLANG_VERSION := $(shell cat $(PROJ_SRC_DIR)/../../VER)
--ResourceDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION)
--PROJ_resources := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(CLANG_VERSION)
-+ResourceDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/share/clambc
-+PROJ_resources := $(DESTDIR)$(PROJ_prefix)/share/clambc
- 
- ResourceLibDir := $(ResourceDir)/lib
- PROJ_resources_lib := $(PROJ_resources)/lib
diff --git a/security/clambc/files/patch-clang_tools_CIndex_CIndexer.cpp b/security/clambc/files/patch-clang_tools_CIndex_CIndexer.cpp
deleted file mode 100644
index 9bee7ff31d2a..000000000000
--- a/security/clambc/files/patch-clang_tools_CIndex_CIndexer.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- clang/tools/CIndex/CIndexer.cpp.orig	2014-11-10 18:04:47 UTC
-+++ clang/tools/CIndex/CIndexer.cpp
-@@ -87,9 +87,8 @@ std::string CIndexer::getClangResourcesPath() {
-     P.eraseComponent();  // Remove /bin   from foo/bin
- 
-     // Get foo/lib/clang/<version>/include
--    P.appendComponent("lib");
--    P.appendComponent("clang");
--    P.appendComponent(CLANG_VERSION_STRING);
-+    P.appendComponent("local");
-+    P.appendComponent("clambc");
-   }
- 
-   return P.str();
diff --git a/security/clambc/files/patch-docs_user_building.tex b/security/clambc/files/patch-docs_user_building.tex
deleted file mode 100644
index a4910b66b94a..000000000000
--- a/security/clambc/files/patch-docs_user_building.tex
+++ /dev/null
@@ -1,20 +0,0 @@
---- docs/user/building.tex.orig	2014-11-10 18:04:47 UTC
-+++ docs/user/building.tex
-@@ -96,7 +96,7 @@ $ make install-clambc -j8
- \verb+$PREFIX/bin/clambc-compiler+
- \item  ClamAV bytecode header files:
- \begin{verbatim}
--$PREFIX/lib/clang/1.1/include:
-+$PREFIX/share/clambc:
- bcfeatures.h
- bytecode_{api_decl.c,api,disasm,execs,features}.h
- bytecode.h
-@@ -104,7 +104,7 @@ bytecode_{local,pe,types}.h
- \end{verbatim}
- \item clang compiler (with ClamAV bytecode backend) compiler include files:
- \begin{verbatim}
--$PREFIX/lib/clang/1.1/include:
-+$PREFIX/share/clambc:
- emmintrin.h
- float.h
- iso646.h
diff --git a/security/clambc/files/patch-docs_user_html_clambc-user.html b/security/clambc/files/patch-docs_user_html_clambc-user.html
deleted file mode 100644
index 2ac586504795..000000000000
--- a/security/clambc/files/patch-docs_user_html_clambc-user.html
+++ /dev/null
@@ -1,11 +0,0 @@
---- docs/user/html/clambc-user.html.orig	2014-11-10 18:04:47 UTC
-+++ docs/user/html/clambc-user.html
-@@ -233,7 +233,7 @@ class="ec-lmtt-10">$PREFIX/bin/clambc-compiler</span></span></span>
- 
-                                                                                 
-      <div class="verbatim" id="verbatim-5">
--     $PREFIX/lib/clang/1.1/include:
-+     $PREFIX/share/clambc:
-      &#x00A0;<br />bcfeatures.h
-      &#x00A0;<br />bytecode_{api_decl.c,api,disasm,execs,features}.h
-      &#x00A0;<br />bytecode.h
diff --git a/security/clambc/pkg-descr b/security/clambc/pkg-descr
deleted file mode 100644
index 4c14fdd82185..000000000000
--- a/security/clambc/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-The ClamAV bytecode compiler allows users to build their own bytecode
-signatures for use with ClamAV.
-
-WWW: https://www.clamav.net/
diff --git a/security/clambc/pkg-plist b/security/clambc/pkg-plist
deleted file mode 100644
index b7a3f2fd13dc..000000000000
--- a/security/clambc/pkg-plist
+++ /dev/null
@@ -1,28 +0,0 @@
-bin/clambc-compiler
-%%DATADIR%%/include/bcfeatures.h
-%%DATADIR%%/include/bytecode.h
-%%DATADIR%%/include/bytecode_api.h
-%%DATADIR%%/include/bytecode_api_decl.c.h
-%%DATADIR%%/include/bytecode_detect.h
-%%DATADIR%%/include/bytecode_disasm.h
-%%DATADIR%%/include/bytecode_execs.h
-%%DATADIR%%/include/bytecode_features.h
-%%DATADIR%%/include/bytecode_ilog.h
-%%DATADIR%%/include/bytecode_local.h
-%%DATADIR%%/include/bytecode_pe.h
-%%DATADIR%%/include/bytecode_types.h
-%%DATADIR%%/include/emmintrin.h
-%%DATADIR%%/include/float.h
-%%DATADIR%%/include/iso646.h
-%%DATADIR%%/include/limits.h
-%%DATADIR%%/include/mm_malloc.h
-%%DATADIR%%/include/mmintrin.h
-%%DATADIR%%/include/pmmintrin.h
-%%DATADIR%%/include/smmintrin.h
-%%DATADIR%%/include/stdarg.h
-%%DATADIR%%/include/stdbool.h
-%%DATADIR%%/include/stddef.h
-%%DATADIR%%/include/stdint.h
-%%DATADIR%%/include/tgmath.h
-%%DATADIR%%/include/tmmintrin.h
-%%DATADIR%%/include/xmmintrin.h
diff --git a/security/cryptopp/Makefile b/security/cryptopp/Makefile
index fbda34714d94..dc1dd4b42e64 100644
--- a/security/cryptopp/Makefile
+++ b/security/cryptopp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		cryptopp
 PORTVERSION=		5.6.5
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=		security
 MASTER_SITES=		http://www.cryptopp.com/
 DISTNAME=		cryptopp${PORTVERSION:S/.//g}
diff --git a/security/fragroute/Makefile b/security/fragroute/Makefile
index 3d0a4a3ccab1..3561cfc19680 100644
--- a/security/fragroute/Makefile
+++ b/security/fragroute/Makefile
@@ -12,20 +12,21 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool for intercepting, modifying, and rewriting egress traffic
 
 LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libdnet.so:net/libdnet \
 		libevent.so:devel/libevent
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--with-libdnet=${LOCALBASE} \
-			--with-libevent=${LOCALBASE} --with-pcap
+CONFIGURE_ARGS=	--with-libdnet=${LOCALBASE} \
+		--with-libevent=${LOCALBASE} --with-pcap
 
 SCRIPTS=	README.snort base-1 frag-1 frag-2 frag-3 frag-4 frag-5 \
-	frag-6 frag-7-unix frag-7-win32 ins-2 ins-3 tcbc-2 tcp-3 tcp-5 \
-	tcp-7 tcp-9
+		frag-6 frag-7-unix frag-7-win32 ins-2 ins-3 tcbc-2 tcp-3 \
+		tcp-5 tcp-7 tcp-9
 
 pre-install:
-	${MKDIR} ${STAGEDIR}${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DATADIR}
 .for FILE in ${SCRIPTS}
 	${INSTALL_DATA} ${WRKSRC}/scripts/${FILE} ${STAGEDIR}${DATADIR}
 .endfor
diff --git a/security/fragroute/pkg-descr b/security/fragroute/pkg-descr
index 358402d495f7..ae798989b0ed 100644
--- a/security/fragroute/pkg-descr
+++ b/security/fragroute/pkg-descr
@@ -12,4 +12,4 @@ This tool was written in good faith to aid in the testing of network
 intrusion detection systems, firewalls, and basic TCP/IP stack
 behaviour. Please do not abuse this software."
 
-WWW: http://www.monkey.org/~dugsong/fragroute/
+WWW: https://www.monkey.org/~dugsong/fragroute/
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index 6953cb9ce211..3bebd0f564d9 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	gnupg
 PORTVERSION=	2.1.23
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	GNUPG
 
diff --git a/security/gnupg22/Makefile b/security/gnupg22/Makefile
index d850003944fc..b5dd65ea3a65 100644
--- a/security/gnupg22/Makefile
+++ b/security/gnupg22/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	gnupg
 PORTVERSION=	2.2.0
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	GNUPG
 PKGNAMESUFFIX=	22
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index caf116f814ae..d13bab754eff 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gpgme
 PORTVERSION=	1.9.0
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	security
 MASTER_SITES=	GNUPG/gpgme
 
diff --git a/security/hashcat-legacy/Makefile b/security/hashcat-legacy/Makefile
index b60da5cec734..91f78ce26fa1 100644
--- a/security/hashcat-legacy/Makefile
+++ b/security/hashcat-legacy/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	hashcat-legacy
 PORTVERSION=	2.00
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 
 MAINTAINER=	lifanov@FreeBSD.org
diff --git a/security/hpenc/Makefile b/security/hpenc/Makefile
index f2dca3ef8447..ecde53ce4819 100644
--- a/security/hpenc/Makefile
+++ b/security/hpenc/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	hpenc
 PORTVERSION=	2.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security
 MASTER_SITES=	http://highsecure.ru/distfiles/
 
diff --git a/security/i2pd/Makefile b/security/i2pd/Makefile
index b13dad584fe1..f16510476ddf 100644
--- a/security/i2pd/Makefile
+++ b/security/i2pd/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	i2pd
 PORTVERSION=	2.15.0
+PORTREVISION=	1
 CATEGORIES=	security net-p2p
 
 MAINTAINER=	amdmi3@FreeBSD.org
diff --git a/security/john/Makefile b/security/john/Makefile
index eb305141d064..56b8ddefe075 100644
--- a/security/john/Makefile
+++ b/security/john/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	john
 DISTVERSION=	1.8.0-jumbo-1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	http://www.openwall.com/john/j/ \
 		http://mirrors.kernel.org/openwall/projects/john/${DISTVERSION:C/-.*//}/ \
diff --git a/security/keepassx-devel/Makefile b/security/keepassx-devel/Makefile
index 392bce9ba04e..95e2c0ae9f4e 100644
--- a/security/keepassx-devel/Makefile
+++ b/security/keepassx-devel/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	keepassx
 PORTVERSION=	2.0.3
+PORTREVISION=	1
 CATEGORIES=	security
 PKGNAMESUFFIX=	-devel
 
diff --git a/security/keepassxc/Makefile b/security/keepassxc/Makefile
index 70da4eccea1e..ab7c2a2a11b8 100644
--- a/security/keepassxc/Makefile
+++ b/security/keepassxc/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	keepassxc
 PORTVERSION=	2.2.0
+PORTREVISION=	1
 CATEGORIES=	security
 
 MAINTAINER=	melanhit@gmail.com
diff --git a/security/keybase/Makefile b/security/keybase/Makefile
index d5070510a6ca..5b05ad8e9165 100644
--- a/security/keybase/Makefile
+++ b/security/keybase/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	keybase
-PORTVERSION=	1.0.28
+PORTVERSION=	1.0.29
 DISTVERSIONPREFIX=	v
 CATEGORIES=	security
 
diff --git a/security/keybase/distinfo b/security/keybase/distinfo
index 6de62bcb29d9..c6156b5925ed 100644
--- a/security/keybase/distinfo
+++ b/security/keybase/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502974004
-SHA256 (keybase-client-v1.0.28_GH0.tar.gz) = 3c50e24d0d501c487ae7d460033bc828ba2993bcc45cd84eb60749d803bb2a25
-SIZE (keybase-client-v1.0.28_GH0.tar.gz) = 22949963
+TIMESTAMP = 1504800432
+SHA256 (keybase-client-v1.0.29_GH0.tar.gz) = e9f7e20d256c40235763e27f992bed1a1542411d625d11c62a28903275f9eaf5
+SIZE (keybase-client-v1.0.29_GH0.tar.gz) = 26834969
diff --git a/security/kf5-kdesu/Makefile b/security/kf5-kdesu/Makefile
index a6558681b6d7..90c48c9309eb 100644
--- a/security/kf5-kdesu/Makefile
+++ b/security/kf5-kdesu/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	kdesu
 PORTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	security kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/security/libressl-devel/Makefile b/security/libressl-devel/Makefile
index 726e40178ad5..8f4bd17f7d85 100644
--- a/security/libressl-devel/Makefile
+++ b/security/libressl-devel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libressl
-PORTVERSION=	2.6.0
+PORTVERSION=	2.6.1
 CATEGORIES=	security devel
 MASTER_SITES=	OPENBSD/LibreSSL
 PKGNAMESUFFIX=	-devel
diff --git a/security/libressl-devel/distinfo b/security/libressl-devel/distinfo
index b519323dd13e..623fa67d93a4 100644
--- a/security/libressl-devel/distinfo
+++ b/security/libressl-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499939012
-SHA256 (libressl-2.6.0.tar.gz) = e48d557474571792699000c32ae97dcef34207d13ed93e4126f213d5dcbe8a53
-SIZE (libressl-2.6.0.tar.gz) = 3297288
+TIMESTAMP = 1504715231
+SHA256 (libressl-2.6.1.tar.gz) = c293b3b5f1fc1d6349c019c3905355d577df32734b631d7e656503894e09127e
+SIZE (libressl-2.6.1.tar.gz) = 3219005
diff --git a/security/libressl-devel/pkg-plist b/security/libressl-devel/pkg-plist
index d91d5d445bc1..87b1ffd38991 100644
--- a/security/libressl-devel/pkg-plist
+++ b/security/libressl-devel/pkg-plist
@@ -76,16 +76,16 @@ include/openssl/x509v3.h
 include/tls.h
 lib/libcrypto.a
 lib/libcrypto.so
-lib/libcrypto.so.41
-lib/libcrypto.so.41.0.2
+lib/libcrypto.so.42
+lib/libcrypto.so.42.0.0
 lib/libssl.a
 lib/libssl.so
-lib/libssl.so.43
-lib/libssl.so.43.0.3
+lib/libssl.so.44
+lib/libssl.so.44.0.1
 lib/libtls.a
 lib/libtls.so
-lib/libtls.so.15
-lib/libtls.so.15.0.7
+lib/libtls.so.16
+lib/libtls.so.16.0.1
 libdata/pkgconfig/libcrypto.pc
 libdata/pkgconfig/libssl.pc
 libdata/pkgconfig/libtls.pc
@@ -100,8 +100,13 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/ASN1_BMPSTRING_new.3.gz
 %%MAN3%%man/man3/ASN1_ENUMERATED_free.3.gz
 %%MAN3%%man/man3/ASN1_ENUMERATED_new.3.gz
+%%MAN3%%man/man3/ASN1_GENERALIZEDTIME_adj.3.gz
+%%MAN3%%man/man3/ASN1_GENERALIZEDTIME_check.3.gz
 %%MAN3%%man/man3/ASN1_GENERALIZEDTIME_free.3.gz
 %%MAN3%%man/man3/ASN1_GENERALIZEDTIME_new.3.gz
+%%MAN3%%man/man3/ASN1_GENERALIZEDTIME_print.3.gz
+%%MAN3%%man/man3/ASN1_GENERALIZEDTIME_set.3.gz
+%%MAN3%%man/man3/ASN1_GENERALIZEDTIME_set_string.3.gz
 %%MAN3%%man/man3/ASN1_GENERALSTRING_free.3.gz
 %%MAN3%%man/man3/ASN1_GENERALSTRING_new.3.gz
 %%MAN3%%man/man3/ASN1_IA5STRING_free.3.gz
@@ -116,6 +121,9 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/ASN1_PRINTABLESTRING_new.3.gz
 %%MAN3%%man/man3/ASN1_PRINTABLE_free.3.gz
 %%MAN3%%man/man3/ASN1_PRINTABLE_new.3.gz
+%%MAN3%%man/man3/ASN1_STRING_TABLE_add.3.gz
+%%MAN3%%man/man3/ASN1_STRING_TABLE_cleanup.3.gz
+%%MAN3%%man/man3/ASN1_STRING_TABLE_get.3.gz
 %%MAN3%%man/man3/ASN1_STRING_cmp.3.gz
 %%MAN3%%man/man3/ASN1_STRING_data.3.gz
 %%MAN3%%man/man3/ASN1_STRING_dup.3.gz
@@ -139,6 +147,8 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/ASN1_TIME_print.3.gz
 %%MAN3%%man/man3/ASN1_TIME_set.3.gz
 %%MAN3%%man/man3/ASN1_TIME_set_string.3.gz
+%%MAN3%%man/man3/ASN1_TIME_set_tm.3.gz
+%%MAN3%%man/man3/ASN1_TIME_to_generalizedtime.3.gz
 %%MAN3%%man/man3/ASN1_TYPE_cmp.3.gz
 %%MAN3%%man/man3/ASN1_TYPE_free.3.gz
 %%MAN3%%man/man3/ASN1_TYPE_get.3.gz
@@ -147,8 +157,14 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/ASN1_TYPE_set1.3.gz
 %%MAN3%%man/man3/ASN1_UNIVERSALSTRING_free.3.gz
 %%MAN3%%man/man3/ASN1_UNIVERSALSTRING_new.3.gz
+%%MAN3%%man/man3/ASN1_UTCTIME_adj.3.gz
+%%MAN3%%man/man3/ASN1_UTCTIME_check.3.gz
+%%MAN3%%man/man3/ASN1_UTCTIME_cmp_time_t.3.gz
 %%MAN3%%man/man3/ASN1_UTCTIME_free.3.gz
 %%MAN3%%man/man3/ASN1_UTCTIME_new.3.gz
+%%MAN3%%man/man3/ASN1_UTCTIME_print.3.gz
+%%MAN3%%man/man3/ASN1_UTCTIME_set.3.gz
+%%MAN3%%man/man3/ASN1_UTCTIME_set_string.3.gz
 %%MAN3%%man/man3/ASN1_UTF8STRING_free.3.gz
 %%MAN3%%man/man3/ASN1_UTF8STRING_new.3.gz
 %%MAN3%%man/man3/ASN1_VISIBLESTRING_free.3.gz
@@ -166,6 +182,7 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/ASN1_item_i2d_fp.3.gz
 %%MAN3%%man/man3/ASN1_item_new.3.gz
 %%MAN3%%man/man3/ASN1_item_print.3.gz
+%%MAN3%%man/man3/ASN1_tag2str.3.gz
 %%MAN3%%man/man3/ASN1_time_parse.3.gz
 %%MAN3%%man/man3/ASN1_time_tm_cmp.3.gz
 %%MAN3%%man/man3/AUTHORITY_INFO_ACCESS_free.3.gz
@@ -307,10 +324,13 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/BIO_should_retry.3.gz
 %%MAN3%%man/man3/BIO_should_write.3.gz
 %%MAN3%%man/man3/BIO_shutdown_wr.3.gz
+%%MAN3%%man/man3/BIO_snprintf.3.gz
 %%MAN3%%man/man3/BIO_ssl_copy_session_id.3.gz
 %%MAN3%%man/man3/BIO_ssl_shutdown.3.gz
 %%MAN3%%man/man3/BIO_tell.3.gz
 %%MAN3%%man/man3/BIO_vfree.3.gz
+%%MAN3%%man/man3/BIO_vprintf.3.gz
+%%MAN3%%man/man3/BIO_vsnprintf.3.gz
 %%MAN3%%man/man3/BIO_wpending.3.gz
 %%MAN3%%man/man3/BIO_write.3.gz
 %%MAN3%%man/man3/BIO_write_filename.3.gz
@@ -374,6 +394,7 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/BN_get0_nist_prime_256.3.gz
 %%MAN3%%man/man3/BN_get0_nist_prime_384.3.gz
 %%MAN3%%man/man3/BN_get0_nist_prime_521.3.gz
+%%MAN3%%man/man3/BN_get_flags.3.gz
 %%MAN3%%man/man3/BN_get_word.3.gz
 %%MAN3%%man/man3/BN_hex2bn.3.gz
 %%MAN3%%man/man3/BN_init.3.gz
@@ -448,6 +469,7 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/CRYPTO_EX_dup.3.gz
 %%MAN3%%man/man3/CRYPTO_EX_free.3.gz
 %%MAN3%%man/man3/CRYPTO_EX_new.3.gz
+%%MAN3%%man/man3/CRYPTO_MEM_LEAK_CB.3.gz
 %%MAN3%%man/man3/CRYPTO_THREADID_cmp.3.gz
 %%MAN3%%man/man3/CRYPTO_THREADID_cpy.3.gz
 %%MAN3%%man/man3/CRYPTO_THREADID_current.3.gz
@@ -468,6 +490,7 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/CRYPTO_malloc.3.gz
 %%MAN3%%man/man3/CRYPTO_mem_ctrl.3.gz
 %%MAN3%%man/man3/CRYPTO_mem_leaks.3.gz
+%%MAN3%%man/man3/CRYPTO_mem_leaks_cb.3.gz
 %%MAN3%%man/man3/CRYPTO_mem_leaks_fp.3.gz
 %%MAN3%%man/man3/CRYPTO_new_ex_data.3.gz
 %%MAN3%%man/man3/CRYPTO_num_locks.3.gz
@@ -937,6 +960,7 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/EVP_MD_CTX_copy.3.gz
 %%MAN3%%man/man3/EVP_MD_CTX_copy_ex.3.gz
 %%MAN3%%man/man3/EVP_MD_CTX_create.3.gz
+%%MAN3%%man/man3/EVP_MD_CTX_ctrl.3.gz
 %%MAN3%%man/man3/EVP_MD_CTX_destroy.3.gz
 %%MAN3%%man/man3/EVP_MD_CTX_init.3.gz
 %%MAN3%%man/man3/EVP_MD_CTX_md.3.gz
@@ -964,10 +988,10 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_set_dh_paramgen_prime_len.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_set_dsa_paramgen_bits.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_set_ec_paramgen_curve_nid.3.gz
+%%MAN3%%man/man3/EVP_PKEY_CTX_set_rsa_keygen_bits.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_set_rsa_keygen_pubexp.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_set_rsa_padding.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_set_rsa_pss_saltlen.3.gz
-%%MAN3%%man/man3/EVP_PKEY_CTX_set_rsa_rsa_keygen_bits.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_set_signature_md.3.gz
 %%MAN3%%man/man3/EVP_PKEY_assign_DH.3.gz
 %%MAN3%%man/man3/EVP_PKEY_assign_DSA.3.gz
@@ -994,6 +1018,7 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/EVP_PKEY_id.3.gz
 %%MAN3%%man/man3/EVP_PKEY_keygen.3.gz
 %%MAN3%%man/man3/EVP_PKEY_keygen_init.3.gz
+%%MAN3%%man/man3/EVP_PKEY_meth_get0_info.3.gz
 %%MAN3%%man/man3/EVP_PKEY_missing_parameters.3.gz
 %%MAN3%%man/man3/EVP_PKEY_new.3.gz
 %%MAN3%%man/man3/EVP_PKEY_paramgen.3.gz
@@ -1027,8 +1052,8 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/EVP_aead_aes_128_gcm.3.gz
 %%MAN3%%man/man3/EVP_aead_aes_256_gcm.3.gz
 %%MAN3%%man/man3/EVP_aead_chacha20_poly1305.3.gz
-%%MAN3%%man/man3/EVP_aead_chacha20_poly1305_ietf.3.gz
 %%MAN3%%man/man3/EVP_aes_128_cbc.3.gz
+%%MAN3%%man/man3/EVP_aes_128_cbc_hmac_sha1.3.gz
 %%MAN3%%man/man3/EVP_aes_128_ccm.3.gz
 %%MAN3%%man/man3/EVP_aes_128_cfb.3.gz
 %%MAN3%%man/man3/EVP_aes_128_ecb.3.gz
@@ -1041,6 +1066,7 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/EVP_aes_192_gcm.3.gz
 %%MAN3%%man/man3/EVP_aes_192_ofb.3.gz
 %%MAN3%%man/man3/EVP_aes_256_cbc.3.gz
+%%MAN3%%man/man3/EVP_aes_256_cbc_hmac_sha1.3.gz
 %%MAN3%%man/man3/EVP_aes_256_ccm.3.gz
 %%MAN3%%man/man3/EVP_aes_256_cfb.3.gz
 %%MAN3%%man/man3/EVP_aes_256_ecb.3.gz
@@ -1084,6 +1110,7 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/EVP_idea_ofb.3.gz
 %%MAN3%%man/man3/EVP_md2.3.gz
 %%MAN3%%man/man3/EVP_md5.3.gz
+%%MAN3%%man/man3/EVP_md5_sha1.3.gz
 %%MAN3%%man/man3/EVP_md_null.3.gz
 %%MAN3%%man/man3/EVP_rc2_40_cbc.3.gz
 %%MAN3%%man/man3/EVP_rc2_64_cbc.3.gz
@@ -1093,6 +1120,7 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/EVP_rc2_ofb.3.gz
 %%MAN3%%man/man3/EVP_rc4.3.gz
 %%MAN3%%man/man3/EVP_rc4_40.3.gz
+%%MAN3%%man/man3/EVP_rc4_hmac_md5.3.gz
 %%MAN3%%man/man3/EVP_rc5_32_12_16_cbc.3.gz
 %%MAN3%%man/man3/EVP_rc5_32_12_16_cfb.3.gz
 %%MAN3%%man/man3/EVP_rc5_32_12_16_ecb.3.gz
@@ -1235,6 +1263,7 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/OpenSSL_add_all_ciphers.3.gz
 %%MAN3%%man/man3/OpenSSL_add_all_digests.3.gz
 %%MAN3%%man/man3/OpenSSL_add_ssl_algorithms.3.gz
+%%MAN3%%man/man3/PEM_bytes_read_bio.3.gz
 %%MAN3%%man/man3/PEM_do_header.3.gz
 %%MAN3%%man/man3/PEM_get_EVP_CIPHER_INFO.3.gz
 %%MAN3%%man/man3/PEM_read.3.gz
@@ -1353,6 +1382,7 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/PKCS7_ENC_CONTENT_new.3.gz
 %%MAN3%%man/man3/PKCS7_ENVELOPE_free.3.gz
 %%MAN3%%man/man3/PKCS7_ENVELOPE_new.3.gz
+%%MAN3%%man/man3/PKCS7_ISSUER_AND_SERIAL_digest.3.gz
 %%MAN3%%man/man3/PKCS7_ISSUER_AND_SERIAL_free.3.gz
 %%MAN3%%man/man3/PKCS7_ISSUER_AND_SERIAL_new.3.gz
 %%MAN3%%man/man3/PKCS7_RECIP_INFO_free.3.gz
@@ -1426,12 +1456,10 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/RSA_padding_add_PKCS1_OAEP.3.gz
 %%MAN3%%man/man3/RSA_padding_add_PKCS1_type_1.3.gz
 %%MAN3%%man/man3/RSA_padding_add_PKCS1_type_2.3.gz
-%%MAN3%%man/man3/RSA_padding_add_SSLv23.3.gz
 %%MAN3%%man/man3/RSA_padding_add_none.3.gz
 %%MAN3%%man/man3/RSA_padding_check_PKCS1_OAEP.3.gz
 %%MAN3%%man/man3/RSA_padding_check_PKCS1_type_1.3.gz
 %%MAN3%%man/man3/RSA_padding_check_PKCS1_type_2.3.gz
-%%MAN3%%man/man3/RSA_padding_check_SSLv23.3.gz
 %%MAN3%%man/man3/RSA_padding_check_none.3.gz
 %%MAN3%%man/man3/RSA_print.3.gz
 %%MAN3%%man/man3/RSA_print_fp.3.gz
@@ -1528,6 +1556,10 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/SSL_CTX_sess_set_remove_cb.3.gz
 %%MAN3%%man/man3/SSL_CTX_sess_timeouts.3.gz
 %%MAN3%%man/man3/SSL_CTX_sessions.3.gz
+%%MAN3%%man/man3/SSL_CTX_set1_curves.3.gz
+%%MAN3%%man/man3/SSL_CTX_set1_curves_list.3.gz
+%%MAN3%%man/man3/SSL_CTX_set1_groups.3.gz
+%%MAN3%%man/man3/SSL_CTX_set1_groups_list.3.gz
 %%MAN3%%man/man3/SSL_CTX_set1_param.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_alpn_protos.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_alpn_select_cb.3.gz
@@ -1539,11 +1571,14 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/SSL_CTX_set_default_passwd_cb.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_default_passwd_cb_userdata.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_default_verify_paths.3.gz
+%%MAN3%%man/man3/SSL_CTX_set_ecdh_auto.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_ex_data.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_generate_session_id.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_info_callback.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_max_cert_list.3.gz
+%%MAN3%%man/man3/SSL_CTX_set_max_proto_version.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_max_send_fragment.3.gz
+%%MAN3%%man/man3/SSL_CTX_set_min_proto_version.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_mode.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_msg_callback.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_msg_callback_arg.3.gz
@@ -1554,12 +1589,15 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/SSL_CTX_set_session_id_context.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_ssl_version.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_timeout.3.gz
+%%MAN3%%man/man3/SSL_CTX_set_tlsext_servername_arg.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_tlsext_servername_callback.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_tlsext_status_arg.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_tlsext_status_cb.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_tlsext_ticket_key_cb.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_tmp_dh.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_tmp_dh_callback.3.gz
+%%MAN3%%man/man3/SSL_CTX_set_tmp_ecdh.3.gz
+%%MAN3%%man/man3/SSL_CTX_set_tmp_ecdh_callback.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_tmp_rsa.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_tmp_rsa_callback.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_verify.3.gz
@@ -1594,7 +1632,6 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/SSL_add_client_CA.3.gz
 %%MAN3%%man/man3/SSL_add_dir_cert_subjects_to_stack.3.gz
 %%MAN3%%man/man3/SSL_add_file_cert_subjects_to_stack.3.gz
-%%MAN3%%man/man3/SSL_add_session.3.gz
 %%MAN3%%man/man3/SSL_alert_desc_string.3.gz
 %%MAN3%%man/man3/SSL_alert_desc_string_long.3.gz
 %%MAN3%%man/man3/SSL_alert_type_string.3.gz
@@ -1610,7 +1647,7 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/SSL_do_handshake.3.gz
 %%MAN3%%man/man3/SSL_dup.3.gz
 %%MAN3%%man/man3/SSL_dup_CA_list.3.gz
-%%MAN3%%man/man3/SSL_flush_sessions.3.gz
+%%MAN3%%man/man3/SSL_export_keying_material.3.gz
 %%MAN3%%man/man3/SSL_free.3.gz
 %%MAN3%%man/man3/SSL_get0_alpn_selected.3.gz
 %%MAN3%%man/man3/SSL_get0_session.3.gz
@@ -1644,6 +1681,8 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/SSL_get_rfd.3.gz
 %%MAN3%%man/man3/SSL_get_secure_renegotiation_support.3.gz
 %%MAN3%%man/man3/SSL_get_server_tmp_key.3.gz
+%%MAN3%%man/man3/SSL_get_servername.3.gz
+%%MAN3%%man/man3/SSL_get_servername_type.3.gz
 %%MAN3%%man/man3/SSL_get_session.3.gz
 %%MAN3%%man/man3/SSL_get_shared_ciphers.3.gz
 %%MAN3%%man/man3/SSL_get_shutdown.3.gz
@@ -1674,12 +1713,17 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/SSL_peek.3.gz
 %%MAN3%%man/man3/SSL_pending.3.gz
 %%MAN3%%man/man3/SSL_read.3.gz
-%%MAN3%%man/man3/SSL_remove_session.3.gz
 %%MAN3%%man/man3/SSL_renegotiate.3.gz
+%%MAN3%%man/man3/SSL_renegotiate_abbreviated.3.gz
+%%MAN3%%man/man3/SSL_renegotiate_pending.3.gz
 %%MAN3%%man/man3/SSL_rstate_string.3.gz
 %%MAN3%%man/man3/SSL_rstate_string_long.3.gz
 %%MAN3%%man/man3/SSL_select_next_proto.3.gz
 %%MAN3%%man/man3/SSL_session_reused.3.gz
+%%MAN3%%man/man3/SSL_set1_curves.3.gz
+%%MAN3%%man/man3/SSL_set1_curves_list.3.gz
+%%MAN3%%man/man3/SSL_set1_groups.3.gz
+%%MAN3%%man/man3/SSL_set1_groups_list.3.gz
 %%MAN3%%man/man3/SSL_set1_param.3.gz
 %%MAN3%%man/man3/SSL_set_accept_state.3.gz
 %%MAN3%%man/man3/SSL_set_alpn_protos.3.gz
@@ -1687,12 +1731,15 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/SSL_set_cipher_list.3.gz
 %%MAN3%%man/man3/SSL_set_client_CA_list.3.gz
 %%MAN3%%man/man3/SSL_set_connect_state.3.gz
+%%MAN3%%man/man3/SSL_set_ecdh_auto.3.gz
 %%MAN3%%man/man3/SSL_set_ex_data.3.gz
 %%MAN3%%man/man3/SSL_set_fd.3.gz
 %%MAN3%%man/man3/SSL_set_generate_session_id.3.gz
 %%MAN3%%man/man3/SSL_set_info_callback.3.gz
 %%MAN3%%man/man3/SSL_set_max_cert_list.3.gz
+%%MAN3%%man/man3/SSL_set_max_proto_version.3.gz
 %%MAN3%%man/man3/SSL_set_max_send_fragment.3.gz
+%%MAN3%%man/man3/SSL_set_min_proto_version.3.gz
 %%MAN3%%man/man3/SSL_set_mode.3.gz
 %%MAN3%%man/man3/SSL_set_msg_callback.3.gz
 %%MAN3%%man/man3/SSL_set_msg_callback_arg.3.gz
@@ -1706,10 +1753,13 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/SSL_set_ssl_method.3.gz
 %%MAN3%%man/man3/SSL_set_time.3.gz
 %%MAN3%%man/man3/SSL_set_timeout.3.gz
+%%MAN3%%man/man3/SSL_set_tlsext_host_name.3.gz
 %%MAN3%%man/man3/SSL_set_tlsext_status_ocsp_resp.3.gz
 %%MAN3%%man/man3/SSL_set_tlsext_status_type.3.gz
 %%MAN3%%man/man3/SSL_set_tmp_dh.3.gz
 %%MAN3%%man/man3/SSL_set_tmp_dh_callback.3.gz
+%%MAN3%%man/man3/SSL_set_tmp_ecdh.3.gz
+%%MAN3%%man/man3/SSL_set_tmp_ecdh_callback.3.gz
 %%MAN3%%man/man3/SSL_set_tmp_rsa.3.gz
 %%MAN3%%man/man3/SSL_set_tmp_rsa_callback.3.gz
 %%MAN3%%man/man3/SSL_set_verify.3.gz
@@ -1776,6 +1826,7 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/TYPE_set_ex_data.3.gz
 %%MAN3%%man/man3/UI_OpenSSL.3.gz
 %%MAN3%%man/man3/UI_UTIL_read_pw.3.gz
+%%MAN3%%man/man3/UI_UTIL_read_pw_string.3.gz
 %%MAN3%%man/man3/UI_add_error_string.3.gz
 %%MAN3%%man/man3/UI_add_info_string.3.gz
 %%MAN3%%man/man3/UI_add_input_boolean.3.gz
@@ -1785,25 +1836,46 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/UI_construct_prompt.3.gz
 %%MAN3%%man/man3/UI_create_method.3.gz
 %%MAN3%%man/man3/UI_ctrl.3.gz
+%%MAN3%%man/man3/UI_destroy_method.3.gz
 %%MAN3%%man/man3/UI_dup_error_string.3.gz
 %%MAN3%%man/man3/UI_dup_info_string.3.gz
 %%MAN3%%man/man3/UI_dup_input_boolean.3.gz
 %%MAN3%%man/man3/UI_dup_input_string.3.gz
 %%MAN3%%man/man3/UI_dup_verify_string.3.gz
 %%MAN3%%man/man3/UI_free.3.gz
+%%MAN3%%man/man3/UI_get0_action_string.3.gz
+%%MAN3%%man/man3/UI_get0_output_string.3.gz
+%%MAN3%%man/man3/UI_get0_result.3.gz
+%%MAN3%%man/man3/UI_get0_result_string.3.gz
+%%MAN3%%man/man3/UI_get0_test_string.3.gz
 %%MAN3%%man/man3/UI_get0_user_data.3.gz
 %%MAN3%%man/man3/UI_get_default_method.3.gz
 %%MAN3%%man/man3/UI_get_ex_data.3.gz
 %%MAN3%%man/man3/UI_get_ex_new_index.3.gz
+%%MAN3%%man/man3/UI_get_input_flags.3.gz
 %%MAN3%%man/man3/UI_get_method.3.gz
+%%MAN3%%man/man3/UI_get_result_maxsize.3.gz
+%%MAN3%%man/man3/UI_get_result_minsize.3.gz
 %%MAN3%%man/man3/UI_get_string_type.3.gz
-%%MAN3%%man/man3/UI_get0_result.3.gz
+%%MAN3%%man/man3/UI_method_get_closer.3.gz
+%%MAN3%%man/man3/UI_method_get_flusher.3.gz
+%%MAN3%%man/man3/UI_method_get_opener.3.gz
+%%MAN3%%man/man3/UI_method_get_prompt_constructor.3.gz
+%%MAN3%%man/man3/UI_method_get_reader.3.gz
+%%MAN3%%man/man3/UI_method_get_writer.3.gz
+%%MAN3%%man/man3/UI_method_set_closer.3.gz
+%%MAN3%%man/man3/UI_method_set_flusher.3.gz
+%%MAN3%%man/man3/UI_method_set_opener.3.gz
+%%MAN3%%man/man3/UI_method_set_prompt_constructor.3.gz
+%%MAN3%%man/man3/UI_method_set_reader.3.gz
+%%MAN3%%man/man3/UI_method_set_writer.3.gz
 %%MAN3%%man/man3/UI_new.3.gz
 %%MAN3%%man/man3/UI_new_method.3.gz
 %%MAN3%%man/man3/UI_process.3.gz
 %%MAN3%%man/man3/UI_set_default_method.3.gz
 %%MAN3%%man/man3/UI_set_ex_data.3.gz
 %%MAN3%%man/man3/UI_set_method.3.gz
+%%MAN3%%man/man3/UI_set_result.3.gz
 %%MAN3%%man/man3/USERNOTICE_free.3.gz
 %%MAN3%%man/man3/USERNOTICE_new.3.gz
 %%MAN3%%man/man3/X25519.3.gz
@@ -1830,6 +1902,7 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/X509_CRL_add1_ext_i2d.3.gz
 %%MAN3%%man/man3/X509_CRL_add_ext.3.gz
 %%MAN3%%man/man3/X509_CRL_delete_ext.3.gz
+%%MAN3%%man/man3/X509_CRL_digest.3.gz
 %%MAN3%%man/man3/X509_CRL_free.3.gz
 %%MAN3%%man/man3/X509_CRL_get0_by_cert.3.gz
 %%MAN3%%man/man3/X509_CRL_get0_by_serial.3.gz
@@ -1876,6 +1949,7 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/X509_NAME_add_entry_by_OBJ.3.gz
 %%MAN3%%man/man3/X509_NAME_add_entry_by_txt.3.gz
 %%MAN3%%man/man3/X509_NAME_delete_entry.3.gz
+%%MAN3%%man/man3/X509_NAME_digest.3.gz
 %%MAN3%%man/man3/X509_NAME_dup.3.gz
 %%MAN3%%man/man3/X509_NAME_entry_count.3.gz
 %%MAN3%%man/man3/X509_NAME_free.3.gz
@@ -1898,6 +1972,8 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/X509_PUBKEY_set0_param.3.gz
 %%MAN3%%man/man3/X509_REQ_INFO_free.3.gz
 %%MAN3%%man/man3/X509_REQ_INFO_new.3.gz
+%%MAN3%%man/man3/X509_REQ_check_private_key.3.gz
+%%MAN3%%man/man3/X509_REQ_digest.3.gz
 %%MAN3%%man/man3/X509_REQ_free.3.gz
 %%MAN3%%man/man3/X509_REQ_get_pubkey.3.gz
 %%MAN3%%man/man3/X509_REQ_get_subject_name.3.gz
@@ -1969,6 +2045,8 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/X509_check_ip.3.gz
 %%MAN3%%man/man3/X509_check_ip_asc.3.gz
 %%MAN3%%man/man3/X509_check_issued.3.gz
+%%MAN3%%man/man3/X509_check_private_key.3.gz
+%%MAN3%%man/man3/X509_cmp_current_time.3.gz
 %%MAN3%%man/man3/X509_cmp_time.3.gz
 %%MAN3%%man/man3/X509_delete_ext.3.gz
 %%MAN3%%man/man3/X509_digest.3.gz
@@ -1991,6 +2069,7 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/X509_load_cert_file.3.gz
 %%MAN3%%man/man3/X509_load_crl_file.3.gz
 %%MAN3%%man/man3/X509_new.3.gz
+%%MAN3%%man/man3/X509_pubkey_digest.3.gz
 %%MAN3%%man/man3/X509_set_ex_data.3.gz
 %%MAN3%%man/man3/X509_set_issuer_name.3.gz
 %%MAN3%%man/man3/X509_set_pubkey.3.gz
@@ -1999,6 +2078,8 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/X509_set_version.3.gz
 %%MAN3%%man/man3/X509_sign.3.gz
 %%MAN3%%man/man3/X509_sign_ctx.3.gz
+%%MAN3%%man/man3/X509_time_adj.3.gz
+%%MAN3%%man/man3/X509_time_adj_ex.3.gz
 %%MAN3%%man/man3/X509_up_ref.3.gz
 %%MAN3%%man/man3/X509_verify.3.gz
 %%MAN3%%man/man3/X509_verify_cert.3.gz
@@ -2059,7 +2140,6 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/d2i_ASN1_SET_ANY.3.gz
 %%MAN3%%man/man3/d2i_ASN1_T61STRING.3.gz
 %%MAN3%%man/man3/d2i_ASN1_TIME.3.gz
-%%MAN3%%man/man3/d2i_ASN1_TIME_new.3.gz
 %%MAN3%%man/man3/d2i_ASN1_TYPE.3.gz
 %%MAN3%%man/man3/d2i_ASN1_UINTEGER.3.gz
 %%MAN3%%man/man3/d2i_ASN1_UNIVERSALSTRING.3.gz
@@ -2215,6 +2295,13 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/des_read_pw_string.3.gz
 %%MAN3%%man/man3/engine.3.gz
 %%MAN3%%man/man3/evp.3.gz
+%%MAN3%%man/man3/get_rfc2409_prime_1024.3.gz
+%%MAN3%%man/man3/get_rfc2409_prime_768.3.gz
+%%MAN3%%man/man3/get_rfc3526_prime_1536.3.gz
+%%MAN3%%man/man3/get_rfc3526_prime_2048.3.gz
+%%MAN3%%man/man3/get_rfc3526_prime_3072.3.gz
+%%MAN3%%man/man3/get_rfc3526_prime_4096.3.gz
+%%MAN3%%man/man3/get_rfc3526_prime_6144.3.gz
 %%MAN3%%man/man3/get_rfc3526_prime_8192.3.gz
 %%MAN3%%man/man3/get_session_cb.3.gz
 %%MAN3%%man/man3/i2d_ACCESS_DESCRIPTION.3.gz
@@ -2234,7 +2321,6 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/i2d_ASN1_SET_ANY.3.gz
 %%MAN3%%man/man3/i2d_ASN1_T61STRING.3.gz
 %%MAN3%%man/man3/i2d_ASN1_TIME.3.gz
-%%MAN3%%man/man3/i2d_ASN1_TIME_new.3.gz
 %%MAN3%%man/man3/i2d_ASN1_TYPE.3.gz
 %%MAN3%%man/man3/i2d_ASN1_UNIVERSALSTRING.3.gz
 %%MAN3%%man/man3/i2d_ASN1_UTCTIME.3.gz
@@ -2263,8 +2349,6 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/i2d_ECPKParameters.3.gz
 %%MAN3%%man/man3/i2d_ECPKParameters_bio.3.gz
 %%MAN3%%man/man3/i2d_ECPKParameters_fp.3.gz
-%%MAN3%%man/man3/i2d_ECPKPrivateKey_fp.3.gz
-%%MAN3%%man/man3/i2d_ECPK_PUBKEY_fp.3.gz
 %%MAN3%%man/man3/i2d_ECParameters.3.gz
 %%MAN3%%man/man3/i2d_ECPrivateKey.3.gz
 %%MAN3%%man/man3/i2d_ECPrivateKey_bio.3.gz
@@ -2429,6 +2513,8 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/tls_close.3.gz
 %%MAN3%%man/man3/tls_config_add_keypair_file.3.gz
 %%MAN3%%man/man3/tls_config_add_keypair_mem.3.gz
+%%MAN3%%man/man3/tls_config_add_keypair_ocsp_file.3.gz
+%%MAN3%%man/man3/tls_config_add_keypair_ocsp_mem.3.gz
 %%MAN3%%man/man3/tls_config_add_ticket_key.3.gz
 %%MAN3%%man/man3/tls_config_clear_keys.3.gz
 %%MAN3%%man/man3/tls_config_error.3.gz
@@ -2448,12 +2534,16 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/tls_config_set_cert_file.3.gz
 %%MAN3%%man/man3/tls_config_set_cert_mem.3.gz
 %%MAN3%%man/man3/tls_config_set_ciphers.3.gz
+%%MAN3%%man/man3/tls_config_set_crl_file.3.gz
+%%MAN3%%man/man3/tls_config_set_crl_mem.3.gz
 %%MAN3%%man/man3/tls_config_set_dheparams.3.gz
-%%MAN3%%man/man3/tls_config_set_ecdhecurve.3.gz
+%%MAN3%%man/man3/tls_config_set_ecdhecurves.3.gz
 %%MAN3%%man/man3/tls_config_set_key_file.3.gz
 %%MAN3%%man/man3/tls_config_set_key_mem.3.gz
 %%MAN3%%man/man3/tls_config_set_keypair_file.3.gz
 %%MAN3%%man/man3/tls_config_set_keypair_mem.3.gz
+%%MAN3%%man/man3/tls_config_set_keypair_ocsp_file.3.gz
+%%MAN3%%man/man3/tls_config_set_keypair_ocsp_mem.3.gz
 %%MAN3%%man/man3/tls_config_set_ocsp_staple_file.3.gz
 %%MAN3%%man/man3/tls_config_set_ocsp_staple_mem.3.gz
 %%MAN3%%man/man3/tls_config_set_protocols.3.gz
@@ -2497,8 +2587,8 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/tls_read.3.gz
 %%MAN3%%man/man3/tls_reset.3.gz
 %%MAN3%%man/man3/tls_server.3.gz
+%%MAN3%%man/man3/tls_unload_file.3.gz
 %%MAN3%%man/man3/tls_write.3.gz
-%%MAN3%%man/man3/tmp_rsa_callback.3.gz
 %%MAN3%%man/man3/verify_callback.3.gz
 @dir etc/ssl/certs
 @dir include/openssl
diff --git a/security/libressl-devel/version.mk b/security/libressl-devel/version.mk
index da6be0e59f5a..ae92709dbbf0 100644
--- a/security/libressl-devel/version.mk
+++ b/security/libressl-devel/version.mk
@@ -1 +1 @@
-OPENSSL_SHLIBVER?=	41
+OPENSSL_SHLIBVER?=	42
diff --git a/security/libzrtpcppcore/Makefile b/security/libzrtpcppcore/Makefile
index 386f2a8e0329..5225b742edd2 100644
--- a/security/libzrtpcppcore/Makefile
+++ b/security/libzrtpcppcore/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	libzrtpcppcore
 PORTVERSION=	4.6.6
+PORTREVISION=	1
 DISTVERSIONPREFIX=	V
 CATEGORIES=	security
 
diff --git a/security/logcheck/Makefile b/security/logcheck/Makefile
index 3d8ebe95b742..91b634e99fa0 100644
--- a/security/logcheck/Makefile
+++ b/security/logcheck/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	logcheck
 PORTVERSION=	1.3.18
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	DEBIAN_POOL
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -10,7 +11,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	yasu@utahime.org
 COMMENT=	Auditing tool for system logs on Unix boxes
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	docbook-to-man>0:textproc/docbook-to-man
diff --git a/security/logcheck/files/patch-docs_logcheck-test.1 b/security/logcheck/files/patch-docs_logcheck-test.1
index 0479807cc670..d5a229cf96d4 100644
--- a/security/logcheck/files/patch-docs_logcheck-test.1
+++ b/security/logcheck/files/patch-docs_logcheck-test.1
@@ -1,5 +1,23 @@
 --- docs/logcheck-test.1.orig	2017-01-25 21:08:04 UTC
 +++ docs/logcheck-test.1
+@@ -4,7 +4,7 @@ logcheck-test \- test new logcheck rules
+ .SH SYNOPSIS
+ .B logcheck\-test
+ .RB [ \-q | \-i ]
+-.RB [ \-a | \-s | \-l
++.RB [ \-a | \-m | \-l
+ .IR FILE ]
+ .RB [ \-e ]
+ .RB [ \-P
+@@ -15,7 +15,7 @@ logcheck-test \- test new logcheck rules
+ .br
+ .B logcheck\-test
+ .RB [ \-q | \-i ]
+-.RB [ \-a | \-s | \-l
++.RB [ \-a | \-m | \-l
+ .IR FILE ]
+ .B \-r
+ .I RULEFILE
 @@ -38,8 +38,8 @@ Show usage information
  .B \-a, \-\-auth.log
  Parse /var/log/auth.log for matching lines
diff --git a/security/logcheck/files/patch-src_logcheck-test b/security/logcheck/files/patch-src_logcheck-test
index b4975603443f..4a6dd35997ba 100644
--- a/security/logcheck/files/patch-src_logcheck-test
+++ b/security/logcheck/files/patch-src_logcheck-test
@@ -9,7 +9,7 @@
  -l|--log-file LOGFILE       : Parse LOGFILE
  -i|--invert-match           : Show lines that don't match the RULE or RULEFILE
  -q|--quiet                  : Suppress rule summary
-@@ -103,9 +103,9 @@ while [ -n "${1:-}" ]; do
+@@ -103,11 +103,11 @@ while [ -n "${1:-}" ]; do
                  warn "option -a ignored"
              fi
          ;;
@@ -19,5 +19,17 @@
 -                FILE="/var/log/syslog"
 +                FILE="/var/log/messages"
              else
-                 warn "option -s ignored"
+-                warn "option -s ignored"
++                warn "option -m ignored"
              fi
+         ;;
+         -q|--quiet)
+@@ -169,7 +169,7 @@ while [ -n "${1:-}" ]; do
+ done
+ 
+ if [ -z "$FILE" ] ; then
+-    err "no log file specified, please choose -a or -s or -l LOGFILE"
++    err "no log file specified, please choose -a or -m or -l LOGFILE"
+     exit 2
+ elif ! [ -r "$FILE" ] ; then
+     err "'$FILE' permission denied"
diff --git a/security/logcheck/files/pkg-deinstall.in b/security/logcheck/files/pkg-deinstall.in
index 1790f8d4f647..b480a6600cee 100644
--- a/security/logcheck/files/pkg-deinstall.in
+++ b/security/logcheck/files/pkg-deinstall.in
@@ -1,25 +1,12 @@
 #!/bin/sh
 
 user="%%LOGCHECK_USER%%"
-group="%%LOGCHECK_GROUP%%"
-configfiles="logcheck.conf logcheck.logfiles"
 
 case $2 in
-DEINSTALL)
-	for f in ${configfiles}; do
-		if diff %%PREFIX%%/etc/logcheck/${f} %%PREFIX%%/etc/logcheck/${f}.sample > /dev/null; then
-			echo "---> ${f} configuration file is the same as ${f}.sample"
-			rm -f %%PREFIX%%/etc/logcheck/${f}
-			echo "---> Deleted %%PREFIX%%/etc/logcheck/${f}"
-		else
-			echo "---> %%PREFIX%%/etc/logcheck/${f} differs from sample file; not deleted"
-		fi
-	done
-;;
 POST-DEINSTALL)
 	if /usr/bin/crontab -u "${user}" -l > /dev/null 2>&1; then
-		rm -f /var/cron/tabs/${user}
-		echo "---> Removed crontab for \"${user}\"."
+		echo y | /usr/bin/crontab -u "${user}" -r
+		echo "==> Removed crontab for \"${user}\"."
 	fi
 ;;
 esac
diff --git a/security/logcheck/files/pkg-install.in b/security/logcheck/files/pkg-install.in
index 944fd6c9a205..49f588fcdfe6 100644
--- a/security/logcheck/files/pkg-install.in
+++ b/security/logcheck/files/pkg-install.in
@@ -1,8 +1,6 @@
 #!/bin/sh
 
 user="%%LOGCHECK_USER%%"
-group="%%LOGCHECK_GROUP%%"
-configfiles="logcheck.conf logcheck.logfiles"
 
 case $2 in
 POST-INSTALL)
@@ -10,22 +8,22 @@ POST-INSTALL)
 	if [ -f %%EXAMPLESDIR%%/crontab.in ] ; then
 		if /usr/bin/crontab -u "${user}" -l >/tmp/logchecktab$$ 2>&1 ; then
 			if test -s /tmp/logchecktab$$; then
-				echo "---> \"${user}\" already has a crontab.  Not overwriting it"
-				echo "---> Please merge any changes from the standard crontab file"
-				echo "--->     %%EXAMPLESDIR%%/crontab.in"
+				echo "==> \"${user}\" already has a crontab.  Not overwriting it"
+				echo "==> Please merge any changes from the standard crontab file"
+				echo "==>     %%EXAMPLESDIR%%/crontab.in"
 			else
 				/usr/bin/crontab -u "${user}" "%%EXAMPLESDIR%%/crontab.in" || exit 1
-				echo "---> Installed crontab(5) file for user \"${user}\""
+				echo "==> Installed crontab(5) file for user \"${user}\""
 			fi
 		else
 			if grep -q "are not allowed to use this program" /tmp/logchecktab$$ ; then
-				echo "---> The logcheck user is not allowed to run crontab."
-				echo "---> Please check the contents of /var/cron/allow and /var/cron/deny"
-				echo "---> and grant access, if necessary."
+				echo "==> The logcheck user is not allowed to run crontab."
+				echo "==> Please check the contents of /var/cron/allow and /var/cron/deny"
+				echo "==> and grant access, if necessary."
 				exit 1
 			else
 				/usr/bin/crontab -u "${user}" "%%EXAMPLESDIR%%/crontab.in" || exit 1
-				echo "---> Created crontab(5) file for user \"${user}\""
+				echo "==> Created crontab(5) file for user \"${user}\""
 			fi
 		fi
 		rm -f /tmp/logchecktab$$
@@ -33,17 +31,9 @@ POST-INSTALL)
     else
         echo "---> Crontab file was not installed for user \"${user}\""
         if [ -f %%EXAMPLESDIR%%/crontab.in ]; then
-            echo "---> A sample crontab file can be found in %%EXAMPLESDIR%%/crontab.in"
-            echo "---> for manual installation."
+            echo "==> A sample crontab file can be found in %%EXAMPLESDIR%%/crontab.in"
+            echo "==> for manual installation."
         fi
     fi
-
-	for f in ${configfiles}; do
-		if [ ! -e %%PREFIX%%/etc/logcheck/${f} ]; then
-			echo "---> It seems you have no previous version of %%PREFIX%%/etc/logcheck/${f}"
-			cp %%PREFIX%%/etc/logcheck/${f}.sample %%PREFIX%%/etc/logcheck/${f}
-			echo "---> Created one from ${f}.sample"
-		fi
-	done
 ;;
 esac
diff --git a/security/logcheck/pkg-plist b/security/logcheck/pkg-plist
index b1b6a7c28958..09efb0af304f 100644
--- a/security/logcheck/pkg-plist
+++ b/security/logcheck/pkg-plist
@@ -184,8 +184,6 @@
 %%ETCDIR%%/ignore.d.workstation/wpasupplicant
 %%ETCDIR%%/ignore.d.workstation/xdm
 %%ETCDIR%%/ignore.d.workstation/xlockmore
-%%ETCDIR%%/logcheck.conf.sample
-%%ETCDIR%%/logcheck.logfiles.sample
 %%ETCDIR%%/violations.d/kernel
 %%ETCDIR%%/violations.d/logcheck
 %%ETCDIR%%/violations.d/smartd
@@ -193,6 +191,8 @@
 %%ETCDIR%%/violations.d/sudo
 %%ETCDIR%%/violations.ignore.d/logcheck-su
 %%ETCDIR%%/violations.ignore.d/logcheck-sudo
+@sample %%ETCDIR%%/logcheck.conf.sample
+@sample %%ETCDIR%%/logcheck.logfiles.sample
 @mode
 bin/logcheck-test
 man/man1/logcheck-test.1.gz
diff --git a/security/metasploit/Makefile b/security/metasploit/Makefile
index b34bd40043ce..4ef78b7beb57 100644
--- a/security/metasploit/Makefile
+++ b/security/metasploit/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	metasploit
-PORTVERSION=	4.16.4
+PORTVERSION=	4.16.6
 CATEGORIES=	security
 
 MAINTAINER=	tanawts@gmail.com
@@ -26,7 +26,7 @@ RUN_DEPENDS=	nmap:security/nmap \
 		rubygem-metasploit-credential>=0:security/rubygem-metasploit-credential \
 		rubygem-metasploit_data_models>=0:security/rubygem-metasploit_data_models \
 		rubygem-metasploit-model>=0:security/rubygem-metasploit-model \
-		rubygem-metasploit-payloads>=1.3.1:security/rubygem-metasploit-payloads \
+		rubygem-metasploit-payloads>=1.3.7:security/rubygem-metasploit-payloads \
 		rubygem-metasploit_payloads-mettle>=0.2.2:security/rubygem-metasploit_payloads-mettle \
 		rubygem-msgpack1>=0:devel/rubygem-msgpack1 \
 		rubygem-network_interface>=0:net/rubygem-network_interface \
diff --git a/security/metasploit/distinfo b/security/metasploit/distinfo
index 7cf0f3533b4c..f8186924bfaa 100644
--- a/security/metasploit/distinfo
+++ b/security/metasploit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504362422
-SHA256 (rapid7-metasploit-framework-4.16.4_GH0.tar.gz) = 90c047801b3cab01a95ac1005eae41ae939f06d2b63f63717e9dc732e1334bd9
-SIZE (rapid7-metasploit-framework-4.16.4_GH0.tar.gz) = 24066657
+TIMESTAMP = 1504945681
+SHA256 (rapid7-metasploit-framework-4.16.6_GH0.tar.gz) = ce52552388df286028aa5e7c29ddc323749742890947b5bdc5038c807a85332b
+SIZE (rapid7-metasploit-framework-4.16.6_GH0.tar.gz) = 24085120
diff --git a/security/nss/Makefile b/security/nss/Makefile
index 988f92f2cffb..6e23abcc0e3f 100644
--- a/security/nss/Makefile
+++ b/security/nss/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nss
-PORTVERSION=	3.32
+PORTVERSION=	3.32.1
 #DISTVERSIONSUFFIX=	-with-ckbi-1.98
 CATEGORIES=	security
 MASTER_SITES=	MOZILLA/security/${PORTNAME}/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src
diff --git a/security/nss/distinfo b/security/nss/distinfo
index 0c282210efff..89d3354d3959 100644
--- a/security/nss/distinfo
+++ b/security/nss/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501164572
-SHA256 (nss-3.32.tar.gz) = 35c6f381cc96bb25e4f924469f6ba3e57b3a16e0c2fb7e295a284a00d57ed335
-SIZE (nss-3.32.tar.gz) = 9493574
+TIMESTAMP = 1505146642
+SHA256 (nss-3.32.1.tar.gz) = 4de59ca7f5bf4a56fbcfdbb4a054f254ba9f408f56476957404a091048624652
+SIZE (nss-3.32.1.tar.gz) = 9494609
diff --git a/security/obfsclient/Makefile b/security/obfsclient/Makefile
index bb5cbc66ffba..6039a66cebc1 100644
--- a/security/obfsclient/Makefile
+++ b/security/obfsclient/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	obfsclient
 PORTVERSION=	0.0.2
 DISTVERSIONPREFIX=	v
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	security
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/security/op/Makefile b/security/op/Makefile
index fcb42f069ce3..d423b54a215d 100644
--- a/security/op/Makefile
+++ b/security/op/Makefile
@@ -15,6 +15,7 @@ LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 GNU_CONFIGURE=	yes
+CONFLICTS_INSTALL=	security/1password-client
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/op.d
diff --git a/security/openconnect-gui/files/patch-CMake_Includes_git__revision__main.cmake b/security/openconnect-gui/files/patch-CMake_Includes_git__revision__main.cmake
new file mode 100644
index 000000000000..15ea1966dda1
--- /dev/null
+++ b/security/openconnect-gui/files/patch-CMake_Includes_git__revision__main.cmake
@@ -0,0 +1,28 @@
+Has been submitted upstream. With ninja, the generated file
+is not recognized as a dependency and not generated before it is
+#included from other code.
+
+--- CMake/Includes/git_revision_main.cmake.orig	2016-08-28 20:11:26 UTC
++++ CMake/Includes/git_revision_main.cmake
+@@ -4,9 +4,9 @@ if(IS_DIRECTORY ${PROJECT_SOURCE_DIR}/.git)
+     find_package(Git 2.7 REQUIRED)
+ endif()
+ 
+-add_custom_target(git_revision ALL)
+ add_custom_command(
+-    TARGET git_revision
++#    TARGET git_revision
++    OUTPUT ${CMAKE_SOURCE_DIR}/src/${PROJECT_NAME}.cpp
+     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src
+ 
+     COMMAND ${CMAKE_COMMAND}
+@@ -35,5 +35,8 @@ add_custom_command(
+         -P ${CMAKE_SOURCE_DIR}/CMake/Includes/git_revision_generate.cmake
+         COMMENT "Analyzing Git revision/tag changes..." VERBATIM
+ )
+-
++add_custom_target(
++        git_revision
++        DEPENDS ${CMAKE_SOURCE_DIR}/src/${PROJECT_NAME}.cpp
++)
+ add_dependencies(${PROJECT_NAME} git_revision)
diff --git a/security/p5-Crypt-RHash/Makefile b/security/p5-Crypt-RHash/Makefile
index 906fa84e6c15..4e3c6ed47f6e 100644
--- a/security/p5-Crypt-RHash/Makefile
+++ b/security/p5-Crypt-RHash/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Crypt-RHash
-PORTVERSION=	0.93
+PORTVERSION=	0.94
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Crypt-RHash/distinfo b/security/p5-Crypt-RHash/distinfo
index b3f9b4b63362..4b9717cb45b7 100644
--- a/security/p5-Crypt-RHash/distinfo
+++ b/security/p5-Crypt-RHash/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479642954
-SHA256 (Crypt-RHash-0.93.tar.gz) = a37ec248f2ed1923b8f452d9a069f939509effcca687b45aa22f1e821d59bb12
-SIZE (Crypt-RHash-0.93.tar.gz) = 155783
+TIMESTAMP = 1504891810
+SHA256 (Crypt-RHash-0.94.tar.gz) = de7236dde296b3c345a0eb03fa8bc2056887fd2eb92dfd2527046552ef36222d
+SIZE (Crypt-RHash-0.94.tar.gz) = 156340
diff --git a/security/p5-Digest-SHA/Makefile b/security/p5-Digest-SHA/Makefile
index 6bdb17d0d631..4e79edff6c4f 100644
--- a/security/p5-Digest-SHA/Makefile
+++ b/security/p5-Digest-SHA/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Digest-SHA
-PORTVERSION=	5.96
+PORTVERSION=	5.97
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Digest-SHA/distinfo b/security/p5-Digest-SHA/distinfo
index 90caca1645d6..8d5f33d49ddf 100644
--- a/security/p5-Digest-SHA/distinfo
+++ b/security/p5-Digest-SHA/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1474161859
-SHA256 (Digest-SHA-5.96.tar.gz) = 2b8e0a9b6e359d5e14159661647cc0fbde06beb7f2a24bf003f5fad0a3a2786a
-SIZE (Digest-SHA-5.96.tar.gz) = 46394
+TIMESTAMP = 1504799683
+SHA256 (Digest-SHA-5.97.tar.gz) = 1407cd62797a6210e6dfe5eb7e48402254a72d6397684a2296980dd29990fb6d
+SIZE (Digest-SHA-5.97.tar.gz) = 46604
diff --git a/security/p5-Digest-SHA3/Makefile b/security/p5-Digest-SHA3/Makefile
index c2ada5ba0801..57ff2446a2db 100644
--- a/security/p5-Digest-SHA3/Makefile
+++ b/security/p5-Digest-SHA3/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Digest-SHA3
-PORTVERSION=	0.25
+PORTVERSION=	0.26
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/p5-Digest-SHA3/distinfo b/security/p5-Digest-SHA3/distinfo
index 6b2f8ae385c0..594ff8b9f693 100644
--- a/security/p5-Digest-SHA3/distinfo
+++ b/security/p5-Digest-SHA3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1474162362
-SHA256 (Digest-SHA3-0.25.tar.gz) = bca652e7a2be1d51939f8ae4fead5acc0b097d556bac81d71b601d96f6b3b386
-SIZE (Digest-SHA3-0.25.tar.gz) = 28152
+TIMESTAMP = 1504799693
+SHA256 (Digest-SHA3-0.26.tar.gz) = 338f441de635e2caf2a7bc1787eb5ecf50f9926aee7fd615bc10c6f8759e5497
+SIZE (Digest-SHA3-0.26.tar.gz) = 28370
diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile
index 0644b3cd962b..d7b230cb5886 100644
--- a/security/pinentry/Makefile
+++ b/security/pinentry/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pinentry
 PORTVERSION=	1.0.0
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES=	security
 MASTER_SITES=	GNUPG/pinentry
 
diff --git a/security/pks/Makefile b/security/pks/Makefile
index 1178fb591697..3ef0ece127f2 100644
--- a/security/pks/Makefile
+++ b/security/pks/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pks
 PORTVERSION=	0.9.6.20040312
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security www
 MASTER_SITES=	http://pks.sourceforge.net/ LOCAL/mandree
 DISTFILES=	pks-current.tgz
diff --git a/security/py-acme/Makefile b/security/py-acme/Makefile
index 92c18f29a99a..252d1e0ae27f 100644
--- a/security/py-acme/Makefile
+++ b/security/py-acme/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	acme
-PORTVERSION=	0.17.0
+PORTVERSION=	0.18.1
 PORTEPOCH=	1
 CATEGORIES=	security python
 MASTER_SITES=	CHEESESHOP
diff --git a/security/py-acme/distinfo b/security/py-acme/distinfo
index 8388041dc3a9..553893723652 100644
--- a/security/py-acme/distinfo
+++ b/security/py-acme/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502133910
-SHA256 (acme-0.17.0.tar.gz) = 3ccbe4aaeb98c77b98ee4093b4e4adb76a1a24cbdfec0130c489c206f1d9b66e
-SIZE (acme-0.17.0.tar.gz) = 94676
+TIMESTAMP = 1505333278
+SHA256 (acme-0.18.1.tar.gz) = 1e4c6c0a3fb9906f0d1389a39c76d730e2691d7f168a219e464237381ddcc667
+SIZE (acme-0.18.1.tar.gz) = 94681
diff --git a/security/py-artifacts/Makefile b/security/py-artifacts/Makefile
index f44476b29fad..861865b960c5 100644
--- a/security/py-artifacts/Makefile
+++ b/security/py-artifacts/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	artifacts
-PORTVERSION=	20170818
+PORTVERSION=	20170909
 CATEGORIES=	security python
 MASTER_SITES=	CHEESESHOP \
 		https://github.com/ForensicArtifacts/artifacts/releases/download/${PORTVERSION}/
@@ -19,6 +19,7 @@ TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yapf>=0:textproc/py-yapf
 
 NO_ARCH=	yes
 USES=		python
+USE_LOCALE=	en_US.UTF-8
 USE_PYTHON=	concurrent distutils autoplist
 DO_MAKE_TEST=	${SETENV} ${TEST_ENV} ${PYTHON_CMD}
 TEST_TARGET=	run_tests.py
diff --git a/security/py-artifacts/distinfo b/security/py-artifacts/distinfo
index 7d388ed472f0..1452d7976290 100644
--- a/security/py-artifacts/distinfo
+++ b/security/py-artifacts/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503257519
-SHA256 (artifacts-20170818.tar.gz) = 8fe5340eea0ed347e251ac5743da26f9e9bbd847f881c921f88aff0b78a76710
-SIZE (artifacts-20170818.tar.gz) = 58959
+TIMESTAMP = 1505025053
+SHA256 (artifacts-20170909.tar.gz) = 39c6624e33c2e62f7e1b3628faa56b09694f3269a44f2039e4c9f101b77e5334
+SIZE (artifacts-20170909.tar.gz) = 58949
diff --git a/security/py-certbot/Makefile b/security/py-certbot/Makefile
index cb6b30ca563b..7f7c9ff77d87 100644
--- a/security/py-certbot/Makefile
+++ b/security/py-certbot/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	certbot
-PORTVERSION=	0.17.0
+PORTVERSION=	0.18.1
 PORTEPOCH=	1
 CATEGORIES=	security python
 MASTER_SITES=	CHEESESHOP
diff --git a/security/py-certbot/distinfo b/security/py-certbot/distinfo
index a05d56246961..a43d76442026 100644
--- a/security/py-certbot/distinfo
+++ b/security/py-certbot/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502134062
-SHA256 (certbot-0.17.0.tar.gz) = 43f5b26c3f314d14babf79a3bdf3522e4fc9eef867a0681c426f113c650a669c
-SIZE (certbot-0.17.0.tar.gz) = 274054
+TIMESTAMP = 1505333366
+SHA256 (certbot-0.18.1.tar.gz) = ae0aaf0cc1af53713232a222fb20891475ec9ff9d128a277c4e0f92ea7c36b4c
+SIZE (certbot-0.18.1.tar.gz) = 276600
diff --git a/security/py-certifi/Makefile b/security/py-certifi/Makefile
index 48e541cbd6be..e236153b72ef 100644
--- a/security/py-certifi/Makefile
+++ b/security/py-certifi/Makefile
@@ -14,6 +14,6 @@ LICENSE=	MPL20
 
 NO_ARCH=	yes
 USES?=		python
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist concurrent distutils
 
 .include <bsd.port.mk>
diff --git a/security/py-first-server/Makefile b/security/py-first-server/Makefile
index 671b2df7c179..99c5d7ee5abb 100644
--- a/security/py-first-server/Makefile
+++ b/security/py-first-server/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	first-server
-PORTVERSION=	0.0.1
+PORTVERSION=	0.0.3
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTVERSIONPREFIX=	v
 
@@ -13,13 +13,12 @@ COMMENT=	Function Identification and Recovery Signature Tool
 LICENSE=	GPLv2
 
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mysqlclient>=1.3.8:databases/py-mysqlclient
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mongoengine>=0.10.0:devel/py-mongoengine
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}django>=1.10.2:www/py-django
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}django>=1.11.4:www/py-django
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}werkzeug>=0.11.11:www/py-werkzeug
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}httplib2>=0.9.2:www/py-httplib2
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}oauth2client>=3.0.0:security/py-oauth2client
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}google-api-python-client>=1.5.3:www/py-google-api-python-client
-RUN_DEPENDS+=	distorm>=0:devel/distorm
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}capstone>=3.0.4:devel/py-capstone
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	vrtadmin
diff --git a/security/py-first-server/distinfo b/security/py-first-server/distinfo
index 5f4617cf8186..4a467ced5472 100644
--- a/security/py-first-server/distinfo
+++ b/security/py-first-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501161109
-SHA256 (vrtadmin-FIRST-server-v0.0.1_GH0.tar.gz) = 6d4ea5dc46b8557a31d644e1c1fe34d0575111aa39db0507b64a191b4e984d6e
-SIZE (vrtadmin-FIRST-server-v0.0.1_GH0.tar.gz) = 2248663
+TIMESTAMP = 1505334460
+SHA256 (vrtadmin-FIRST-server-v0.0.3_GH0.tar.gz) = 3cbe371adc82bd5f6340ed313992a18967403368db1604b93eebb39d20eb6e9c
+SIZE (vrtadmin-FIRST-server-v0.0.3_GH0.tar.gz) = 2254467
diff --git a/security/py-first-server/pkg-message b/security/py-first-server/pkg-message
new file mode 100644
index 000000000000..b25e9a5a55d4
--- /dev/null
+++ b/security/py-first-server/pkg-message
@@ -0,0 +1,7 @@
+
+As of version 0.0.2, FIRST no longer requires these packages:
+
+* distorm3
+* mongoengine
+
+You may want to remove them.
diff --git a/security/py-first-server/pkg-plist b/security/py-first-server/pkg-plist
index 5b298e59533c..5f6cd1ac4a5b 100644
--- a/security/py-first-server/pkg-plist
+++ b/security/py-first-server/pkg-plist
@@ -1,18 +1,29 @@
+%%WWWDIR%%/engines/__init__.py
+%%WWWDIR%%/engines/admin.py
+%%WWWDIR%%/engines/apps.py
+%%WWWDIR%%/engines/migrations/__init__.py
+%%WWWDIR%%/engines/models.py
+%%WWWDIR%%/engines/tests.py
+%%WWWDIR%%/engines/views.py
+%%WWWDIR%%/example_config.json
 %%WWWDIR%%/first/__init__.py
-%%WWWDIR%%/first/auth.py
-%%WWWDIR%%/first/dbs/__init__.py
-%%WWWDIR%%/first/dbs/builtin_db.py
-%%WWWDIR%%/first/engines/__init__.py
-%%WWWDIR%%/first/engines/basic_masking.py
-%%WWWDIR%%/first/engines/exact_match.py
-%%WWWDIR%%/first/engines/mnemonic_hash.py
-%%WWWDIR%%/first/engines/results.py
-%%WWWDIR%%/first/engines/skeleton.py_
-%%WWWDIR%%/first/error.py
-%%WWWDIR%%/first/models.py
 %%WWWDIR%%/first/settings.py
 %%WWWDIR%%/first/urls.py
 %%WWWDIR%%/first/wsgi.py
+%%WWWDIR%%/first_core/__init__.py
+%%WWWDIR%%/first_core/auth.py
+%%WWWDIR%%/first_core/dbs/__init__.py
+%%WWWDIR%%/first_core/dbs/builtin_db.py
+%%WWWDIR%%/first_core/disassembly/__init__.py
+%%WWWDIR%%/first_core/engines/__init__.py
+%%WWWDIR%%/first_core/engines/basic_masking.py
+%%WWWDIR%%/first_core/engines/exact_match.py
+%%WWWDIR%%/first_core/engines/mnemonic_hash.py
+%%WWWDIR%%/first_core/engines/results.py
+%%WWWDIR%%/first_core/engines/skeleton.py_
+%%WWWDIR%%/first_core/error.py
+%%WWWDIR%%/first_core/models.py
+%%WWWDIR%%/first_core/util.py
 %%WWWDIR%%/manage.py
 %%WWWDIR%%/rest/__init__.py
 %%WWWDIR%%/rest/admin.py
@@ -23,12 +34,15 @@
 %%WWWDIR%%/rest/tests.py
 %%WWWDIR%%/rest/urls.py
 %%WWWDIR%%/rest/views.py
+%%WWWDIR%%/utilities/__init__.py
 %%WWWDIR%%/utilities/engine_shell.py
-%%WWWDIR%%/utilities/populate_engine.py
+%%WWWDIR%%/utilities/mongo_to_django_orm.py
 %%WWWDIR%%/utilities/test_engine.py
+%%WWWDIR%%/utilities/user_shell.py
 %%WWWDIR%%/www/__init__.py
 %%WWWDIR%%/www/admin.py
 %%WWWDIR%%/www/apps.py
+%%WWWDIR%%/www/migrations/0001_initial.py
 %%WWWDIR%%/www/migrations/__init__.py
 %%WWWDIR%%/www/models.py
 %%WWWDIR%%/www/static/www/Thumbs.db
diff --git a/security/py-google-auth/Makefile b/security/py-google-auth/Makefile
index 0290e95cdf86..f43a441464cc 100644
--- a/security/py-google-auth/Makefile
+++ b/security/py-google-auth/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	google-auth
-PORTVERSION=	1.0.2
+PORTVERSION=	1.1.0
 CATEGORIES=	security python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -20,7 +20,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cachetools>=2.0.0:devel/py-cachetools \
 		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six
 
 NO_ARCH=	yes
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist concurrent distutils
 USES=		python
 
 .include <bsd.port.mk>
diff --git a/security/py-google-auth/distinfo b/security/py-google-auth/distinfo
index db0ed2f523dd..310a8e95c81e 100644
--- a/security/py-google-auth/distinfo
+++ b/security/py-google-auth/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501694364
-SHA256 (google-auth-1.0.2.tar.gz) = bd9f242370496f71fd307d50f66974e36b28f10bfd3437421689ba54d8c6c980
-SIZE (google-auth-1.0.2.tar.gz) = 276353
+TIMESTAMP = 1505293192
+SHA256 (google-auth-1.1.0.tar.gz) = 3aca3b909477a60efc1150ead3a42ff6734365f24d121d258924fdce467f17c5
+SIZE (google-auth-1.1.0.tar.gz) = 290602
diff --git a/security/py-keyrings.alt/Makefile b/security/py-keyrings.alt/Makefile
index f915be1fd0d9..3b84f35da850 100644
--- a/security/py-keyrings.alt/Makefile
+++ b/security/py-keyrings.alt/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	keyrings.alt
-PORTVERSION=	2.2
+PORTVERSION=	2.3
 CATEGORIES=	security python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/security/py-keyrings.alt/distinfo b/security/py-keyrings.alt/distinfo
index a4b659e9025b..bdd23573b0b3 100644
--- a/security/py-keyrings.alt/distinfo
+++ b/security/py-keyrings.alt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1493259448
-SHA256 (keyrings.alt-2.2.tar.gz) = f438bd6e9f1b413b8926b0568fc8aaf2f773fa5b75fed4fb49091c5b32ad85a6
-SIZE (keyrings.alt-2.2.tar.gz) = 26121
+TIMESTAMP = 1504978655
+SHA256 (keyrings.alt-2.3.tar.gz) = 5cb9b6cdb5ce5e8216533e342d3e1b418ddd210466834061966d7dc1a4736f2d
+SIZE (keyrings.alt-2.3.tar.gz) = 26170
diff --git a/security/py-pyaxo/Makefile b/security/py-pyaxo/Makefile
new file mode 100644
index 000000000000..7dff2b4d57c4
--- /dev/null
+++ b/security/py-pyaxo/Makefile
@@ -0,0 +1,23 @@
+# Created by: Yuri Victorovich
+# $FreeBSD$
+
+PORTNAME=	pyaxo
+PORTVERSION=	0.7.7
+CATEGORIES=	security net python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	yuri@rawbw.com
+COMMENT=	Python implementation of the Axolotl ratchet protocol
+
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}passlib>=1.6.1:security/py-passlib \
+		${PYTHON_PKGNAMEPREFIX}pynacl>=1.0.1:security/py-pynacl
+
+USES=		python:2.7
+USE_PYTHON=	autoplist distutils
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/security/py-pyaxo/distinfo b/security/py-pyaxo/distinfo
new file mode 100644
index 000000000000..a440a10e9a23
--- /dev/null
+++ b/security/py-pyaxo/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1504483719
+SHA256 (pyaxo-0.7.7.tar.gz) = f0eafd73e76fc9fa8dc403a68254b7f712a311a6208f812f27f8acc4de8aaaa1
+SIZE (pyaxo-0.7.7.tar.gz) = 63293
diff --git a/security/py-pyaxo/pkg-descr b/security/py-pyaxo/pkg-descr
new file mode 100644
index 000000000000..79908d5ef665
--- /dev/null
+++ b/security/py-pyaxo/pkg-descr
@@ -0,0 +1,10 @@
+The Double Ratchet Algorithm is a protocol (similar to OTR) that provides for
+perfect forward secrecy in (a)synchronous communications. It uses triple
+Diffie-Hellman for authentication and ECDHE for perfect forward secrecy. The
+protocol is lighter and more robust than the OTR protocol - providing better
+forward and future secrecy, as well as deniability.
+
+The protocol was developed by Trevor Perrin and Moxie Marlinspike. Its chief
+use currently is in the Open Whisper Systems Signal package.
+
+WWW: https://github.com/rxcomm/pyaxo
diff --git a/security/py-service_identity/Makefile b/security/py-service_identity/Makefile
index 2bab7ac8a47e..b8c41d85b223 100644
--- a/security/py-service_identity/Makefile
+++ b/security/py-service_identity/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	service_identity
-PORTVERSION=	16.0.0
+PORTVERSION=	17.0.0
 CATEGORIES=	security python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/security/py-service_identity/distinfo b/security/py-service_identity/distinfo
index 8c8f3b075d60..e3bdea4e3c10 100644
--- a/security/py-service_identity/distinfo
+++ b/security/py-service_identity/distinfo
@@ -1,2 +1,3 @@
-SHA256 (service_identity-16.0.0.tar.gz) = 0630e222f59f91f3db498be46b1d879ff220955d7bbad719a5cb9ad14e3c3036
-SIZE (service_identity-16.0.0.tar.gz) = 30270
+TIMESTAMP = 1504993632
+SHA256 (service_identity-17.0.0.tar.gz) = 4001fbb3da19e0df22c47a06d29681a398473af4aa9d745eca525b3b2c2302ab
+SIZE (service_identity-17.0.0.tar.gz) = 23502
diff --git a/security/py-txtorcon/Makefile b/security/py-txtorcon/Makefile
new file mode 100644
index 000000000000..efb6a81de3f4
--- /dev/null
+++ b/security/py-txtorcon/Makefile
@@ -0,0 +1,27 @@
+# Created by: Yuri Victorovich
+# $FreeBSD$
+
+PORTNAME=	txtorcon
+PORTVERSION=	0.19.3
+CATEGORIES=	security python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	yuri@rawbw.com
+COMMENT=	Twisted-based Tor controller client
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twisted>=15.5.0:devel/py-twisted \
+		${PYTHON_PKGNAMEPREFIX}ipaddress>=1.0.16:net/py-ipaddress \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=3.6.1:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}incremental>0:devel/py-incremental \
+		${PYTHON_PKGNAMEPREFIX}Automat>0:devel/py-Automat
+
+USES=		python:2.7 shebangfix
+USE_PYTHON=	distutils autoplist
+NO_ARCH=	yes
+SHEBANG_FILES=	examples/*.py
+
+.include <bsd.port.mk>
diff --git a/security/py-txtorcon/distinfo b/security/py-txtorcon/distinfo
new file mode 100644
index 000000000000..a34ce2cda014
--- /dev/null
+++ b/security/py-txtorcon/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1504485237
+SHA256 (txtorcon-0.19.3.tar.gz) = f73396667909a3c7a98f4dd865edf4ed6a2518ee5a935d92e18b8a479ec244fd
+SIZE (txtorcon-0.19.3.tar.gz) = 265716
diff --git a/security/py-txtorcon/pkg-descr b/security/py-txtorcon/pkg-descr
new file mode 100644
index 000000000000..d278b4e3ea6f
--- /dev/null
+++ b/security/py-txtorcon/pkg-descr
@@ -0,0 +1,11 @@
+txtorcon is an implementation of the control-spec for Tor using the Twisted
+networking library for Python.
+
+This is useful for writing utilities to control or make use of Tor in
+event-based Python programs. If your Twisted program supports endpoints (like
+twistd does) your server or client can make use of Tor immediately, with no
+code changes. Start your own Tor or connect to one and get live stream, circuit,
+relay updates; read and change config; monitor events; build circuits; create
+onion services; etcetera (ReadTheDocs).
+
+WWW: https://github.com/meejah/txtorcon
diff --git a/security/quantis/Makefile b/security/quantis/Makefile
index 699807ca8917..b0933f322e14 100644
--- a/security/quantis/Makefile
+++ b/security/quantis/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	quantis
 DISTVERSION=	v13.11.08
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	security devel java
 MASTER_SITES=	http://www.idquantique.com/~download/Quantis/ \
 		LOCAL/ale
diff --git a/security/rubygem-metasploit-payloads/Makefile b/security/rubygem-metasploit-payloads/Makefile
index 9176376a4159..26faa7404591 100644
--- a/security/rubygem-metasploit-payloads/Makefile
+++ b/security/rubygem-metasploit-payloads/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	metasploit-payloads
-PORTVERSION=	1.3.1
+PORTVERSION=	1.3.7
 CATEGORIES=	security rubygems
 MASTER_SITES=	RG
 
diff --git a/security/rubygem-metasploit-payloads/distinfo b/security/rubygem-metasploit-payloads/distinfo
index 3a6be8ea59a1..9e19bae4eaff 100644
--- a/security/rubygem-metasploit-payloads/distinfo
+++ b/security/rubygem-metasploit-payloads/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503602904
-SHA256 (rubygem/metasploit-payloads-1.3.1.gem) = dd7e4018922f8d32aace493f78fa1b642f8a58b29e7563aeb7b930f211509045
-SIZE (rubygem/metasploit-payloads-1.3.1.gem) = 11912704
+TIMESTAMP = 1504945779
+SHA256 (rubygem/metasploit-payloads-1.3.7.gem) = 46c0d07ed4fe58cca69a13e3085180105546bc56cea3d069b21746e5a1abd5c8
+SIZE (rubygem/metasploit-payloads-1.3.7.gem) = 11930112
diff --git a/security/rubygem-net-ssh/Makefile b/security/rubygem-net-ssh/Makefile
index 7c6865cadbcc..080505a207db 100644
--- a/security/rubygem-net-ssh/Makefile
+++ b/security/rubygem-net-ssh/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	net-ssh
-PORTVERSION=	4.1.0
+PORTVERSION=	4.2.0
 PORTEPOCH=	2
 CATEGORIES=	security rubygems
 MASTER_SITES=	RG
diff --git a/security/rubygem-net-ssh/distinfo b/security/rubygem-net-ssh/distinfo
index 088c40882e5a..7c19e4194e2f 100644
--- a/security/rubygem-net-ssh/distinfo
+++ b/security/rubygem-net-ssh/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1487527752
-SHA256 (rubygem/net-ssh-4.1.0.gem) = 78d04afead09892a7ad6214e51ce4d31e8a1048fd70c70fac10c784e962c7704
-SIZE (rubygem/net-ssh-4.1.0.gem) = 125952
+TIMESTAMP = 1504799737
+SHA256 (rubygem/net-ssh-4.2.0.gem) = 1dda1318904d8ed2c8e18b041cbe29746e6ff45ff4a798eb52aa05fa4fda841d
+SIZE (rubygem/net-ssh-4.2.0.gem) = 126976
diff --git a/security/rubygem-nexpose/Makefile b/security/rubygem-nexpose/Makefile
index 765904404231..a52de7361916 100644
--- a/security/rubygem-nexpose/Makefile
+++ b/security/rubygem-nexpose/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	nexpose
-PORTVERSION=	6.1.1
+PORTVERSION=	7.0.0
 CATEGORIES=	security rubygems
 MASTER_SITES=	RG
 
diff --git a/security/rubygem-nexpose/distinfo b/security/rubygem-nexpose/distinfo
index bb84eafc3d95..04f4d2df2eba 100644
--- a/security/rubygem-nexpose/distinfo
+++ b/security/rubygem-nexpose/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502057606
-SHA256 (rubygem/nexpose-6.1.1.gem) = eb37d87274a75a96f596b909bec176cc2da8956d0e8c24216423a39f80dcde4a
-SIZE (rubygem/nexpose-6.1.1.gem) = 98816
+TIMESTAMP = 1504945836
+SHA256 (rubygem/nexpose-7.0.0.gem) = 89ba2e6b7a54570e00b934187cdb44f7e556387de4aa0f51f3f7f40c39f7ed94
+SIZE (rubygem/nexpose-7.0.0.gem) = 109056
diff --git a/security/rubygem-recog/Makefile b/security/rubygem-recog/Makefile
index 40bb7bc48592..db4febfd9e26 100644
--- a/security/rubygem-recog/Makefile
+++ b/security/rubygem-recog/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	recog
-PORTVERSION=	2.1.12
+PORTVERSION=	2.1.15
 CATEGORIES=	security rubygems
 MASTER_SITES=	RG
 
diff --git a/security/rubygem-recog/distinfo b/security/rubygem-recog/distinfo
index ba24cffa2d30..030fe0895c92 100644
--- a/security/rubygem-recog/distinfo
+++ b/security/rubygem-recog/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503602823
-SHA256 (rubygem/recog-2.1.12.gem) = 43be97ec970cbe70135796709537d7caa93910787eaeb8ee2247e59ca71f0240
-SIZE (rubygem/recog-2.1.12.gem) = 223744
+TIMESTAMP = 1504945876
+SHA256 (rubygem/recog-2.1.15.gem) = e7f252816d089bba56ebc9568ad48fa8f90da6ba5f222fff4132b372ffce5d22
+SIZE (rubygem/recog-2.1.15.gem) = 224256
diff --git a/security/rubygem-rex-random_identifier/Makefile b/security/rubygem-rex-random_identifier/Makefile
index 7654852843b1..203494efd784 100644
--- a/security/rubygem-rex-random_identifier/Makefile
+++ b/security/rubygem-rex-random_identifier/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	rex-random_identifier
-PORTVERSION=	0.1.3
+PORTVERSION=	0.1.4
 CATEGORIES=	security rubygems
 MASTER_SITES=	RG
 
diff --git a/security/rubygem-rex-random_identifier/distinfo b/security/rubygem-rex-random_identifier/distinfo
index c6d05945627e..b1b0d0eb598c 100644
--- a/security/rubygem-rex-random_identifier/distinfo
+++ b/security/rubygem-rex-random_identifier/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504257959
-SHA256 (rubygem/rex-random_identifier-0.1.3.gem) = 87330d64b49bb6f470c66de8c18f8ac28271937dcb002ba9a5981156f8d89df7
-SIZE (rubygem/rex-random_identifier-0.1.3.gem) = 16896
+TIMESTAMP = 1504945904
+SHA256 (rubygem/rex-random_identifier-0.1.4.gem) = 73d1fe1183426b435cba63ca5c6894df63da6c13fc61bc6916ac38f79926e939
+SIZE (rubygem/rex-random_identifier-0.1.4.gem) = 16896
diff --git a/security/seccure/Makefile b/security/seccure/Makefile
index 6f66f33fcb59..e17bdfa198ca 100644
--- a/security/seccure/Makefile
+++ b/security/seccure/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	seccure
 PORTVERSION=	0.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security
 MASTER_SITES=	http://point-at-infinity.org/seccure/ \
 		NETBSD
diff --git a/security/ssh-vault/Makefile b/security/ssh-vault/Makefile
index 7db0c83895c2..ae964de3e7db 100644
--- a/security/ssh-vault/Makefile
+++ b/security/ssh-vault/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	ssh-vault
-PORTVERSION=	0.11.4
+PORTVERSION=	0.12.1
 CATEGORIES=	security
 
 MAINTAINER=	nbari@tequila.io
@@ -17,7 +17,7 @@ USES=		go
 
 USE_GITHUB=	yes
 GH_TUPLE=	ssh-vault:crypto:ae180e0:crypto/src/github.com/ssh-vault/crypto \
-		ssh-vault:ssh2pem:bcc6846:ssh2pem/src/github.com/ssh-vault/ssh2pem
+		ssh-vault:ssh2pem:c1edc64:ssh2pem/src/github.com/ssh-vault/ssh2pem
 GH_SUBDIR=	src/github.com/${PORTNAME}/${PORTNAME}
 
 STRIP=		# stripping can break go binaries
diff --git a/security/ssh-vault/distinfo b/security/ssh-vault/distinfo
index 74c74846c37b..2e27583226cd 100644
--- a/security/ssh-vault/distinfo
+++ b/security/ssh-vault/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1503309777
-SHA256 (ssh-vault-ssh-vault-0.11.4_GH0.tar.gz) = a007ec0790c0768761cd7c5747e3434ab6c9e06af29e9e3c336a79e0e179604a
-SIZE (ssh-vault-ssh-vault-0.11.4_GH0.tar.gz) = 16766
+TIMESTAMP = 1504985804
+SHA256 (ssh-vault-ssh-vault-0.12.1_GH0.tar.gz) = e68ead1903f343a14d5177b5ff97972f5e5582159201180011323ae0b3c8d947
+SIZE (ssh-vault-ssh-vault-0.12.1_GH0.tar.gz) = 17753
 SHA256 (ssh-vault-crypto-ae180e0_GH0.tar.gz) = fe73e39078ecd1d077ddfdfb296c00eaa19c149856443259fe8964ff0951423f
 SIZE (ssh-vault-crypto-ae180e0_GH0.tar.gz) = 2062
-SHA256 (ssh-vault-ssh2pem-bcc6846_GH0.tar.gz) = b11c21626f5f69794220405a63637abd324b139a88d032f4e2b52d769160a30c
-SIZE (ssh-vault-ssh2pem-bcc6846_GH0.tar.gz) = 1521
+SHA256 (ssh-vault-ssh2pem-c1edc64_GH0.tar.gz) = a06595af99ffe330a6167250e53492b0738664d69c311fcb0f02e1cb6fea33a9
+SIZE (ssh-vault-ssh2pem-c1edc64_GH0.tar.gz) = 1523
diff --git a/security/starttls/Makefile b/security/starttls/Makefile
index d8f5bc7420a7..12d0df0b0581 100644
--- a/security/starttls/Makefile
+++ b/security/starttls/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	starttls
 PORTVERSION=	0.10
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.opaopa.org/pub/elisp/
 
diff --git a/security/titus/Makefile b/security/titus/Makefile
index 35e9ed8300b7..f9f5ae4ff005 100644
--- a/security/titus/Makefile
+++ b/security/titus/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	titus
 PORTVERSION=	0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 
 MAINTAINER=	feld@FreeBSD.org
diff --git a/security/tor-devel/Makefile b/security/tor-devel/Makefile
index d85f7d003453..cde1db0d32ad 100644
--- a/security/tor-devel/Makefile
+++ b/security/tor-devel/Makefile
@@ -2,7 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	tor
-DISTVERSION=	0.3.1.5-alpha
+DISTVERSION=	0.3.1.6-rc
+PORTREVISION=	1
 CATEGORIES=	security net ipv6
 MASTER_SITES=	TOR
 PKGNAMESUFFIX=	-devel
@@ -43,7 +44,7 @@ PLIST_SUB=	USER="${USERS}" GROUP="${GROUPS}"
 GROUPS=		_tor
 USERS=		_tor
 
-CONFLICTS=	tor-[0-9]*
+CONFLICTS_INSTALL=	tor-[0-9]*
 
 STATIC_TOR_USES=	ssl:build
 STATIC_TOR_USES_OFF=	ssl
diff --git a/security/tor-devel/distinfo b/security/tor-devel/distinfo
index 3c157a1546b6..4ba79cee0227 100644
--- a/security/tor-devel/distinfo
+++ b/security/tor-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502515690
-SHA256 (tor-0.3.1.5-alpha.tar.gz) = 04281b87e8b97517ba52232cd58de06a816f5a136b9b7a7316be878b36df8313
-SIZE (tor-0.3.1.5-alpha.tar.gz) = 5997514
+TIMESTAMP = 1505321357
+SHA256 (tor-0.3.1.6-rc.tar.gz) = d1548e28e1f82e2eb4a95f2334f4809383f173b32e57ab628d76b088f10ca6fd
+SIZE (tor-0.3.1.6-rc.tar.gz) = 6029128
diff --git a/security/tor/Makefile b/security/tor/Makefile
index 079c0339d7fd..46e93620d67d 100644
--- a/security/tor/Makefile
+++ b/security/tor/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	tor
 PORTVERSION=	0.3.0.10
+PORTREVISION=	1
 CATEGORIES=	security net ipv6
 MASTER_SITES=	TOR
 
diff --git a/security/vuxml/vuln.xml b/security/vuxml/vuln.xml
index 2a6282cffd29..3cdeff0e5ad8 100644
--- a/security/vuxml/vuln.xml
+++ b/security/vuxml/vuln.xml
@@ -58,6 +58,273 @@ Notes:
   * Do not forget port variants (linux-f10-libxml2, libxml2, etc.)
 -->
 <vuxml xmlns="http://www.vuxml.org/apps/vuxml-1">
+  <vuln vid="6a177c87-9933-11e7-93f7-d43d7e971a1b">
+    <topic>GitLab -- multiple vulnerabilities</topic>
+    <affects>
+      <package>
+	      <name>gitlab</name>
+  <range><ge>1.0.0</ge><le>9.3.10</le></range>
+  <range><ge>9.4.0</ge><le>9.4.5</le></range>
+  <range><ge>9.5.0</ge><le>9.5.3</le></range>
+      </package>
+    </affects>
+    <description>
+      <body xmlns="http://www.w3.org/1999/xhtml">
+	<p>GitLab reports:</p>
+	<blockquote cite="https://about.gitlab.com/2017/09/07/gitlab-9-dot-5-dot-4-security-release/">
+    <h1>Cross-Site Scripting (XSS) vulnerability in profile names</h1>
+	  <p>An external security audit performed by Madison Gurkha disclosed a
+	  Cross-Site Scripting (XSS) vulnerability in user names that could be
+	  exploited in several locations.</p>
+    <h1>Open Redirect in go-get middleware</h1>
+    <p>Tim Goddard via HackerOne reported that GitLab was vulnerable to an open
+    redirect vulnerability caused when a specific flag is passed to the go-get
+    middleware. This vulnerability could also possibly be used to conduct
+    Cross-Site Scripting attacks.</p>
+    <h1>Race condition in project uploads</h1>
+    <p>Jobert Abma from HackerOne reported that GitLab was vulnerable to a race
+    condition in project uploads. While very difficult to exploit this race
+    condition could potentially allow an attacker to overwrite a victim's
+    uploaded project if the attacker can guess the name of the uploaded file
+    before it is extracted.</p>
+    <h1>Cross-Site Request Forgery (CSRF) token leakage</h1>
+    <p>naure via HackerOne reported that GitLab was vulnerable to CSRF token
+    leakage via improper filtering of external URLs in relative URL creation. A
+    specially crafted link configured in a project's environments settings could
+    be used to steal a visiting user's CSRF token.</p>
+    <h1>Potential project disclosure via project deletion bug</h1>
+    <p>An internal code review discovered that removed projects were not always
+    being deleted from the file system. This could allow an attacker who knew
+    the full path to a previously deleted project to steal a copy of the
+    repository. These releases prevent the leftover repository from being
+    accessed when creating a new project. The project deletion bug will be fixed
+    in a later release.</p>
+    <h1>White-listed style attribute for table contents in MD enables UI
+    redressing</h1>
+    <p>An external security audit performed by Recurity-Labs discovered a UI
+    redressing vulnerability in the GitLab markdown sanitization library.</p>
+    <h1>DOM clobbering in sanitized MD causes errors</h1>
+    <p>An external security audit performed by Recurity-Labs discovered a DOM
+    clobbering vulnerability in the GitLab markdown sanitization library that
+    could be used to render project pages unreadable.</p>
+    <h1>Nokogiri vendored libxslt library vulnerable to potential integer
+    overflow (CVE-2017-5029 and CVE-2016-4738)</h1>
+    <p>The bundled Nokogiri library has been updated to patch an integer
+    overflow vulnerability. Details are available in the Nokogiri issue.</p>
+    <h1>Security risk in recommended Geo configuration could give all users
+    access to all repositories</h1>
+    <p>An internal code review discovered that GitLab Geo instances could be
+    vulnerable to an attack that would allow any user on the primary Geo
+    instance to clone any repository on a secondary Geo instance.</p>
+    <h1>GitLab Pages private certificate disclosure via symlinks</h1>
+    <p>An external security review conducted by Recurity-Labs discovered a
+    vulnerability in GitLab Pages that could be used to disclose the contents of
+    private SSL keys.</p>
+	</blockquote>
+      </body>
+    </description>
+    <references>
+      <url>https://about.gitlab.com/2017/09/07/gitlab-9-dot-5-dot-4-security-release/</url>
+      <cvename>CVE-2017-5029</cvename>
+      <cvename>CVE-2016-4738</cvename>
+    </references>
+    <dates>
+      <discovery>2017-09-07</discovery>
+      <entry>2017-09-14</entry>
+    </dates>
+  </vuln>
+
+  <vuln vid="531aae08-97f0-11e7-aadd-6451062f0f7a">
+    <topic>Flash Player -- multiple vulnerabilities</topic>
+    <affects>
+      <package>
+	<name>linux-flashplayer</name>
+	<range><lt>27.0.0.130</lt></range>
+      </package>
+    </affects>
+    <description>
+      <body xmlns="http://www.w3.org/1999/xhtml">
+	<p>Adobe reports:</p>
+	<blockquote cite="https://helpx.adobe.com/security/products/flash-player/apsb17-28.html">
+	  <ul>
+	    <li>These updates resolve memory corruption vulnerabilities that
+	      could lead to remote code execution (CVE-2017-11281,
+	      CVE-2017-11282).</li>
+	  </ul>
+	</blockquote>
+      </body>
+    </description>
+    <references>
+      <cvename>CVE-2017-11281</cvename>
+      <cvename>CVE-2017-11282</cvename>
+      <url>https://helpx.adobe.com/security/products/flash-player/apsb17-28.html</url>
+    </references>
+    <dates>
+      <discovery>2017-09-12</discovery>
+      <entry>2017-09-12</entry>
+    </dates>
+  </vuln>
+
+  <vuln vid="47e2e52c-975c-11e7-942d-5404a68a61a2">
+    <topic>emacs -- enriched text remote code execution vulnerability</topic>
+    <affects>
+      <package>
+	<name>emacs25</name>
+	<name>emacs-nox11</name>
+	<range><lt>25.3,3</lt></range>
+      </package>
+      <package>
+	<name>emacs-devel</name>
+	<range><lt>26.0.50.20170912,2</lt></range>
+      </package>
+    </affects>
+    <description>
+      <body xmlns="http://www.w3.org/1999/xhtml">
+	<p>Paul Eggert reports:</p>
+	<blockquote cite="http://seclists.org/oss-sec/2017/q3/422">
+	  <p>Charles A. Roelli has found a security flaw in the enriched mode in GNU Emacs.</p>
+	  <p>When Emacs renders MIME text/enriched data (Internet RFC 1896), it
+	  is vulnerable to arbitrary code execution. Since Emacs-based mail
+	  clients decode "Content-Type: text/enriched", this code is exploitable
+	  remotely. This bug affects GNU Emacs versions 19.29 through 25.2.</p>
+	</blockquote>
+      </body>
+    </description>
+    <references>
+      <url>http://seclists.org/oss-sec/2017/q3/422</url>
+      <url>https://bugs.gnu.org/28350</url>
+    </references>
+    <dates>
+      <discovery>2017-09-04</discovery>
+      <entry>2017-09-12</entry>
+      <modified>2017-09-13</modified>
+    </dates>
+  </vuln>
+
+  <vuln vid="f9f76a50-9642-11e7-ab09-080027b00c2e">
+    <topic>cyrus-imapd -- broken "other users" behaviour</topic>
+    <affects>
+      <package>
+	<name>cyrus-imapd30</name>
+	<range><ge>3.0.0</ge><lt>3.0.4</lt></range>
+      </package>
+    </affects>
+    <description>
+      <body xmlns="http://www.w3.org/1999/xhtml">
+	<p>Cyrus IMAP 3.0.4 Release Notes states:</p>
+	<blockquote cite="https://www.cyrusimap.org/imap/download/release-notes/3.0/x/3.0.4.html">
+	  <p>Fixed Issue #2132: Broken "Other Users" behaviour</p>
+	</blockquote>
+      </body>
+    </description>
+    <references>
+      <cvename>CVE-2017-14230</cvename>
+      <url>http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-14230</url>
+    </references>
+    <dates>
+      <discovery>2017-09-07</discovery>
+      <entry>2017-09-10</entry>
+    </dates>
+  </vuln>
+
+  <vuln vid="aaab03be-932d-11e7-92d8-4b26fc968492">
+    <topic>Django -- possible XSS in traceback section of technical 500 debug page</topic>
+    <affects>
+      <package>
+	<name>py27-django110</name>
+	<name>py34-django110</name>
+	<name>py35-django110</name>
+	<name>py36-django110</name>
+	<range><lt>1.10.8</lt></range>
+      </package>
+      <package>
+	<name>py27-django111</name>
+	<name>py34-django111</name>
+	<name>py35-django111</name>
+	<name>py36-django111</name>
+	<range><lt>1.11.5</lt></range>
+      </package>
+    </affects>
+    <description>
+      <body xmlns="http://www.w3.org/1999/xhtml">
+	<p>Django blog:</p>
+	<blockquote cite="https://www.djangoproject.com/weblog/2017/sep/05/security-releases/">
+	  <p>In older versions, HTML autoescaping was disabled in a portion of the template
+	    for the technical 500 debug page. Given the right circumstances, this allowed a
+	    cross-site scripting attack. This vulnerability shouldn't affect most production
+	    sites since you shouldn't run with DEBUG = True (which makes this page accessible)
+	    in your production settings.</p>
+	</blockquote>
+      </body>
+    </description>
+    <references>
+      <cvename>CVE-2017-12794</cvename>
+      <url>https://www.djangoproject.com/weblog/2017/sep/05/security-releases/</url>
+    </references>
+    <dates>
+      <discovery>2017-09-05</discovery>
+      <entry>2017-09-06</entry>
+    </dates>
+  </vuln>
+
+  <vuln vid="e1100e63-92f7-11e7-bd95-e8e0b747a45a">
+    <topic>chromium -- multiple vulnerabilities</topic>
+    <affects>
+      <package>
+	<name>chromium</name>
+	<range><lt>61.0.3163.79</lt></range>
+      </package>
+    </affects>
+    <description>
+      <body xmlns="http://www.w3.org/1999/xhtml">
+	<p>Google Chrome releases reports:</p>
+	<blockquote cite="https://chromereleases.googleblog.com/2017/09/stable-channel-update-for-desktop.html">
+	  <p>22 security fixes in this release, including:</p>
+	  <ul>
+	    <li>[737023] High CVE-2017-5111: Use after free in PDFium. Reported by
+	      Luat Nguyen on KeenLab, Tencent on 2017-06-27</li>
+	    <li>[740603] High CVE-2017-5112: Heap buffer overflow in WebGL. Reported by
+	      Tobias Klein on 2017-07-10</li>
+	    <li>[747043] High CVE-2017-5113: Heap buffer overflow in Skia. Reported by
+	      Anonymous on 2017-07-20</li>
+	    <li>[752829] High CVE-2017-5114: Memory lifecycle issue in PDFium. Reported by
+	      Ke Liu of Tencent's Xuanwu LAB on 2017-08-07</li>
+	    <li>[744584] High CVE-2017-5115: Type confusion in V8. Reported by
+	      Marco Giovannini on 2017-07-17</li>
+	    <li>[759624] High CVE-2017-5116: Type confusion in V8. Reported by
+	      Anonymous on 2017-08-28</li>
+	    <li>[739190] Medium CVE-2017-5117: Use of uninitialized value in Skia. Reported by
+	      Tobias Klein on 2017-07-04</li>
+	    <li>[747847] Medium CVE-2017-5118: Bypass of Content Security Policy in Blink. Reported by
+	      WenXu Wu of Tencent's Xuanwu Lab on 2017-07-24</li>
+	    <li>[725127] Medium CVE-2017-5119: Use of uninitialized value in Skia. Reported by
+	      Anonymous on 2017-05-22</li>
+	    <li>[718676] Low CVE-2017-5120: Potential HTTPS downgrade during redirect navigation. Reported by
+	      Xiaoyin Liu on 2017-05-05</li>
+	    <li>[762099] Various fixes from internal audits, fuzzing and other initiatives</li>
+	  </ul>
+	</blockquote>
+      </body>
+    </description>
+    <references>
+      <cvename>CVE-2017-5111</cvename>
+      <cvename>CVE-2017-5112</cvename>
+      <cvename>CVE-2017-5113</cvename>
+      <cvename>CVE-2017-5114</cvename>
+      <cvename>CVE-2017-5115</cvename>
+      <cvename>CVE-2017-5116</cvename>
+      <cvename>CVE-2017-5117</cvename>
+      <cvename>CVE-2017-5118</cvename>
+      <cvename>CVE-2017-5119</cvename>
+      <cvename>CVE-2017-5120</cvename>
+      <url>https://chromereleases.googleblog.com/2017/09/stable-channel-update-for-desktop.html</url>
+    </references>
+    <dates>
+      <discovery>2017-09-05</discovery>
+      <entry>2017-09-06</entry>
+    </dates>
+  </vuln>
+
   <vuln vid="44101b31-8ffd-11e7-b5af-a4badb2f4699">
     <cancelled/>
   </vuln>
@@ -397,11 +664,13 @@ Notes:
       </package>
       <package>
 	<name>atril</name>
-	<range><le>1.19.0</le></range>
+	<range><lt>1.18.1</lt></range>
+	<range><ge>1.19.0</ge><lt>1.19.1</lt></range>
       </package>
       <package>
 	<name>atril-lite</name>
-	<range><le>1.19.0</le></range>
+	<range><lt>1.18.1</lt></range>
+	<range><ge>1.19.0</ge><lt>1.19.1</lt></range>
       </package>
     </affects>
     <description>
@@ -5301,12 +5570,12 @@ maliciously crafted GET request to the Horde server.</p>
 	<range><lt>1.9.13</lt></range>
       </package>
       <package>
-      <name>py27-django110</name>
-      <name>py27-django110</name>
-      <name>py27-django110</name>
-      <name>py27-django110</name>
-      <name>py27-django110</name>
-      <range><lt>1.10.7</lt></range>
+	<name>py27-django110</name>
+	<name>py33-django110</name>
+	<name>py34-django110</name>
+	<name>py35-django110</name>
+	<name>py36-django110</name>
+	<range><lt>1.10.7</lt></range>
       </package>
     </affects>
     <description>
diff --git a/shells/dash/Makefile b/shells/dash/Makefile
index 0870a9a07bc8..f650134f037e 100644
--- a/shells/dash/Makefile
+++ b/shells/dash/Makefile
@@ -1,13 +1,16 @@
 # $FreeBSD$
 
 PORTNAME=	dash
-PORTVERSION=	0.5.8
+PORTVERSION=	0.5.9.1
 CATEGORIES=	shells
 MASTER_SITES=	http://gondor.apana.org.au/~herbert/dash/files/
 
 MAINTAINER=	bdrewery@FreeBSD.org
 COMMENT=	POSIX-compliant implementation of /bin/sh
 
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 GNU_CONFIGURE=	yes
 # This work in 11-CURRENT r266677M amd64 but fails to work in 11.0-CURRENT r266677 i386
 CFLAGS+=	-DUNUSABLE_RT_SIGNALS
diff --git a/shells/dash/distinfo b/shells/dash/distinfo
index 800e99d717f8..7394ae9cca14 100644
--- a/shells/dash/distinfo
+++ b/shells/dash/distinfo
@@ -1,2 +1,3 @@
-SHA256 (dash-0.5.8.tar.gz) = c6db3a237747b02d20382a761397563d813b306c020ae28ce25a1c3915fac60f
-SIZE (dash-0.5.8.tar.gz) = 223028
+TIMESTAMP = 1485880831
+SHA256 (dash-0.5.9.1.tar.gz) = 5ecd5bea72a93ed10eb15a1be9951dd51b52e5da1d4a7ae020efd9826b49e659
+SIZE (dash-0.5.9.1.tar.gz) = 225217
diff --git a/shells/fish/Makefile b/shells/fish/Makefile
index fefd5819ca1c..bf35bb6d3508 100644
--- a/shells/fish/Makefile
+++ b/shells/fish/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	fish
-PORTVERSION=	2.5.0
+PORTVERSION=	2.6.0
 CATEGORIES=	shells
 MASTER_SITES=	http://fishshell.com/files/${PORTVERSION}/
 
@@ -11,8 +11,11 @@ COMMENT=	User friendly command line shell
 
 LICENSE=	GPLv2
 
+LIB_DEPENDS+=	libpcre2-32.so:devel/pcre2
+
 USES=		autoreconf cpe gmake libtool ncurses pkgconfig pathfix python:3 \
-		localbase compiler:c++11-lang
+		localbase compiler:c++11-lang shebangfix
+SHEBANG_FILES=	share/tools/*.py share/tools/web_config/webconfig.py
 
 GNU_CONFIGURE=	yes
 
diff --git a/shells/fish/distinfo b/shells/fish/distinfo
index de87dc0657ad..012b9920a33f 100644
--- a/shells/fish/distinfo
+++ b/shells/fish/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1486791004
-SHA256 (fish-2.5.0.tar.gz) = f8c0edadca2de379ccf305aeace660a9255fa2180c72e85e97705a24c256b2a5
-SIZE (fish-2.5.0.tar.gz) = 3496831
+TIMESTAMP = 1497402776
+SHA256 (fish-2.6.0.tar.gz) = 7ee5bbd671c73e5323778982109241685d58a836e52013e18ee5d9f2e638fdfb
+SIZE (fish-2.6.0.tar.gz) = 3575346
diff --git a/shells/fish/files/patch-share_completions_python.fish b/shells/fish/files/patch-share_completions_python.fish
deleted file mode 100644
index a8cd43c851d6..000000000000
--- a/shells/fish/files/patch-share_completions_python.fish
+++ /dev/null
@@ -1,18 +0,0 @@
---- share/completions/python.fish.orig	2017-02-11 04:56:23 UTC
-+++ share/completions/python.fish
-@@ -16,15 +16,3 @@ complete -c python -s W -x --description
- complete -c python -s x -d 'Skip first line of source, allowing use of non-Unix forms of #!cmd'
- complete -c python -a "(__fish_complete_suffix .py)"
- complete -c python -a '-' -d 'Read program from stdin'
--
--switch (python -V 2>&1 | string replace -r '^.*\s([23])..*' '$1')[1]
--    case 2
--        complete -c python -s 3 -d 'Warn about Python 3.x incompatibilities that 2to3 cannot trivially fix'
--        complete -c python -s t --description "Warn on mixed tabs and spaces"
--        complete -c python -s Q -x -a "old new warn warnall" --description "Division control"
--    case 3
--        complete -c python -s q --description 'Don\'t print version and copyright messages on interactive startup'
--        complete -c python -s X -x -d 'Set implementation-specific option'
--        complete -c python -s b  -d 'Issue warnings about str(bytes_instance), str(bytearray_instance) and comparing bytes/bytearray with str'
--        complete -c python -o bb -d 'Issue errors'
--end
diff --git a/shells/fish/files/patch-share_functions_____fish__print__filesystems.fish b/shells/fish/files/patch-share_functions_____fish__print__filesystems.fish
deleted file mode 100644
index 9a4ceed4fea0..000000000000
--- a/shells/fish/files/patch-share_functions_____fish__print__filesystems.fish
+++ /dev/null
@@ -1,11 +0,0 @@
---- share/functions/__fish_print_filesystems.fish.orig	2017-02-03 01:46:58 UTC
-+++ share/functions/__fish_print_filesystems.fish
-@@ -4,6 +4,6 @@ function __fish_print_filesystems -d "Pr
-     set fs $fs hfs hpfs iso9660 jfs minix msdos ncpfs nfs ntfs proc qnx4 ramfs
-     set fs $fs reiserfs romfs smbfs sysv tmpfs udf ufs umsdos vfat xenix xfs xiafs
-     # Mount has helper binaries to mount filesystems
--    # These are called mount.* and are placed somewhere in $PATH
--    printf "%s\n" $fs (string replace -ra ".*/mount." "" -- $PATH/mount.*)
-+    # These are called mount_* and are placed somewhere in $PATH
-+    printf "%s\n" $fs (string replace -ra ".*/mount_" "" -- $PATH/mount_*)
- end
diff --git a/shells/fish/files/patch-src_common.cpp b/shells/fish/files/patch-src_common.cpp
new file mode 100644
index 000000000000..ceebe1361a8e
--- /dev/null
+++ b/shells/fish/files/patch-src_common.cpp
@@ -0,0 +1,11 @@
+--- src/common.cpp.orig	2017-06-16 23:56:48 UTC
++++ src/common.cpp
+@@ -1986,7 +1986,7 @@ void redirect_tty_output() {
+ }
+ 
+ /// Display a failed assertion message, dump a stack trace if possible, then die.
+-[[noreturn]] void __assert(const char *msg, const char *file, size_t line, int error) {
++[[noreturn]] void __fish_assert(const char *msg, const char *file, size_t line, int error) {
+     if (error) {
+         debug(0, L"%s:%zu: failed assertion: %s: errno %d (%s)", file, line, msg, error,
+               strerror(error));
diff --git a/shells/fish/files/patch-src_common.h b/shells/fish/files/patch-src_common.h
new file mode 100644
index 000000000000..a932b29d34d2
--- /dev/null
+++ b/shells/fish/files/patch-src_common.h
@@ -0,0 +1,32 @@
+--- src/common.h.orig	2017-06-16 23:55:11 UTC
++++ src/common.h
+@@ -213,23 +213,21 @@ extern bool has_working_tty_timestamps;
+ /// stdio functions and should be writing the message to stderr rather than stdout. Second, if
+ /// possible it is useful to provide additional context such as a stack backtrace.
+ #undef assert
+-#undef __assert
+-//#define assert(e)  do {(void)((e) ? ((void)0) : __assert(#e, __FILE__, __LINE__)); } while(false)
+-#define assert(e) (e) ? ((void)0) : __assert(#e, __FILE__, __LINE__, 0)
+-#define assert_with_errno(e) (e) ? ((void)0) : __assert(#e, __FILE__, __LINE__, errno)
+-#define DIE(msg) __assert(msg, __FILE__, __LINE__, 0)
+-#define DIE_WITH_ERRNO(msg) __assert(msg, __FILE__, __LINE__, errno)
++#define assert(e) (e) ? ((void)0) : __fish_assert(#e, __FILE__, __LINE__, 0)
++#define assert_with_errno(e) (e) ? ((void)0) : __fish_assert(#e, __FILE__, __LINE__, errno)
++#define DIE(msg) __fish_assert(msg, __FILE__, __LINE__, 0)
++#define DIE_WITH_ERRNO(msg) __fish_assert(msg, __FILE__, __LINE__, errno)
+ /// This macro is meant to be used with functions that return zero on success otherwise return an
+ /// errno value. Most notably the pthread family of functions which we never expect to fail.
+ #define DIE_ON_FAILURE(e)                             \
+     do {                                              \
+         int status = e;                               \
+         if (status != 0) {                            \
+-            __assert(#e, __FILE__, __LINE__, status); \
++            __fish_assert(#e, __FILE__, __LINE__, status); \
+         }                                             \
+     } while (0)
+ 
+-[[noreturn]] void __assert(const char *msg, const char *file, size_t line, int error);
++[[noreturn]] void __fish_assert(const char *msg, const char *file, size_t line, int error);
+ 
+ /// Check if signals are blocked. If so, print an error message and return from the function
+ /// performing this check.
diff --git a/shells/fish/pkg-plist b/shells/fish/pkg-plist
index 5d1a47147300..c73baf04f0d1 100644
--- a/shells/fish/pkg-plist
+++ b/shells/fish/pkg-plist
@@ -69,7 +69,6 @@ man/man1/fish_key_reader.1.gz
 %%DATADIR%%/completions/alsactl.fish
 %%DATADIR%%/completions/alsamixer.fish
 %%DATADIR%%/completions/amixer.fish
-%%DATADIR%%/completions/anamnesis.fish
 %%DATADIR%%/completions/and.fish
 %%DATADIR%%/completions/animate.fish
 %%DATADIR%%/completions/ant.fish
@@ -128,7 +127,6 @@ man/man1/fish_key_reader.1.gz
 %%DATADIR%%/completions/builtin.fish
 %%DATADIR%%/completions/bundle.fish
 %%DATADIR%%/completions/bunzip2.fish
-%%DATADIR%%/completions/burp.fish
 %%DATADIR%%/completions/busctl.fish
 %%DATADIR%%/completions/bzcat.fish
 %%DATADIR%%/completions/bzip2.fish
@@ -136,10 +134,12 @@ man/man1/fish_key_reader.1.gz
 %%DATADIR%%/completions/bzr.fish
 %%DATADIR%%/completions/cabal-dev.fish
 %%DATADIR%%/completions/cabal.fish
+%%DATADIR%%/completions/caddy.fish
 %%DATADIR%%/completions/caffeinate.fish
 %%DATADIR%%/completions/cancel.fish
 %%DATADIR%%/completions/canto.fish
 %%DATADIR%%/completions/cargo.fish
+%%DATADIR%%/completions/castnow.fish
 %%DATADIR%%/completions/cat.fish
 %%DATADIR%%/completions/cd.fish
 %%DATADIR%%/completions/cdrecord.fish
@@ -147,6 +147,7 @@ man/man1/fish_key_reader.1.gz
 %%DATADIR%%/completions/chmod.fish
 %%DATADIR%%/completions/chown.fish
 %%DATADIR%%/completions/chsh.fish
+%%DATADIR%%/completions/climate.fish
 %%DATADIR%%/completions/colordiff.fish
 %%DATADIR%%/completions/colorsvn.fish
 %%DATADIR%%/completions/combine.fish
@@ -176,7 +177,6 @@ man/man1/fish_key_reader.1.gz
 %%DATADIR%%/completions/darcs.fish
 %%DATADIR%%/completions/date.fish
 %%DATADIR%%/completions/dconf.fish
-%%DATADIR%%/completions/dcop.fish
 %%DATADIR%%/completions/dd.fish
 %%DATADIR%%/completions/defaults.fish
 %%DATADIR%%/completions/df.fish
@@ -185,7 +185,6 @@ man/man1/fish_key_reader.1.gz
 %%DATADIR%%/completions/diskutil.fish
 %%DATADIR%%/completions/display.fish
 %%DATADIR%%/completions/djview.fish
-%%DATADIR%%/completions/djview3.fish
 %%DATADIR%%/completions/djview4.fish
 %%DATADIR%%/completions/dlocate.fish
 %%DATADIR%%/completions/dmesg.fish
@@ -198,7 +197,6 @@ man/man1/fish_key_reader.1.gz
 %%DATADIR%%/completions/dvipdf.fish
 %%DATADIR%%/completions/dvipdfm.fish
 %%DATADIR%%/completions/echo.fish
-%%DATADIR%%/completions/effectv.fish
 %%DATADIR%%/completions/egrep.fish
 %%DATADIR%%/completions/eix-sync.fish
 %%DATADIR%%/completions/eix.fish
@@ -217,7 +215,6 @@ man/man1/fish_key_reader.1.gz
 %%DATADIR%%/completions/exec.fish
 %%DATADIR%%/completions/exit.fish
 %%DATADIR%%/completions/expand.fish
-%%DATADIR%%/completions/fcrontab.fish
 %%DATADIR%%/completions/feh.fish
 %%DATADIR%%/completions/fg.fish
 %%DATADIR%%/completions/fgrep.fish
@@ -227,6 +224,7 @@ man/man1/fish_key_reader.1.gz
 %%DATADIR%%/completions/fish.fish
 %%DATADIR%%/completions/fish_indent.fish
 %%DATADIR%%/completions/flac.fish
+%%DATADIR%%/completions/flatpak.fish
 %%DATADIR%%/completions/fluxbox-remote.fish
 %%DATADIR%%/completions/fossil.fish
 %%DATADIR%%/completions/ftp.fish
@@ -250,21 +248,25 @@ man/man1/fish_key_reader.1.gz
 %%DATADIR%%/completions/gpg.fish
 %%DATADIR%%/completions/gphoto2.fish
 %%DATADIR%%/completions/gprof.fish
+%%DATADIR%%/completions/gradle.fish
 %%DATADIR%%/completions/grep.fish
 %%DATADIR%%/completions/groupadd.fish
 %%DATADIR%%/completions/grunt.fish
+%%DATADIR%%/completions/gsettings.fish
 %%DATADIR%%/completions/gunzip.fish
 %%DATADIR%%/completions/gv.fish
 %%DATADIR%%/completions/gvim.fish
 %%DATADIR%%/completions/gvimdiff.fish
 %%DATADIR%%/completions/gzip.fish
 %%DATADIR%%/completions/head.fish
+%%DATADIR%%/completions/helm.fish
 %%DATADIR%%/completions/help.fish
 %%DATADIR%%/completions/heroku.fish
 %%DATADIR%%/completions/hg.fish
 %%DATADIR%%/completions/highlight.fish
 %%DATADIR%%/completions/history.fish
 %%DATADIR%%/completions/htop.fish
+%%DATADIR%%/completions/i3-msg.fish
 %%DATADIR%%/completions/iconv.fish
 %%DATADIR%%/completions/id.fish
 %%DATADIR%%/completions/identify.fish
@@ -276,9 +278,11 @@ man/man1/fish_key_reader.1.gz
 %%DATADIR%%/completions/import.fish
 %%DATADIR%%/completions/invoke-rc.d.fish
 %%DATADIR%%/completions/ip.fish
+%%DATADIR%%/completions/ipset.fish
 %%DATADIR%%/completions/iptables.fish
 %%DATADIR%%/completions/jobs.fish
 %%DATADIR%%/completions/journalctl.fish
+%%DATADIR%%/completions/jq.fish
 %%DATADIR%%/completions/kcmshell5.fish
 %%DATADIR%%/completions/kill.fish
 %%DATADIR%%/completions/killall.fish
@@ -289,6 +293,7 @@ man/man1/fish_key_reader.1.gz
 %%DATADIR%%/completions/launchctl.fish
 %%DATADIR%%/completions/lein.fish
 %%DATADIR%%/completions/less.fish
+%%DATADIR%%/completions/light.fish
 %%DATADIR%%/completions/ll.fish
 %%DATADIR%%/completions/ln.fish
 %%DATADIR%%/completions/localectl.fish
@@ -316,6 +321,7 @@ man/man1/fish_key_reader.1.gz
 %%DATADIR%%/completions/lxpanel.fish
 %%DATADIR%%/completions/m4.fish
 %%DATADIR%%/completions/machinectl.fish
+%%DATADIR%%/completions/magento.fish
 %%DATADIR%%/completions/make.fish
 %%DATADIR%%/completions/makedepend.fish
 %%DATADIR%%/completions/makepkg.fish
@@ -328,12 +334,16 @@ man/man1/fish_key_reader.1.gz
 %%DATADIR%%/completions/mdimport.fish
 %%DATADIR%%/completions/mdls.fish
 %%DATADIR%%/completions/mdutil.fish
-%%DATADIR%%/completions/meat.fish
+%%DATADIR%%/completions/minikube.fish
 %%DATADIR%%/completions/mix.fish
 %%DATADIR%%/completions/mkdir.fish
+%%DATADIR%%/completions/mkdosfs.fish
+%%DATADIR%%/completions/mkfs.fat.fish
+%%DATADIR%%/completions/mkfs.vfat.fish
 %%DATADIR%%/completions/mkinitcpio.fish
 %%DATADIR%%/completions/mktemp.fish
 %%DATADIR%%/completions/mkvextract.fish
+%%DATADIR%%/completions/mocha.fish
 %%DATADIR%%/completions/mocp.fish
 %%DATADIR%%/completions/modinfo.fish
 %%DATADIR%%/completions/modprobe.fish
@@ -415,6 +425,7 @@ man/man1/fish_key_reader.1.gz
 %%DATADIR%%/completions/psql.fish
 %%DATADIR%%/completions/psub.fish
 %%DATADIR%%/completions/pushd.fish
+%%DATADIR%%/completions/pv.fish
 %%DATADIR%%/completions/pydf.fish
 %%DATADIR%%/completions/pygmentize.fish
 %%DATADIR%%/completions/python.fish
@@ -459,6 +470,7 @@ man/man1/fish_key_reader.1.gz
 %%DATADIR%%/completions/set.fish
 %%DATADIR%%/completions/set_color.fish
 %%DATADIR%%/completions/setfacl.fish
+%%DATADIR%%/completions/setsid.fish
 %%DATADIR%%/completions/setxkbmap.fish
 %%DATADIR%%/completions/sha1sum.fish
 %%DATADIR%%/completions/sha224sum.fish
@@ -488,6 +500,7 @@ man/man1/fish_key_reader.1.gz
 %%DATADIR%%/completions/tee.fish
 %%DATADIR%%/completions/telnet.fish
 %%DATADIR%%/completions/termite.fish
+%%DATADIR%%/completions/terraform.fish
 %%DATADIR%%/completions/test.fish
 %%DATADIR%%/completions/tex.fish
 %%DATADIR%%/completions/time.fish
@@ -515,6 +528,7 @@ man/man1/fish_key_reader.1.gz
 %%DATADIR%%/completions/update-eix-remote.fish
 %%DATADIR%%/completions/update-eix.fish
 %%DATADIR%%/completions/useradd.fish
+%%DATADIR%%/completions/usermod.fish
 %%DATADIR%%/completions/vagrant.fish
 %%DATADIR%%/completions/valgrind.fish
 %%DATADIR%%/completions/vared.fish
@@ -541,6 +555,7 @@ man/man1/fish_key_reader.1.gz
 %%DATADIR%%/completions/xdvi.fish
 %%DATADIR%%/completions/xelatex.fish
 %%DATADIR%%/completions/xgettext.fish
+%%DATADIR%%/completions/xinput.fish
 %%DATADIR%%/completions/xmms.fish
 %%DATADIR%%/completions/xpdf.fish
 %%DATADIR%%/completions/xprop.fish
@@ -550,6 +565,7 @@ man/man1/fish_key_reader.1.gz
 %%DATADIR%%/completions/xterm.fish
 %%DATADIR%%/completions/xz.fish
 %%DATADIR%%/completions/yaourt.fish
+%%DATADIR%%/completions/yarn.fish
 %%DATADIR%%/completions/yast2.fish
 %%DATADIR%%/completions/yum.fish
 %%DATADIR%%/completions/zcat.fish
@@ -562,6 +578,7 @@ man/man1/fish_key_reader.1.gz
 %%DATADIR%%/functions/__fish_bind_test1.fish
 %%DATADIR%%/functions/__fish_bind_test2.fish
 %%DATADIR%%/functions/__fish_cancel_commandline.fish
+%%DATADIR%%/functions/__fish_commandline_is_singlequoted.fish
 %%DATADIR%%/functions/__fish_commandline_test.fish
 %%DATADIR%%/functions/__fish_complete_abook_formats.fish
 %%DATADIR%%/functions/__fish_complete_ant_targets.fish
@@ -581,6 +598,7 @@ man/man1/fish_key_reader.1.gz
 %%DATADIR%%/functions/__fish_complete_lpr_option.fish
 %%DATADIR%%/functions/__fish_complete_lsusb.fish
 %%DATADIR%%/functions/__fish_complete_man.fish
+%%DATADIR%%/functions/__fish_complete_mount_opts.fish
 %%DATADIR%%/functions/__fish_complete_path.fish
 %%DATADIR%%/functions/__fish_complete_pgrep.fish
 %%DATADIR%%/functions/__fish_complete_pids.fish
@@ -608,6 +626,7 @@ man/man1/fish_key_reader.1.gz
 %%DATADIR%%/functions/__fish_gnu_complete.fish
 %%DATADIR%%/functions/__fish_hg_prompt.fish
 %%DATADIR%%/functions/__fish_is_first_token.fish
+%%DATADIR%%/functions/__fish_is_git_repository.fish
 %%DATADIR%%/functions/__fish_is_token_n.fish
 %%DATADIR%%/functions/__fish_list_current_token.fish
 %%DATADIR%%/functions/__fish_make_completion_signals.fish
@@ -704,6 +723,7 @@ man/man1/fish_key_reader.1.gz
 %%DATADIR%%/functions/fish_hybrid_key_bindings.fish
 %%DATADIR%%/functions/fish_indent.fish
 %%DATADIR%%/functions/fish_key_reader.fish
+%%DATADIR%%/functions/fish_md5.fish
 %%DATADIR%%/functions/fish_mode_prompt.fish
 %%DATADIR%%/functions/fish_prompt.fish
 %%DATADIR%%/functions/fish_update_completions.fish
@@ -763,6 +783,7 @@ man/man1/fish_key_reader.1.gz
 %%DATADIR%%/man/man1/count.1.gz
 %%DATADIR%%/man/man1/dirh.1.gz
 %%DATADIR%%/man/man1/dirs.1.gz
+%%DATADIR%%/man/man1/disown.1.gz
 %%DATADIR%%/man/man1/echo.1.gz
 %%DATADIR%%/man/man1/else.1.gz
 %%DATADIR%%/man/man1/emit.1.gz
@@ -828,6 +849,7 @@ man/man1/fish_key_reader.1.gz
 %%DATADIR%%/tools/web_config/favicon.png
 %%DATADIR%%/tools/web_config/fishconfig.css
 %%DATADIR%%/tools/web_config/index.html
+%%DATADIR%%/tools/web_config/js/angular-sanitize.js
 %%DATADIR%%/tools/web_config/js/angular.js
 %%DATADIR%%/tools/web_config/js/app.js
 %%DATADIR%%/tools/web_config/js/colorutils.js
@@ -861,6 +883,8 @@ man/man1/fish_key_reader.1.gz
 %%NLS%%share/locale/de/LC_MESSAGES/fish.mo
 %%NLS%%share/locale/en/LC_MESSAGES/fish.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/fish.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/fish.mo
+%%NLS%%share/locale/nn/LC_MESSAGES/fish.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/fish.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/fish.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/fish.mo
diff --git a/shells/mksh/Makefile b/shells/mksh/Makefile
index f4355b7643d5..153b2b8d505c 100644
--- a/shells/mksh/Makefile
+++ b/shells/mksh/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mksh
-PORTVERSION=	56
-PORTREVISION=	1
+PORTVERSION=	56b
 DISTVERSIONPREFIX=	R
 CATEGORIES=	shells
 MASTER_SITES=	http://www.mirbsd.org/MirOS/dist/mir/mksh/ \
diff --git a/shells/mksh/distinfo b/shells/mksh/distinfo
index bdcc1707dca1..a78f39324c99 100644
--- a/shells/mksh/distinfo
+++ b/shells/mksh/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502298389
-SHA256 (mksh-R56.tgz) = ad38fa722f64d1ccf6a58cfacd5da9eb866c5d80de022e91bb32a62292949ff4
-SIZE (mksh-R56.tgz) = 414865
+TIMESTAMP = 1504280246
+SHA256 (mksh-R56b.tgz) = 40ec744eec256583e4e18907cde22af57c980286f535df47326fed07e48c9a7f
+SIZE (mksh-R56b.tgz) = 415088
diff --git a/sysutils/Makefile b/sysutils/Makefile
index 130ce02ddb04..5912485d97f1 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -191,6 +191,7 @@
     SUBDIR += consolehm
     SUBDIR += consolekit2
     SUBDIR += consul
+    SUBDIR += consul_exporter
     SUBDIR += consul-alerts
     SUBDIR += contractor
     SUBDIR += copytape
@@ -1140,11 +1141,11 @@
     SUBDIR += syslinux
     SUBDIR += syslog-ng
     SUBDIR += syslog-ng-incubator
+    SUBDIR += syslog-ng310
+    SUBDIR += syslog-ng311
     SUBDIR += syslog-ng36
     SUBDIR += syslog-ng37
     SUBDIR += syslog-ng39
-    SUBDIR += syslog-ng310
-    SUBDIR += syslog-ng311
     SUBDIR += syslogger
     SUBDIR += sysrc
     SUBDIR += system-tools-backends
@@ -1350,6 +1351,7 @@
     SUBDIR += zfstools
     SUBDIR += zidrav
     SUBDIR += zisofs-tools
+    SUBDIR += znapzend
     SUBDIR += zogftw
     SUBDIR += zrep
     SUBDIR += zsd
diff --git a/sysutils/android-file-transfer/Makefile b/sysutils/android-file-transfer/Makefile
index 7213ac771b23..0ac412976266 100644
--- a/sysutils/android-file-transfer/Makefile
+++ b/sysutils/android-file-transfer/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	android-file-transfer
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.2
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	sysutils
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/sysutils/b2sum/Makefile b/sysutils/b2sum/Makefile
index 1bb34253e33d..47638a0e7b95 100644
--- a/sysutils/b2sum/Makefile
+++ b/sysutils/b2sum/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	b2sum
 PORTVERSION=	0.0.d${B2VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils security
 MASTER_SITES=	http://blake2.net/
 DISTNAME=	blake2_code_${B2VERSION}${EXTRACT_SUFFX}
diff --git a/sysutils/bacula9-docs/Makefile b/sysutils/bacula9-docs/Makefile
index 76c3eb4e65ef..5dc8eb089569 100644
--- a/sysutils/bacula9-docs/Makefile
+++ b/sysutils/bacula9-docs/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bacula
-PORTVERSION=	9.0.3
+PORTVERSION=	9.0.4
 CATEGORIES=	sysutils
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	9-docs
diff --git a/sysutils/bacula9-docs/distinfo b/sysutils/bacula9-docs/distinfo
index 08297efb51ac..dfe937585db9 100644
--- a/sysutils/bacula9-docs/distinfo
+++ b/sysutils/bacula9-docs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503938340
-SHA256 (bacula-docs-9.0.3.tar.bz2) = 96ed36991d486f4fd5cb0734d3fa7c12f7dbcac936d0e0a87d6c25f7fa3066cb
-SIZE (bacula-docs-9.0.3.tar.bz2) = 50216652
+TIMESTAMP = 1504721203
+SHA256 (bacula-docs-9.0.4.tar.bz2) = 7f6697eb5076a33ea44b1c11ab8255e9b1b8e976757d8172af0d9d1108eac8c0
+SIZE (bacula-docs-9.0.4.tar.bz2) = 50200516
diff --git a/sysutils/bacula9-server/Makefile b/sysutils/bacula9-server/Makefile
index 5f0229e6e00e..97cad239e6c8 100644
--- a/sysutils/bacula9-server/Makefile
+++ b/sysutils/bacula9-server/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bacula
-PORTVERSION=	9.0.3
+PORTVERSION=	9.0.4
 PORTREVISION=	0
 CATEGORIES?=	sysutils
 MASTER_SITES=	SF/bacula/bacula/${PORTVERSION}
diff --git a/sysutils/bacula9-server/distinfo b/sysutils/bacula9-server/distinfo
index d1dbeee54b22..db2254511209 100644
--- a/sysutils/bacula9-server/distinfo
+++ b/sysutils/bacula9-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503524082
-SHA256 (bacula-9.0.3.tar.gz) = ae8501960d43399bea13113274993637b6395d73d7d2c47f9b7a07cb4aa72251
-SIZE (bacula-9.0.3.tar.gz) = 3951688
+TIMESTAMP = 1504720901
+SHA256 (bacula-9.0.4.tar.gz) = cafa2d9a9e89a77d3b79984972487e72fb90d949269c77a74a68e97a9d28996f
+SIZE (bacula-9.0.4.tar.gz) = 3965761
diff --git a/sysutils/beats/Makefile b/sysutils/beats/Makefile
index a9a44e7384df..2f5a1b295e77 100644
--- a/sysutils/beats/Makefile
+++ b/sysutils/beats/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	beats
-PORTVERSION=	5.5.2
+PORTVERSION=	5.6.0
 DISTVERSIONPREFIX=v
 CATEGORIES=	sysutils
 
diff --git a/sysutils/beats/distinfo b/sysutils/beats/distinfo
index 4afe77ba0bd8..ba395e8e1425 100644
--- a/sysutils/beats/distinfo
+++ b/sysutils/beats/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503047128
-SHA256 (elastic-beats-v5.5.2_GH0.tar.gz) = 39e792324a35fe84ef9a63cd5324252bc71d1c665188e8d597e12ca170cfde7a
-SIZE (elastic-beats-v5.5.2_GH0.tar.gz) = 18075191
+TIMESTAMP = 1505234011
+SHA256 (elastic-beats-v5.6.0_GH0.tar.gz) = 7ec86da04b97fa7dcddc88250f0f7d2efd06f4ef058cc0097d1d439526b9ed44
+SIZE (elastic-beats-v5.6.0_GH0.tar.gz) = 18142573
diff --git a/sysutils/bsdisks/Makefile b/sysutils/bsdisks/Makefile
index 8818a7e91220..cea2d57a493a 100644
--- a/sysutils/bsdisks/Makefile
+++ b/sysutils/bsdisks/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	bsdisks
 PORTVERSION=	0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	https://bitbucket.org/arrowd/bsdisks/downloads/
 
diff --git a/sysutils/cbsd/Makefile b/sysutils/cbsd/Makefile
index c197f4ac9c8e..5c0e14e0fc2d 100644
--- a/sysutils/cbsd/Makefile
+++ b/sysutils/cbsd/Makefile
@@ -1,13 +1,14 @@
 # $FreeBSD$
 
 PORTNAME=	cbsd
-PORTVERSION=	11.1.3
+PORTVERSION=	11.1.5
 CATEGORIES=	sysutils
 
 MAINTAINER=	olevole@olevole.ru
 COMMENT=	Yet another FreeBSD Jail and Bhyve Management Utility
 
 LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	rsync:net/rsync \
 		sudo:security/sudo \
diff --git a/sysutils/cbsd/distinfo b/sysutils/cbsd/distinfo
index 78dd6b865ee5..5d5d1ba1f9e4 100644
--- a/sysutils/cbsd/distinfo
+++ b/sysutils/cbsd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504093396
-SHA256 (cbsd-cbsd-11.1.3_GH0.tar.gz) = 3d0ba2daa0242ca957fcd0ab92f7600c78dd8f2a2f5a1e1e40de0cf2ef6e93b2
-SIZE (cbsd-cbsd-11.1.3_GH0.tar.gz) = 5512823
+TIMESTAMP = 1505079759
+SHA256 (cbsd-cbsd-11.1.5_GH0.tar.gz) = 36ef007d9cf6ea991e1d81a6aff88fe5833ef62444ba68a4fa1a822f868afbed
+SIZE (cbsd-cbsd-11.1.5_GH0.tar.gz) = 5517841
diff --git a/sysutils/clone/Makefile b/sysutils/clone/Makefile
index 78ae3ea11823..6674169069e6 100644
--- a/sysutils/clone/Makefile
+++ b/sysutils/clone/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	clone
 PORTVERSION=	1.0.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://cyclaero.com/public/clone/
 
diff --git a/sysutils/cloudabi-utils/Makefile b/sysutils/cloudabi-utils/Makefile
index 22d814d56542..fd9117dede3e 100644
--- a/sysutils/cloudabi-utils/Makefile
+++ b/sysutils/cloudabi-utils/Makefile
@@ -2,28 +2,35 @@
 # $FreeBSD$
 
 PORTNAME=	cloudabi-utils
-PORTVERSION=	0.26
-DISTVERSIONPREFIX=v
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.30
 CATEGORIES=	sysutils
 
 MAINTAINER=	ed@FreeBSD.org
 COMMENT=	Utilities for running CloudABI programs
 
 LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/include/cloudabi_types.h:devel/cloudabi
+ONLY_FOR_ARCHS=	aarch64 amd64 armv6 i386
+ONLY_FOR_ARCHS_REASON=	CloudABI has not yet been ported to other architectures
+
+BUILD_DEPENDS=	${LOCALBASE}/include/cloudabi_types.h:devel/cloudabi \
+		${LOCALBASE}/include/flower/protocol/switchboard.ad.h:net/flower \
+		${LOCALBASE}/include/yaml2argdata/yaml_builder.h:devel/yaml2argdata
 LIB_DEPENDS=	libargdata.so:devel/argdata \
-		libyaml.so:textproc/libyaml
+		libarpc.so:devel/arpc \
+		libyaml-cpp.so:devel/yaml-cpp
 
+USES=		cmake localbase:ldflags pkgconfig tar:xz
+USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	NuxiNL
 
-ONLY_FOR_ARCHS=	aarch64 amd64 armv6 i386
-ONLY_FOR_ARCHS_REASON=	CloudABI has not yet been ported to other architectures
-
-USES=		cmake compiler:c11 pkgconfig tar:xz
-USE_LDCONFIG=	yes
+.include <bsd.port.pre.mk>
 
-CFLAGS+=	-I${LOCALBASE}/include
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100511
+IGNORE=		requires various C++17 features
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/sysutils/cloudabi-utils/distinfo b/sysutils/cloudabi-utils/distinfo
index 27f65d912b00..3bd5376a78d9 100644
--- a/sysutils/cloudabi-utils/distinfo
+++ b/sysutils/cloudabi-utils/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500995361
-SHA256 (NuxiNL-cloudabi-utils-v0.26_GH0.tar.gz) = b48449fa0623b71a25f365a2b7e7f938190d33825113c8948b19f0b9ceac350c
-SIZE (NuxiNL-cloudabi-utils-v0.26_GH0.tar.gz) = 227599
+TIMESTAMP = 1504787087
+SHA256 (NuxiNL-cloudabi-utils-v0.30_GH0.tar.gz) = 7e1483348b322dec8ce1d31202e9d635dbfdfa3a1e46f0675b5e997aa28c0a93
+SIZE (NuxiNL-cloudabi-utils-v0.30_GH0.tar.gz) = 221541
diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile
index 47dc203ce48b..9e951acc2996 100644
--- a/sysutils/conky/Makefile
+++ b/sysutils/conky/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	conky
 PORTVERSION=	1.10.6
-PORTREVISION=	2
+PORTREVISION=	3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
diff --git a/sysutils/consul/Makefile b/sysutils/consul/Makefile
index 71bd95174298..1b5cd8076262 100644
--- a/sysutils/consul/Makefile
+++ b/sysutils/consul/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	consul
-PORTVERSION=	0.8.5
+PORTVERSION=	0.9.3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
diff --git a/sysutils/consul/distinfo b/sysutils/consul/distinfo
index f3b95708f0fe..4e6adc9084c5 100644
--- a/sysutils/consul/distinfo
+++ b/sysutils/consul/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500310152
-SHA256 (hashicorp-consul-v0.8.5_GH0.tar.gz) = 3049ac26e6226b61af2d631d5705669cadb8bf3b0c7860e169590ce1472c6b64
-SIZE (hashicorp-consul-v0.8.5_GH0.tar.gz) = 6630059
+TIMESTAMP = 1505222411
+SHA256 (hashicorp-consul-v0.9.3_GH0.tar.gz) = 69b76432203e046a8025ce13f7cc041b2308d72f07f240a57f2ba5d580fcff70
+SIZE (hashicorp-consul-v0.9.3_GH0.tar.gz) = 7278357
diff --git a/sysutils/consul_exporter/Makefile b/sysutils/consul_exporter/Makefile
new file mode 100644
index 000000000000..139d5ae64fa9
--- /dev/null
+++ b/sysutils/consul_exporter/Makefile
@@ -0,0 +1,48 @@
+# $FreeBSD$
+
+PORTNAME=	consul_exporter
+PORTVERSION=	0.3.0
+DISTVERSIONPREFIX=	v
+CATEGORIES=	sysutils
+
+MAINTAINER=	t.tom@succont.de
+COMMENT=	Exporter for Consul metrics
+
+LICENSE=	APACHE20
+
+BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
+
+USES=		compiler
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	prometheus
+GH_SUBDIR=	src/github.com/${GH_ACCOUNT}/consul_exporter
+
+USE_RC_SUBR=	consul_exporter
+
+PLIST_FILES=	bin/consul_exporter
+
+post-extract:
+	@${MV} ${WRKSRC}/vendor/ ${WRKSRC}/src/
+
+do-build:
+	@cd ${WRKSRC}/src/github.com/prometheus/consul_exporter; ${SETENV} CGO_ENABLED=0 ${BUILD_ENV} GOPATH=${WRKSRC} go build \
+		-ldflags "\
+		-X github.com/prometheus/consul_exporter/version.Version=${PORTVERSION}  \
+		-X github.com/prometheus/consul_exporter/version.VersionPrerelease=  \
+		-X github.com/prometheus/consul_exporter/version.GitDescribe=v${PORTVERSION} \
+		" \
+		-o bin/consul_exporter
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/prometheus/consul_exporter/bin/consul_exporter ${STAGEDIR}${PREFIX}/bin/consul_exporter
+
+.include <bsd.port.pre.mk>
+
+# golang assumes that if clang is in use, it is called "clang" and not "cc". If
+# it's called "cc", go fails.
+.if ${COMPILER_TYPE} == clang
+BUILD_ENV=	CC=clang
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/sysutils/consul_exporter/distinfo b/sysutils/consul_exporter/distinfo
new file mode 100644
index 000000000000..8e8cb2769716
--- /dev/null
+++ b/sysutils/consul_exporter/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1504964932
+SHA256 (prometheus-consul_exporter-v0.3.0_GH0.tar.gz) = 621a7fd6f50b59d6c10f2325dafcffa95ab7b1491514c1f801485b4b037e9428
+SIZE (prometheus-consul_exporter-v0.3.0_GH0.tar.gz) = 1031879
diff --git a/sysutils/consul_exporter/files/consul_exporter.in b/sysutils/consul_exporter/files/consul_exporter.in
new file mode 100644
index 000000000000..0a460d928b35
--- /dev/null
+++ b/sysutils/consul_exporter/files/consul_exporter.in
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+# $FreeBSD$
+#
+# PROVIDE: consul_exporter
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
+# to enable this service:
+#
+# consul_exporter_enable (bool):      Set to NO by default.
+#                                       Set it to YES to enable consul exporter.
+# consul_exporter_env (string):       Set environment variables used with consul exporter.
+#                                          Default is "".
+# consul_exporter_args (string):      Set flags used with consul-exporter.
+#                                          Default is "".
+
+. /etc/rc.subr
+
+name=consul_exporter
+rcvar=consul_exporter_enable
+extra_commands="reload"
+
+load_rc_config $name
+
+: ${consul_exporter_enable:="NO"}
+: ${consul_exporter_env:=""}
+: ${consul_exporter_args:=""}
+
+pidfile=/var/run/consul_exporter.pid
+procname="%%PREFIX%%/bin/consul_exporter"
+command="/usr/sbin/daemon"
+command_args="-f -p ${pidfile} /usr/bin/env ${consul_env} ${procname} ${consul_exporter_args}"
+
+run_rc_command "$1"
diff --git a/sysutils/consul_exporter/pkg-descr b/sysutils/consul_exporter/pkg-descr
new file mode 100644
index 000000000000..cb8a5481a14f
--- /dev/null
+++ b/sysutils/consul_exporter/pkg-descr
@@ -0,0 +1,3 @@
+Export Consul service health to Prometheus.
+
+WWW: https://github.com/prometheus/consul_exporter
diff --git a/sysutils/dar/Makefile b/sysutils/dar/Makefile
index a071b68811ca..c95720017a45 100644
--- a/sysutils/dar/Makefile
+++ b/sysutils/dar/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	dar
 PORTVERSION=	2.5.11
+PORTREVISION=	1
 CATEGORIES=	sysutils archivers
 MASTER_SITES=	SF
 
diff --git a/sysutils/debhelper/Makefile b/sysutils/debhelper/Makefile
index 068d7aed8a40..99d685c2f18f 100644
--- a/sysutils/debhelper/Makefile
+++ b/sysutils/debhelper/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	debhelper
-PORTVERSION=	10.7.2
+PORTVERSION=	10.8
 CATEGORIES=	sysutils
 MASTER_SITES=	DEBIAN
 DISTNAME=	${PORTNAME}_${PORTVERSION}
diff --git a/sysutils/debhelper/distinfo b/sysutils/debhelper/distinfo
index a800de54e46a..e239ff481f4c 100644
--- a/sysutils/debhelper/distinfo
+++ b/sysutils/debhelper/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501694300
-SHA256 (debhelper_10.7.2.tar.xz) = 680d7b420f513ce26b7a2056d1be94739c19729312aa9cda6532298a1485e57b
-SIZE (debhelper_10.7.2.tar.xz) = 416368
+TIMESTAMP = 1505127774
+SHA256 (debhelper_10.8.tar.xz) = 15fd4ffa30657cffab6cd7a3aeff2429a64e9c80745e96ecdedc1360f1501ab2
+SIZE (debhelper_10.8.tar.xz) = 418392
diff --git a/sysutils/debhelper/files/patch-Makefile b/sysutils/debhelper/files/patch-Makefile
index 1214367aaed3..4a204ea91f94 100644
--- a/sysutils/debhelper/files/patch-Makefile
+++ b/sysutils/debhelper/files/patch-Makefile
@@ -1,4 +1,4 @@
---- Makefile.orig	2017-06-29 19:50:57 UTC
+--- Makefile.orig	2017-09-02 15:29:54 UTC
 +++ Makefile
 @@ -3,7 +3,7 @@ PO4A ?= po4a
  POD2MAN ?= pod2man
@@ -9,7 +9,7 @@
  MANPAGES=$(COMMANDS:=.1) dh.1
  
  # Find deprecated commands by looking at their synopsis.
-@@ -109,17 +109,16 @@ endif
+@@ -118,17 +118,16 @@ endif
  	done;
  
  install:
@@ -22,16 +22,16 @@
 +		$(DESTDIR)${SITE_PERL}/Debian/Debhelper/Buildsystem
  	install dh $(COMMANDS) $(DESTDIR)$(PREFIX)/bin
 -	install -m 0644 autoscripts/* $(DESTDIR)$(PREFIX)/share/debhelper/autoscripts
--	install -m 0644 Debian/Debhelper/*.pm $(DESTDIR)$(PERLLIBDIR)
+-	install -m 0644 lib/Debian/Debhelper/*.pm $(DESTDIR)$(PERLLIBDIR)
 +	install -m 0644 autoscripts/* $(DESTDIR)$(PREFIX)/bin
-+	install -m 0644 Debian/Debhelper/*.pm $(DESTDIR)${SITE_PERL}/Debian/Debhelper
++	install -m 0644 lib/Debian/Debhelper/*.pm $(DESTDIR)${SITE_PERL}/Debian/Debhelper
  	[ "$(PREFIX)" = /usr ] || \
 -		sed -i '/$$prefix=/s@/usr@$(PREFIX)@g' $(DESTDIR)$(PERLLIBDIR)/Dh_Lib.pm
--	install -m 0644 Debian/Debhelper/Sequence/*.pm $(DESTDIR)$(PERLLIBDIR)/Sequence
--	install -m 0644 Debian/Debhelper/Buildsystem/*.pm $(DESTDIR)$(PERLLIBDIR)/Buildsystem
+-	install -m 0644 lib/Debian/Debhelper/Sequence/*.pm $(DESTDIR)$(PERLLIBDIR)/Sequence
+-	install -m 0644 lib/Debian/Debhelper/Buildsystem/*.pm $(DESTDIR)$(PERLLIBDIR)/Buildsystem
 +		sed -i '' '/$$prefix=/s@/usr@$(PREFIX)@g' $(DESTDIR)${SITE_PERL}/Debian/Debhelper/Dh_Lib.pm
-+	install -m 0644 Debian/Debhelper/Sequence/*.pm $(DESTDIR)${SITE_PERL}/Debian/Debhelper/Sequence
-+	install -m 0644 Debian/Debhelper/Buildsystem/*.pm $(DESTDIR)${SITE_PERL}/Debian/Debhelper/Buildsystem
++	install -m 0644 lib/Debian/Debhelper/Sequence/*.pm $(DESTDIR)${SITE_PERL}/Debian/Debhelper/Sequence
++	install -m 0644 lib/Debian/Debhelper/Buildsystem/*.pm $(DESTDIR)${SITE_PERL}/Debian/Debhelper/Buildsystem
  
  test: version
- 	./run perl -MTest::Harness -e 'runtests grep { ! /CVS/ && ! /\.svn/ && -f && -x } @ARGV' t/* t/*/*
+ 	MAKEFLAGS= HARNESS_OPTIONS=j$(TEST_JOBS) ./run perl -MTest::Harness -e 'runtests grep { ! /CVS/ && ! /\.svn/ && -f && -x && m/\.t$$/ } @ARGV' t/* t/*/*
diff --git a/sysutils/dmidecode/Makefile b/sysutils/dmidecode/Makefile
index ff9ab6ab882b..ba2af87a4c16 100644
--- a/sysutils/dmidecode/Makefile
+++ b/sysutils/dmidecode/Makefile
author	jeh <jeh@FreeBSD.org>	2000-10-28 10:04:18 +0800
committer	jeh <jeh@FreeBSD.org>	2000-10-28 10:04:18 +0800
commit	ecf4e9909a1102d50d20c72635360392f7f9b4af (patch)
tree	4c9aa60f2d06f4fb61abfc16c98c70f07a0ef4b3 /security/nessus-devel/distinfo
parent	a48a01b66b2bcaf5e1885839dc6ecabd71f097cc (diff)
download	freebsd-ports-graphics-ecf4e9909a1102d50d20c72635360392f7f9b4af.tar.gz freebsd-ports-graphics-ecf4e9909a1102d50d20c72635360392f7f9b4af.tar.zst freebsd-ports-graphics-ecf4e9909a1102d50d20c72635360392f7f9b4af.zip