diff --git a/archivers/lzop/Makefile b/archivers/lzop/Makefile
index 9894311f42a..90e669b22e8 100644
--- a/archivers/lzop/Makefile
+++ b/archivers/lzop/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	lzop
-DISTVERSION=	1.03
+DISTVERSION=	1.04
 CATEGORIES=	archivers
 MASTER_SITES=	http://www.lzop.org/download/ \
 		LOCAL/mandree
@@ -10,12 +10,12 @@ MASTER_SITES=	http://www.lzop.org/download/ \
 MAINTAINER=	mandree@FreeBSD.org
 COMMENT=	Fast file compressor similar to gzip, using the LZO library
 
+LICENSE=	GPLv2+
+
 LIB_DEPENDS=	liblzo2.so:archivers/lzo2
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-PLIST_FILES=	bin/lzop man/man1/lzop.1.gz
-
 .include <bsd.port.mk>
diff --git a/archivers/lzop/distinfo b/archivers/lzop/distinfo
index 08a6b7b4fee..9bdaed2210a 100644
--- a/archivers/lzop/distinfo
+++ b/archivers/lzop/distinfo
@@ -1,2 +1,3 @@
-SHA256 (lzop-1.03.tar.gz) = c1425b8c77d49f5a679d5a126c90ea6ad99585a55e335a613cae59e909dbb2c9
-SIZE (lzop-1.03.tar.gz) = 370775
+TIMESTAMP = 1502442897
+SHA256 (lzop-1.04.tar.gz) = 7e72b62a8a60aff5200a047eea0773a8fb205caf7acbe1774d95147f305a2f41
+SIZE (lzop-1.04.tar.gz) = 393483
diff --git a/archivers/lzop/pkg-plist b/archivers/lzop/pkg-plist
new file mode 100644
index 00000000000..3ece1a53454
--- /dev/null
+++ b/archivers/lzop/pkg-plist
@@ -0,0 +1,13 @@
+bin/lzop
+man/man1/lzop.1.gz
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/THANKS
+%%PORTDOCS%%%%DOCSDIR%%/lzop.html
+%%PORTDOCS%%%%DOCSDIR%%/lzop.man
+%%PORTDOCS%%%%DOCSDIR%%/lzop.pod
+%%PORTDOCS%%%%DOCSDIR%%/lzop.ps
+%%PORTDOCS%%%%DOCSDIR%%/lzop.tex
+%%PORTDOCS%%%%DOCSDIR%%/lzop.txt
diff --git a/astro/match/Makefile b/astro/match/Makefile
index ee47be8ea3a..15efdee519e 100644
--- a/astro/match/Makefile
+++ b/astro/match/Makefile
@@ -2,15 +2,15 @@
 # $FreeBSD$
 
 PORTNAME=	match
-PORTVERSION=	0.16
+PORTVERSION=	1.0
 CATEGORIES=	astro
-MASTER_SITES=	http://spiff.rit.edu/match/ \
-		http://www.c-s.li/ports/
+MASTER_SITES=	http://spiff.rit.edu/match/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	a.andersson.thn@gmail.com
 COMMENT=	Program for matching star lists
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 CONFLICTS=	avenger-[0-9]*
 GNU_CONFIGURE=	yes
diff --git a/astro/match/distinfo b/astro/match/distinfo
index a65aff902e0..02a124a32ae 100644
--- a/astro/match/distinfo
+++ b/astro/match/distinfo
@@ -1,2 +1,3 @@
-SHA256 (match-0.16.tar.gz) = f865e91e7c9b26147ca0215db559df1f17354e374d81627975cd98cc5020eff8
-SIZE (match-0.16.tar.gz) = 195400
+TIMESTAMP = 1502626918
+SHA256 (match-1.0.tar.gz) = 2f1e408cc3458e88f0ec7bc54554883addbf1a84a2cea63c78d48a82e28228f3
+SIZE (match-1.0.tar.gz) = 182164
diff --git a/audio/Makefile b/audio/Makefile
index e5732815ec2..defefed50c0 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -393,6 +393,7 @@
     SUBDIR += liblastfm
     SUBDIR += liblo
     SUBDIR += liblscp
+    SUBDIR += libltc
     SUBDIR += libmad
     SUBDIR += libmatemixer
     SUBDIR += libmikmod
@@ -469,6 +470,7 @@
     SUBDIR += lpac
     SUBDIR += lua51-mpd
     SUBDIR += lv2
+    SUBDIR += lvtk
     SUBDIR += lxmusic
     SUBDIR += mac
     SUBDIR += madfufw
@@ -635,6 +637,7 @@
     SUBDIR += py-eyed3
     SUBDIR += py-fmoo-audiotools
     SUBDIR += py-gmusicapi
+    SUBDIR += py-gmusicproxy
     SUBDIR += py-hsaudiotag
     SUBDIR += py-id3
     SUBDIR += py-karaoke
@@ -818,6 +821,7 @@
     SUBDIR += wmsmixer
     SUBDIR += workman
     SUBDIR += wxguitar
+    SUBDIR += x42-plugins-lv2
     SUBDIR += xanalyser
     SUBDIR += xcd
     SUBDIR += xcdplayer
@@ -861,6 +865,7 @@
     SUBDIR += xwave
     SUBDIR += yell
     SUBDIR += zinf
+    SUBDIR += zita-convolver
     SUBDIR += zita-resampler
     SUBDIR += zynaddsubfx
 
diff --git a/audio/dssi/Makefile b/audio/dssi/Makefile
index 47e523eab9c..97c7d710b21 100644
--- a/audio/dssi/Makefile
+++ b/audio/dssi/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dssi
 PORTVERSION=	1.1.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	audio
 MASTER_SITES=	SF
 
@@ -11,6 +11,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	API for audio processing plugins
 
 LICENSE=	LGPL21
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa
 LIB_DEPENDS=	libdssialsacompat.so:audio/libdssialsacompat \
@@ -20,34 +21,24 @@ LIB_DEPENDS=	libdssialsacompat.so:audio/libdssialsacompat \
 		libjack.so:audio/jack
 RUN_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa
 
-USES=		gmake pathfix pkgconfig libtool
+USES=		gmake pathfix pkgconfig localbase libtool
 GNU_CONFIGURE=	yes
-
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+USE_XORG=	x11
 
 PORTDOCS=	ChangeLog README
 
 PORTEXAMPLES=	*
-
-EXAMPLESSRCDIR=		${WRKSRC}/examples
-
-EXAMPLES_FILES1=	dssi_analyse_plugin dssi_list_plugins \
-			dssi_osc_send dssi_osc_update
-
-EXAMPLES_FILES2=	LTS_qt trivial_sampler_qt
+EXAMPLESSRCDIR=	${WRKSRC}/examples
+EXAMPLES_FILES1=dssi_analyse_plugin dssi_list_plugins \
+		dssi_osc_send dssi_osc_update
+EXAMPLES_FILES2=LTS_qt trivial_sampler_qt
 
 OPTIONS_DEFINE=	DOCS EXAMPLES QT4
-OPTIONS_DEFAULT=	QT4
-
+OPTIONS_DEFAULT=QT4
 OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MQT4}
-USE_QT4=	corelib gui moc_build
+QT4_USE=	QT4=corelib,gui,moc_build
 QT_NONSTANDARD=	yes
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e \
@@ -59,26 +50,22 @@ post-patch:
 	@${REINPLACE_CMD} -e \
 		'/alsa >=/s|$$PKG_CONFIG|${FALSE}|' ${WRKSRC}/configure
 
-.if ! ${PORT_OPTIONS:MQT4}
+post-patch-QT4-off:
 	@${REINPLACE_CMD} -e \
 		'/QtCore >=/s|$$PKG_CONFIG|${FALSE}|' ${WRKSRC}/configure
-.endif
 
 post-install:
 .for l in trivial_synth less_trivial_synth trivial_sampler karplong
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/dssi/${l}.so
 .endfor
-
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
-
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_PROGRAM} ${EXAMPLES_FILES1:S|^|${EXAMPLESSRCDIR}/|} \
 		${STAGEDIR}${EXAMPLESDIR}
 
-.if ${PORT_OPTIONS:MQT4}
+post-install-QT4-on:
 	${INSTALL_PROGRAM} ${EXAMPLES_FILES2:S|^|${EXAMPLESSRCDIR}/|} \
 		${STAGEDIR}${EXAMPLESDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/audio/jack/Makefile b/audio/jack/Makefile
index c53903a91ce..2c8aacc41da 100644
--- a/audio/jack/Makefile
+++ b/audio/jack/Makefile
@@ -3,10 +3,8 @@
 
 PORTNAME=	jackit
 PORTVERSION=	0.125.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
-MASTER_SITES=	http://jackaudio.org/downloads/
-DISTNAME=	jack-audio-connection-kit-${PORTVERSION}
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Low latency audio server
@@ -19,22 +17,36 @@ LIB_DEPENDS=	libsndfile.so:audio/libsndfile \
 		libcelt0.so:audio/celt \
 		libuuid.so:misc/e2fsprogs-libuuid
 
-GNU_CONFIGURE=	yes
+USES=		autoreconf gmake pathfix pkgconfig libtool localbase bdb
+USE_GITHUB=	yes
+GH_ACCOUNT=	jackaudio
+GH_PROJECT=	jack1
+GH_TAGNAME=	90f9dd3
+GH_TUPLE=	jackaudio:headers:07f1ecf:h/jack
+GH_TUPLE+=	jackaudio:tools:8d13c31:t/tools
+GH_TUPLE+=	jackaudio:example-clients:7fa0890:e/example-clients
 USE_LDCONFIG=	yes
-USES=		gmake pathfix pkgconfig libtool localbase bdb
+GNU_CONFIGURE=	yes
 USE_RC_SUBR=	jackd
 
 CONFIGURE_ARGS=	--disable-portaudio \
+		--enable-optimize \
 		--enable-force-install \
 		--with-default-tmpdir=/tmp
 
-CFLAGS+=	-I${BDB_INCLUDE_DIR}
-LIBS+=	-L${BDB_LIB_DIR}
-INSTALL_TARGET=	install-strip
+CFLAGS+=		-I${BDB_INCLUDE_DIR}
+LIBS+=			-L${BDB_LIB_DIR}
+INSTALL_TARGET=		install-strip
 
-OPTIONS_DEFINE=	ALSA DOXYGEN READLINE SNDIO
-OPTIONS_DEFAULT=READLINE
-OPTIONS_SUB=	yes
+OPTIONS_DEFINE=		ALSA DOXYGEN READLINE SNDIO COOKEDMODE
+OPTIONS_DEFINE_i386=	DYNSIMD
+OPTIONS_DEFINE_amd64=	DYNSIMD
+OPTIONS_DEFAULT=	READLINE COOKEDMODE
+OPTIONS_DEFAULT_i386=	DYNSIMD
+OPTIONS_DEFAULT_amd64=	DYNSIMD
+OPTIONS_SUB=		yes
+COOKEDMODE_DESC=	Use OSS COOKEDMODE (OSS driver is broken without it)
+DYNSIMD_DESC=		Use dynamic SIMD selection (only i386/amd64)
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CONFIGURE_ENABLE=	alsa
@@ -50,21 +62,11 @@ READLINE_CONFIGURE_ENV_OFF=	ac_cv_lib_readline_readline=no \
 SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
 SNDIO_CONFIGURE_ENABLE=	sndio
 
+COOKEDMODE_CFLAGS=	-DOPTION_COOKEDMODE
+
+DYNSIMD_CONFIGURE_ENABLE=dynsimd
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|define USE_MLOCK|undef USE_MLOCK|' \
-		-e 's|alloca.h||' \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e "s,-lpthread,-pthread," \
-		${WRKSRC}/configure ${WRKSRC}/libjack/Makefile.in \
-		${WRKSRC}/jackd/Makefile.in \
-		${WRKSRC}/example-clients/Makefile.in ${WRKSRC}/jack.pc.in
-	@${REINPLACE_CMD} -e "s,-lrt,," ${WRKSRC}/libjack/Makefile.in \
-		${WRKSRC}/jackd/Makefile.in \
-		${WRKSRC}/example-clients/Makefile.in
-	@${REINPLACE_CMD} -e "s,-ldl,," ${WRKSRC}/jackd/Makefile.in \
-		${WRKSRC}/example-clients/Makefile.in
-	@${REINPLACE_CMD} -e 's|md5sum|md5 -q|g' \
-		${WRKSRC}/jackd/Makefile.in
 	@${RM} ${WRKSRC}/doc/reference/html/*
 
 post-build:
diff --git a/audio/jack/distinfo b/audio/jack/distinfo
index 6a98cb33f05..ff163a3f8ae 100644
--- a/audio/jack/distinfo
+++ b/audio/jack/distinfo
@@ -1,3 +1,9 @@
-TIMESTAMP = 1491234945
-SHA256 (jack-audio-connection-kit-0.125.0.tar.gz) = 3517b5bff82139a76b2b66fe2fd9a3b34b6e594c184f95a988524c575b11d444
-SIZE (jack-audio-connection-kit-0.125.0.tar.gz) = 1217977
+TIMESTAMP = 1500250305
+SHA256 (jackaudio-jack1-0.125.0-90f9dd3_GH0.tar.gz) = e0ba7dcf58fa934af51329cd329f466fe8d2bc180d07e4ab8be21ed80c60aa8a
+SIZE (jackaudio-jack1-0.125.0-90f9dd3_GH0.tar.gz) = 392822
+SHA256 (jackaudio-headers-07f1ecf_GH0.tar.gz) = 04a3bb87d278923985ba44045b7a27439c90776cc5d4a6016d062fc7a6aa5023
+SIZE (jackaudio-headers-07f1ecf_GH0.tar.gz) = 36704
+SHA256 (jackaudio-tools-8d13c31_GH0.tar.gz) = 23e6bc60c8cef4283677206f2687a408367203a725c091c923f48554ae6e8cc8
+SIZE (jackaudio-tools-8d13c31_GH0.tar.gz) = 45544
+SHA256 (jackaudio-example-clients-7fa0890_GH0.tar.gz) = 79e2ac1d38d7d77b1afb71aa97414c339e8c00613a5d9b725861232b5c995223
+SIZE (jackaudio-example-clients-7fa0890_GH0.tar.gz) = 16174
diff --git a/audio/jack/files/jackd.in b/audio/jack/files/jackd.in
index fce713a7433..b45c9fe28e0 100644
--- a/audio/jack/files/jackd.in
+++ b/audio/jack/files/jackd.in
@@ -27,8 +27,10 @@ start_jackd() {
   if [ $jackd_rtprio = "YES" ]; then
     local rt="rtprio 1"
   fi
+  # log the date and parameters
+  echo -e "\n[`date`] Starting the daemon, user=$jackd_user rtprio=$jackd_rtprio args=\"$jackd_args\"" >> /var/log/${name}.log
   # daemon(8) should be able to set the realtime priority, but it isn't
-  $rt daemon -p /var/run/${name}.pid -u ${jackd_user} %%PREFIX%%/bin/jackd ${jackd_args} >/var/log/${name}.log 2>&1
+  $rt daemon -p /var/run/${name}.pid -o /var/log/${name}.log -u "${jackd_user}" %%PREFIX%%/bin/jackd ${jackd_args}
 }
 
 load_rc_config ${name}
diff --git a/audio/jack/files/patch-configure.ac b/audio/jack/files/patch-configure.ac
new file mode 100644
index 00000000000..963aa5328a8
--- /dev/null
+++ b/audio/jack/files/patch-configure.ac
@@ -0,0 +1,10 @@
+--- configure.ac.orig	2017-01-10 10:20:51 UTC
++++ configure.ac
+@@ -172,6 +172,7 @@ case "${host_os}" in
+     # barrier code, this may be fixed in 5.3, stay tuned.
+     USE_BARRIER="no"
+     USE_MD5SUM=0
++    JACK_DO_NOT_MLOCK=0
+     ;;
+   openbsd*)
+     # pthread_barrier* not implemented
diff --git a/audio/jack/files/patch-drivers_oss_oss__driver.c b/audio/jack/files/patch-drivers_oss_oss__driver.c
index 8163808148b..19e76f680df 100644
--- a/audio/jack/files/patch-drivers_oss_oss__driver.c
+++ b/audio/jack/files/patch-drivers_oss_oss__driver.c
@@ -1,4 +1,4 @@
---- drivers/oss/oss_driver.c.orig	2016-02-23 15:13:53 UTC
+--- drivers/oss/oss_driver.c.orig	2017-01-10 10:20:51 UTC
 +++ drivers/oss/oss_driver.c
 @@ -23,6 +23,7 @@
  
@@ -83,7 +83,20 @@
  			dstidx += chcount;
  		}
  		break;
-@@ -441,19 +454,7 @@ static int oss_driver_start (oss_driver_
+@@ -429,7 +442,11 @@ static int oss_driver_detach (oss_driver
+ 
+ static int oss_driver_start (oss_driver_t *driver)
+ {
+-	int flags = 0;
++#if defined(OPTION_COOKEDMODE)
++	int cookedmode = 1;
++#else
++	int cookedmode = 0;
++#endif
+ 	int format;
+ 	int channels;
+ 	int samplerate;
+@@ -441,19 +458,7 @@ static int oss_driver_start (oss_driver_
  	const char *indev = driver->indev;
  	const char *outdev = driver->outdev;
  
@@ -104,7 +117,52 @@
  	driver->trigger = 0;
  	if (strcmp (indev, outdev) != 0) {
  		if (driver->capture_channels > 0) {
-@@ -705,7 +706,9 @@ static int oss_driver_start (oss_driver_
+@@ -464,7 +469,7 @@ static int oss_driver_start (oss_driver_
+ 					indev, __FILE__, __LINE__, errno);
+ 			}
+ #ifndef OSS_NO_COOKED_MODE
+-			ioctl (infd, SNDCTL_DSP_COOKEDMODE, &flags);
++			ioctl (infd, SNDCTL_DSP_COOKEDMODE, &cookedmode);
+ #endif
+ 			fragsize = driver->period_size *
+ 				   driver->capture_channels * samplesize;
+@@ -479,7 +484,7 @@ static int oss_driver_start (oss_driver_
+ 					outdev, __FILE__, __LINE__, errno);
+ 			}
+ #ifndef OSS_NO_COOKED_MODE
+-			ioctl (outfd, SNDCTL_DSP_COOKEDMODE, &flags);
++			ioctl (outfd, SNDCTL_DSP_COOKEDMODE, &cookedmode);
+ #endif
+ 			fragsize = driver->period_size *
+ 				   driver->playback_channels * samplesize;
+@@ -497,7 +502,7 @@ static int oss_driver_start (oss_driver_
+ 				return -1;
+ 			}
+ #ifndef OSS_NO_COOKED_MODE
+-			ioctl (infd, SNDCTL_DSP_COOKEDMODE, &flags);
++			ioctl (infd, SNDCTL_DSP_COOKEDMODE, &cookedmode);
+ #endif
+ 		} else if (driver->capture_channels == 0 &&
+ 			   driver->playback_channels != 0) {
+@@ -510,7 +515,7 @@ static int oss_driver_start (oss_driver_
+ 				return -1;
+ 			}
+ #ifndef OSS_NO_COOKED_MODE
+-			ioctl (outfd, SNDCTL_DSP_COOKEDMODE, &flags);
++			ioctl (outfd, SNDCTL_DSP_COOKEDMODE, &cookedmode);
+ #endif
+ 		} else {
+ 			infd = outfd = open (indev, O_RDWR | O_EXCL);
+@@ -521,7 +526,7 @@ static int oss_driver_start (oss_driver_
+ 				return -1;
+ 			}
+ #ifndef OSS_NO_COOKED_MODE
+-			ioctl (infd, SNDCTL_DSP_COOKEDMODE, &flags);
++			ioctl (infd, SNDCTL_DSP_COOKEDMODE, &cookedmode);
+ #endif
+ 		}
+ 		if (infd >= 0 && outfd >= 0) {
+@@ -705,7 +710,9 @@ static int oss_driver_start (oss_driver_
  		sem_post (&driver->sem_start);
  	}
  
@@ -115,7 +173,7 @@
  	driver->next_periodtime = 0;
  	driver->iodelay = 0.0F;
  
-@@ -1143,6 +1146,23 @@ jack_driver_t * driver_initialize (jack_
+@@ -1143,6 +1150,23 @@ jack_driver_t * driver_initialize (jack_
  		pnode = jack_slist_next (pnode);
  	}
  
@@ -139,7 +197,7 @@
  	driver->sample_rate = sample_rate;
  	driver->period_size = period_size;
  	driver->nperiods = nperiods;
-@@ -1163,58 +1183,6 @@ jack_driver_t * driver_initialize (jack_
+@@ -1163,58 +1187,6 @@ jack_driver_t * driver_initialize (jack_
  	}
  	driver->infd = -1;
  	driver->outfd = -1;
diff --git a/audio/jack/files/patch-jackd_jackd.c b/audio/jack/files/patch-jackd_jackd.c
new file mode 100644
index 00000000000..7a21cfe41cf
--- /dev/null
+++ b/audio/jack/files/patch-jackd_jackd.c
@@ -0,0 +1,22 @@
+--- jackd/jackd.c.orig	2017-07-17 17:10:09 UTC
++++ jackd/jackd.c
+@@ -521,11 +521,17 @@ jack_drivers_load ()
+ 
+ static void copyright (FILE* file)
+ {
+-	fprintf (file, "jackd " VERSION "\n"
++	fprintf (file, "jackd " VERSION " (COOKEDMODE=%s)\n"
+ 		 "Copyright 2001-2009 Paul Davis, Stephane Letz, Jack O'Quinn, Torben Hohn and others.\n"
+ 		 "jackd comes with ABSOLUTELY NO WARRANTY\n"
+ 		 "This is free software, and you are welcome to redistribute it\n"
+-		 "under certain conditions; see the file COPYING for details\n\n");
++		 "under certain conditions; see the file COPYING for details\n\n",
++#if defined(OPTION_COOKEDMODE)
++                 "on"
++#else
++                 "off"
++#endif
++                 );
+ }
+ 
+ static void usage (FILE *file)
diff --git a/audio/jack/files/patch-libjack_client.c b/audio/jack/files/patch-libjack_client.c
index 779cb71f499..d6c5ffb1d3b 100644
--- a/audio/jack/files/patch-libjack_client.c
+++ b/audio/jack/files/patch-libjack_client.c
@@ -1,6 +1,6 @@
---- libjack/client.c.orig	2016-09-14 17:41:53 UTC
+--- libjack/client.c.orig	2017-01-10 10:20:51 UTC
 +++ libjack/client.c
-@@ -69,6 +69,30 @@
+@@ -68,6 +68,30 @@
  static pthread_mutex_t client_lock;
  static pthread_cond_t client_ready;
  
@@ -31,7 +31,7 @@
  static int
  jack_client_close_aux(jack_client_t *client);
  
-@@ -252,7 +276,7 @@ oop_client_deliver_request (void *ptr, j
+@@ -251,7 +275,7 @@ oop_client_deliver_request (void *ptr, j
  	int wok, rok;
  	jack_client_t *client = (jack_client_t*)ptr;
  
@@ -40,7 +40,7 @@
  	       == sizeof(*req));
  
  	/* if necessary, add variable length key data after a PropertyChange request
-@@ -260,7 +284,7 @@ oop_client_deliver_request (void *ptr, j
+@@ -259,7 +283,7 @@ oop_client_deliver_request (void *ptr, j
  
  	if (req->type == PropertyChangeNotify) {
  		if (req->x.property.keylen) {
@@ -49,7 +49,7 @@
  				jack_error ("cannot send property key of length %d to server",
  					    req->x.property.keylen);
  				req->status = -1;
-@@ -269,7 +293,7 @@ oop_client_deliver_request (void *ptr, j
+@@ -268,7 +292,7 @@ oop_client_deliver_request (void *ptr, j
  		}
  	}
  
@@ -58,7 +58,7 @@
  	       == sizeof(*req));
  
  	if (wok && rok) {               /* everything OK? */
-@@ -838,14 +862,14 @@ server_event_connect (jack_client_t *cli
+@@ -837,14 +861,14 @@ server_event_connect (jack_client_t *cli
  
  	jack_uuid_copy (&req.client_id, client->control->uuid);
  
@@ -76,7 +76,7 @@
  		jack_error ("cannot read event connect result from server (%s)",
  			    strerror (errno));
  		close (fd);
-@@ -1110,14 +1134,14 @@ jack_request_client (ClientType type,
+@@ -1109,14 +1133,14 @@ jack_request_client (ClientType type,
  	snprintf (req.object_data, sizeof(req.object_data),
  		  "%s", va->load_init);
  
@@ -93,7 +93,7 @@
  
  		if (errno == 0) {
  			/* server shut the socket */
-@@ -1513,7 +1537,7 @@ jack_internal_client_close (const char *
+@@ -1512,7 +1536,7 @@ jack_internal_client_close (const char *
  		return;
  	}
  
@@ -102,7 +102,7 @@
  		jack_error ("cannot deliver ClientUnload request to JACK "
  			    "server.");
  	}
-@@ -1649,7 +1673,7 @@ jack_session_notify (jack_client_t* clie
+@@ -1648,7 +1672,7 @@ jack_session_notify (jack_client_t* clie
  
  	request.x.session.type = code;
  
@@ -111,7 +111,7 @@
  	      != sizeof(request)) ) {
  		jack_error ("cannot send request type %d to server",
  			    request.type);
-@@ -1659,7 +1683,7 @@ jack_session_notify (jack_client_t* clie
+@@ -1658,7 +1682,7 @@ jack_session_notify (jack_client_t* clie
  	while ( 1 ) {
  		jack_uuid_t uid;
  
@@ -120,7 +120,7 @@
  			jack_error ("cannot read result for request type %d from"
  				    " server (%s)", request.type, strerror (errno));
  			goto out;
-@@ -1681,19 +1705,19 @@ jack_session_notify (jack_client_t* clie
+@@ -1680,19 +1704,19 @@ jack_session_notify (jack_client_t* clie
  			break;
  		}
  
@@ -143,7 +143,7 @@
  		    != sizeof(retval[num_replies - 1].flags) ) {
  			jack_error ("cannot read result for request type %d from"
  				    " server (%s)", request.type, strerror (errno));
-@@ -1812,7 +1836,7 @@ jack_client_process_events (jack_client_
+@@ -1811,7 +1835,7 @@ jack_client_process_events (jack_client_
  		/* server has sent us an event. process the
  		 * event and reply */
  
@@ -152,7 +152,7 @@
  		    != sizeof(event)) {
  			jack_error ("cannot read server event (%s)",
  				    strerror (errno));
-@@ -1822,7 +1846,7 @@ jack_client_process_events (jack_client_
+@@ -1821,7 +1845,7 @@ jack_client_process_events (jack_client_
  		if (event.type == PropertyChange) {
  			if (event.y.key_size) {
  				key = (char*)malloc (event.y.key_size);
@@ -161,7 +161,7 @@
  				    event.y.key_size) {
  					jack_error ("cannot read property change key (%s)",
  						    strerror (errno));
-@@ -1941,7 +1965,7 @@ jack_client_process_events (jack_client_
+@@ -1940,7 +1964,7 @@ jack_client_process_events (jack_client_
  		DEBUG ("client has dealt with the event, writing "
  		       "response on event fd");
  
@@ -170,7 +170,7 @@
  		    != sizeof(status)) {
  			jack_error ("cannot send event response to "
  				    "engine (%s)", strerror (errno));
-@@ -1961,7 +1985,7 @@ jack_wake_next_client (jack_client_t* cl
+@@ -1960,7 +1984,7 @@ jack_wake_next_client (jack_client_t* cl
  	int pret = 0;
  	char c = 0;
  
@@ -179,7 +179,7 @@
  	    != sizeof(c)) {
  		DEBUG ("cannot write byte to fd %d", client->graph_next_fd);
  		jack_error ("cannot continue execution of the "
-@@ -1989,7 +2013,7 @@ jack_wake_next_client (jack_client_t* cl
+@@ -1988,7 +2012,7 @@ jack_wake_next_client (jack_client_t* cl
  	}
  
  	if (pret > 0 && (pfds[0].revents & POLLIN)) {
diff --git a/audio/jack/pkg-message b/audio/jack/pkg-message
new file mode 100644
index 00000000000..f5ac56a7b0a
--- /dev/null
+++ b/audio/jack/pkg-message
@@ -0,0 +1,26 @@
+======================================================================
+It is recommended to run Jack with real-time priority (-R).
+
+The recommended way to start Jack is to add the following
+lines to /etc/rc.conf:
+
+jackd_enable="YES"
+jackd_user="{your-jack-user}"
+jackd_rtprio="YES"
+jackd_args="-R -doss -r{sample-rate} -p1024 -n3 -w16 \
+            --capture /dev/dsp{N} --playback /dev/dsp{N}"
+
+Where:
+- your-jack-user: is the user who is going to use jack; currently
+                  only one user is supported
+- sample-rate: can be 44100, 48000, etc.
+- /dev/dsp{N}: your OSS devices, usually /dev/dsp0
+
+Please note that the port option COOKEDMODE is "on" by default, which
+makes your system to automatically scale the sample-rate between
+Jack and audio hardware. One reason COOKEDMODE=on is because
+Jack's OSS driver doesn't support some sample-rate and hardware
+combinations when COOKEDMODE=off. To achieve the best sound quality
+please make sure your hardware natively supports the sample-rate set
+in jackd_args, and set COOKEDMODE=off.
+======================================================================
diff --git a/audio/jack/pkg-plist b/audio/jack/pkg-plist
index 2874f847900..17463153135 100644
--- a/audio/jack/pkg-plist
+++ b/audio/jack/pkg-plist
@@ -61,7 +61,28 @@ lib/libjackserver.so
 lib/libjackserver.so.0
 lib/libjackserver.so.0.0.28
 libdata/pkgconfig/jack.pc
+man/man1/alsa_in.1.gz
+man/man1/alsa_out.1.gz
+man/man1/jack_bufsize.1.gz
+man/man1/jack_connect.1.gz
+man/man1/jack_disconnect.1.gz
+man/man1/jack_freewheel.1.gz
+man/man1/jack_impulse_grabber.1.gz
+man/man1/jack_iodelay.1.gz
+man/man1/jack_load.1.gz
+man/man1/jack_load_test.1.gz
+man/man1/jack_lsp.1.gz
+man/man1/jack_metro.1.gz
+man/man1/jack_monitor_client.1.gz
+man/man1/jack_netsource.1.gz
+man/man1/jack_property.1.gz
+man/man1/jack_samplerate.1.gz
+man/man1/jack_showtime.1.gz
+man/man1/jack_transport.1.gz
+man/man1/jack_unload.1.gz
+man/man1/jack_wait.1.gz
 man/man1/jackd.1.gz
+man/man1/jackrec.1.gz
 man/man1/jackstart.1.gz
 %%DOXYGEN%%share/jack-audio-connection-kit/reference/html/annotated.html
 %%DOXYGEN%%share/jack-audio-connection-kit/reference/html/classes.html
diff --git a/audio/libltc/Makefile b/audio/libltc/Makefile
new file mode 100644
index 00000000000..58d9e49e749
--- /dev/null
+++ b/audio/libltc/Makefile
@@ -0,0 +1,23 @@
+# Created by: Yuri Victorovich <yuri@rawbw.com>
+# $FreeBSD$
+
+PORTNAME=	libltc
+DISTVERSIONPREFIX=	v
+DISTVERSION=	1.3.0
+CATEGORIES=	audio
+
+MAINTAINER=	yuri@rawbw.com
+COMMENT=	Linear/Logitudinal Time Code (LTC) Library
+
+LICENSE=	LGPL3
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+USES=		autoreconf gmake libtool
+USE_GITHUB=	yes
+GH_ACCOUNT=	x42
+GNU_CONFIGURE=	yes
+USE_LDCONFIG=	yes
+
+INSTALL_TARGET=	install-strip
+
+.include <bsd.port.mk>
diff --git a/audio/libltc/distinfo b/audio/libltc/distinfo
new file mode 100644
index 00000000000..a8d599201f6
--- /dev/null
+++ b/audio/libltc/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1501731257
+SHA256 (x42-libltc-v1.3.0_GH0.tar.gz) = a760e651247e5a01a62b9fd03d8edd32047ff1ec0565d396585970e9049b727c
+SIZE (x42-libltc-v1.3.0_GH0.tar.gz) = 101798
diff --git a/audio/libltc/pkg-descr b/audio/libltc/pkg-descr
new file mode 100644
index 00000000000..5feb9871c71
--- /dev/null
+++ b/audio/libltc/pkg-descr
@@ -0,0 +1,8 @@
+Linear (or Longitudinal) Timecode (LTC) is an encoding of SMPTE timecode data
+as a Manchester-Biphase encoded audio signal. The audio signal is commonly
+recorded on a VTR track or other storage media.
+
+libltc provides functionality to encode and decode LTC audio from/to SMPTE or
+EBU timecode, including SMPTE date support.
+
+WWW: https://github.com/x42/libltc
diff --git a/audio/libltc/pkg-plist b/audio/libltc/pkg-plist
new file mode 100644
index 00000000000..4d441780553
--- /dev/null
+++ b/audio/libltc/pkg-plist
@@ -0,0 +1,7 @@
+include/ltc.h
+lib/libltc.a
+lib/libltc.so
+lib/libltc.so.11
+lib/libltc.so.11.0.5
+libdata/pkgconfig/ltc.pc
+man/man3/ltc.h.3.gz
diff --git a/audio/lmms/Makefile b/audio/lmms/Makefile
index e0b21b63ab3..ecb1ede8627 100644
--- a/audio/lmms/Makefile
+++ b/audio/lmms/Makefile
@@ -4,6 +4,7 @@
 PORTNAME=	lmms
 PORTVERSION=	1.1.3
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	audio
 
@@ -18,6 +19,7 @@ LIB_DEPENDS=	libFLAC.so:audio/flac \
 		libsamplerate.so:audio/libsamplerate \
 		libsndfile.so:audio/libsndfile \
 		libvorbis.so:audio/libvorbis \
+		libogg.so:audio/libogg \
 		libfftw3.so:math/fftw3 \
 		libfftw3f.so:math/fftw3-float \
 		libsamplerate.so:audio/libsamplerate \
@@ -27,10 +29,11 @@ RUN_DEPENDS=	${LOCALBASE}/share/ladspa/rdf/caps.rdf:audio/caps-plugins \
 		${LOCALBASE}/share/ladspa/rdf/swh-plugins.rdf:audio/swhplugins \
 		${LOCALBASE}/share/ladspa/rdf/tap-plugins.rdf:audio/tap-plugins
 
-OPTIONS_DEFINE=	JACK PULSEAUDIO SDL
+OPTIONS_DEFINE=	OSS JACK PULSEAUDIO PORTAUDIO SDL
+OPTIONS_DEFAULT=OSS
 
 USE_LDCONFIG=	yes
-USE_XORG=	xft
+USE_XORG=	x11 xext xft ice sm
 USE_QT4=	corelib gui xml moc_build uic_build rcc_build \
 		qmake_build
 USE_GITHUB=	yes
@@ -54,6 +57,9 @@ JACK_CMAKE_OFF=		-DWANT_JACK:BOOL=OFF
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_OFF=	-DWANT_PULSEAUDIO:BOOL=OFF
 
+PORTAUDIO_LIB_DEPENDS=	libportaudio.so:audio/portaudio
+PORTAUDIO_CMAKE_OFF=	-DWANT_PORTAUDIO:BOOL=OFF
+
 SDL_USE=		SDL=sdl
 SDL_CMAKE_OFF=		-DWANT_SDL:BOOL=OFF
 
@@ -77,6 +83,12 @@ post-patch:
 	@${REINPLACE_CMD} -e 's/lib64/lib/' \
 		${WRKSRC}/cmake/modules/DetectMachine.cmake
 
+post-patch-OSS-off:
+	@${REINPLACE_CMD} \
+		-e 's|SET(LMMS_HAVE_OSS TRUE)|SET(LMMS_HAVE_OSS FALSE)|; \
+		    s|SET(STATUS_OSS "OK")|SET(STATUS_OSS "<disabled>")|' \
+		${WRKSRC}/CMakeLists.txt
+
 post-install:
 	@${LN} -sf ${DATADIR}/themes/default/icon.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/lmms.png
diff --git a/audio/lmms/distinfo b/audio/lmms/distinfo
index f00c6ce54c0..2192467b306 100644
--- a/audio/lmms/distinfo
+++ b/audio/lmms/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1500880879
 SHA256 (LMMS-lmms-v1.1.3_GH0.tar.gz) = 59338e7b90e02fe18db73114aefe479c0e6d1e0e366185d71ea5c1a1e0f9e6bc
 SIZE (LMMS-lmms-v1.1.3_GH0.tar.gz) = 16843533
diff --git a/audio/lvtk/Makefile b/audio/lvtk/Makefile
new file mode 100644
index 00000000000..5abb7b03114
--- /dev/null
+++ b/audio/lvtk/Makefile
@@ -0,0 +1,21 @@
+# Created by: Yuri Victorovich <yuri@rawbw.com>
+# $FreeBSD$
+
+PORTNAME=	lvtk
+PORTVERSION=	1.2.0
+CATEGORIES=	audio
+
+MAINTAINER=	yuri@rawbw.com
+COMMENT=	Wraps the LV2 C API and extensions into easy to use C++ classes
+
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+BUILD_DEPENDS=	lv2>0:audio/lv2 \
+		${LOCALBASE}/include/gtkmm-2.4/gtkmm.h:x11-toolkits/gtkmm24
+
+USES=		waf pkgconfig
+USE_GITHUB=	yes
+GH_TAGNAME=	7c0ffdf
+
+.include <bsd.port.mk>
diff --git a/audio/lvtk/distinfo b/audio/lvtk/distinfo
new file mode 100644
index 00000000000..6e675232404
--- /dev/null
+++ b/audio/lvtk/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1502006846
+SHA256 (lvtk-lvtk-1.2.0-7c0ffdf_GH0.tar.gz) = a23a3f72637334fb82a141c6b117d91a68e54b84a1737ddc03422b572e55f9b4
+SIZE (lvtk-lvtk-1.2.0-7c0ffdf_GH0.tar.gz) = 188503
diff --git a/audio/lvtk/pkg-descr b/audio/lvtk/pkg-descr
new file mode 100644
index 00000000000..d55a3c16fed
--- /dev/null
+++ b/audio/lvtk/pkg-descr
@@ -0,0 +1,5 @@
+This toolkit contains libraries that wrap the LV2 C API and extensions into
+easy to use C++ classes. The original work for this was mostly done by
+Lars Luthman in lv2-c++-tools.
+
+WWW: https://github.com/lvtk/lvtk
diff --git a/audio/lvtk/pkg-plist b/audio/lvtk/pkg-plist
new file mode 100644
index 00000000000..30b3d42f0e6
--- /dev/null
+++ b/audio/lvtk/pkg-plist
@@ -0,0 +1,38 @@
+include/lvtk-2/lvtk/behaviors/write_midi.hpp
+include/lvtk-2/lvtk/ext/atom.hpp
+include/lvtk-2/lvtk/ext/bufsize.hpp
+include/lvtk-2/lvtk/ext/common.h
+include/lvtk-2/lvtk/ext/data_access.hpp
+include/lvtk-2/lvtk/ext/event.hpp
+include/lvtk-2/lvtk/ext/extra.hpp
+include/lvtk-2/lvtk/ext/idle_interface.hpp
+include/lvtk-2/lvtk/ext/instance_access.hpp
+include/lvtk-2/lvtk/ext/log.hpp
+include/lvtk-2/lvtk/ext/midi.hpp
+include/lvtk-2/lvtk/ext/morph.hpp
+include/lvtk-2/lvtk/ext/options.hpp
+include/lvtk-2/lvtk/ext/patch.hpp
+include/lvtk-2/lvtk/ext/resize_port.hpp
+include/lvtk-2/lvtk/ext/state.hpp
+include/lvtk-2/lvtk/ext/time.hpp
+include/lvtk-2/lvtk/ext/units.hpp
+include/lvtk-2/lvtk/ext/urid.hpp
+include/lvtk-2/lvtk/ext/urimap.hpp
+include/lvtk-2/lvtk/ext/worker.hpp
+include/lvtk-2/lvtk/feature.hpp
+include/lvtk-2/lvtk/gtkui.hpp
+include/lvtk-2/lvtk/lvtk.hpp
+include/lvtk-2/lvtk/plugin.hpp
+include/lvtk-2/lvtk/private/debug.hpp
+include/lvtk-2/lvtk/private/types.hpp
+include/lvtk-2/lvtk/private/ui_features.hpp
+include/lvtk-2/lvtk/qt4ui.hpp
+include/lvtk-2/lvtk/synth.hpp
+include/lvtk-2/lvtk/ui.hpp
+include/lvtk-2/lvtk/version.h
+lib/liblvtk_plugin2.a
+lib/liblvtk_ui2.a
+libdata/pkgconfig/lvtk-2.pc
+libdata/pkgconfig/lvtk-gtkui-2.pc
+libdata/pkgconfig/lvtk-plugin-2.pc
+libdata/pkgconfig/lvtk-ui-2.pc
diff --git a/audio/py-gmusicapi/Makefile b/audio/py-gmusicapi/Makefile
index 097cab36464..b459f027385 100644
--- a/audio/py-gmusicapi/Makefile
+++ b/audio/py-gmusicapi/Makefile
@@ -28,12 +28,12 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}appdirs>=1.3.0:devel/py-appdirs \
 		${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl \
 		${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	simon-weber
-
 USES=		python
 USE_PYTHON=	distutils autoplist
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	simon-weber
+
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/audio/py-gmusicproxy/Makefile b/audio/py-gmusicproxy/Makefile
new file mode 100644
index 00000000000..85b736e8306
--- /dev/null
+++ b/audio/py-gmusicproxy/Makefile
@@ -0,0 +1,31 @@
+# Created by: Ashley Chase <erisianash@gmail.com>
+# $FreeBSD$
+
+PORTNAME=	gmusicproxy
+PORTVERSION=	1.0.8
+DISTVERSIONPREFIX= v
+CATEGORIES=	audio python
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	erisianash@gmail.com
+COMMENT=	Proxy for streaming Google Play Music using any media-player
+
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}appdirs>=1.3.0:devel/py-appdirs \
+		${PYTHON_PKGNAMEPREFIX}gmusicapi>=10.1.0:audio/py-gmusicapi \
+		${PYTHON_PKGNAMEPREFIX}netifaces>=-0.10.4:net/py-netifaces \
+		${PYTHON_PKGNAMEPREFIX}xdg>=0.25:devel/py-xdg \
+		${PYTHON_PKGNAMEPREFIX}eyed3>=0.7.8:audio/py-eyed3 \
+		${PYTHON_PKGNAMEPREFIX}daemon>=2.0.5:devel/py-daemon
+
+USES=		python
+USE_PYTHON=	distutils autoplist
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	diraimondo
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/audio/py-gmusicproxy/distinfo b/audio/py-gmusicproxy/distinfo
new file mode 100644
index 00000000000..38d50731a12
--- /dev/null
+++ b/audio/py-gmusicproxy/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1497955248
+SHA256 (diraimondo-gmusicproxy-v1.0.8_GH0.tar.gz) = d22141d5d8b854bc1583948c79269db39a0daf54dd11c89262a5ba25c02be088
+SIZE (diraimondo-gmusicproxy-v1.0.8_GH0.tar.gz) = 31956
diff --git a/audio/py-gmusicproxy/pkg-descr b/audio/py-gmusicproxy/pkg-descr
new file mode 100644
index 00000000000..d373176ebc8
--- /dev/null
+++ b/audio/py-gmusicproxy/pkg-descr
@@ -0,0 +1,14 @@
+This program permits the use of Google Play Music with All Access
+subscription with any music player that is able to stream MP3 files and to
+manage M3U playlists (e.g., MPD server, VLC, ...). It can work also with a
+free account without All Access extras.
+
+This project is based on the great Unofficial Google Play Music API
+(gmusicapi) of Simon Weber: it already permits to create URLs to stream the
+tracks as regular MP3 but they expire in 1 minute! Keeping this proxy
+running, it can generate persistent local URLs that never expire and that
+can be used in any media-player.
+
+This project is not supported nor endorsed by Google. Its aim is not the
+abuse of the service but the one to improve the access to it. I'm not
+responsible of its misuse.
diff --git a/audio/quimup/Makefile b/audio/quimup/Makefile
index f5f173467f1..9d49fa685f8 100644
--- a/audio/quimup/Makefile
+++ b/audio/quimup/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	quimup
-PORTVERSION=	1.4.1
-PORTREVISION=	1
+PORTVERSION=	1.4.2
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}
-DISTNAME=	${PORTNAME}_${PORTVERSION}_source
+DISTNAME=	${PORTNAME}%20${PORTVERSION}_source
 
 MAINTAINER=	cmangin@arobas.net
 COMMENT=	Qt5 client for MPD (the Music Player Daemon)
diff --git a/audio/quimup/distinfo b/audio/quimup/distinfo
index f3ed951fd67..9627c86b9cf 100644
--- a/audio/quimup/distinfo
+++ b/audio/quimup/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1465390589
-SHA256 (quimup_1.4.1_source.tar.gz) = dca98b80ce9583937a7f9d1c2ae8c619eecbeea704f30d1111c80312dec3347d
-SIZE (quimup_1.4.1_source.tar.gz) = 233112
+TIMESTAMP = 1502487093
+SHA256 (quimup%201.4.2_source.tar.gz) = 5a29a813eff8db1dbe95342527f5b9ea25b88a41c6cb68b2a1ed5a438a9a52c2
+SIZE (quimup%201.4.2_source.tar.gz) = 233404
diff --git a/audio/shairport-sync/Makefile b/audio/shairport-sync/Makefile
index 573f798597c..107038b019c 100644
--- a/audio/shairport-sync/Makefile
+++ b/audio/shairport-sync/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	shairport-sync
-DISTVERSION=	3.1d16
+PORTVERSION=	3.1
 CATEGORIES=	audio
 
 MAINTAINER=	ehaupt@FreeBSD.org
diff --git a/audio/shairport-sync/distinfo b/audio/shairport-sync/distinfo
index b154584d1f0..bd7bf3eed6c 100644
--- a/audio/shairport-sync/distinfo
+++ b/audio/shairport-sync/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1496909908
-SHA256 (mikebrady-shairport-sync-3.1d16_GH0.tar.gz) = f133f3963f7729fe88e9af424857b81830bf8505bd225bc16330bd4f7105e4e9
-SIZE (mikebrady-shairport-sync-3.1d16_GH0.tar.gz) = 291627
+TIMESTAMP = 1502653399
+SHA256 (mikebrady-shairport-sync-3.1_GH0.tar.gz) = a5b4d8330ac84ab37bb6438ca2449c73254f7d517ffe1f4721af86ebc69885c5
+SIZE (mikebrady-shairport-sync-3.1_GH0.tar.gz) = 296247
diff --git a/audio/x42-plugins-lv2/Makefile b/audio/x42-plugins-lv2/Makefile
new file mode 100644
index 00000000000..a1f508d9cbd
--- /dev/null
+++ b/audio/x42-plugins-lv2/Makefile
@@ -0,0 +1,41 @@
+# Created by: Yuri Victorovich <yuri@rawbw.com>
+# $FreeBSD$
+
+PORTNAME=	x42-plugins
+PORTVERSION=	20170428
+CATEGORIES=	audio
+MASTER_SITES=	http://gareus.org/misc/x42-plugins/
+PKGNAMESUFFIX=	-lv2
+
+MAINTAINER=	yuri@rawbw.com
+COMMENT=	Collection of LV2 plugins (submodules)
+
+BUILD_DEPENDS=	lv2>0:audio/lv2 \
+		${LOCALBASE}/include/fftw3.h:math/fftw3 \
+		bash:shells/bash
+LIB_DEPENDS=	libfftw3f.so:math/fftw3-float \
+		libjack.so:audio/jack \
+		liblo.so:audio/liblo \
+		libltc.so:audio/libltc \
+		libsamplerate.so:audio/libsamplerate \
+		libsndfile.so:audio/libsndfile \
+		libzita-convolver.so:audio/zita-convolver
+
+USES=		gmake localbase pkgconfig tar:xz shebangfix
+USE_GNOME=	glib20 pango cairo
+USE_XORG=	x11
+USE_GL=		glu gl
+MAKE_ENV=	BUILDOPENGL=yes BUILDGTK=no LV2DIR=${PREFIX}/lib/lv2 MANDIR=${PREFIX}/man/man1
+SHEBANG_FILES=	stepseq.lv2/gridgen.sh
+
+post-patch:
+	${REINPLACE_CMD} 's/__APPLE__/__FreeBSD__/' \
+		${WRKSRC}/tuna.lv2/src/spectr.c \
+		${WRKSRC}/meters.lv2/src/spectr.c
+	${REINPLACE_CMD} 's|$$(mandir)/man1|$$(MANDIR)|' \
+		${WRKSRC}/sisco.lv2/Makefile
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lv2/convo.lv2/convoLV2.so
+
+.include <bsd.port.mk>
diff --git a/audio/x42-plugins-lv2/distinfo b/audio/x42-plugins-lv2/distinfo
new file mode 100644
index 00000000000..025a8452365
--- /dev/null
+++ b/audio/x42-plugins-lv2/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1501726099
+SHA256 (x42-plugins-20170428.tar.xz) = af836a96c88a47c1b246ac9cc48389b72868f5e2bfe4ff2de9e708315516287a
+SIZE (x42-plugins-20170428.tar.xz) = 6864860
diff --git a/audio/x42-plugins-lv2/pkg-descr b/audio/x42-plugins-lv2/pkg-descr
new file mode 100644
index 00000000000..dccd535eef7
--- /dev/null
+++ b/audio/x42-plugins-lv2/pkg-descr
@@ -0,0 +1,3 @@
+A collection of professional lv2 audio plugins written by Robin Gareus.
+
+WWW: https://github.com/x42/x42-plugins/
diff --git a/audio/x42-plugins-lv2/pkg-plist b/audio/x42-plugins-lv2/pkg-plist
new file mode 100644
index 00000000000..05a759a9744
--- /dev/null
+++ b/audio/x42-plugins-lv2/pkg-plist
@@ -0,0 +1,74 @@
+bin/x42-fat1
+bin/x42-fil4
+bin/x42-meter
+bin/x42-mixtri
+bin/x42-scope
+bin/x42-stepseq
+bin/x42-tuna
+lib/lv2/balance.lv2/balance.so
+lib/lv2/balance.lv2/balance.ttl
+lib/lv2/balance.lv2/manifest.ttl
+lib/lv2/convo.lv2/convoLV2.so
+lib/lv2/convo.lv2/convoLV2.ttl
+lib/lv2/convo.lv2/manifest.ttl
+lib/lv2/fat1.lv2/fat1.so
+lib/lv2/fat1.lv2/fat1.ttl
+lib/lv2/fat1.lv2/fat1UI_gl.so
+lib/lv2/fat1.lv2/manifest.ttl
+lib/lv2/fil4.lv2/fil4.so
+lib/lv2/fil4.lv2/fil4.ttl
+lib/lv2/fil4.lv2/fil4UI_gl.so
+lib/lv2/fil4.lv2/manifest.ttl
+lib/lv2/meters.lv2/manifest.ttl
+lib/lv2/meters.lv2/meters.so
+lib/lv2/meters.lv2/meters.ttl
+lib/lv2/meters.lv2/meters_glui.so
+lib/lv2/midifilter.lv2/manifest.ttl
+lib/lv2/midifilter.lv2/midifilter.so
+lib/lv2/midifilter.lv2/midifilter.ttl
+lib/lv2/midifilter.lv2/presets.ttl
+lib/lv2/midigen.lv2/manifest.ttl
+lib/lv2/midigen.lv2/midigen.so
+lib/lv2/midigen.lv2/midigen.ttl
+lib/lv2/midimap.lv2/manifest.ttl
+lib/lv2/midimap.lv2/midimap.so
+lib/lv2/midimap.lv2/midimap.ttl
+lib/lv2/midimap.lv2/presets.ttl
+lib/lv2/mixtri.lv2/manifest.ttl
+lib/lv2/mixtri.lv2/mixtri.so
+lib/lv2/mixtri.lv2/mixtri.ttl
+lib/lv2/mixtri.lv2/mixtriUI_gl.so
+lib/lv2/nodelay.lv2/manifest.ttl
+lib/lv2/nodelay.lv2/nodelay.so
+lib/lv2/nodelay.lv2/nodelay.ttl
+lib/lv2/onsettrigger.lv2/manifest.ttl
+lib/lv2/onsettrigger.lv2/onsettrigger.so
+lib/lv2/onsettrigger.lv2/onsettrigger.ttl
+lib/lv2/sisco.lv2/manifest.ttl
+lib/lv2/sisco.lv2/sisco.so
+lib/lv2/sisco.lv2/sisco.ttl
+lib/lv2/sisco.lv2/siscoUI_gl.so
+lib/lv2/stepseq_s8n8.lv2/manifest.ttl
+lib/lv2/stepseq_s8n8.lv2/stepseq.so
+lib/lv2/stepseq_s8n8.lv2/stepseq.ttl
+lib/lv2/stepseq_s8n8.lv2/stepseqUI_gl.so
+lib/lv2/stereoroute.lv2/manifest.ttl
+lib/lv2/stereoroute.lv2/stereoroute.so
+lib/lv2/stereoroute.lv2/stereoroute.ttl
+lib/lv2/testsignal.lv2/manifest.ttl
+lib/lv2/testsignal.lv2/testsignal.so
+lib/lv2/testsignal.lv2/testsignal.ttl
+lib/lv2/tuna.lv2/manifest.ttl
+lib/lv2/tuna.lv2/tuna.so
+lib/lv2/tuna.lv2/tuna.ttl
+lib/lv2/tuna.lv2/tunaUI_gl.so
+lib/lv2/xfade.lv2/manifest.ttl
+lib/lv2/xfade.lv2/xfade.so
+lib/lv2/xfade.lv2/xfade.ttl
+man/man1/x42-fat1.1.gz
+man/man1/x42-fil4.1.gz
+man/man1/x42-meter.1.gz
+man/man1/x42-mixtri.1.gz
+man/man1/x42-stepseq.1.gz
+man/man1/x42-tuna.1.gz
+man/man1/x42-scope.1.gz
diff --git a/audio/zita-convolver/Makefile b/audio/zita-convolver/Makefile
new file mode 100644
index 00000000000..3c9214f1767
--- /dev/null
+++ b/audio/zita-convolver/Makefile
@@ -0,0 +1,34 @@
+# Created by: Yuri Victorovich <yuri@rawbw.com>
+# $FreeBSD$
+
+PORTNAME=	zita-convolver
+PORTVERSION=	3.1.0
+CATEGORIES=	audio
+MASTER_SITES=	http://kokkinizita.linuxaudio.org/linuxaudio/downloads/
+
+MAINTAINER=	yuri@rawbw.com
+COMMENT=	Fast, partitioned convolution engine library
+
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/../COPYING
+
+BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:math/fftw3
+LIB_DEPENDS=	libfftw3f.so:math/fftw3-float
+
+USES=		compiler:c++11-lib gmake localbase:ldflags tar:bz2
+USE_LDCONFIG=	yes
+WRKSRC_SUBDIR=	libs
+
+PLIST_FILES=	include/zita-convolver.h \
+		lib/libzita-convolver.so \
+		lib/libzita-convolver.so.3 \
+		lib/libzita-convolver.so.${PORTVERSION}
+
+post-patch:
+	${REINPLACE_CMD} 's/__APPLE__/__FreeBSD__/' \
+		${WRKSRC}/zita-convolver.h
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libzita-convolver.so.${PORTVERSION}
+
+.include <bsd.port.mk>
diff --git a/audio/zita-convolver/distinfo b/audio/zita-convolver/distinfo
new file mode 100644
index 00000000000..65480e2c699
--- /dev/null
+++ b/audio/zita-convolver/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1501728395
+SHA256 (zita-convolver-3.1.0.tar.bz2) = bf7e93b582168b78d40666974460ad8142c2fa3c3412e327e4ab960b3fb31993
+SIZE (zita-convolver-3.1.0.tar.bz2) = 21485
diff --git a/audio/zita-convolver/files/patch-Makefile b/audio/zita-convolver/files/patch-Makefile
new file mode 100644
index 00000000000..cfab1e421c3
--- /dev/null
+++ b/audio/zita-convolver/files/patch-Makefile
@@ -0,0 +1,34 @@
+--- Makefile.orig	2011-11-20 21:30:54 UTC
++++ Makefile
+@@ -21,8 +21,8 @@
+ # Modify as required.
+ #
+ PREFIX = /usr/local
+-SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
+-LIBDIR = lib$(SUFFIX)
++#SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
++LIBDIR = lib
+ 
+ 
+ MAJVERS = 3
+@@ -45,9 +45,10 @@ ZITA-CONVOLVER_DEP = -lfftw3f -lpthread
+ ZITA-CONVOLVER_O = zita-convolver.o
+ ZITA-CONVOLVER_H = zita-convolver.h 
+ 
++all: $(ZITA-CONVOLVER_MIN)
+ 
+ $(ZITA-CONVOLVER_MIN):	$(ZITA-CONVOLVER_O)
+-	g++ -shared $(LDFLAGS) -Wl,-soname,$(ZITA-CONVOLVER_MAJ) -o $(ZITA-CONVOLVER_MIN) $(ZITA-CONVOLVER_O) $(ZITA-CONVOLVER_DEP)
++	${CXX} -shared $(LDFLAGS) -Wl,-soname,$(ZITA-CONVOLVER_MAJ) -o $(ZITA-CONVOLVER_MIN) $(ZITA-CONVOLVER_O) $(ZITA-CONVOLVER_DEP)
+ 
+ 
+ install:	$(ZITA-CONVOLVER_MIN)
+@@ -56,7 +57,7 @@ install:	$(ZITA-CONVOLVER_MIN)
+ 	install -m 644 $(ZITA-CONVOLVER_H) $(DESTDIR)$(PREFIX)/include
+ 	install -m 755 $(ZITA-CONVOLVER_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)
+ 	ln -sf $(ZITA-CONVOLVER_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(ZITA-CONVOLVER_SO)
+-	ldconfig
++	ln -sf $(ZITA-CONVOLVER_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(ZITA-CONVOLVER_MAJ)
+ 
+ clean:
+ 	/bin/rm -f *~ *.o *.a *.d *.so.*
diff --git a/audio/zita-convolver/pkg-descr b/audio/zita-convolver/pkg-descr
new file mode 100644
index 00000000000..851ea09a535
--- /dev/null
+++ b/audio/zita-convolver/pkg-descr
@@ -0,0 +1,5 @@
+A C++ library implementing a real-time convolution matrix for up to 64 inputs
+and outputs. It uses multiple partition sizes to provide both low delay and
+efficient CPU use.
+
+WWW: http://kokkinizita.linuxaudio.org/linuxaudio/
diff --git a/benchmarks/iperf/Makefile b/benchmarks/iperf/Makefile
index 531d5a78e1a..2797a0458fd 100644
--- a/benchmarks/iperf/Makefile
+++ b/benchmarks/iperf/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	iperf
-PORTVERSION=	2.0.9
+PORTVERSION=	2.0.10
 CATEGORIES=	benchmarks
 MASTER_SITES=	SF/${PORTNAME}2
 
diff --git a/benchmarks/iperf/distinfo b/benchmarks/iperf/distinfo
index b5b05e61343..ae389e12af4 100644
--- a/benchmarks/iperf/distinfo
+++ b/benchmarks/iperf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479828112
-SHA256 (iperf-2.0.9.tar.gz) = db02911f35686e808ed247160dfa766e08ae3f59d1e7dcedef0ffb2a6643f0bf
-SIZE (iperf-2.0.9.tar.gz) = 279153
+TIMESTAMP = 1502528492
+SHA256 (iperf-2.0.10.tar.gz) = 7fe4348dcca313b74e0aa9c34a8ccd713b84a5615b8578f4aa94cedce9891ef2
+SIZE (iperf-2.0.10.tar.gz) = 290282
diff --git a/benchmarks/stress-ng/Makefile b/benchmarks/stress-ng/Makefile
index 6aa53554eb5..a37a39cb35a 100644
--- a/benchmarks/stress-ng/Makefile
+++ b/benchmarks/stress-ng/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	stress-ng
-PORTVERSION=	0.08.09
+PORTVERSION=	0.08.10
 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 7e8d6a2ced1..8a523b2203c 100644
--- a/benchmarks/stress-ng/distinfo
+++ b/benchmarks/stress-ng/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501069751
-SHA256 (stress-ng-0.08.09.tar.gz) = 1364ff75543eb86f085e30d174098f11b74f12d017ad51c820b46c6473dfd8ac
-SIZE (stress-ng-0.08.09.tar.gz) = 434993
+TIMESTAMP = 1502406121
+SHA256 (stress-ng-0.08.10.tar.gz) = f2465f788ce297a9ea496df3b6084ee6835836d15c118a07d26273a977cdcd12
+SIZE (stress-ng-0.08.10.tar.gz) = 435918
diff --git a/cad/kicad-devel/Makefile.git_rev b/cad/kicad-devel/Makefile.git_rev
index d68c55cf6cd..e9e7f4029ef 100644
--- a/cad/kicad-devel/Makefile.git_rev
+++ b/cad/kicad-devel/Makefile.git_rev
@@ -1,2 +1,2 @@
-GIT_SRC_HASH=  0719b99ad81c16f06e4068c91210230d7703aeec
-GIT_SRC_DATE=  20170624104526
+GIT_SRC_HASH=  0e41632105e3f1673fd8e455723ace079d931f8d
+GIT_SRC_DATE=  20170812181047
diff --git a/cad/kicad-devel/distinfo b/cad/kicad-devel/distinfo
index 4b0a5f03341..f73600fef15 100644
--- a/cad/kicad-devel/distinfo
+++ b/cad/kicad-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1498319256
-SHA256 (kicad/kicad-r20170624104526.tar.bz2) = 285f97c5eb7537be9be535f74d9836d386723918a38d63bc8830e955a5039e89
-SIZE (kicad/kicad-r20170624104526.tar.bz2) = 243515405
+TIMESTAMP = 1502638580
+SHA256 (kicad/kicad-r20170812181047.tar.bz2) = dda97045f539723b28a7355070a1dcd42aef19f4eb1d106fe0b139a2808110ce
+SIZE (kicad/kicad-r20170812181047.tar.bz2) = 328816475
diff --git a/cad/kicad-devel/files/patch-include-system-libcontext.h b/cad/kicad-devel/files/patch-include-system-libcontext.h
deleted file mode 100644
index 8d13d440e0a..00000000000
--- a/cad/kicad-devel/files/patch-include-system-libcontext.h
+++ /dev/null
@@ -1,21 +0,0 @@
---- include/system/libcontext.h.orig	2017-03-23 17:46:25.970103000 +0100
-+++ include/system/libcontext.h	2017-03-23 17:49:04.053146000 +0100
-@@ -23,13 +23,15 @@
- 
- 
--#if defined(__GNUC__) || defined(__APPLE__)
-+#if defined(__GNUC__) || defined(__APPLE__) || defined(__FreeBSD__)
- 
-     #define LIBCONTEXT_COMPILER_gcc
- 
--    #if defined(__linux__)
-+    #if defined(__linux__) || defined(__FreeBSD__)
-     #ifdef __x86_64__
-         #define LIBCONTEXT_PLATFORM_linux_x86_64
-         #define LIBCONTEXT_CALL_CONVENTION
--
-+    #elif __amd64__
-+        #define LIBCONTEXT_PLATFORM_linux_x86_64
-+        #define LIBCONTEXT_CALL_CONVENTION
-     #elif __i386__
-         #define LIBCONTEXT_PLATFORM_linux_i386
diff --git a/cad/kicad-devel/pkg-plist b/cad/kicad-devel/pkg-plist
index f65cf1a8fd2..9f823d4b53e 100644
--- a/cad/kicad-devel/pkg-plist
+++ b/cad/kicad-devel/pkg-plist
@@ -716,117 +716,116 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
 %%DATADIR%%/modules/packages3d/Capacitors_SMD.3dshapes/C_2220.wrl
 %%DATADIR%%/modules/packages3d/Capacitors_SMD.3dshapes/C_2225.step
 %%DATADIR%%/modules/packages3d/Capacitors_SMD.3dshapes/C_2225.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L10.0mm_D4.5mm_P15.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L10.0mm_D4.5mm_P15.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L10.0mm_D4.5mm_P15.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L10.0mm_D6.0mm_P15.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L10.0mm_D6.0mm_P15.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L10.0mm_D6.0mm_P15.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L11.0mm_D5.0mm_P18.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L11.0mm_D5.0mm_P18.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L11.0mm_D5.0mm_P18.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L11.0mm_D6.0mm_P18.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L11.0mm_D6.0mm_P18.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L11.0mm_D6.0mm_P18.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L11.0mm_D8.0mm_P15.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L11.0mm_D8.0mm_P15.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L11.0mm_D8.0mm_P15.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L18.0mm_D10.0mm_P25.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L18.0mm_D10.0mm_P25.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L18.0mm_D10.0mm_P25.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L18.0mm_D6.5mm_P25.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L18.0mm_D6.5mm_P25.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L18.0mm_D6.5mm_P25.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L18.0mm_D8.0mm_P25.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L18.0mm_D8.0mm_P25.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L18.0mm_D8.0mm_P25.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L20.0mm_D10.0mm_P26.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L20.0mm_D10.0mm_P26.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L20.0mm_D10.0mm_P26.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L20.0mm_D13.0mm_P26.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L20.0mm_D13.0mm_P26.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L20.0mm_D13.0mm_P26.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L21.0mm_D8.0mm_P28.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L21.0mm_D8.0mm_P28.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L21.0mm_D8.0mm_P28.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L25.0mm_D10.0mm_P30.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L25.0mm_D10.0mm_P30.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L25.0mm_D10.0mm_P30.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L26.5mm_D20.0mm_P33.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L26.5mm_D20.0mm_P33.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L26.5mm_D20.0mm_P33.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L29.0mm_D10.0mm_P35.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L29.0mm_D10.0mm_P35.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L29.0mm_D10.0mm_P35.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L29.0mm_D13.0mm_P35.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L29.0mm_D13.0mm_P35.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L29.0mm_D13.0mm_P35.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L29.0mm_D16.0mm_P35.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L29.0mm_D16.0mm_P35.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L29.0mm_D16.0mm_P35.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L29.0mm_D20.0mm_P35.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L29.0mm_D20.0mm_P35.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L29.0mm_D20.0mm_P35.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L30.0mm_D10.0mm_P35.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L30.0mm_D10.0mm_P35.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L30.0mm_D10.0mm_P35.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L30.0mm_D12.5mm_P35.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L30.0mm_D12.5mm_P35.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L30.0mm_D12.5mm_P35.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L30.0mm_D15.0mm_P35.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L30.0mm_D15.0mm_P35.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L30.0mm_D15.0mm_P35.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L30.0mm_D18.0mm_P35.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L30.0mm_D18.0mm_P35.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L30.0mm_D18.0mm_P35.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L34.5mm_D20.0mm_P41.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L34.5mm_D20.0mm_P41.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L34.5mm_D20.0mm_P41.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L37.0mm_D13.0mm_P43.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L37.0mm_D13.0mm_P43.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L37.0mm_D13.0mm_P43.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L37.0mm_D16.0mm_P43.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L37.0mm_D16.0mm_P43.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L37.0mm_D16.0mm_P43.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L37.0mm_D20.0mm_P43.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L37.0mm_D20.0mm_P43.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L37.0mm_D20.0mm_P43.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L38.0mm_D18.0mm_P44.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L38.0mm_D18.0mm_P44.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L38.0mm_D18.0mm_P44.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L38.0mm_D21.0mm_P44.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L38.0mm_D21.0mm_P44.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L38.0mm_D21.0mm_P44.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L40.0mm_D16.0mm_P48.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L40.0mm_D16.0mm_P48.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L40.0mm_D16.0mm_P48.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L42.0mm_D23.0mm_P45.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L42.0mm_D23.0mm_P45.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L42.0mm_D23.0mm_P45.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L42.0mm_D26.0mm_P45.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L42.0mm_D26.0mm_P45.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L42.0mm_D26.0mm_P45.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L42.0mm_D29.0mm_P45.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L42.0mm_D29.0mm_P45.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L42.0mm_D29.0mm_P45.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L42.0mm_D32.0mm_P45.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L42.0mm_D32.0mm_P45.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L42.0mm_D32.0mm_P45.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L42.0mm_D35.0mm_P45.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L42.0mm_D35.0mm_P45.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L42.0mm_D35.0mm_P45.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L42.5mm_D20.0mm_P49.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L42.5mm_D20.0mm_P49.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L42.5mm_D20.0mm_P49.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L46.0mm_D20.0mm_P52.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L46.0mm_D20.0mm_P52.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L46.0mm_D20.0mm_P52.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L55.0mm_D23.0mm_P60.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L55.0mm_D23.0mm_P60.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L55.0mm_D23.0mm_P60.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L55.0mm_D26.0mm_P60.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L55.0mm_D26.0mm_P60.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L55.0mm_D26.0mm_P60.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L55.0mm_D29.0mm_P60.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L55.0mm_D29.0mm_P60.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L55.0mm_D29.0mm_P60.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L55.0mm_D32.0mm_P60.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L55.0mm_D32.0mm_P60.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L55.0mm_D32.0mm_P60.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L55.0mm_D35.0mm_P60.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L55.0mm_D35.0mm_P60.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L55.0mm_D35.0mm_P60.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L67.0mm_D23.0mm_P75.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L67.0mm_D23.0mm_P75.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L67.0mm_D23.0mm_P75.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L67.0mm_D26.0mm_P75.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L67.0mm_D26.0mm_P75.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L67.0mm_D26.0mm_P75.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L67.0mm_D29.0mm_P75.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L67.0mm_D29.0mm_P75.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L67.0mm_D29.0mm_P75.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L67.0mm_D32.0mm_P75.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L67.0mm_D32.0mm_P75.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L67.0mm_D32.0mm_P75.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L67.0mm_D35.0mm_P75.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L67.0mm_D35.0mm_P75.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L67.0mm_D35.0mm_P75.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L80.0mm_D23.0mm_P85.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L80.0mm_D23.0mm_P85.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L80.0mm_D23.0mm_P85.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L80.0mm_D26.0mm_P85.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L80.0mm_D26.0mm_P85.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L80.0mm_D26.0mm_P85.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L80.0mm_D29.0mm_P85.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L80.0mm_D29.0mm_P85.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L80.0mm_D29.0mm_P85.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L80.0mm_D32.0mm_P85.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L80.0mm_D32.0mm_P85.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L80.0mm_D32.0mm_P85.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L80.0mm_D35.0mm_P85.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L80.0mm_D35.0mm_P85.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L80.0mm_D35.0mm_P85.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L93.0mm_D23.0mm_P100.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L93.0mm_D23.0mm_P100.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L93.0mm_D23.0mm_P100.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L93.0mm_D26.0mm_P100.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L93.0mm_D26.0mm_P100.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L93.0mm_D26.0mm_P100.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L93.0mm_D29.0mm_P100.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L93.0mm_D29.0mm_P100.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L93.0mm_D29.0mm_P100.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L93.0mm_D32.0mm_P100.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L93.0mm_D32.0mm_P100.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L93.0mm_D32.0mm_P100.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L93.0mm_D35.0mm_P100.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L93.0mm_D35.0mm_P100.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_L93.0mm_D35.0mm_P100.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Axial_Round_Horizontal_master.FCStd
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_D10.0mm_P2.50mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_D10.0mm_P2.50mm.wrl
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_D10.0mm_P2.50mm_P5.00mm.step
@@ -911,172 +910,171 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_D8.0mm_P3.80mm.wrl
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_D8.0mm_P5.00mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_D8.0mm_P5.00mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Round_Vertical_3pin_master.FCStd
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Round_Vertical_master.FCStd
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Tantal_D10.5mm_P2.50mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Tantal_D10.5mm_P2.50mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Tantal_D10.5mm_P2.50mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Tantal_D10.5mm_P5.00mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Tantal_D10.5mm_P5.00mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Tantal_D10.5mm_P5.00mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Tantal_D4.5mm_P2.50mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Tantal_D4.5mm_P2.50mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Tantal_D4.5mm_P2.50mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Tantal_D4.5mm_P5.00mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Tantal_D4.5mm_P5.00mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Tantal_D4.5mm_P5.00mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Tantal_D5.0mm_P2.50mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Tantal_D5.0mm_P2.50mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Tantal_D5.0mm_P2.50mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Tantal_D5.0mm_P5.00mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Tantal_D5.0mm_P5.00mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Tantal_D5.0mm_P5.00mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Tantal_D5.5mm_P2.50mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Tantal_D5.5mm_P2.50mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Tantal_D5.5mm_P2.50mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Tantal_D5.5mm_P5.00mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Tantal_D5.5mm_P5.00mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Tantal_D5.5mm_P5.00mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Tantal_D6.0mm_P2.50mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Tantal_D6.0mm_P2.50mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Tantal_D6.0mm_P2.50mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Tantal_D6.0mm_P5.00mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Tantal_D6.0mm_P5.00mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Tantal_D6.0mm_P5.00mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Tantal_D7.0mm_P2.50mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Tantal_D7.0mm_P2.50mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Tantal_D7.0mm_P2.50mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Tantal_D7.0mm_P5.00mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Tantal_D7.0mm_P5.00mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Tantal_D7.0mm_P5.00mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Tantal_D8.0mm_P2.50mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Tantal_D8.0mm_P2.50mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Tantal_D8.0mm_P2.50mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Tantal_D8.0mm_P5.00mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Tantal_D8.0mm_P5.00mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Tantal_D8.0mm_P5.00mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Tantal_D9.0mm_P2.50mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Tantal_D9.0mm_P2.50mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Tantal_D9.0mm_P2.50mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Tantal_D9.0mm_P5.00mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Tantal_D9.0mm_P5.00mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/CP_Radial_Tantal_D9.0mm_P5.00mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L12.0mm_D10.5mm_P15.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L12.0mm_D10.5mm_P15.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L12.0mm_D10.5mm_P15.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L12.0mm_D10.5mm_P20.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L12.0mm_D10.5mm_P20.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L12.0mm_D10.5mm_P20.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L12.0mm_D6.5mm_P15.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L12.0mm_D6.5mm_P15.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L12.0mm_D6.5mm_P15.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L12.0mm_D6.5mm_P20.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L12.0mm_D6.5mm_P20.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L12.0mm_D6.5mm_P20.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L12.0mm_D7.5mm_P15.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L12.0mm_D7.5mm_P15.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L12.0mm_D7.5mm_P15.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L12.0mm_D7.5mm_P20.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L12.0mm_D7.5mm_P20.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L12.0mm_D7.5mm_P20.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L12.0mm_D8.5mm_P15.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L12.0mm_D8.5mm_P15.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L12.0mm_D8.5mm_P15.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L12.0mm_D8.5mm_P20.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L12.0mm_D8.5mm_P20.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L12.0mm_D8.5mm_P20.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L12.0mm_D9.5mm_P15.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L12.0mm_D9.5mm_P15.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L12.0mm_D9.5mm_P15.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L12.0mm_D9.5mm_P20.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L12.0mm_D9.5mm_P20.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L12.0mm_D9.5mm_P20.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L17.0mm_D6.5mm_P20.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L17.0mm_D6.5mm_P20.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L17.0mm_D6.5mm_P20.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L17.0mm_D6.5mm_P25.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L17.0mm_D6.5mm_P25.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L17.0mm_D6.5mm_P25.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L17.0mm_D7.0mm_P20.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L17.0mm_D7.0mm_P20.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L17.0mm_D7.0mm_P20.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L17.0mm_D7.0mm_P25.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L17.0mm_D7.0mm_P25.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L17.0mm_D7.0mm_P25.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L19.0mm_D7.5mm_P25.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L19.0mm_D7.5mm_P25.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L19.0mm_D7.5mm_P25.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L19.0mm_D8.0mm_P25.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L19.0mm_D8.0mm_P25.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L19.0mm_D8.0mm_P25.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L19.0mm_D9.0mm_P25.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L19.0mm_D9.0mm_P25.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L19.0mm_D9.0mm_P25.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L19.0mm_D9.5mm_P25.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L19.0mm_D9.5mm_P25.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L19.0mm_D9.5mm_P25.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L22.0mm_D10.5mm_P27.50mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L22.0mm_D10.5mm_P27.50mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L22.0mm_D10.5mm_P27.50mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L22.0mm_D9.5mm_P27.50mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L22.0mm_D9.5mm_P27.50mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L22.0mm_D9.5mm_P27.50mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L3.8mm_D2.6mm_P10.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L3.8mm_D2.6mm_P10.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L3.8mm_D2.6mm_P10.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L3.8mm_D2.6mm_P12.50mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L3.8mm_D2.6mm_P12.50mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L3.8mm_D2.6mm_P12.50mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L3.8mm_D2.6mm_P15.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L3.8mm_D2.6mm_P15.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L3.8mm_D2.6mm_P15.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L3.8mm_D2.6mm_P7.50mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L3.8mm_D2.6mm_P7.50mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L3.8mm_D2.6mm_P7.50mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L5.1mm_D3.1mm_P10.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L5.1mm_D3.1mm_P10.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L5.1mm_D3.1mm_P10.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L5.1mm_D3.1mm_P12.50mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L5.1mm_D3.1mm_P12.50mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L5.1mm_D3.1mm_P12.50mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L5.1mm_D3.1mm_P15.00mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L5.1mm_D3.1mm_P15.00mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L5.1mm_D3.1mm_P15.00mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L5.1mm_D3.1mm_P7.50mm_Horizontal.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L5.1mm_D3.1mm_P7.50mm_Horizontal.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_L5.1mm_D3.1mm_P7.50mm_Horizontal.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Axial_Round_Horizontal_master.FCStd
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D10.0mm_W2.5mm_P5.00mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D10.0mm_W2.5mm_P5.00mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D10.0mm_W2.5mm_P5.00mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D10.5mm_W5.0mm_P10.00mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D10.5mm_W5.0mm_P10.00mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D10.5mm_W5.0mm_P10.00mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D10.5mm_W5.0mm_P5.00mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D10.5mm_W5.0mm_P5.00mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D10.5mm_W5.0mm_P5.00mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D10.5mm_W5.0mm_P7.50mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D10.5mm_W5.0mm_P7.50mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D10.5mm_W5.0mm_P7.50mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D11.0mm_W5.0mm_P10.00mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D11.0mm_W5.0mm_P10.00mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D11.0mm_W5.0mm_P10.00mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D11.0mm_W5.0mm_P5.00mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D11.0mm_W5.0mm_P5.00mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D11.0mm_W5.0mm_P5.00mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D11.0mm_W5.0mm_P7.50mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D11.0mm_W5.0mm_P7.50mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D11.0mm_W5.0mm_P7.50mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D12.0mm_W4.4mm_P7.75mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D12.0mm_W4.4mm_P7.75mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D12.0mm_W4.4mm_P7.75mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D12.5mm_W5.0mm_P10.00mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D12.5mm_W5.0mm_P10.00mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D12.5mm_W5.0mm_P10.00mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D12.5mm_W5.0mm_P7.50mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D12.5mm_W5.0mm_P7.50mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D12.5mm_W5.0mm_P7.50mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D14.5mm_W5.0mm_P10.00mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D14.5mm_W5.0mm_P10.00mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D14.5mm_W5.0mm_P10.00mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D14.5mm_W5.0mm_P7.50mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D14.5mm_W5.0mm_P7.50mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D14.5mm_W5.0mm_P7.50mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D16.0mm_W5.0mm_P10.00mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D16.0mm_W5.0mm_P10.00mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D16.0mm_W5.0mm_P10.00mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D16.0mm_W5.0mm_P7.50mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D16.0mm_W5.0mm_P7.50mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D16.0mm_W5.0mm_P7.50mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D3.0mm_W1.6mm_P2.50mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D3.0mm_W1.6mm_P2.50mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D3.0mm_W1.6mm_P2.50mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D3.0mm_W2.0mm_P2.50mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D3.0mm_W2.0mm_P2.50mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D3.0mm_W2.0mm_P2.50mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D3.4mm_W2.1mm_P2.50mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D3.4mm_W2.1mm_P2.50mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D3.4mm_W2.1mm_P2.50mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D3.8mm_W2.6mm_P2.50mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D3.8mm_W2.6mm_P2.50mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D3.8mm_W2.6mm_P2.50mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D4.3mm_W1.9mm_P5.00mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D4.3mm_W1.9mm_P5.00mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D4.3mm_W1.9mm_P5.00mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D4.7mm_W2.5mm_P5.00mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D4.7mm_W2.5mm_P5.00mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D4.7mm_W2.5mm_P5.00mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D5.0mm_W2.5mm_P2.50mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D5.0mm_W2.5mm_P2.50mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D5.0mm_W2.5mm_P2.50mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D5.0mm_W2.5mm_P5.00mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D5.0mm_W2.5mm_P5.00mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D5.0mm_W2.5mm_P5.00mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D5.1mm_W3.2mm_P5.00mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D5.1mm_W3.2mm_P5.00mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D5.1mm_W3.2mm_P5.00mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D6.0mm_W2.5mm_P5.00mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D6.0mm_W2.5mm_P5.00mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D6.0mm_W2.5mm_P5.00mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D6.0mm_W4.4mm_P5.00mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D6.0mm_W4.4mm_P5.00mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D6.0mm_W4.4mm_P5.00mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D7.0mm_W2.5mm_P5.00mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D7.0mm_W2.5mm_P5.00mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D7.0mm_W2.5mm_P5.00mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D7.5mm_W4.4mm_P5.00mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D7.5mm_W2.5mm_P5.00mm.step
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D7.5mm_W2.5mm_P5.00mm.wrl
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D7.5mm_W4.4mm_P5.00mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D7.5mm_W4.4mm_P5.00mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D7.5mm_W5.0mm_P10.00mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D7.5mm_W5.0mm_P10.00mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D7.5mm_W5.0mm_P10.00mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D7.5mm_W5.0mm_P5.00mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D7.5mm_W5.0mm_P5.00mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D7.5mm_W5.0mm_P5.00mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D7.5mm_W5.0mm_P7.50mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D7.5mm_W5.0mm_P7.50mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D7.5mm_W5.0mm_P7.50mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D8.0mm_W2.5mm_P5.00mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D8.0mm_W2.5mm_P5.00mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D8.0mm_W2.5mm_P5.00mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D8.0mm_W5.0mm_P10.00mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D8.0mm_W5.0mm_P10.00mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D8.0mm_W5.0mm_P10.00mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D8.0mm_W5.0mm_P5.00mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D8.0mm_W5.0mm_P5.00mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D8.0mm_W5.0mm_P5.00mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D8.0mm_W5.0mm_P7.50mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D8.0mm_W5.0mm_P7.50mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D8.0mm_W5.0mm_P7.50mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D9.0mm_W2.5mm_P5.00mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D9.0mm_W2.5mm_P5.00mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D9.0mm_W2.5mm_P5.00mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D9.0mm_W5.0mm_P10.00mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D9.0mm_W5.0mm_P10.00mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D9.0mm_W5.0mm_P10.00mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D9.0mm_W5.0mm_P5.00mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D9.0mm_W5.0mm_P5.00mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D9.0mm_W5.0mm_P5.00mm.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D9.0mm_W5.0mm_P7.50mm.FCStd
+%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D9.0mm_W5.0mm_P7.50mm.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Disc_D9.0mm_W5.0mm_P7.50mm.wrl
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Rect_L10.0mm_W2.5mm_P7.50mm_MKS4.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Rect_L10.0mm_W2.5mm_P7.50mm_MKS4.wrl
@@ -1432,10 +1430,6 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Rect_L9.0mm_W9.5mm_P7.50mm_MKT.wrl
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Rect_L9.0mm_W9.8mm_P7.50mm_MKT.step
 %%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/C_Rect_L9.0mm_W9.8mm_P7.50mm_MKT.wrl
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/c_disc_master.FCStd
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/c_mks_master.FCStd
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/c_mkt_master.FCStd
-%%DATADIR%%/modules/packages3d/Capacitors_THT.3dshapes/cp_tantal_drop_master.FCStd
 %%DATADIR%%/modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/CP_Tantalum_Case-A_EIA-3216-18.step
 %%DATADIR%%/modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/CP_Tantalum_Case-A_EIA-3216-18.wrl
 %%DATADIR%%/modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/CP_Tantalum_Case-B_EIA-3528-21.step
@@ -2935,6 +2929,8 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
 %%DATADIR%%/modules/packages3d/Connectors_Samtec.3dshapes/LSHM-130-xxx-x-DV-A-S.wrl
 %%DATADIR%%/modules/packages3d/Connectors_Samtec.3dshapes/LSHM-140-xxx-x-DV-A-N.wrl
 %%DATADIR%%/modules/packages3d/Connectors_Samtec.3dshapes/LSHM-140-xxx-x-DV-A-S.wrl
+%%DATADIR%%/modules/packages3d/Connectors_USB.3dshapes/USB_Micro-B_Molex_47346-0001.step
+%%DATADIR%%/modules/packages3d/Connectors_USB.3dshapes/USB_Micro-B_Molex_47346-0001.wrl
 %%DATADIR%%/modules/packages3d/Converters_DCDC_ACDC.3dshapes/DCDC-Conv_TRACO_TEN20-xxxx.stp
 %%DATADIR%%/modules/packages3d/Converters_DCDC_ACDC.3dshapes/DCDC-Conv_TRACO_TEN20-xxxx.wrl
 %%DATADIR%%/modules/packages3d/Converters_DCDC_ACDC.3dshapes/DCDC-Conv_TRACO_TSR-1.wings
@@ -3395,23 +3391,88 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
 %%DATADIR%%/modules/packages3d/Discret.3dshapes/TO92GSD.wrl
 %%DATADIR%%/modules/packages3d/Discret.3dshapes/VP0808.wings
 %%DATADIR%%/modules/packages3d/Discret.3dshapes/VP0808.wrl
-%%DATADIR%%/modules/packages3d/Display.3dshapes/EA_DOGXL160-7.step
-%%DATADIR%%/modules/packages3d/Display.3dshapes/EA_DOGXL160-7.wrl
-%%DATADIR%%/modules/packages3d/Display.3dshapes/HDSP-48xx.fcstd
-%%DATADIR%%/modules/packages3d/Display.3dshapes/HDSP-48xx.step
-%%DATADIR%%/modules/packages3d/Display.3dshapes/HDSP-48xx.wrl
-%%DATADIR%%/modules/packages3d/Display.3dshapes/LCD-016N002L.wings
-%%DATADIR%%/modules/packages3d/Display.3dshapes/LCD-016N002L.wrl
+%%DATADIR%%/modules/packages3d/Displays.3dshapes/AG12864E.step
+%%DATADIR%%/modules/packages3d/Displays.3dshapes/AG12864E.wrl
+%%DATADIR%%/modules/packages3d/Displays.3dshapes/EA_DOGXL160-7.step
+%%DATADIR%%/modules/packages3d/Displays.3dshapes/EA_DOGXL160-7.wrl
+%%DATADIR%%/modules/packages3d/Displays.3dshapes/EA_DOGXL160-7_Backlight.step
+%%DATADIR%%/modules/packages3d/Displays.3dshapes/EA_DOGXL160-7_Backlight.wrl
+%%DATADIR%%/modules/packages3d/Displays.3dshapes/EA_T123X-I2C.step
+%%DATADIR%%/modules/packages3d/Displays.3dshapes/EA_T123X-I2C.wrl
+%%DATADIR%%/modules/packages3d/Displays.3dshapes/HDSM-441B_HDSM-443B.step
+%%DATADIR%%/modules/packages3d/Displays.3dshapes/HDSM-441B_HDSM-443B.wrl
+%%DATADIR%%/modules/packages3d/Displays.3dshapes/HDSP-4830.step
+%%DATADIR%%/modules/packages3d/Displays.3dshapes/HDSP-4830.wrl
+%%DATADIR%%/modules/packages3d/Displays.3dshapes/HDSP-4832.step
+%%DATADIR%%/modules/packages3d/Displays.3dshapes/HDSP-4832.wrl
+%%DATADIR%%/modules/packages3d/Displays.3dshapes/HDSP-4836.step
+%%DATADIR%%/modules/packages3d/Displays.3dshapes/HDSP-4836.wrl
+%%DATADIR%%/modules/packages3d/Displays.3dshapes/HDSP-4840.step
+%%DATADIR%%/modules/packages3d/Displays.3dshapes/HDSP-4840.wrl
+%%DATADIR%%/modules/packages3d/Displays.3dshapes/HDSP-4850.step
+%%DATADIR%%/modules/packages3d/Displays.3dshapes/HDSP-4850.wrl
+%%DATADIR%%/modules/packages3d/Displays.3dshapes/HDSP-48xx.step
+%%DATADIR%%/modules/packages3d/Displays.3dshapes/HDSP-48xx.wrl
+%%DATADIR%%/modules/packages3d/Displays.3dshapes/HLCP-J100.step
+%%DATADIR%%/modules/packages3d/Displays.3dshapes/HLCP-J100.wrl
+%%DATADIR%%/modules/packages3d/Displays.3dshapes/HY1602E.step
+%%DATADIR%%/modules/packages3d/Displays.3dshapes/HY1602E.wrl
+%%DATADIR%%/modules/packages3d/Displays.3dshapes/LCD-016N002L.step
+%%DATADIR%%/modules/packages3d/Displays.3dshapes/LCD-016N002L.wrl
+%%DATADIR%%/modules/packages3d/Displays.3dshapes/LM16255.step
+%%DATADIR%%/modules/packages3d/Displays.3dshapes/LM16255.wrl
+%%DATADIR%%/modules/packages3d/Displays.3dshapes/RC1602A.step
+%%DATADIR%%/modules/packages3d/Displays.3dshapes/RC1602A.wrl
+%%DATADIR%%/modules/packages3d/Displays.3dshapes/WC1602A.step
+%%DATADIR%%/modules/packages3d/Displays.3dshapes/WC1602A.wrl
 %%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/7SEGMENT-LED__HDSM531_HDSM533_SMD.wings
 %%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/7SEGMENT-LED__HDSM531_HDSM533_SMD.wrl
 %%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/7SegmentLED_LTS6760_LTS6780.wings
 %%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/7SegmentLED_LTS6760_LTS6780.wrl
-%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/7SegmentLED_SBC18-11EGWA.wings
-%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/7SegmentLED_SBC18-11EGWA.wrl
-%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/Cx56-12.fcstd
-%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/Cx56-12.wrl
-%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/MAN3640A.wings
-%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/MAN3640A.wrl
+%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/CA56-12CGKWA.step
+%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/CA56-12CGKWA.wrl
+%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/CA56-12EWA.step
+%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/CA56-12EWA.wrl
+%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/CA56-12SEKWA.step
+%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/CA56-12SEKWA.wrl
+%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/CA56-12SRWA.step
+%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/CA56-12SRWA.wrl
+%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/CA56-12SURKWA.step
+%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/CA56-12SURKWA.wrl
+%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/CA56-12SYKWA.step
+%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/CA56-12SYKWA.wrl
+%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/CC56-12GWA.step
+%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/CC56-12GWA.wrl
+%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/CC56-12YWA.step
+%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/CC56-12YWA.wrl
+%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/DE113-XX-XX.step
+%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/DE113-XX-XX.wrl
+%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/DE114-RS-20.step
+%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/DE114-RS-20.wrl
+%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/DE170-XX-XX.step
+%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/DE170-XX-XX.wrl
+%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/MAN3410A.step
+%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/MAN3410A.wrl
+%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/MAN3420A.step
+%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/MAN3420A.wrl
+%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/MAN3610A.step
+%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/MAN3610A.wrl
+%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/MAN3620A.step
+%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/MAN3620A.wrl
+%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/MAN3630A.step
+%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/MAN3630A.wrl
+%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/MAN3810A.step
+%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/MAN3810A.wrl
+%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/MAN3820A.step
+%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/MAN3820A.wrl
+%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/MAN71A.step
+%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/MAN71A.wrl
+%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/MAN72A.step
+%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/MAN72A.wrl
+%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/MAN73A.step
+%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/MAN73A.wrl
+%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/SBC18-11SURKCGKWA.step
+%%DATADIR%%/modules/packages3d/Displays_7-Segment.3dshapes/SBC18-11SURKCGKWA.wrl
 %%DATADIR%%/modules/packages3d/Fuse_Holders_and_Fuses.3dshapes/BladeFuse-CarType.wings
 %%DATADIR%%/modules/packages3d/Fuse_Holders_and_Fuses.3dshapes/BladeFuse-CarType.wrl
 %%DATADIR%%/modules/packages3d/Fuse_Holders_and_Fuses.3dshapes/BladeFuse-Mini.wings
@@ -3454,6 +3515,12 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
 %%DATADIR%%/modules/packages3d/Housings_BGA.3dshapes/BGA-48_6x8_8.0x9.0mm_Pitch0.8mm.wrl
 %%DATADIR%%/modules/packages3d/Housings_BGA.3dshapes/BGA-64_10x10_9.0x9.0mm_Pitch0.8mm.wings
 %%DATADIR%%/modules/packages3d/Housings_BGA.3dshapes/BGA-64_10x10_9.0x9.0mm_Pitch0.8mm.wrl
+%%DATADIR%%/modules/packages3d/Housings_BGA.3dshapes/DSBGA-12_3x4_1.36x1.86mm_Pitch0.5mm.step
+%%DATADIR%%/modules/packages3d/Housings_BGA.3dshapes/DSBGA-12_3x4_1.36x1.86mm_Pitch0.5mm.wrl
+%%DATADIR%%/modules/packages3d/Housings_BGA.3dshapes/Maxim_WLP-12.step
+%%DATADIR%%/modules/packages3d/Housings_BGA.3dshapes/Maxim_WLP-12.wrl
+%%DATADIR%%/modules/packages3d/Housings_BGA.3dshapes/Texas_Junior_DSBGA-12.step
+%%DATADIR%%/modules/packages3d/Housings_BGA.3dshapes/Texas_Junior_DSBGA-12.wrl
 %%DATADIR%%/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-10-1EP_2x3mm_Pitch0.5mm.step
 %%DATADIR%%/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-10-1EP_2x3mm_Pitch0.5mm.wrl
 %%DATADIR%%/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-10-1EP_3x3mm_Pitch0.5mm.step
@@ -3602,6 +3669,8 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
 %%DATADIR%%/modules/packages3d/Housings_DFN_QFN.3dshapes/Texas_R_PUQFN-N12.wrl
 %%DATADIR%%/modules/packages3d/Housings_DFN_QFN.3dshapes/Texas_S-PVQFN-N14.step
 %%DATADIR%%/modules/packages3d/Housings_DFN_QFN.3dshapes/Texas_S-PVQFN-N14.wrl
+%%DATADIR%%/modules/packages3d/Housings_DFN_QFN.3dshapes/UDFN-10_1.35x2.6mm_Pitch0.5mm.step
+%%DATADIR%%/modules/packages3d/Housings_DFN_QFN.3dshapes/UDFN-10_1.35x2.6mm_Pitch0.5mm.wrl
 %%DATADIR%%/modules/packages3d/Housings_DFN_QFN.3dshapes/UQFN-10_1.4x1.8mm_Pitch0.4mm.step
 %%DATADIR%%/modules/packages3d/Housings_DFN_QFN.3dshapes/UQFN-10_1.4x1.8mm_Pitch0.4mm.wrl
 %%DATADIR%%/modules/packages3d/Housings_DFN_QFN.3dshapes/UQFN-16-1EP_3x3mm_Pitch0.5mm.step
@@ -3646,6 +3715,8 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
 %%DATADIR%%/modules/packages3d/Housings_DIP.3dshapes/DIP-28_W7.62mm_LongPads.wrl
 %%DATADIR%%/modules/packages3d/Housings_DIP.3dshapes/DIP-32_W15.24mm.wrl
 %%DATADIR%%/modules/packages3d/Housings_DIP.3dshapes/DIP-32_W15.24mm_LongPads.wrl
+%%DATADIR%%/modules/packages3d/Housings_DIP.3dshapes/DIP-32_W7.62mm.step
+%%DATADIR%%/modules/packages3d/Housings_DIP.3dshapes/DIP-32_W7.62mm.wrl
 %%DATADIR%%/modules/packages3d/Housings_DIP.3dshapes/DIP-40_W15.24mm.wrl
 %%DATADIR%%/modules/packages3d/Housings_DIP.3dshapes/DIP-40_W15.24mm_LongPads.wrl
 %%DATADIR%%/modules/packages3d/Housings_DIP.3dshapes/DIP-40_W25.4mm.wrl
@@ -3843,6 +3914,8 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
 %%DATADIR%%/modules/packages3d/Housings_SSOP.3dshapes/QSOP-24_3.9x8.7mm_Pitch0.635mm.wrl
 %%DATADIR%%/modules/packages3d/Housings_SSOP.3dshapes/SOP-16_4.4x10.4mm_Pitch1.27mm.step
 %%DATADIR%%/modules/packages3d/Housings_SSOP.3dshapes/SOP-16_4.4x10.4mm_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Housings_SSOP.3dshapes/SOP-4_3.8x4.1mm_Pitch2.54mm.step
+%%DATADIR%%/modules/packages3d/Housings_SSOP.3dshapes/SOP-4_3.8x4.1mm_Pitch2.54mm.wrl
 %%DATADIR%%/modules/packages3d/Housings_SSOP.3dshapes/SOP-4_4.4x2.8mm_Pitch1.27mm.step
 %%DATADIR%%/modules/packages3d/Housings_SSOP.3dshapes/SOP-4_4.4x2.8mm_Pitch1.27mm.wrl
 %%DATADIR%%/modules/packages3d/Housings_SSOP.3dshapes/SSOP-14_5.3x6.2mm_Pitch0.65mm.step
@@ -3967,44 +4040,28 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
 %%DATADIR%%/modules/packages3d/Inductors.3dshapes/self_cms_we-pd3.wrl
 %%DATADIR%%/modules/packages3d/Inductors.3dshapes/self_cms_we-tpc_XL.wings
 %%DATADIR%%/modules/packages3d/Inductors.3dshapes/self_cms_we-tpc_XL.wrl
-%%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_0201.wings
+%%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_0201.step
 %%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_0201.wrl
-%%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_0402.wings
+%%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_0402.step
 %%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_0402.wrl
-%%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_0603.wings
+%%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_0603.step
 %%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_0603.wrl
-%%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_0603_HandSoldering.wings
-%%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_0603_HandSoldering.wrl
-%%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_0805.wings
+%%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_0805.step
 %%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_0805.wrl
-%%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_0805_HandSoldering.wings
-%%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_0805_HandSoldering.wrl
-%%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_1206.wings
+%%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_1206.step
 %%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_1206.wrl
-%%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_1206_HandSoldering.wings
-%%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_1206_HandSoldering.wrl
-%%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_1210.wings
+%%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_1210.step
 %%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_1210.wrl
-%%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_1210_HandSoldering.wings
-%%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_1210_HandSoldering.wrl
-%%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_1218.wings
-%%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_1218.wrl
-%%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_1218_HandSoldering.wings
-%%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_1218_HandSoldering.wrl
 %%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_12x12mm_h4.5mm.wings
 %%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_12x12mm_h4.5mm.wrl
 %%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_12x12mm_h6mm.wings
 %%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_12x12mm_h6mm.wrl
 %%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_12x12mm_h8mm.wings
 %%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_12x12mm_h8mm.wrl
-%%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_2010.wings
-%%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_2010.wrl
-%%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_2010_HandSoldering.wings
-%%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_2010_HandSoldering.wrl
-%%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_2512.wings
-%%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_2512.wrl
-%%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_2512_HandSoldering.wings
-%%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_2512_HandSoldering.wrl
+%%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_1806.step
+%%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_1806.wrl
+%%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_1812.step
+%%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_1812.wrl
 %%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_SELF-WE-PD-XXL.wings
 %%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_SELF-WE-PD-XXL.wrl
 %%DATADIR%%/modules/packages3d/Inductors_SMD.3dshapes/L_SELF-WE-PD3S.wings
@@ -4655,326 +4712,965 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
 %%DATADIR%%/modules/packages3d/Pentawatts.3dshapes/Pentawatt_Neutral_Staggered_Verical_TO220-5-T05D.wrl
 %%DATADIR%%/modules/packages3d/Pentawatts.3dshapes/Pentawatt_Neutral_Straight_Vertical_TO220-5-T05A.wings
 %%DATADIR%%/modules/packages3d/Pentawatts.3dshapes/Pentawatt_Neutral_Straight_Vertical_TO220-5-T05A.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x01_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x01_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x01_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x01_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x01_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x01_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x01_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x02_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x02_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x02_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x02_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x02_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x02_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x02_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x03_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x03_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x03_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x03_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x03_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x03_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x03_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x04_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x04_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x04_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x04_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x04_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x04_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x04_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x05_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x05_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x05_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x05_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x05_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x05_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x05_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x06_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x06_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x06_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x06_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x06_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x06_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x06_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x07_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x07_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x07_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x07_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x07_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x07_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x07_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x08_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x08_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x08_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x08_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x08_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x08_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x08_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x09_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x09_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x09_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x09_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x09_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x09_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x09_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x10_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x10_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x10_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x10_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x10_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x10_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x10_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x11_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x11_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x11_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x11_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x11_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x11_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x11_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x12_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x12_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x12_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x12_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x12_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x12_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x12_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x13_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x13_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x13_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x13_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x13_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x13_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x13_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x14_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x14_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x14_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x14_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x14_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x14_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x14_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x15_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x15_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x15_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x15_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x15_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x15_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x15_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x16_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x16_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x16_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x16_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x16_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x16_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x16_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x17_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x17_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x17_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x17_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x17_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x17_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x17_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x18_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x18_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x18_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x18_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x18_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x18_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x18_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x19_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x19_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x19_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x19_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x19_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x19_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x19_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x20_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x20_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x20_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x20_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x20_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x20_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x20_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x21_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x21_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x21_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x21_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x21_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x21_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x21_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x22_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x22_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x22_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x22_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x22_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x22_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x22_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x23_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x23_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x23_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x23_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x23_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x23_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x23_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x24_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x24_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x24_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x24_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x24_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x24_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x24_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x25_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x25_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x25_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x25_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x25_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x25_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x25_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x26_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x26_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x26_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x26_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x26_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x26_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x26_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x27_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x27_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x27_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x27_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x27_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x27_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x27_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x28_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x28_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x28_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x28_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x28_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x28_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x28_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x29_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x29_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x29_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x29_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x29_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x29_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x29_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x30_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x30_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x30_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x30_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x30_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x30_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x30_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x31_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x31_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x31_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x31_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x31_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x31_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x31_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x32_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x32_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x32_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x32_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x32_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x32_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x32_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x33_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x33_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x33_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x33_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x33_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x33_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x33_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x34_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x34_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x34_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x34_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x34_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x34_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x34_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x35_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x35_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x35_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x35_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x35_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x35_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x35_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x36_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x36_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x36_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x36_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x36_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x36_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x36_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x37_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x37_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x37_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x37_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x37_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x37_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x37_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x38_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x38_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x38_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x38_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x38_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x38_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x38_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x39_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x39_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x39_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x39_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x39_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x39_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x39_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x40_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x40_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x40_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x40_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x40_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x40_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x40_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x01_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x01_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x01_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x01_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x01_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x01_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x01_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x02_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x02_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x02_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x02_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x02_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x02_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x02_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x03_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x03_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x03_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x03_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x03_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x03_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x03_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x04_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x04_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x04_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x04_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x04_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x04_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x04_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x05_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x05_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x05_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x05_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x05_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x05_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x05_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x06_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x06_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x06_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x06_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x06_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x06_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x06_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x07_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x07_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x07_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x07_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x07_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x07_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x07_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x08_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x08_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x08_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x08_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x08_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x08_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x08_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x09_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x09_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x09_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x09_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x09_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x09_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x09_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x10_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x10_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x10_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x10_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x10_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x10_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x10_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x11_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x11_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x11_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x11_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x11_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x11_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x11_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x12_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x12_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x12_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x12_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x12_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x12_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x12_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x13_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x13_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x13_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x13_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x13_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x13_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x13_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x14_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x14_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x14_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x14_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x14_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x14_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x14_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x15_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x15_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x15_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x15_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x15_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x15_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x15_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x16_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x16_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x16_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x16_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x16_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x16_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x16_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x17_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x17_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x17_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x17_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x17_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x17_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x17_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x18_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x18_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x18_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x18_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x18_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x18_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x18_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x19_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x19_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x19_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x19_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x19_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x19_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x19_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x20_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x20_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x20_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x20_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x20_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x20_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x20_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x21_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x21_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x21_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x21_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x21_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x21_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x21_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x22_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x22_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x22_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x22_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x22_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x22_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x22_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x23_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x23_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x23_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x23_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x23_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x23_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x23_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x24_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x24_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x24_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x24_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x24_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x24_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x24_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x25_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x25_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x25_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x25_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x25_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x25_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x25_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x26_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x26_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x26_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x26_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x26_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x26_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x26_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x27_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x27_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x27_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x27_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x27_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x27_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x27_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x28_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x28_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x28_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x28_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x28_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x28_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x28_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x29_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x29_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x29_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x29_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x29_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x29_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x29_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x30_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x30_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x30_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x30_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x30_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x30_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x30_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x31_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x31_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x31_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x31_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x31_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x31_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x31_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x32_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x32_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x32_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x32_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x32_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x32_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x32_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x33_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x33_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x33_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x33_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x33_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x33_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x33_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x34_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x34_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x34_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x34_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x34_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x34_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x34_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x35_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x35_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x35_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x35_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x35_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x35_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x35_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x36_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x36_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x36_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x36_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x36_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x36_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x36_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x37_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x37_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x37_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x37_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x37_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x37_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x37_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x38_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x38_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x38_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x38_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x38_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x38_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x38_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x39_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x39_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x39_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x39_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x39_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x39_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x39_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x40_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x40_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x40_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x40_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x40_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x40_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x40_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x01_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x01_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x01_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x01_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x01_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x01_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x01_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x02_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x02_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x02_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x02_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x02_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x02_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x02_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x02_Pitch3.96mm_Friction_Lock.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x03_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x03_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x03_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x03_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x03_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x03_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x03_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x04_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x04_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x04_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x04_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x04_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x04_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x04_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x05_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x05_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x05_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x05_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x05_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x05_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x05_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x06_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x06_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x06_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x06_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x06_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x06_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x06_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x07_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x07_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x07_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x07_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x07_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x07_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x07_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x08_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x08_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x08_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x08_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x08_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x08_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x08_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x09_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x09_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x09_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x09_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x09_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x09_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x09_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x10_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x10_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x10_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x10_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x10_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x10_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x10_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x11_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x11_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x11_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x11_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x11_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x11_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x11_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x12_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x12_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x12_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x12_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x12_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x12_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x12_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x13_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x13_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x13_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x13_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x13_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x13_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x13_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x14_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x14_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x14_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x14_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x14_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x14_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x14_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x15_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x15_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x15_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x15_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x15_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x15_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x15_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x16_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x16_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x16_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x16_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x16_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x16_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x16_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x17_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x17_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x17_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x17_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x17_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x17_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x17_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x18_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x18_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x18_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x18_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x18_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x18_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x18_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x19_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x19_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x19_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x19_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x19_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x19_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x19_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x20_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x20_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x20_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x20_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x20_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x20_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x20_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x21_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x21_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x21_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x21_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x21_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x21_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x21_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x22_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x22_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x22_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x22_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x22_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x22_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x22_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x23_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x23_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x23_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x23_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x23_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x23_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x23_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x24_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x24_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x24_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x24_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x24_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x24_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x24_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x25_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x25_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x25_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x25_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x25_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x25_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x25_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x26_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x26_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x26_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x26_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x26_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x26_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x26_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x27_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x27_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x27_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x27_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x27_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x27_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x27_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x28_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x28_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x28_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x28_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x28_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x28_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x28_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x29_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x29_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x29_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x29_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x29_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x29_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x29_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x30_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x30_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x30_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x30_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x30_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x30_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x30_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x31_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x31_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x31_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x31_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x31_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x31_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x31_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x32_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x32_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x32_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x32_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x32_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x32_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x32_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x33_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x33_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x33_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x33_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x33_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x33_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x33_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x34_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x34_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x34_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x34_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x34_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x34_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x34_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x35_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x35_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x35_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x35_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x35_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x35_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x35_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x36_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x36_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x36_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x36_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x36_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x36_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x36_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x37_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x37_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x37_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x37_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x37_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x37_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x37_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x38_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x38_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x38_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x38_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x38_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x38_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x38_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x39_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x39_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x39_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x39_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x39_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x39_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x39_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x40_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x40_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x40_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x40_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x40_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x40_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x40_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x01_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x01_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x01_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x01_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x01_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x01_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x01_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x02_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x02_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x02_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x02_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x02_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x02_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x02_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x03_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x03_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x03_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x03_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x03_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x03_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x03_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x04_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x04_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x04_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x04_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x04_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x04_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x04_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x05_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x05_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x05_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x05_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x05_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x05_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x05_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x06_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x06_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x06_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x06_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x06_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x06_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x06_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x07_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x07_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x07_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x07_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x07_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x07_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x07_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x08_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x08_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x08_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x08_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x08_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x08_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x08_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x09_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x09_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x09_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x09_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x09_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x09_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x09_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x10_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x10_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x10_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x10_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x10_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x10_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x10_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x11_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x11_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x11_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x11_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x11_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x11_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x11_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x12_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x12_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x12_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x12_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x12_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x12_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x12_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x13_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x13_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x13_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x13_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x13_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x13_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x13_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x14_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x14_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x14_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x14_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x14_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x14_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x14_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x15_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x15_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x15_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x15_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x15_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x15_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x15_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x16_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x16_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x16_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x16_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x16_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x16_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x16_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x17_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x17_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x17_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x17_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x17_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x17_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x17_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x18_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x18_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x18_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x18_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x18_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x18_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x18_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x19_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x19_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x19_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x19_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x19_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x19_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x19_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x20_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x20_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x20_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x20_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x20_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x20_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x20_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x21_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x21_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x21_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x21_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x21_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x21_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x21_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x22_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x22_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x22_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x22_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x22_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x22_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x22_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x23_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x23_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x23_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x23_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x23_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x23_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x23_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x24_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x24_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x24_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x24_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x24_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x24_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x24_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x25_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x25_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x25_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x25_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x25_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x25_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x25_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x26_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x26_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x26_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x26_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x26_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x26_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x26_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x27_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x27_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x27_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x27_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x27_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x27_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x27_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x28_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x28_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x28_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x28_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x28_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x28_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x28_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x29_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x29_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x29_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x29_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x29_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x29_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x29_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x30_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x30_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x30_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x30_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x30_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x30_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x30_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x31_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x31_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x31_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x31_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x31_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x31_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x31_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x32_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x32_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x32_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x32_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x32_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x32_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x32_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x33_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x33_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x33_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x33_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x33_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x33_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x33_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x34_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x34_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x34_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x34_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x34_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x34_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x34_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x35_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x35_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x35_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x35_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x35_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x35_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x35_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x36_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x36_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x36_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x36_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x36_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x36_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x36_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x37_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x37_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x37_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x37_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x37_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x37_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x37_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x38_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x38_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x38_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x38_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x38_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x38_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x38_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x39_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x39_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x39_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x39_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x39_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x39_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x39_Pitch2.54mm.wrl
-%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x40_Pitch2.54mm.wings
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x40_Pitch1.27mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x40_Pitch1.27mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x40_Pitch2.00mm.step
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x40_Pitch2.00mm.wrl
+%%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x40_Pitch2.54mm.step
 %%DATADIR%%/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x40_Pitch2.54mm.wrl
 %%DATADIR%%/modules/packages3d/Potentiometers.3dshapes/Potentiometer_Alps_RK097_Single_Vertical.FCStd
 %%DATADIR%%/modules/packages3d/Potentiometers.3dshapes/Potentiometer_Alps_RK097_Single_Vertical.wrl
@@ -6117,6 +6813,10 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
 %%DATADIR%%/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TSOT-23.wrl
 %%DATADIR%%/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/VSOF5.step
 %%DATADIR%%/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/VSOF5.wrl
+%%DATADIR%%/modules/packages3d/TO_SOT_Packages_THT.3dshapes/Multiwatt-11_Vertical_StaggeredType1.step
+%%DATADIR%%/modules/packages3d/TO_SOT_Packages_THT.3dshapes/Multiwatt-11_Vertical_StaggeredType1.wrl
+%%DATADIR%%/modules/packages3d/TO_SOT_Packages_THT.3dshapes/Multiwatt-11_Vertical_StaggeredType2.step
+%%DATADIR%%/modules/packages3d/TO_SOT_Packages_THT.3dshapes/Multiwatt-11_Vertical_StaggeredType2.wrl
 %%DATADIR%%/modules/packages3d/TO_SOT_Packages_THT.3dshapes/Multiwatt-15_Horizontal_StaggeredType1.wings
 %%DATADIR%%/modules/packages3d/TO_SOT_Packages_THT.3dshapes/Multiwatt-15_Horizontal_StaggeredType1.wrl
 %%DATADIR%%/modules/packages3d/TO_SOT_Packages_THT.3dshapes/Multiwatt-15_Vertical_StaggeredType1.wings
@@ -6590,6 +7290,18 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
 %%DATADIR%%/template/BeagleBone-Black-Cape/meta/icon.png
 %%DATADIR%%/template/BeagleBone-Black-Cape/meta/info.html
 %%DATADIR%%/template/CMakeLists.txt
+%%DATADIR%%/template/EuroCard160mmX100mm/EuroCard160mmX100mm.kicad_pcb
+%%DATADIR%%/template/EuroCard160mmX100mm/EuroCard160mmX100mm.pro
+%%DATADIR%%/template/EuroCard160mmX100mm/EuroCard160mmX100mm.sch
+%%DATADIR%%/template/EuroCard160mmX100mm/meta/brd.png
+%%DATADIR%%/template/EuroCard160mmX100mm/meta/icon.png
+%%DATADIR%%/template/EuroCard160mmX100mm/meta/info.html
+%%DATADIR%%/template/EuroCard160mmX100mm_holes/EuroCard160mmX100mm_holes.kicad_pcb
+%%DATADIR%%/template/EuroCard160mmX100mm_holes/EuroCard160mmX100mm_holes.pro
+%%DATADIR%%/template/EuroCard160mmX100mm_holes/EuroCard160mmX100mm_holes.sch
+%%DATADIR%%/template/EuroCard160mmX100mm_holes/meta/brd.png
+%%DATADIR%%/template/EuroCard160mmX100mm_holes/meta/icon.png
+%%DATADIR%%/template/EuroCard160mmX100mm_holes/meta/info.html
 %%DATADIR%%/template/fp-lib-table.for-eagle-6.4.0
 %%DATADIR%%/template/fp-lib-table.for-github
 %%DATADIR%%/template/fp-lib-table.for-legacy
diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile
index fc54c5f8e7e..3c689646dab 100644
--- a/cad/qcad/Makefile
+++ b/cad/qcad/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	qcad
-PORTVERSION=	3.17.1.0
+PORTVERSION=	3.17.3.6
 DISTVERSIONPREFIX=	v
 #PORTREVISION=	1
 CATEGORIES=	cad
@@ -43,7 +43,7 @@ RESDIR=		${WRKSRC}/release
 SHRLIBS=	qcadcore qcadecmaapi qcadentity qcadgrid qcadgui qcadoperations	\
 		qcadsnap qcadspatialindex qcadstemmer spatialindexnavel qcadzip
 STALIBS=	dxflib stemmer
-SHRDIR=		fonts libraries patterns plugins scripts ts
+SHRDIR=		fonts libraries linetypes patterns plugins scripts ts
 #QSCRIPTS should not be installed to avoid conflicts with texlive-base
 QSCRIPTS=	bbox dwg2bmp dwg2pdf dwg2svg
 
diff --git a/cad/qcad/distinfo b/cad/qcad/distinfo
index b13102187fd..799e759c018 100644
--- a/cad/qcad/distinfo
+++ b/cad/qcad/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1496501047
-SHA256 (qcad/qcad-qcad-v3.17.1.0_GH0.tar.gz) = 9456e45681bf9bb9a8baf50f0d707c11e5d71987390fdd0c6a4df8345858cf5b
-SIZE (qcad/qcad-qcad-v3.17.1.0_GH0.tar.gz) = 29372817
+TIMESTAMP = 1502624613
+SHA256 (qcad/qcad-qcad-v3.17.3.6_GH0.tar.gz) = d102f26edeb57b78132664a2d34e7efeec3827465885f53add6b1b3d1f35db55
+SIZE (qcad/qcad-qcad-v3.17.3.6_GH0.tar.gz) = 29285260
diff --git a/cad/qcad/files/patch-src_core_RBlockReferenceEntity.cpp b/cad/qcad/files/patch-src_core_RBlockReferenceEntity.cpp
deleted file mode 100644
index 24dcceca988..00000000000
--- a/cad/qcad/files/patch-src_core_RBlockReferenceEntity.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
---- src/core/RBlockReferenceEntity.cpp.orig	2017-06-18 19:08:03.431567000 +0200
-+++ src/core/RBlockReferenceEntity.cpp	2017-06-18 19:08:31.008331000 +0200
-@@ -418,5 +418,5 @@
-                     QStack<REntity*> blockRefStack = e.getBlockRefViewportStack();
-                     bool skip = false;
--                    for (int i=blockRefStack.length()-1; i>=0; i--) {
-+                    for (int i=blockRefStack.size()-1; i>=0; i--) {
-                         REntity* ent = blockRefStack.at(i);
-                         RBlockReferenceEntity* blockRef = dynamic_cast<RBlockReferenceEntity*>(ent);
diff --git a/cad/qcad/pkg-plist b/cad/qcad/pkg-plist
index 461926c30d4..83d74cdf30c 100644
--- a/cad/qcad/pkg-plist
+++ b/cad/qcad/pkg-plist
@@ -322,6 +322,8 @@ lib/libstemmer.a
 %%DATADIR%%/libraries/templates/metric/iso_en_a4_metric_portrait_aec.rdf
 %%DATADIR%%/libraries/templates/metric/title_block_80mm_x_80mm.dxf
 %%DATADIR%%/libraries/templates/metric/title_block_80mm_x_80mm.rdf
+%%DATADIR%%/linetypes/imperial/qcad.lin
+%%DATADIR%%/linetypes/metric/qcadiso.lin
 %%DATADIR%%/patterns/imperial/acad_iso02w100.pat
 %%DATADIR%%/patterns/imperial/acad_iso03w100.pat
 %%DATADIR%%/patterns/imperial/acad_iso04w100.pat
@@ -487,46 +489,46 @@ lib/libstemmer.a
 %%DATADIR%%/plugins/libqcaddxf.so
 %%DATADIR%%/plugins/libqcaddxf_debug.so
 %%DATADIR%%/plugins/printsupport/readme.txt
-%%DATADIR%%/plugins/script/libqcadqtscript_core.so
-%%DATADIR%%/plugins/script/libqcadqtscript_core.so.1
-%%DATADIR%%/plugins/script/libqcadqtscript_core.so.1.0
-%%DATADIR%%/plugins/script/libqcadqtscript_core.so.1.0.0
-%%DATADIR%%/plugins/script/libqcadqtscript_gui.so
-%%DATADIR%%/plugins/script/libqcadqtscript_gui.so.1
-%%DATADIR%%/plugins/script/libqcadqtscript_gui.so.1.0
-%%DATADIR%%/plugins/script/libqcadqtscript_gui.so.1.0.0
-%%DATADIR%%/plugins/script/libqcadqtscript_network.so
-%%DATADIR%%/plugins/script/libqcadqtscript_network.so.1
-%%DATADIR%%/plugins/script/libqcadqtscript_network.so.1.0
-%%DATADIR%%/plugins/script/libqcadqtscript_network.so.1.0.0
-%%DATADIR%%/plugins/script/libqcadqtscript_opengl.so
-%%DATADIR%%/plugins/script/libqcadqtscript_opengl.so.1
-%%DATADIR%%/plugins/script/libqcadqtscript_opengl.so.1.0
-%%DATADIR%%/plugins/script/libqcadqtscript_opengl.so.1.0.0
-%%DATADIR%%/plugins/script/libqcadqtscript_sql.so
-%%DATADIR%%/plugins/script/libqcadqtscript_sql.so.1
-%%DATADIR%%/plugins/script/libqcadqtscript_sql.so.1.0
-%%DATADIR%%/plugins/script/libqcadqtscript_sql.so.1.0.0
-%%DATADIR%%/plugins/script/libqcadqtscript_svg.so
-%%DATADIR%%/plugins/script/libqcadqtscript_svg.so.1
-%%DATADIR%%/plugins/script/libqcadqtscript_svg.so.1.0
-%%DATADIR%%/plugins/script/libqcadqtscript_svg.so.1.0.0
-%%DATADIR%%/plugins/script/libqcadqtscript_uitools.so
-%%DATADIR%%/plugins/script/libqcadqtscript_uitools.so.1
-%%DATADIR%%/plugins/script/libqcadqtscript_uitools.so.1.0
-%%DATADIR%%/plugins/script/libqcadqtscript_uitools.so.1.0.0
-%%DATADIR%%/plugins/script/libqcadqtscript_webkit.so
-%%DATADIR%%/plugins/script/libqcadqtscript_webkit.so.1
-%%DATADIR%%/plugins/script/libqcadqtscript_webkit.so.1.0
-%%DATADIR%%/plugins/script/libqcadqtscript_webkit.so.1.0.0
-%%DATADIR%%/plugins/script/libqcadqtscript_xml.so
-%%DATADIR%%/plugins/script/libqcadqtscript_xml.so.1
-%%DATADIR%%/plugins/script/libqcadqtscript_xml.so.1.0
-%%DATADIR%%/plugins/script/libqcadqtscript_xml.so.1.0.0
-%%DATADIR%%/plugins/script/libqcadqtscript_xmlpatterns.so
-%%DATADIR%%/plugins/script/libqcadqtscript_xmlpatterns.so.1
-%%DATADIR%%/plugins/script/libqcadqtscript_xmlpatterns.so.1.0
-%%DATADIR%%/plugins/script/libqcadqtscript_xmlpatterns.so.1.0.0
+%%DATADIR%%/plugins/script/libqtscript_core.so
+%%DATADIR%%/plugins/script/libqtscript_core.so.1
+%%DATADIR%%/plugins/script/libqtscript_core.so.1.0
+%%DATADIR%%/plugins/script/libqtscript_core.so.1.0.0
+%%DATADIR%%/plugins/script/libqtscript_gui.so
+%%DATADIR%%/plugins/script/libqtscript_gui.so.1
+%%DATADIR%%/plugins/script/libqtscript_gui.so.1.0
+%%DATADIR%%/plugins/script/libqtscript_gui.so.1.0.0
+%%DATADIR%%/plugins/script/libqtscript_network.so
+%%DATADIR%%/plugins/script/libqtscript_network.so.1
+%%DATADIR%%/plugins/script/libqtscript_network.so.1.0
+%%DATADIR%%/plugins/script/libqtscript_network.so.1.0.0
+%%DATADIR%%/plugins/script/libqtscript_opengl.so
+%%DATADIR%%/plugins/script/libqtscript_opengl.so.1
+%%DATADIR%%/plugins/script/libqtscript_opengl.so.1.0
+%%DATADIR%%/plugins/script/libqtscript_opengl.so.1.0.0
+%%DATADIR%%/plugins/script/libqtscript_sql.so
+%%DATADIR%%/plugins/script/libqtscript_sql.so.1
+%%DATADIR%%/plugins/script/libqtscript_sql.so.1.0
+%%DATADIR%%/plugins/script/libqtscript_sql.so.1.0.0
+%%DATADIR%%/plugins/script/libqtscript_svg.so
+%%DATADIR%%/plugins/script/libqtscript_svg.so.1
+%%DATADIR%%/plugins/script/libqtscript_svg.so.1.0
+%%DATADIR%%/plugins/script/libqtscript_svg.so.1.0.0
+%%DATADIR%%/plugins/script/libqtscript_uitools.so
+%%DATADIR%%/plugins/script/libqtscript_uitools.so.1
+%%DATADIR%%/plugins/script/libqtscript_uitools.so.1.0
+%%DATADIR%%/plugins/script/libqtscript_uitools.so.1.0.0
+%%DATADIR%%/plugins/script/libqtscript_webkit.so
+%%DATADIR%%/plugins/script/libqtscript_webkit.so.1
+%%DATADIR%%/plugins/script/libqtscript_webkit.so.1.0
+%%DATADIR%%/plugins/script/libqtscript_webkit.so.1.0.0
+%%DATADIR%%/plugins/script/libqtscript_xml.so
+%%DATADIR%%/plugins/script/libqtscript_xml.so.1
+%%DATADIR%%/plugins/script/libqtscript_xml.so.1.0
+%%DATADIR%%/plugins/script/libqtscript_xml.so.1.0.0
+%%DATADIR%%/plugins/script/libqtscript_xmlpatterns.so
+%%DATADIR%%/plugins/script/libqtscript_xmlpatterns.so.1
+%%DATADIR%%/plugins/script/libqtscript_xmlpatterns.so.1.0
+%%DATADIR%%/plugins/script/libqtscript_xmlpatterns.so.1.0.0
 %%DATADIR%%/plugins/sqldrivers/libqsqlite.so
 %%DATADIR%%/plugins/sqldrivers/readme.txt
 %%DATADIR%%/scripts/.gitignore
@@ -592,6 +594,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Block/AddBlock/ts/AddBlock_sl.ts
 %%DATADIR%%/scripts/Block/AddBlock/ts/AddBlock_sv.qm
 %%DATADIR%%/scripts/Block/AddBlock/ts/AddBlock_sv.ts
+%%DATADIR%%/scripts/Block/AddBlock/ts/AddBlock_tr.qm
+%%DATADIR%%/scripts/Block/AddBlock/ts/AddBlock_tr.ts
 %%DATADIR%%/scripts/Block/AddBlock/ts/AddBlock_zh_CN.qm
 %%DATADIR%%/scripts/Block/AddBlock/ts/AddBlock_zh_CN.ts
 %%DATADIR%%/scripts/Block/AddBlock/ts/AddBlock_zh_TW.qm
@@ -677,6 +681,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Block/CreateBlock/ts/CreateBlock_sl.ts
 %%DATADIR%%/scripts/Block/CreateBlock/ts/CreateBlock_sv.qm
 %%DATADIR%%/scripts/Block/CreateBlock/ts/CreateBlock_sv.ts
+%%DATADIR%%/scripts/Block/CreateBlock/ts/CreateBlock_tr.qm
+%%DATADIR%%/scripts/Block/CreateBlock/ts/CreateBlock_tr.ts
 %%DATADIR%%/scripts/Block/CreateBlock/ts/CreateBlock_zh_CN.qm
 %%DATADIR%%/scripts/Block/CreateBlock/ts/CreateBlock_zh_CN.ts
 %%DATADIR%%/scripts/Block/CreateBlock/ts/CreateBlock_zh_TW.qm
@@ -738,6 +744,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Block/CreateLibraryItem/ts/CreateLibraryItem_sl.ts
 %%DATADIR%%/scripts/Block/CreateLibraryItem/ts/CreateLibraryItem_sv.qm
 %%DATADIR%%/scripts/Block/CreateLibraryItem/ts/CreateLibraryItem_sv.ts
+%%DATADIR%%/scripts/Block/CreateLibraryItem/ts/CreateLibraryItem_tr.qm
+%%DATADIR%%/scripts/Block/CreateLibraryItem/ts/CreateLibraryItem_tr.ts
 %%DATADIR%%/scripts/Block/CreateLibraryItem/ts/CreateLibraryItem_zh_CN.qm
 %%DATADIR%%/scripts/Block/CreateLibraryItem/ts/CreateLibraryItem_zh_CN.ts
 %%DATADIR%%/scripts/Block/CreateLibraryItem/ts/CreateLibraryItem_zh_TW.qm
@@ -796,6 +804,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Block/DeselectBlockReferences/ts/DeselectBlockReferences_sl.ts
 %%DATADIR%%/scripts/Block/DeselectBlockReferences/ts/DeselectBlockReferences_sv.qm
 %%DATADIR%%/scripts/Block/DeselectBlockReferences/ts/DeselectBlockReferences_sv.ts
+%%DATADIR%%/scripts/Block/DeselectBlockReferences/ts/DeselectBlockReferences_tr.qm
+%%DATADIR%%/scripts/Block/DeselectBlockReferences/ts/DeselectBlockReferences_tr.ts
 %%DATADIR%%/scripts/Block/DeselectBlockReferences/ts/DeselectBlockReferences_zh_CN.qm
 %%DATADIR%%/scripts/Block/DeselectBlockReferences/ts/DeselectBlockReferences_zh_CN.ts
 %%DATADIR%%/scripts/Block/DeselectBlockReferences/ts/DeselectBlockReferences_zh_TW.qm
@@ -860,6 +870,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Block/EditBlock/ts/EditBlock_sl.ts
 %%DATADIR%%/scripts/Block/EditBlock/ts/EditBlock_sv.qm
 %%DATADIR%%/scripts/Block/EditBlock/ts/EditBlock_sv.ts
+%%DATADIR%%/scripts/Block/EditBlock/ts/EditBlock_tr.qm
+%%DATADIR%%/scripts/Block/EditBlock/ts/EditBlock_tr.ts
 %%DATADIR%%/scripts/Block/EditBlock/ts/EditBlock_zh_CN.qm
 %%DATADIR%%/scripts/Block/EditBlock/ts/EditBlock_zh_CN.ts
 %%DATADIR%%/scripts/Block/EditBlock/ts/EditBlock_zh_TW.qm
@@ -926,6 +938,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Block/EditFromReference/ts/EditFromReference_sl.ts
 %%DATADIR%%/scripts/Block/EditFromReference/ts/EditFromReference_sv.qm
 %%DATADIR%%/scripts/Block/EditFromReference/ts/EditFromReference_sv.ts
+%%DATADIR%%/scripts/Block/EditFromReference/ts/EditFromReference_tr.qm
+%%DATADIR%%/scripts/Block/EditFromReference/ts/EditFromReference_tr.ts
 %%DATADIR%%/scripts/Block/EditFromReference/ts/EditFromReference_zh_CN.qm
 %%DATADIR%%/scripts/Block/EditFromReference/ts/EditFromReference_zh_CN.ts
 %%DATADIR%%/scripts/Block/EditFromReference/ts/EditFromReference_zh_TW.qm
@@ -987,6 +1001,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Block/EditMainDrawing/ts/EditMainDrawing_sl.ts
 %%DATADIR%%/scripts/Block/EditMainDrawing/ts/EditMainDrawing_sv.qm
 %%DATADIR%%/scripts/Block/EditMainDrawing/ts/EditMainDrawing_sv.ts
+%%DATADIR%%/scripts/Block/EditMainDrawing/ts/EditMainDrawing_tr.qm
+%%DATADIR%%/scripts/Block/EditMainDrawing/ts/EditMainDrawing_tr.ts
 %%DATADIR%%/scripts/Block/EditMainDrawing/ts/EditMainDrawing_zh_CN.qm
 %%DATADIR%%/scripts/Block/EditMainDrawing/ts/EditMainDrawing_zh_CN.ts
 %%DATADIR%%/scripts/Block/EditMainDrawing/ts/EditMainDrawing_zh_TW.qm
@@ -1048,6 +1064,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Block/HideAllBlocks/ts/HideAllBlocks_sl.ts
 %%DATADIR%%/scripts/Block/HideAllBlocks/ts/HideAllBlocks_sv.qm
 %%DATADIR%%/scripts/Block/HideAllBlocks/ts/HideAllBlocks_sv.ts
+%%DATADIR%%/scripts/Block/HideAllBlocks/ts/HideAllBlocks_tr.qm
+%%DATADIR%%/scripts/Block/HideAllBlocks/ts/HideAllBlocks_tr.ts
 %%DATADIR%%/scripts/Block/HideAllBlocks/ts/HideAllBlocks_zh_CN.qm
 %%DATADIR%%/scripts/Block/HideAllBlocks/ts/HideAllBlocks_zh_CN.ts
 %%DATADIR%%/scripts/Block/HideAllBlocks/ts/HideAllBlocks_zh_TW.qm
@@ -1142,6 +1160,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Block/InsertBlock/ts/InsertBlock_sl.ts
 %%DATADIR%%/scripts/Block/InsertBlock/ts/InsertBlock_sv.qm
 %%DATADIR%%/scripts/Block/InsertBlock/ts/InsertBlock_sv.ts
+%%DATADIR%%/scripts/Block/InsertBlock/ts/InsertBlock_tr.qm
+%%DATADIR%%/scripts/Block/InsertBlock/ts/InsertBlock_tr.ts
 %%DATADIR%%/scripts/Block/InsertBlock/ts/InsertBlock_zh_CN.qm
 %%DATADIR%%/scripts/Block/InsertBlock/ts/InsertBlock_zh_CN.ts
 %%DATADIR%%/scripts/Block/InsertBlock/ts/InsertBlock_zh_TW.qm
@@ -1196,6 +1216,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Block/InsertBlockItem/ts/InsertBlockItem_sl.ts
 %%DATADIR%%/scripts/Block/InsertBlockItem/ts/InsertBlockItem_sv.qm
 %%DATADIR%%/scripts/Block/InsertBlockItem/ts/InsertBlockItem_sv.ts
+%%DATADIR%%/scripts/Block/InsertBlockItem/ts/InsertBlockItem_tr.qm
+%%DATADIR%%/scripts/Block/InsertBlockItem/ts/InsertBlockItem_tr.ts
 %%DATADIR%%/scripts/Block/InsertBlockItem/ts/InsertBlockItem_zh_CN.qm
 %%DATADIR%%/scripts/Block/InsertBlockItem/ts/InsertBlockItem_zh_CN.ts
 %%DATADIR%%/scripts/Block/InsertBlockItem/ts/InsertBlockItem_zh_TW.qm
@@ -1239,6 +1261,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Block/InsertScriptItem/ts/InsertScriptItem_sl.ts
 %%DATADIR%%/scripts/Block/InsertScriptItem/ts/InsertScriptItem_sv.qm
 %%DATADIR%%/scripts/Block/InsertScriptItem/ts/InsertScriptItem_sv.ts
+%%DATADIR%%/scripts/Block/InsertScriptItem/ts/InsertScriptItem_tr.qm
+%%DATADIR%%/scripts/Block/InsertScriptItem/ts/InsertScriptItem_tr.ts
 %%DATADIR%%/scripts/Block/InsertScriptItem/ts/InsertScriptItem_zh_CN.qm
 %%DATADIR%%/scripts/Block/InsertScriptItem/ts/InsertScriptItem_zh_CN.ts
 %%DATADIR%%/scripts/Block/InsertScriptItem/ts/InsertScriptItem_zh_TW.qm
@@ -1304,6 +1328,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Block/RemoveBlock/ts/RemoveBlock_sl.ts
 %%DATADIR%%/scripts/Block/RemoveBlock/ts/RemoveBlock_sv.qm
 %%DATADIR%%/scripts/Block/RemoveBlock/ts/RemoveBlock_sv.ts
+%%DATADIR%%/scripts/Block/RemoveBlock/ts/RemoveBlock_tr.qm
+%%DATADIR%%/scripts/Block/RemoveBlock/ts/RemoveBlock_tr.ts
 %%DATADIR%%/scripts/Block/RemoveBlock/ts/RemoveBlock_zh_CN.qm
 %%DATADIR%%/scripts/Block/RemoveBlock/ts/RemoveBlock_zh_CN.ts
 %%DATADIR%%/scripts/Block/RemoveBlock/ts/RemoveBlock_zh_TW.qm
@@ -1368,6 +1394,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Block/RenameBlock/ts/RenameBlock_sl.ts
 %%DATADIR%%/scripts/Block/RenameBlock/ts/RenameBlock_sv.qm
 %%DATADIR%%/scripts/Block/RenameBlock/ts/RenameBlock_sv.ts
+%%DATADIR%%/scripts/Block/RenameBlock/ts/RenameBlock_tr.qm
+%%DATADIR%%/scripts/Block/RenameBlock/ts/RenameBlock_tr.ts
 %%DATADIR%%/scripts/Block/RenameBlock/ts/RenameBlock_zh_CN.qm
 %%DATADIR%%/scripts/Block/RenameBlock/ts/RenameBlock_zh_CN.ts
 %%DATADIR%%/scripts/Block/RenameBlock/ts/RenameBlock_zh_TW.qm
@@ -1426,6 +1454,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Block/SelectBlockReferences/ts/SelectBlockReferences_sl.ts
 %%DATADIR%%/scripts/Block/SelectBlockReferences/ts/SelectBlockReferences_sv.qm
 %%DATADIR%%/scripts/Block/SelectBlockReferences/ts/SelectBlockReferences_sv.ts
+%%DATADIR%%/scripts/Block/SelectBlockReferences/ts/SelectBlockReferences_tr.qm
+%%DATADIR%%/scripts/Block/SelectBlockReferences/ts/SelectBlockReferences_tr.ts
 %%DATADIR%%/scripts/Block/SelectBlockReferences/ts/SelectBlockReferences_zh_CN.qm
 %%DATADIR%%/scripts/Block/SelectBlockReferences/ts/SelectBlockReferences_zh_CN.ts
 %%DATADIR%%/scripts/Block/SelectBlockReferences/ts/SelectBlockReferences_zh_TW.qm
@@ -1487,6 +1517,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Block/ShowAllBlocks/ts/ShowAllBlocks_sl.ts
 %%DATADIR%%/scripts/Block/ShowAllBlocks/ts/ShowAllBlocks_sv.qm
 %%DATADIR%%/scripts/Block/ShowAllBlocks/ts/ShowAllBlocks_sv.ts
+%%DATADIR%%/scripts/Block/ShowAllBlocks/ts/ShowAllBlocks_tr.qm
+%%DATADIR%%/scripts/Block/ShowAllBlocks/ts/ShowAllBlocks_tr.ts
 %%DATADIR%%/scripts/Block/ShowAllBlocks/ts/ShowAllBlocks_zh_CN.qm
 %%DATADIR%%/scripts/Block/ShowAllBlocks/ts/ShowAllBlocks_zh_CN.ts
 %%DATADIR%%/scripts/Block/ShowAllBlocks/ts/ShowAllBlocks_zh_TW.qm
@@ -1548,6 +1580,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Block/ToggleBlockVisibility/ts/ToggleBlockVisibility_sl.ts
 %%DATADIR%%/scripts/Block/ToggleBlockVisibility/ts/ToggleBlockVisibility_sv.qm
 %%DATADIR%%/scripts/Block/ToggleBlockVisibility/ts/ToggleBlockVisibility_sv.ts
+%%DATADIR%%/scripts/Block/ToggleBlockVisibility/ts/ToggleBlockVisibility_tr.qm
+%%DATADIR%%/scripts/Block/ToggleBlockVisibility/ts/ToggleBlockVisibility_tr.ts
 %%DATADIR%%/scripts/Block/ToggleBlockVisibility/ts/ToggleBlockVisibility_zh_CN.qm
 %%DATADIR%%/scripts/Block/ToggleBlockVisibility/ts/ToggleBlockVisibility_zh_CN.ts
 %%DATADIR%%/scripts/Block/ToggleBlockVisibility/ts/ToggleBlockVisibility_zh_TW.qm
@@ -1595,6 +1629,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Block/ts/Block_sl.ts
 %%DATADIR%%/scripts/Block/ts/Block_sv.qm
 %%DATADIR%%/scripts/Block/ts/Block_sv.ts
+%%DATADIR%%/scripts/Block/ts/Block_tr.qm
+%%DATADIR%%/scripts/Block/ts/Block_tr.ts
 %%DATADIR%%/scripts/Block/ts/Block_zh_CN.qm
 %%DATADIR%%/scripts/Block/ts/Block_zh_CN.ts
 %%DATADIR%%/scripts/Block/ts/Block_zh_TW.qm
@@ -1686,6 +1722,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Arc/Arc2PA/ts/Arc2PA_sl.ts
 %%DATADIR%%/scripts/Draw/Arc/Arc2PA/ts/Arc2PA_sv.qm
 %%DATADIR%%/scripts/Draw/Arc/Arc2PA/ts/Arc2PA_sv.ts
+%%DATADIR%%/scripts/Draw/Arc/Arc2PA/ts/Arc2PA_tr.qm
+%%DATADIR%%/scripts/Draw/Arc/Arc2PA/ts/Arc2PA_tr.ts
 %%DATADIR%%/scripts/Draw/Arc/Arc2PA/ts/Arc2PA_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Arc/Arc2PA/ts/Arc2PA_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Arc/Arc2PA/ts/Arc2PA_zh_TW.qm
@@ -1749,6 +1787,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Arc/Arc2PH/ts/Arc2PH_sl.ts
 %%DATADIR%%/scripts/Draw/Arc/Arc2PH/ts/Arc2PH_sv.qm
 %%DATADIR%%/scripts/Draw/Arc/Arc2PH/ts/Arc2PH_sv.ts
+%%DATADIR%%/scripts/Draw/Arc/Arc2PH/ts/Arc2PH_tr.qm
+%%DATADIR%%/scripts/Draw/Arc/Arc2PH/ts/Arc2PH_tr.ts
 %%DATADIR%%/scripts/Draw/Arc/Arc2PH/ts/Arc2PH_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Arc/Arc2PH/ts/Arc2PH_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Arc/Arc2PH/ts/Arc2PH_zh_TW.qm
@@ -1825,6 +1865,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Arc/Arc2PL/ts/Arc2PL_sl.ts
 %%DATADIR%%/scripts/Draw/Arc/Arc2PL/ts/Arc2PL_sv.qm
 %%DATADIR%%/scripts/Draw/Arc/Arc2PL/ts/Arc2PL_sv.ts
+%%DATADIR%%/scripts/Draw/Arc/Arc2PL/ts/Arc2PL_tr.qm
+%%DATADIR%%/scripts/Draw/Arc/Arc2PL/ts/Arc2PL_tr.ts
 %%DATADIR%%/scripts/Draw/Arc/Arc2PL/ts/Arc2PL_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Arc/Arc2PL/ts/Arc2PL_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Arc/Arc2PL/ts/Arc2PL_zh_TW.qm
@@ -1910,6 +1952,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Arc/Arc2PR/ts/Arc2PR_sl.ts
 %%DATADIR%%/scripts/Draw/Arc/Arc2PR/ts/Arc2PR_sv.qm
 %%DATADIR%%/scripts/Draw/Arc/Arc2PR/ts/Arc2PR_sv.ts
+%%DATADIR%%/scripts/Draw/Arc/Arc2PR/ts/Arc2PR_tr.qm
+%%DATADIR%%/scripts/Draw/Arc/Arc2PR/ts/Arc2PR_tr.ts
 %%DATADIR%%/scripts/Draw/Arc/Arc2PR/ts/Arc2PR_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Arc/Arc2PR/ts/Arc2PR_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Arc/Arc2PR/ts/Arc2PR_zh_TW.qm
@@ -1982,6 +2026,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Arc/Arc3P/ts/Arc3P_sl.ts
 %%DATADIR%%/scripts/Draw/Arc/Arc3P/ts/Arc3P_sv.qm
 %%DATADIR%%/scripts/Draw/Arc/Arc3P/ts/Arc3P_sv.ts
+%%DATADIR%%/scripts/Draw/Arc/Arc3P/ts/Arc3P_tr.qm
+%%DATADIR%%/scripts/Draw/Arc/Arc3P/ts/Arc3P_tr.ts
 %%DATADIR%%/scripts/Draw/Arc/Arc3P/ts/Arc3P_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Arc/Arc3P/ts/Arc3P_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Arc/Arc3P/ts/Arc3P_zh_TW.qm
@@ -2061,6 +2107,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Arc/ArcCPA/ts/ArcCPA_sl.ts
 %%DATADIR%%/scripts/Draw/Arc/ArcCPA/ts/ArcCPA_sv.qm
 %%DATADIR%%/scripts/Draw/Arc/ArcCPA/ts/ArcCPA_sv.ts
+%%DATADIR%%/scripts/Draw/Arc/ArcCPA/ts/ArcCPA_tr.qm
+%%DATADIR%%/scripts/Draw/Arc/ArcCPA/ts/ArcCPA_tr.ts
 %%DATADIR%%/scripts/Draw/Arc/ArcCPA/ts/ArcCPA_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Arc/ArcCPA/ts/ArcCPA_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Arc/ArcCPA/ts/ArcCPA_zh_TW.qm
@@ -2134,6 +2182,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Arc/ArcConcentric/ts/ArcConcentric_sl.ts
 %%DATADIR%%/scripts/Draw/Arc/ArcConcentric/ts/ArcConcentric_sv.qm
 %%DATADIR%%/scripts/Draw/Arc/ArcConcentric/ts/ArcConcentric_sv.ts
+%%DATADIR%%/scripts/Draw/Arc/ArcConcentric/ts/ArcConcentric_tr.qm
+%%DATADIR%%/scripts/Draw/Arc/ArcConcentric/ts/ArcConcentric_tr.ts
 %%DATADIR%%/scripts/Draw/Arc/ArcConcentric/ts/ArcConcentric_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Arc/ArcConcentric/ts/ArcConcentric_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Arc/ArcConcentric/ts/ArcConcentric_zh_TW.qm
@@ -2207,6 +2257,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Arc/ArcConcentricThrough/ts/ArcConcentricThrough_sl.ts
 %%DATADIR%%/scripts/Draw/Arc/ArcConcentricThrough/ts/ArcConcentricThrough_sv.qm
 %%DATADIR%%/scripts/Draw/Arc/ArcConcentricThrough/ts/ArcConcentricThrough_sv.ts
+%%DATADIR%%/scripts/Draw/Arc/ArcConcentricThrough/ts/ArcConcentricThrough_tr.qm
+%%DATADIR%%/scripts/Draw/Arc/ArcConcentricThrough/ts/ArcConcentricThrough_tr.ts
 %%DATADIR%%/scripts/Draw/Arc/ArcConcentricThrough/ts/ArcConcentricThrough_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Arc/ArcConcentricThrough/ts/ArcConcentricThrough_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Arc/ArcConcentricThrough/ts/ArcConcentricThrough_zh_TW.qm
@@ -2277,6 +2329,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Arc/ArcTPR/ts/ArcTPR_sl.ts
 %%DATADIR%%/scripts/Draw/Arc/ArcTPR/ts/ArcTPR_sv.qm
 %%DATADIR%%/scripts/Draw/Arc/ArcTPR/ts/ArcTPR_sv.ts
+%%DATADIR%%/scripts/Draw/Arc/ArcTPR/ts/ArcTPR_tr.qm
+%%DATADIR%%/scripts/Draw/Arc/ArcTPR/ts/ArcTPR_tr.ts
 %%DATADIR%%/scripts/Draw/Arc/ArcTPR/ts/ArcTPR_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Arc/ArcTPR/ts/ArcTPR_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Arc/ArcTPR/ts/ArcTPR_zh_TW.qm
@@ -2350,6 +2404,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Arc/ArcTangential/ts/ArcTangential_sl.ts
 %%DATADIR%%/scripts/Draw/Arc/ArcTangential/ts/ArcTangential_sv.qm
 %%DATADIR%%/scripts/Draw/Arc/ArcTangential/ts/ArcTangential_sv.ts
+%%DATADIR%%/scripts/Draw/Arc/ArcTangential/ts/ArcTangential_tr.qm
+%%DATADIR%%/scripts/Draw/Arc/ArcTangential/ts/ArcTangential_tr.ts
 %%DATADIR%%/scripts/Draw/Arc/ArcTangential/ts/ArcTangential_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Arc/ArcTangential/ts/ArcTangential_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Arc/ArcTangential/ts/ArcTangential_zh_TW.qm
@@ -2397,6 +2453,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Arc/ts/Arc_sl.ts
 %%DATADIR%%/scripts/Draw/Arc/ts/Arc_sv.qm
 %%DATADIR%%/scripts/Draw/Arc/ts/Arc_sv.ts
+%%DATADIR%%/scripts/Draw/Arc/ts/Arc_tr.qm
+%%DATADIR%%/scripts/Draw/Arc/ts/Arc_tr.ts
 %%DATADIR%%/scripts/Draw/Arc/ts/Arc_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Arc/ts/Arc_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Arc/ts/Arc_zh_TW.qm
@@ -2474,6 +2532,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Circle/Circle2P/ts/Circle2P_sl.ts
 %%DATADIR%%/scripts/Draw/Circle/Circle2P/ts/Circle2P_sv.qm
 %%DATADIR%%/scripts/Draw/Circle/Circle2P/ts/Circle2P_sv.ts
+%%DATADIR%%/scripts/Draw/Circle/Circle2P/ts/Circle2P_tr.qm
+%%DATADIR%%/scripts/Draw/Circle/Circle2P/ts/Circle2P_tr.ts
 %%DATADIR%%/scripts/Draw/Circle/Circle2P/ts/Circle2P_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Circle/Circle2P/ts/Circle2P_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Circle/Circle2P/ts/Circle2P_zh_TW.qm
@@ -2552,6 +2612,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Circle/Circle2PR/ts/Circle2PR_sl.ts
 %%DATADIR%%/scripts/Draw/Circle/Circle2PR/ts/Circle2PR_sv.qm
 %%DATADIR%%/scripts/Draw/Circle/Circle2PR/ts/Circle2PR_sv.ts
+%%DATADIR%%/scripts/Draw/Circle/Circle2PR/ts/Circle2PR_tr.qm
+%%DATADIR%%/scripts/Draw/Circle/Circle2PR/ts/Circle2PR_tr.ts
 %%DATADIR%%/scripts/Draw/Circle/Circle2PR/ts/Circle2PR_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Circle/Circle2PR/ts/Circle2PR_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Circle/Circle2PR/ts/Circle2PR_zh_TW.qm
@@ -2625,6 +2687,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Circle/Circle2TP/ts/Circle2TP_sl.ts
 %%DATADIR%%/scripts/Draw/Circle/Circle2TP/ts/Circle2TP_sv.qm
 %%DATADIR%%/scripts/Draw/Circle/Circle2TP/ts/Circle2TP_sv.ts
+%%DATADIR%%/scripts/Draw/Circle/Circle2TP/ts/Circle2TP_tr.qm
+%%DATADIR%%/scripts/Draw/Circle/Circle2TP/ts/Circle2TP_tr.ts
 %%DATADIR%%/scripts/Draw/Circle/Circle2TP/ts/Circle2TP_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Circle/Circle2TP/ts/Circle2TP_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Circle/Circle2TP/ts/Circle2TP_zh_TW.qm
@@ -2697,6 +2761,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Circle/Circle2TR/ts/Circle2TR_sl.ts
 %%DATADIR%%/scripts/Draw/Circle/Circle2TR/ts/Circle2TR_sv.qm
 %%DATADIR%%/scripts/Draw/Circle/Circle2TR/ts/Circle2TR_sv.ts
+%%DATADIR%%/scripts/Draw/Circle/Circle2TR/ts/Circle2TR_tr.qm
+%%DATADIR%%/scripts/Draw/Circle/Circle2TR/ts/Circle2TR_tr.ts
 %%DATADIR%%/scripts/Draw/Circle/Circle2TR/ts/Circle2TR_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Circle/Circle2TR/ts/Circle2TR_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Circle/Circle2TR/ts/Circle2TR_zh_TW.qm
@@ -2769,6 +2835,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Circle/Circle3P/ts/Circle3P_sl.ts
 %%DATADIR%%/scripts/Draw/Circle/Circle3P/ts/Circle3P_sv.qm
 %%DATADIR%%/scripts/Draw/Circle/Circle3P/ts/Circle3P_sv.ts
+%%DATADIR%%/scripts/Draw/Circle/Circle3P/ts/Circle3P_tr.qm
+%%DATADIR%%/scripts/Draw/Circle/Circle3P/ts/Circle3P_tr.ts
 %%DATADIR%%/scripts/Draw/Circle/Circle3P/ts/Circle3P_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Circle/Circle3P/ts/Circle3P_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Circle/Circle3P/ts/Circle3P_zh_TW.qm
@@ -2844,6 +2912,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Circle/Circle3T/ts/Circle3T_sl.ts
 %%DATADIR%%/scripts/Draw/Circle/Circle3T/ts/Circle3T_sv.qm
 %%DATADIR%%/scripts/Draw/Circle/Circle3T/ts/Circle3T_sv.ts
+%%DATADIR%%/scripts/Draw/Circle/Circle3T/ts/Circle3T_tr.qm
+%%DATADIR%%/scripts/Draw/Circle/Circle3T/ts/Circle3T_tr.ts
 %%DATADIR%%/scripts/Draw/Circle/Circle3T/ts/Circle3T_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Circle/Circle3T/ts/Circle3T_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Circle/Circle3T/ts/Circle3T_zh_TW.qm
@@ -2915,6 +2985,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Circle/CircleCD/ts/CircleCD_sl.ts
 %%DATADIR%%/scripts/Draw/Circle/CircleCD/ts/CircleCD_sv.qm
 %%DATADIR%%/scripts/Draw/Circle/CircleCD/ts/CircleCD_sv.ts
+%%DATADIR%%/scripts/Draw/Circle/CircleCD/ts/CircleCD_tr.qm
+%%DATADIR%%/scripts/Draw/Circle/CircleCD/ts/CircleCD_tr.ts
 %%DATADIR%%/scripts/Draw/Circle/CircleCD/ts/CircleCD_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Circle/CircleCD/ts/CircleCD_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Circle/CircleCD/ts/CircleCD_zh_TW.qm
@@ -2987,6 +3059,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Circle/CircleCP/ts/CircleCP_sl.ts
 %%DATADIR%%/scripts/Draw/Circle/CircleCP/ts/CircleCP_sv.qm
 %%DATADIR%%/scripts/Draw/Circle/CircleCP/ts/CircleCP_sv.ts
+%%DATADIR%%/scripts/Draw/Circle/CircleCP/ts/CircleCP_tr.qm
+%%DATADIR%%/scripts/Draw/Circle/CircleCP/ts/CircleCP_tr.ts
 %%DATADIR%%/scripts/Draw/Circle/CircleCP/ts/CircleCP_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Circle/CircleCP/ts/CircleCP_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Circle/CircleCP/ts/CircleCP_zh_TW.qm
@@ -3062,6 +3136,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Circle/CircleCR/ts/CircleCR_sl.ts
 %%DATADIR%%/scripts/Draw/Circle/CircleCR/ts/CircleCR_sv.qm
 %%DATADIR%%/scripts/Draw/Circle/CircleCR/ts/CircleCR_sv.ts
+%%DATADIR%%/scripts/Draw/Circle/CircleCR/ts/CircleCR_tr.qm
+%%DATADIR%%/scripts/Draw/Circle/CircleCR/ts/CircleCR_tr.ts
 %%DATADIR%%/scripts/Draw/Circle/CircleCR/ts/CircleCR_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Circle/CircleCR/ts/CircleCR_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Circle/CircleCR/ts/CircleCR_zh_TW.qm
@@ -3135,6 +3211,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Circle/CircleConcentric/ts/CircleConcentric_sl.ts
 %%DATADIR%%/scripts/Draw/Circle/CircleConcentric/ts/CircleConcentric_sv.qm
 %%DATADIR%%/scripts/Draw/Circle/CircleConcentric/ts/CircleConcentric_sv.ts
+%%DATADIR%%/scripts/Draw/Circle/CircleConcentric/ts/CircleConcentric_tr.qm
+%%DATADIR%%/scripts/Draw/Circle/CircleConcentric/ts/CircleConcentric_tr.ts
 %%DATADIR%%/scripts/Draw/Circle/CircleConcentric/ts/CircleConcentric_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Circle/CircleConcentric/ts/CircleConcentric_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Circle/CircleConcentric/ts/CircleConcentric_zh_TW.qm
@@ -3208,6 +3286,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Circle/CircleConcentricThrough/ts/CircleConcentricThrough_sl.ts
 %%DATADIR%%/scripts/Draw/Circle/CircleConcentricThrough/ts/CircleConcentricThrough_sv.qm
 %%DATADIR%%/scripts/Draw/Circle/CircleConcentricThrough/ts/CircleConcentricThrough_sv.ts
+%%DATADIR%%/scripts/Draw/Circle/CircleConcentricThrough/ts/CircleConcentricThrough_tr.qm
+%%DATADIR%%/scripts/Draw/Circle/CircleConcentricThrough/ts/CircleConcentricThrough_tr.ts
 %%DATADIR%%/scripts/Draw/Circle/CircleConcentricThrough/ts/CircleConcentricThrough_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Circle/CircleConcentricThrough/ts/CircleConcentricThrough_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Circle/CircleConcentricThrough/ts/CircleConcentricThrough_zh_TW.qm
@@ -3277,6 +3357,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Circle/CircleT2P/ts/CircleT2P_sl.ts
 %%DATADIR%%/scripts/Draw/Circle/CircleT2P/ts/CircleT2P_sv.qm
 %%DATADIR%%/scripts/Draw/Circle/CircleT2P/ts/CircleT2P_sv.ts
+%%DATADIR%%/scripts/Draw/Circle/CircleT2P/ts/CircleT2P_tr.qm
+%%DATADIR%%/scripts/Draw/Circle/CircleT2P/ts/CircleT2P_tr.ts
 %%DATADIR%%/scripts/Draw/Circle/CircleT2P/ts/CircleT2P_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Circle/CircleT2P/ts/CircleT2P_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Circle/CircleT2P/ts/CircleT2P_zh_TW.qm
@@ -3347,6 +3429,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Circle/CircleTPR/ts/CircleTPR_sl.ts
 %%DATADIR%%/scripts/Draw/Circle/CircleTPR/ts/CircleTPR_sv.qm
 %%DATADIR%%/scripts/Draw/Circle/CircleTPR/ts/CircleTPR_sv.ts
+%%DATADIR%%/scripts/Draw/Circle/CircleTPR/ts/CircleTPR_tr.qm
+%%DATADIR%%/scripts/Draw/Circle/CircleTPR/ts/CircleTPR_tr.ts
 %%DATADIR%%/scripts/Draw/Circle/CircleTPR/ts/CircleTPR_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Circle/CircleTPR/ts/CircleTPR_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Circle/CircleTPR/ts/CircleTPR_zh_TW.qm
@@ -3394,6 +3478,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Circle/ts/Circle_sl.ts
 %%DATADIR%%/scripts/Draw/Circle/ts/Circle_sv.qm
 %%DATADIR%%/scripts/Draw/Circle/ts/Circle_sv.ts
+%%DATADIR%%/scripts/Draw/Circle/ts/Circle_tr.qm
+%%DATADIR%%/scripts/Draw/Circle/ts/Circle_tr.ts
 %%DATADIR%%/scripts/Draw/Circle/ts/Circle_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Circle/ts/Circle_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Circle/ts/Circle_zh_TW.qm
@@ -3470,6 +3556,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Dimension/DimAligned/ts/DimAligned_sl.ts
 %%DATADIR%%/scripts/Draw/Dimension/DimAligned/ts/DimAligned_sv.qm
 %%DATADIR%%/scripts/Draw/Dimension/DimAligned/ts/DimAligned_sv.ts
+%%DATADIR%%/scripts/Draw/Dimension/DimAligned/ts/DimAligned_tr.qm
+%%DATADIR%%/scripts/Draw/Dimension/DimAligned/ts/DimAligned_tr.ts
 %%DATADIR%%/scripts/Draw/Dimension/DimAligned/ts/DimAligned_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Dimension/DimAligned/ts/DimAligned_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Dimension/DimAligned/ts/DimAligned_zh_TW.qm
@@ -3545,6 +3633,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Dimension/DimAngular/ts/DimAngular_sl.ts
 %%DATADIR%%/scripts/Draw/Dimension/DimAngular/ts/DimAngular_sv.qm
 %%DATADIR%%/scripts/Draw/Dimension/DimAngular/ts/DimAngular_sv.ts
+%%DATADIR%%/scripts/Draw/Dimension/DimAngular/ts/DimAngular_tr.qm
+%%DATADIR%%/scripts/Draw/Dimension/DimAngular/ts/DimAngular_tr.ts
 %%DATADIR%%/scripts/Draw/Dimension/DimAngular/ts/DimAngular_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Dimension/DimAngular/ts/DimAngular_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Dimension/DimAngular/ts/DimAngular_zh_TW.qm
@@ -3620,6 +3710,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Dimension/DimDiametric/ts/DimDiametric_sl.ts
 %%DATADIR%%/scripts/Draw/Dimension/DimDiametric/ts/DimDiametric_sv.qm
 %%DATADIR%%/scripts/Draw/Dimension/DimDiametric/ts/DimDiametric_sv.ts
+%%DATADIR%%/scripts/Draw/Dimension/DimDiametric/ts/DimDiametric_tr.qm
+%%DATADIR%%/scripts/Draw/Dimension/DimDiametric/ts/DimDiametric_tr.ts
 %%DATADIR%%/scripts/Draw/Dimension/DimDiametric/ts/DimDiametric_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Dimension/DimDiametric/ts/DimDiametric_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Dimension/DimDiametric/ts/DimDiametric_zh_TW.qm
@@ -3684,6 +3776,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Dimension/DimHorizontal/ts/DimHorizontal_sl.ts
 %%DATADIR%%/scripts/Draw/Dimension/DimHorizontal/ts/DimHorizontal_sv.qm
 %%DATADIR%%/scripts/Draw/Dimension/DimHorizontal/ts/DimHorizontal_sv.ts
+%%DATADIR%%/scripts/Draw/Dimension/DimHorizontal/ts/DimHorizontal_tr.qm
+%%DATADIR%%/scripts/Draw/Dimension/DimHorizontal/ts/DimHorizontal_tr.ts
 %%DATADIR%%/scripts/Draw/Dimension/DimHorizontal/ts/DimHorizontal_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Dimension/DimHorizontal/ts/DimHorizontal_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Dimension/DimHorizontal/ts/DimHorizontal_zh_TW.qm
@@ -3756,6 +3850,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Dimension/DimOrdinate/ts/DimOrdinate_sl.ts
 %%DATADIR%%/scripts/Draw/Dimension/DimOrdinate/ts/DimOrdinate_sv.qm
 %%DATADIR%%/scripts/Draw/Dimension/DimOrdinate/ts/DimOrdinate_sv.ts
+%%DATADIR%%/scripts/Draw/Dimension/DimOrdinate/ts/DimOrdinate_tr.qm
+%%DATADIR%%/scripts/Draw/Dimension/DimOrdinate/ts/DimOrdinate_tr.ts
 %%DATADIR%%/scripts/Draw/Dimension/DimOrdinate/ts/DimOrdinate_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Dimension/DimOrdinate/ts/DimOrdinate_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Dimension/DimOrdinate/ts/DimOrdinate_zh_TW.qm
@@ -3831,6 +3927,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Dimension/DimRadial/ts/DimRadial_sl.ts
 %%DATADIR%%/scripts/Draw/Dimension/DimRadial/ts/DimRadial_sv.qm
 %%DATADIR%%/scripts/Draw/Dimension/DimRadial/ts/DimRadial_sv.ts
+%%DATADIR%%/scripts/Draw/Dimension/DimRadial/ts/DimRadial_tr.qm
+%%DATADIR%%/scripts/Draw/Dimension/DimRadial/ts/DimRadial_tr.ts
 %%DATADIR%%/scripts/Draw/Dimension/DimRadial/ts/DimRadial_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Dimension/DimRadial/ts/DimRadial_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Dimension/DimRadial/ts/DimRadial_zh_TW.qm
@@ -3892,6 +3990,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Dimension/DimRegen/ts/DimRegen_sl.ts
 %%DATADIR%%/scripts/Draw/Dimension/DimRegen/ts/DimRegen_sv.qm
 %%DATADIR%%/scripts/Draw/Dimension/DimRegen/ts/DimRegen_sv.ts
+%%DATADIR%%/scripts/Draw/Dimension/DimRegen/ts/DimRegen_tr.qm
+%%DATADIR%%/scripts/Draw/Dimension/DimRegen/ts/DimRegen_tr.ts
 %%DATADIR%%/scripts/Draw/Dimension/DimRegen/ts/DimRegen_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Dimension/DimRegen/ts/DimRegen_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Dimension/DimRegen/ts/DimRegen_zh_TW.qm
@@ -3965,6 +4065,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Dimension/DimRotated/ts/DimRotated_sl.ts
 %%DATADIR%%/scripts/Draw/Dimension/DimRotated/ts/DimRotated_sv.qm
 %%DATADIR%%/scripts/Draw/Dimension/DimRotated/ts/DimRotated_sv.ts
+%%DATADIR%%/scripts/Draw/Dimension/DimRotated/ts/DimRotated_tr.qm
+%%DATADIR%%/scripts/Draw/Dimension/DimRotated/ts/DimRotated_tr.ts
 %%DATADIR%%/scripts/Draw/Dimension/DimRotated/ts/DimRotated_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Dimension/DimRotated/ts/DimRotated_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Dimension/DimRotated/ts/DimRotated_zh_TW.qm
@@ -4029,6 +4131,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Dimension/DimVertical/ts/DimVertical_sl.ts
 %%DATADIR%%/scripts/Draw/Dimension/DimVertical/ts/DimVertical_sv.qm
 %%DATADIR%%/scripts/Draw/Dimension/DimVertical/ts/DimVertical_sv.ts
+%%DATADIR%%/scripts/Draw/Dimension/DimVertical/ts/DimVertical_tr.qm
+%%DATADIR%%/scripts/Draw/Dimension/DimVertical/ts/DimVertical_tr.ts
 %%DATADIR%%/scripts/Draw/Dimension/DimVertical/ts/DimVertical_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Dimension/DimVertical/ts/DimVertical_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Dimension/DimVertical/ts/DimVertical_zh_TW.qm
@@ -4113,6 +4217,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Dimension/Leader/ts/Leader_sl.ts
 %%DATADIR%%/scripts/Draw/Dimension/Leader/ts/Leader_sv.qm
 %%DATADIR%%/scripts/Draw/Dimension/Leader/ts/Leader_sv.ts
+%%DATADIR%%/scripts/Draw/Dimension/Leader/ts/Leader_tr.qm
+%%DATADIR%%/scripts/Draw/Dimension/Leader/ts/Leader_tr.ts
 %%DATADIR%%/scripts/Draw/Dimension/Leader/ts/Leader_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Dimension/Leader/ts/Leader_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Dimension/Leader/ts/Leader_zh_TW.qm
@@ -4180,6 +4286,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Dimension/ts/Dimension_sl.ts
 %%DATADIR%%/scripts/Draw/Dimension/ts/Dimension_sv.qm
 %%DATADIR%%/scripts/Draw/Dimension/ts/Dimension_sv.ts
+%%DATADIR%%/scripts/Draw/Dimension/ts/Dimension_tr.qm
+%%DATADIR%%/scripts/Draw/Dimension/ts/Dimension_tr.ts
 %%DATADIR%%/scripts/Draw/Dimension/ts/Dimension_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Dimension/ts/Dimension_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Dimension/ts/Dimension_zh_TW.qm
@@ -4270,6 +4378,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Ellipse/EllipseArcCPPA/ts/EllipseArcCPPA_sl.ts
 %%DATADIR%%/scripts/Draw/Ellipse/EllipseArcCPPA/ts/EllipseArcCPPA_sv.qm
 %%DATADIR%%/scripts/Draw/Ellipse/EllipseArcCPPA/ts/EllipseArcCPPA_sv.ts
+%%DATADIR%%/scripts/Draw/Ellipse/EllipseArcCPPA/ts/EllipseArcCPPA_tr.qm
+%%DATADIR%%/scripts/Draw/Ellipse/EllipseArcCPPA/ts/EllipseArcCPPA_tr.ts
 %%DATADIR%%/scripts/Draw/Ellipse/EllipseArcCPPA/ts/EllipseArcCPPA_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Ellipse/EllipseArcCPPA/ts/EllipseArcCPPA_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Ellipse/EllipseArcCPPA/ts/EllipseArcCPPA_zh_TW.qm
@@ -4342,6 +4452,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Ellipse/EllipseCPP/ts/EllipseCPP_sl.ts
 %%DATADIR%%/scripts/Draw/Ellipse/EllipseCPP/ts/EllipseCPP_sv.qm
 %%DATADIR%%/scripts/Draw/Ellipse/EllipseCPP/ts/EllipseCPP_sv.ts
+%%DATADIR%%/scripts/Draw/Ellipse/EllipseCPP/ts/EllipseCPP_tr.qm
+%%DATADIR%%/scripts/Draw/Ellipse/EllipseCPP/ts/EllipseCPP_tr.ts
 %%DATADIR%%/scripts/Draw/Ellipse/EllipseCPP/ts/EllipseCPP_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Ellipse/EllipseCPP/ts/EllipseCPP_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Ellipse/EllipseCPP/ts/EllipseCPP_zh_TW.qm
@@ -4396,6 +4508,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Ellipse/EllipseDD/ts/EllipseDD_sl.ts
 %%DATADIR%%/scripts/Draw/Ellipse/EllipseDD/ts/EllipseDD_sv.qm
 %%DATADIR%%/scripts/Draw/Ellipse/EllipseDD/ts/EllipseDD_sv.ts
+%%DATADIR%%/scripts/Draw/Ellipse/EllipseDD/ts/EllipseDD_tr.qm
+%%DATADIR%%/scripts/Draw/Ellipse/EllipseDD/ts/EllipseDD_tr.ts
 %%DATADIR%%/scripts/Draw/Ellipse/EllipseDD/ts/EllipseDD_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Ellipse/EllipseDD/ts/EllipseDD_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Ellipse/EllipseDD/ts/EllipseDD_zh_TW.qm
@@ -4465,6 +4579,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Ellipse/EllipseInscribedQuad/ts/EllipseInscribedQuad_sl.ts
 %%DATADIR%%/scripts/Draw/Ellipse/EllipseInscribedQuad/ts/EllipseInscribedQuad_sv.qm
 %%DATADIR%%/scripts/Draw/Ellipse/EllipseInscribedQuad/ts/EllipseInscribedQuad_sv.ts
+%%DATADIR%%/scripts/Draw/Ellipse/EllipseInscribedQuad/ts/EllipseInscribedQuad_tr.qm
+%%DATADIR%%/scripts/Draw/Ellipse/EllipseInscribedQuad/ts/EllipseInscribedQuad_tr.ts
 %%DATADIR%%/scripts/Draw/Ellipse/EllipseInscribedQuad/ts/EllipseInscribedQuad_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Ellipse/EllipseInscribedQuad/ts/EllipseInscribedQuad_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Ellipse/EllipseInscribedQuad/ts/EllipseInscribedQuad_zh_TW.qm
@@ -4538,6 +4654,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Ellipse/EllipseOffset/ts/EllipseOffset_sl.ts
 %%DATADIR%%/scripts/Draw/Ellipse/EllipseOffset/ts/EllipseOffset_sv.qm
 %%DATADIR%%/scripts/Draw/Ellipse/EllipseOffset/ts/EllipseOffset_sv.ts
+%%DATADIR%%/scripts/Draw/Ellipse/EllipseOffset/ts/EllipseOffset_tr.qm
+%%DATADIR%%/scripts/Draw/Ellipse/EllipseOffset/ts/EllipseOffset_tr.ts
 %%DATADIR%%/scripts/Draw/Ellipse/EllipseOffset/ts/EllipseOffset_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Ellipse/EllipseOffset/ts/EllipseOffset_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Ellipse/EllipseOffset/ts/EllipseOffset_zh_TW.qm
@@ -4611,6 +4729,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Ellipse/EllipseOffsetThrough/ts/EllipseOffsetThrough_sl.ts
 %%DATADIR%%/scripts/Draw/Ellipse/EllipseOffsetThrough/ts/EllipseOffsetThrough_sv.qm
 %%DATADIR%%/scripts/Draw/Ellipse/EllipseOffsetThrough/ts/EllipseOffsetThrough_sv.ts
+%%DATADIR%%/scripts/Draw/Ellipse/EllipseOffsetThrough/ts/EllipseOffsetThrough_tr.qm
+%%DATADIR%%/scripts/Draw/Ellipse/EllipseOffsetThrough/ts/EllipseOffsetThrough_tr.ts
 %%DATADIR%%/scripts/Draw/Ellipse/EllipseOffsetThrough/ts/EllipseOffsetThrough_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Ellipse/EllipseOffsetThrough/ts/EllipseOffsetThrough_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Ellipse/EllipseOffsetThrough/ts/EllipseOffsetThrough_zh_TW.qm
@@ -4665,6 +4785,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Ellipse/EllipseRR/ts/EllipseRR_sl.ts
 %%DATADIR%%/scripts/Draw/Ellipse/EllipseRR/ts/EllipseRR_sv.qm
 %%DATADIR%%/scripts/Draw/Ellipse/EllipseRR/ts/EllipseRR_sv.ts
+%%DATADIR%%/scripts/Draw/Ellipse/EllipseRR/ts/EllipseRR_tr.qm
+%%DATADIR%%/scripts/Draw/Ellipse/EllipseRR/ts/EllipseRR_tr.ts
 %%DATADIR%%/scripts/Draw/Ellipse/EllipseRR/ts/EllipseRR_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Ellipse/EllipseRR/ts/EllipseRR_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Ellipse/EllipseRR/ts/EllipseRR_zh_TW.qm
@@ -4715,6 +4837,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Ellipse/ts/Ellipse_sl.ts
 %%DATADIR%%/scripts/Draw/Ellipse/ts/Ellipse_sv.qm
 %%DATADIR%%/scripts/Draw/Ellipse/ts/Ellipse_sv.ts
+%%DATADIR%%/scripts/Draw/Ellipse/ts/Ellipse_tr.qm
+%%DATADIR%%/scripts/Draw/Ellipse/ts/Ellipse_tr.ts
 %%DATADIR%%/scripts/Draw/Ellipse/ts/Ellipse_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Ellipse/ts/Ellipse_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Ellipse/ts/Ellipse_zh_TW.qm
@@ -4823,6 +4947,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Hatch/HatchFromSelection/ts/HatchFromSelection_sl.ts
 %%DATADIR%%/scripts/Draw/Hatch/HatchFromSelection/ts/HatchFromSelection_sv.qm
 %%DATADIR%%/scripts/Draw/Hatch/HatchFromSelection/ts/HatchFromSelection_sv.ts
+%%DATADIR%%/scripts/Draw/Hatch/HatchFromSelection/ts/HatchFromSelection_tr.qm
+%%DATADIR%%/scripts/Draw/Hatch/HatchFromSelection/ts/HatchFromSelection_tr.ts
 %%DATADIR%%/scripts/Draw/Hatch/HatchFromSelection/ts/HatchFromSelection_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Hatch/HatchFromSelection/ts/HatchFromSelection_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Hatch/HatchFromSelection/ts/HatchFromSelection_zh_TW.qm
@@ -4862,6 +4988,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Hatch/ts/Hatch_sl.ts
 %%DATADIR%%/scripts/Draw/Hatch/ts/Hatch_sv.qm
 %%DATADIR%%/scripts/Draw/Hatch/ts/Hatch_sv.ts
+%%DATADIR%%/scripts/Draw/Hatch/ts/Hatch_tr.qm
+%%DATADIR%%/scripts/Draw/Hatch/ts/Hatch_tr.ts
 %%DATADIR%%/scripts/Draw/Hatch/ts/Hatch_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Hatch/ts/Hatch_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Hatch/ts/Hatch_zh_TW.qm
@@ -4940,6 +5068,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Image/ts/Image_sl.ts
 %%DATADIR%%/scripts/Draw/Image/ts/Image_sv.qm
 %%DATADIR%%/scripts/Draw/Image/ts/Image_sv.ts
+%%DATADIR%%/scripts/Draw/Image/ts/Image_tr.qm
+%%DATADIR%%/scripts/Draw/Image/ts/Image_tr.ts
 %%DATADIR%%/scripts/Draw/Image/ts/Image_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Image/ts/Image_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Image/ts/Image_zh_TW.qm
@@ -5057,6 +5187,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Line/Line2P/ts/Line2P_sl.ts
 %%DATADIR%%/scripts/Draw/Line/Line2P/ts/Line2P_sv.qm
 %%DATADIR%%/scripts/Draw/Line/Line2P/ts/Line2P_sv.ts
+%%DATADIR%%/scripts/Draw/Line/Line2P/ts/Line2P_tr.qm
+%%DATADIR%%/scripts/Draw/Line/Line2P/ts/Line2P_tr.ts
 %%DATADIR%%/scripts/Draw/Line/Line2P/ts/Line2P_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Line/Line2P/ts/Line2P_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Line/Line2P/ts/Line2P_zh_TW.qm
@@ -5134,6 +5266,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Line/LineAngle/ts/LineAngle_sl.ts
 %%DATADIR%%/scripts/Draw/Line/LineAngle/ts/LineAngle_sv.qm
 %%DATADIR%%/scripts/Draw/Line/LineAngle/ts/LineAngle_sv.ts
+%%DATADIR%%/scripts/Draw/Line/LineAngle/ts/LineAngle_tr.qm
+%%DATADIR%%/scripts/Draw/Line/LineAngle/ts/LineAngle_tr.ts
 %%DATADIR%%/scripts/Draw/Line/LineAngle/ts/LineAngle_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Line/LineAngle/ts/LineAngle_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Line/LineAngle/ts/LineAngle_zh_TW.qm
@@ -5212,6 +5346,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Line/LineBisector/ts/LineBisector_sl.ts
 %%DATADIR%%/scripts/Draw/Line/LineBisector/ts/LineBisector_sv.qm
 %%DATADIR%%/scripts/Draw/Line/LineBisector/ts/LineBisector_sv.ts
+%%DATADIR%%/scripts/Draw/Line/LineBisector/ts/LineBisector_tr.qm
+%%DATADIR%%/scripts/Draw/Line/LineBisector/ts/LineBisector_tr.ts
 %%DATADIR%%/scripts/Draw/Line/LineBisector/ts/LineBisector_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Line/LineBisector/ts/LineBisector_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Line/LineBisector/ts/LineBisector_zh_TW.qm
@@ -5284,6 +5420,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Line/LineFreehand/ts/LineFreehand_sl.ts
 %%DATADIR%%/scripts/Draw/Line/LineFreehand/ts/LineFreehand_sv.qm
 %%DATADIR%%/scripts/Draw/Line/LineFreehand/ts/LineFreehand_sv.ts
+%%DATADIR%%/scripts/Draw/Line/LineFreehand/ts/LineFreehand_tr.qm
+%%DATADIR%%/scripts/Draw/Line/LineFreehand/ts/LineFreehand_tr.ts
 %%DATADIR%%/scripts/Draw/Line/LineFreehand/ts/LineFreehand_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Line/LineFreehand/ts/LineFreehand_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Line/LineFreehand/ts/LineFreehand_zh_TW.qm
@@ -5349,6 +5487,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Line/LineHorizontal/ts/LineHorizontal_sl.ts
 %%DATADIR%%/scripts/Draw/Line/LineHorizontal/ts/LineHorizontal_sv.qm
 %%DATADIR%%/scripts/Draw/Line/LineHorizontal/ts/LineHorizontal_sv.ts
+%%DATADIR%%/scripts/Draw/Line/LineHorizontal/ts/LineHorizontal_tr.qm
+%%DATADIR%%/scripts/Draw/Line/LineHorizontal/ts/LineHorizontal_tr.ts
 %%DATADIR%%/scripts/Draw/Line/LineHorizontal/ts/LineHorizontal_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Line/LineHorizontal/ts/LineHorizontal_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Line/LineHorizontal/ts/LineHorizontal_zh_TW.qm
@@ -5422,6 +5562,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Line/LineOrthogonal/ts/LineOrthogonal_sl.ts
 %%DATADIR%%/scripts/Draw/Line/LineOrthogonal/ts/LineOrthogonal_sv.qm
 %%DATADIR%%/scripts/Draw/Line/LineOrthogonal/ts/LineOrthogonal_sv.ts
+%%DATADIR%%/scripts/Draw/Line/LineOrthogonal/ts/LineOrthogonal_tr.qm
+%%DATADIR%%/scripts/Draw/Line/LineOrthogonal/ts/LineOrthogonal_tr.ts
 %%DATADIR%%/scripts/Draw/Line/LineOrthogonal/ts/LineOrthogonal_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Line/LineOrthogonal/ts/LineOrthogonal_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Line/LineOrthogonal/ts/LineOrthogonal_zh_TW.qm
@@ -5491,6 +5633,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Line/LineOrthogonalTangent/ts/LineOrthogonalTangent_sl.ts
 %%DATADIR%%/scripts/Draw/Line/LineOrthogonalTangent/ts/LineOrthogonalTangent_sv.qm
 %%DATADIR%%/scripts/Draw/Line/LineOrthogonalTangent/ts/LineOrthogonalTangent_sv.ts
+%%DATADIR%%/scripts/Draw/Line/LineOrthogonalTangent/ts/LineOrthogonalTangent_tr.qm
+%%DATADIR%%/scripts/Draw/Line/LineOrthogonalTangent/ts/LineOrthogonalTangent_tr.ts
 %%DATADIR%%/scripts/Draw/Line/LineOrthogonalTangent/ts/LineOrthogonalTangent_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Line/LineOrthogonalTangent/ts/LineOrthogonalTangent_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Line/LineOrthogonalTangent/ts/LineOrthogonalTangent_zh_TW.qm
@@ -5567,6 +5711,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Line/LineParallel/ts/LineParallel_sl.ts
 %%DATADIR%%/scripts/Draw/Line/LineParallel/ts/LineParallel_sv.qm
 %%DATADIR%%/scripts/Draw/Line/LineParallel/ts/LineParallel_sv.ts
+%%DATADIR%%/scripts/Draw/Line/LineParallel/ts/LineParallel_tr.qm
+%%DATADIR%%/scripts/Draw/Line/LineParallel/ts/LineParallel_tr.ts
 %%DATADIR%%/scripts/Draw/Line/LineParallel/ts/LineParallel_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Line/LineParallel/ts/LineParallel_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Line/LineParallel/ts/LineParallel_zh_TW.qm
@@ -5643,6 +5789,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Line/LineParallelThrough/ts/LineParallelThrough_sl.ts
 %%DATADIR%%/scripts/Draw/Line/LineParallelThrough/ts/LineParallelThrough_sv.qm
 %%DATADIR%%/scripts/Draw/Line/LineParallelThrough/ts/LineParallelThrough_sv.ts
+%%DATADIR%%/scripts/Draw/Line/LineParallelThrough/ts/LineParallelThrough_tr.qm
+%%DATADIR%%/scripts/Draw/Line/LineParallelThrough/ts/LineParallelThrough_tr.ts
 %%DATADIR%%/scripts/Draw/Line/LineParallelThrough/ts/LineParallelThrough_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Line/LineParallelThrough/ts/LineParallelThrough_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Line/LineParallelThrough/ts/LineParallelThrough_zh_TW.qm
@@ -5716,6 +5864,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Line/LineRelativeAngle/ts/LineRelativeAngle_sl.ts
 %%DATADIR%%/scripts/Draw/Line/LineRelativeAngle/ts/LineRelativeAngle_sv.qm
 %%DATADIR%%/scripts/Draw/Line/LineRelativeAngle/ts/LineRelativeAngle_sv.ts
+%%DATADIR%%/scripts/Draw/Line/LineRelativeAngle/ts/LineRelativeAngle_tr.qm
+%%DATADIR%%/scripts/Draw/Line/LineRelativeAngle/ts/LineRelativeAngle_tr.ts
 %%DATADIR%%/scripts/Draw/Line/LineRelativeAngle/ts/LineRelativeAngle_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Line/LineRelativeAngle/ts/LineRelativeAngle_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Line/LineRelativeAngle/ts/LineRelativeAngle_zh_TW.qm
@@ -5790,6 +5940,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Line/LineTangent1/ts/LineTangent1_sl.ts
 %%DATADIR%%/scripts/Draw/Line/LineTangent1/ts/LineTangent1_sv.qm
 %%DATADIR%%/scripts/Draw/Line/LineTangent1/ts/LineTangent1_sv.ts
+%%DATADIR%%/scripts/Draw/Line/LineTangent1/ts/LineTangent1_tr.qm
+%%DATADIR%%/scripts/Draw/Line/LineTangent1/ts/LineTangent1_tr.ts
 %%DATADIR%%/scripts/Draw/Line/LineTangent1/ts/LineTangent1_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Line/LineTangent1/ts/LineTangent1_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Line/LineTangent1/ts/LineTangent1_zh_TW.qm
@@ -5864,6 +6016,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Line/LineTangent2/ts/LineTangent2_sl.ts
 %%DATADIR%%/scripts/Draw/Line/LineTangent2/ts/LineTangent2_sv.qm
 %%DATADIR%%/scripts/Draw/Line/LineTangent2/ts/LineTangent2_sv.ts
+%%DATADIR%%/scripts/Draw/Line/LineTangent2/ts/LineTangent2_tr.qm
+%%DATADIR%%/scripts/Draw/Line/LineTangent2/ts/LineTangent2_tr.ts
 %%DATADIR%%/scripts/Draw/Line/LineTangent2/ts/LineTangent2_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Line/LineTangent2/ts/LineTangent2_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Line/LineTangent2/ts/LineTangent2_zh_TW.qm
@@ -5928,6 +6082,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Line/LineVertical/ts/LineVertical_sl.ts
 %%DATADIR%%/scripts/Draw/Line/LineVertical/ts/LineVertical_sv.qm
 %%DATADIR%%/scripts/Draw/Line/LineVertical/ts/LineVertical_sv.ts
+%%DATADIR%%/scripts/Draw/Line/LineVertical/ts/LineVertical_tr.qm
+%%DATADIR%%/scripts/Draw/Line/LineVertical/ts/LineVertical_tr.ts
 %%DATADIR%%/scripts/Draw/Line/LineVertical/ts/LineVertical_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Line/LineVertical/ts/LineVertical_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Line/LineVertical/ts/LineVertical_zh_TW.qm
@@ -5987,6 +6143,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Line/ts/Line_sl.ts
 %%DATADIR%%/scripts/Draw/Line/ts/Line_sv.qm
 %%DATADIR%%/scripts/Draw/Line/ts/Line_sv.ts
+%%DATADIR%%/scripts/Draw/Line/ts/Line_tr.qm
+%%DATADIR%%/scripts/Draw/Line/ts/Line_tr.ts
 %%DATADIR%%/scripts/Draw/Line/ts/Line_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Line/ts/Line_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Line/ts/Line_zh_TW.qm
@@ -6064,6 +6222,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Point/Point1P/ts/Point1P_sl.ts
 %%DATADIR%%/scripts/Draw/Point/Point1P/ts/Point1P_sv.qm
 %%DATADIR%%/scripts/Draw/Point/Point1P/ts/Point1P_sv.ts
+%%DATADIR%%/scripts/Draw/Point/Point1P/ts/Point1P_tr.qm
+%%DATADIR%%/scripts/Draw/Point/Point1P/ts/Point1P_tr.ts
 %%DATADIR%%/scripts/Draw/Point/Point1P/ts/Point1P_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Point/Point1P/ts/Point1P_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Point/Point1P/ts/Point1P_zh_TW.qm
@@ -6111,6 +6271,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Point/ts/Point_sl.ts
 %%DATADIR%%/scripts/Draw/Point/ts/Point_sv.qm
 %%DATADIR%%/scripts/Draw/Point/ts/Point_sv.ts
+%%DATADIR%%/scripts/Draw/Point/ts/Point_tr.qm
+%%DATADIR%%/scripts/Draw/Point/ts/Point_tr.ts
 %%DATADIR%%/scripts/Draw/Point/ts/Point_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Point/ts/Point_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Point/ts/Point_zh_TW.qm
@@ -6196,6 +6358,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Polyline/DrawPolyline/ts/DrawPolyline_sl.ts
 %%DATADIR%%/scripts/Draw/Polyline/DrawPolyline/ts/DrawPolyline_sv.qm
 %%DATADIR%%/scripts/Draw/Polyline/DrawPolyline/ts/DrawPolyline_sv.ts
+%%DATADIR%%/scripts/Draw/Polyline/DrawPolyline/ts/DrawPolyline_tr.qm
+%%DATADIR%%/scripts/Draw/Polyline/DrawPolyline/ts/DrawPolyline_tr.ts
 %%DATADIR%%/scripts/Draw/Polyline/DrawPolyline/ts/DrawPolyline_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Polyline/DrawPolyline/ts/DrawPolyline_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Polyline/DrawPolyline/ts/DrawPolyline_zh_TW.qm
@@ -6247,6 +6411,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Polyline/ts/Polyline_sl.ts
 %%DATADIR%%/scripts/Draw/Polyline/ts/Polyline_sv.qm
 %%DATADIR%%/scripts/Draw/Polyline/ts/Polyline_sv.ts
+%%DATADIR%%/scripts/Draw/Polyline/ts/Polyline_tr.qm
+%%DATADIR%%/scripts/Draw/Polyline/ts/Polyline_tr.ts
 %%DATADIR%%/scripts/Draw/Polyline/ts/Polyline_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Polyline/ts/Polyline_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Polyline/ts/Polyline_zh_TW.qm
@@ -6310,6 +6476,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Shape/ShapePolygonAFCP/ts/ShapePolygonAFCP_sl.ts
 %%DATADIR%%/scripts/Draw/Shape/ShapePolygonAFCP/ts/ShapePolygonAFCP_sv.qm
 %%DATADIR%%/scripts/Draw/Shape/ShapePolygonAFCP/ts/ShapePolygonAFCP_sv.ts
+%%DATADIR%%/scripts/Draw/Shape/ShapePolygonAFCP/ts/ShapePolygonAFCP_tr.qm
+%%DATADIR%%/scripts/Draw/Shape/ShapePolygonAFCP/ts/ShapePolygonAFCP_tr.ts
 %%DATADIR%%/scripts/Draw/Shape/ShapePolygonAFCP/ts/ShapePolygonAFCP_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Shape/ShapePolygonAFCP/ts/ShapePolygonAFCP_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Shape/ShapePolygonAFCP/ts/ShapePolygonAFCP_zh_TW.qm
@@ -6369,6 +6537,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Shape/ShapePolygonAFPP/ts/ShapePolygonAFPP_sl.ts
 %%DATADIR%%/scripts/Draw/Shape/ShapePolygonAFPP/ts/ShapePolygonAFPP_sv.qm
 %%DATADIR%%/scripts/Draw/Shape/ShapePolygonAFPP/ts/ShapePolygonAFPP_sv.ts
+%%DATADIR%%/scripts/Draw/Shape/ShapePolygonAFPP/ts/ShapePolygonAFPP_tr.qm
+%%DATADIR%%/scripts/Draw/Shape/ShapePolygonAFPP/ts/ShapePolygonAFPP_tr.ts
 %%DATADIR%%/scripts/Draw/Shape/ShapePolygonAFPP/ts/ShapePolygonAFPP_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Shape/ShapePolygonAFPP/ts/ShapePolygonAFPP_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Shape/ShapePolygonAFPP/ts/ShapePolygonAFPP_zh_TW.qm
@@ -6446,6 +6616,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Shape/ShapePolygonCP/ts/ShapePolygonCP_sl.ts
 %%DATADIR%%/scripts/Draw/Shape/ShapePolygonCP/ts/ShapePolygonCP_sv.qm
 %%DATADIR%%/scripts/Draw/Shape/ShapePolygonCP/ts/ShapePolygonCP_sv.ts
+%%DATADIR%%/scripts/Draw/Shape/ShapePolygonCP/ts/ShapePolygonCP_tr.qm
+%%DATADIR%%/scripts/Draw/Shape/ShapePolygonCP/ts/ShapePolygonCP_tr.ts
 %%DATADIR%%/scripts/Draw/Shape/ShapePolygonCP/ts/ShapePolygonCP_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Shape/ShapePolygonCP/ts/ShapePolygonCP_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Shape/ShapePolygonCP/ts/ShapePolygonCP_zh_TW.qm
@@ -6523,6 +6695,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Shape/ShapePolygonPP/ts/ShapePolygonPP_sl.ts
 %%DATADIR%%/scripts/Draw/Shape/ShapePolygonPP/ts/ShapePolygonPP_sv.qm
 %%DATADIR%%/scripts/Draw/Shape/ShapePolygonPP/ts/ShapePolygonPP_sv.ts
+%%DATADIR%%/scripts/Draw/Shape/ShapePolygonPP/ts/ShapePolygonPP_tr.qm
+%%DATADIR%%/scripts/Draw/Shape/ShapePolygonPP/ts/ShapePolygonPP_tr.ts
 %%DATADIR%%/scripts/Draw/Shape/ShapePolygonPP/ts/ShapePolygonPP_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Shape/ShapePolygonPP/ts/ShapePolygonPP_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Shape/ShapePolygonPP/ts/ShapePolygonPP_zh_TW.qm
@@ -6597,6 +6771,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Shape/ShapeRectanglePP/ts/ShapeRectanglePP_sl.ts
 %%DATADIR%%/scripts/Draw/Shape/ShapeRectanglePP/ts/ShapeRectanglePP_sv.qm
 %%DATADIR%%/scripts/Draw/Shape/ShapeRectanglePP/ts/ShapeRectanglePP_sv.ts
+%%DATADIR%%/scripts/Draw/Shape/ShapeRectanglePP/ts/ShapeRectanglePP_tr.qm
+%%DATADIR%%/scripts/Draw/Shape/ShapeRectanglePP/ts/ShapeRectanglePP_tr.ts
 %%DATADIR%%/scripts/Draw/Shape/ShapeRectanglePP/ts/ShapeRectanglePP_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Shape/ShapeRectanglePP/ts/ShapeRectanglePP_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Shape/ShapeRectanglePP/ts/ShapeRectanglePP_zh_TW.qm
@@ -6673,6 +6849,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Shape/ShapeRectangleSize/ts/ShapeRectangleSize_sl.ts
 %%DATADIR%%/scripts/Draw/Shape/ShapeRectangleSize/ts/ShapeRectangleSize_sv.qm
 %%DATADIR%%/scripts/Draw/Shape/ShapeRectangleSize/ts/ShapeRectangleSize_sv.ts
+%%DATADIR%%/scripts/Draw/Shape/ShapeRectangleSize/ts/ShapeRectangleSize_tr.qm
+%%DATADIR%%/scripts/Draw/Shape/ShapeRectangleSize/ts/ShapeRectangleSize_tr.ts
 %%DATADIR%%/scripts/Draw/Shape/ShapeRectangleSize/ts/ShapeRectangleSize_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Shape/ShapeRectangleSize/ts/ShapeRectangleSize_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Shape/ShapeRectangleSize/ts/ShapeRectangleSize_zh_TW.qm
@@ -6712,6 +6890,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Shape/ts/Shape_sl.ts
 %%DATADIR%%/scripts/Draw/Shape/ts/Shape_sv.qm
 %%DATADIR%%/scripts/Draw/Shape/ts/Shape_sv.ts
+%%DATADIR%%/scripts/Draw/Shape/ts/Shape_tr.qm
+%%DATADIR%%/scripts/Draw/Shape/ts/Shape_tr.ts
 %%DATADIR%%/scripts/Draw/Shape/ts/Shape_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Shape/ts/Shape_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Shape/ts/Shape_zh_TW.qm
@@ -6799,6 +6979,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Spline/SplineControlPoints/ts/SplineControlPoints_sl.ts
 %%DATADIR%%/scripts/Draw/Spline/SplineControlPoints/ts/SplineControlPoints_sv.qm
 %%DATADIR%%/scripts/Draw/Spline/SplineControlPoints/ts/SplineControlPoints_sv.ts
+%%DATADIR%%/scripts/Draw/Spline/SplineControlPoints/ts/SplineControlPoints_tr.qm
+%%DATADIR%%/scripts/Draw/Spline/SplineControlPoints/ts/SplineControlPoints_tr.ts
 %%DATADIR%%/scripts/Draw/Spline/SplineControlPoints/ts/SplineControlPoints_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Spline/SplineControlPoints/ts/SplineControlPoints_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Spline/SplineControlPoints/ts/SplineControlPoints_zh_TW.qm
@@ -6846,6 +7028,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Spline/ts/Spline_sl.ts
 %%DATADIR%%/scripts/Draw/Spline/ts/Spline_sv.qm
 %%DATADIR%%/scripts/Draw/Spline/ts/Spline_sv.ts
+%%DATADIR%%/scripts/Draw/Spline/ts/Spline_tr.qm
+%%DATADIR%%/scripts/Draw/Spline/ts/Spline_tr.ts
 %%DATADIR%%/scripts/Draw/Spline/ts/Spline_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Spline/ts/Spline_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Spline/ts/Spline_zh_TW.qm
@@ -6884,16 +7068,26 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Text/Tests/required/Text02_000.dxf
 %%DATADIR%%/scripts/Draw/Text/Tests/required/Text03_000.dxf
 %%DATADIR%%/scripts/Draw/Text/Tests/required/Text04_000.dxf
+%%DATADIR%%/scripts/Draw/Text/Tests/required/Text04_001.dxf
 %%DATADIR%%/scripts/Draw/Text/Tests/required/Text05_000.dxf
+%%DATADIR%%/scripts/Draw/Text/Tests/required/Text05_001.dxf
 %%DATADIR%%/scripts/Draw/Text/Tests/required/Text06_000.dxf
+%%DATADIR%%/scripts/Draw/Text/Tests/required/Text06_001.dxf
 %%DATADIR%%/scripts/Draw/Text/Tests/required/Text07_000.dxf
 %%DATADIR%%/scripts/Draw/Text/Tests/required/Text08_000.dxf
+%%DATADIR%%/scripts/Draw/Text/Tests/required/Text08_001.dxf
 %%DATADIR%%/scripts/Draw/Text/Tests/required/Text09_000.dxf
+%%DATADIR%%/scripts/Draw/Text/Tests/required/Text09_001.dxf
 %%DATADIR%%/scripts/Draw/Text/Tests/required/Text10_000.dxf
+%%DATADIR%%/scripts/Draw/Text/Tests/required/Text10_001.dxf
 %%DATADIR%%/scripts/Draw/Text/Tests/required/Text11_000.dxf
+%%DATADIR%%/scripts/Draw/Text/Tests/required/Text11_001.dxf
 %%DATADIR%%/scripts/Draw/Text/Tests/required/Text12_000.dxf
+%%DATADIR%%/scripts/Draw/Text/Tests/required/Text12_001.dxf
 %%DATADIR%%/scripts/Draw/Text/Tests/required/Text13_000.dxf
+%%DATADIR%%/scripts/Draw/Text/Tests/required/Text13_001.dxf
 %%DATADIR%%/scripts/Draw/Text/Tests/required/Text14_000.dxf
+%%DATADIR%%/scripts/Draw/Text/Tests/required/Text14_001.dxf
 %%DATADIR%%/scripts/Draw/Text/Text-inverse.svg
 %%DATADIR%%/scripts/Draw/Text/Text.js
 %%DATADIR%%/scripts/Draw/Text/Text.pro
@@ -7022,6 +7216,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/Text/ts/Text_sl.ts
 %%DATADIR%%/scripts/Draw/Text/ts/Text_sv.qm
 %%DATADIR%%/scripts/Draw/Text/ts/Text_sv.ts
+%%DATADIR%%/scripts/Draw/Text/ts/Text_tr.qm
+%%DATADIR%%/scripts/Draw/Text/ts/Text_tr.ts
 %%DATADIR%%/scripts/Draw/Text/ts/Text_zh_CN.qm
 %%DATADIR%%/scripts/Draw/Text/ts/Text_zh_CN.ts
 %%DATADIR%%/scripts/Draw/Text/ts/Text_zh_TW.qm
@@ -7068,6 +7264,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Draw/ts/Draw_sl.ts
 %%DATADIR%%/scripts/Draw/ts/Draw_sv.qm
 %%DATADIR%%/scripts/Draw/ts/Draw_sv.ts
+%%DATADIR%%/scripts/Draw/ts/Draw_tr.qm
+%%DATADIR%%/scripts/Draw/ts/Draw_tr.ts
 %%DATADIR%%/scripts/Draw/ts/Draw_zh_CN.qm
 %%DATADIR%%/scripts/Draw/ts/Draw_zh_CN.ts
 %%DATADIR%%/scripts/Draw/ts/Draw_zh_TW.qm
@@ -7117,6 +7315,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Edit/AppPreferences/GraphicsViewPreferences/BehaviorPreferences/ts/BehaviorPreferences_sl.ts
 %%DATADIR%%/scripts/Edit/AppPreferences/GraphicsViewPreferences/BehaviorPreferences/ts/BehaviorPreferences_sv.qm
 %%DATADIR%%/scripts/Edit/AppPreferences/GraphicsViewPreferences/BehaviorPreferences/ts/BehaviorPreferences_sv.ts
+%%DATADIR%%/scripts/Edit/AppPreferences/GraphicsViewPreferences/BehaviorPreferences/ts/BehaviorPreferences_tr.qm
+%%DATADIR%%/scripts/Edit/AppPreferences/GraphicsViewPreferences/BehaviorPreferences/ts/BehaviorPreferences_tr.ts
 %%DATADIR%%/scripts/Edit/AppPreferences/GraphicsViewPreferences/BehaviorPreferences/ts/BehaviorPreferences_zh_CN.qm
 %%DATADIR%%/scripts/Edit/AppPreferences/GraphicsViewPreferences/BehaviorPreferences/ts/BehaviorPreferences_zh_CN.ts
 %%DATADIR%%/scripts/Edit/AppPreferences/GraphicsViewPreferences/BehaviorPreferences/ts/BehaviorPreferences_zh_TW.qm
@@ -7159,6 +7359,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Edit/AppPreferences/GraphicsViewPreferences/ColorPreferences/ts/ColorPreferences_sl.ts
 %%DATADIR%%/scripts/Edit/AppPreferences/GraphicsViewPreferences/ColorPreferences/ts/ColorPreferences_sv.qm
 %%DATADIR%%/scripts/Edit/AppPreferences/GraphicsViewPreferences/ColorPreferences/ts/ColorPreferences_sv.ts
+%%DATADIR%%/scripts/Edit/AppPreferences/GraphicsViewPreferences/ColorPreferences/ts/ColorPreferences_tr.qm
+%%DATADIR%%/scripts/Edit/AppPreferences/GraphicsViewPreferences/ColorPreferences/ts/ColorPreferences_tr.ts
 %%DATADIR%%/scripts/Edit/AppPreferences/GraphicsViewPreferences/ColorPreferences/ts/ColorPreferences_zh_CN.qm
 %%DATADIR%%/scripts/Edit/AppPreferences/GraphicsViewPreferences/ColorPreferences/ts/ColorPreferences_zh_CN.ts
 %%DATADIR%%/scripts/Edit/AppPreferences/GraphicsViewPreferences/ColorPreferences/ts/ColorPreferences_zh_TW.qm
@@ -7201,6 +7403,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Edit/AppPreferences/GraphicsViewPreferences/FontPreferences/ts/FontPreferences_sl.ts
 %%DATADIR%%/scripts/Edit/AppPreferences/GraphicsViewPreferences/FontPreferences/ts/FontPreferences_sv.qm
 %%DATADIR%%/scripts/Edit/AppPreferences/GraphicsViewPreferences/FontPreferences/ts/FontPreferences_sv.ts
+%%DATADIR%%/scripts/Edit/AppPreferences/GraphicsViewPreferences/FontPreferences/ts/FontPreferences_tr.qm
+%%DATADIR%%/scripts/Edit/AppPreferences/GraphicsViewPreferences/FontPreferences/ts/FontPreferences_tr.ts
 %%DATADIR%%/scripts/Edit/AppPreferences/GraphicsViewPreferences/FontPreferences/ts/FontPreferences_zh_CN.qm
 %%DATADIR%%/scripts/Edit/AppPreferences/GraphicsViewPreferences/FontPreferences/ts/FontPreferences_zh_CN.ts
 %%DATADIR%%/scripts/Edit/AppPreferences/GraphicsViewPreferences/FontPreferences/ts/FontPreferences_zh_TW.qm
@@ -7245,6 +7449,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Edit/AppPreferences/GraphicsViewPreferences/GridPreferences/ts/GridPreferences_sl.ts
 %%DATADIR%%/scripts/Edit/AppPreferences/GraphicsViewPreferences/GridPreferences/ts/GridPreferences_sv.qm
 %%DATADIR%%/scripts/Edit/AppPreferences/GraphicsViewPreferences/GridPreferences/ts/GridPreferences_sv.ts
+%%DATADIR%%/scripts/Edit/AppPreferences/GraphicsViewPreferences/GridPreferences/ts/GridPreferences_tr.qm
+%%DATADIR%%/scripts/Edit/AppPreferences/GraphicsViewPreferences/GridPreferences/ts/GridPreferences_tr.ts
 %%DATADIR%%/scripts/Edit/AppPreferences/GraphicsViewPreferences/GridPreferences/ts/GridPreferences_zh_CN.qm
 %%DATADIR%%/scripts/Edit/AppPreferences/GraphicsViewPreferences/GridPreferences/ts/GridPreferences_zh_CN.ts
 %%DATADIR%%/scripts/Edit/AppPreferences/GraphicsViewPreferences/GridPreferences/ts/GridPreferences_zh_TW.qm
@@ -7284,6 +7490,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Edit/AppPreferences/GraphicsViewPreferences/ts/GraphicsViewPreferences_sl.ts
 %%DATADIR%%/scripts/Edit/AppPreferences/GraphicsViewPreferences/ts/GraphicsViewPreferences_sv.qm
 %%DATADIR%%/scripts/Edit/AppPreferences/GraphicsViewPreferences/ts/GraphicsViewPreferences_sv.ts
+%%DATADIR%%/scripts/Edit/AppPreferences/GraphicsViewPreferences/ts/GraphicsViewPreferences_tr.qm
+%%DATADIR%%/scripts/Edit/AppPreferences/GraphicsViewPreferences/ts/GraphicsViewPreferences_tr.ts
 %%DATADIR%%/scripts/Edit/AppPreferences/GraphicsViewPreferences/ts/GraphicsViewPreferences_zh_CN.qm
 %%DATADIR%%/scripts/Edit/AppPreferences/GraphicsViewPreferences/ts/GraphicsViewPreferences_zh_CN.ts
 %%DATADIR%%/scripts/Edit/AppPreferences/GraphicsViewPreferences/ts/GraphicsViewPreferences_zh_TW.qm
@@ -7327,6 +7535,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Edit/AppPreferences/InputPreferences/ts/InputPreferences_sl.ts
 %%DATADIR%%/scripts/Edit/AppPreferences/InputPreferences/ts/InputPreferences_sv.qm
 %%DATADIR%%/scripts/Edit/AppPreferences/InputPreferences/ts/InputPreferences_sv.ts
+%%DATADIR%%/scripts/Edit/AppPreferences/InputPreferences/ts/InputPreferences_tr.qm
+%%DATADIR%%/scripts/Edit/AppPreferences/InputPreferences/ts/InputPreferences_tr.ts
 %%DATADIR%%/scripts/Edit/AppPreferences/InputPreferences/ts/InputPreferences_zh_CN.qm
 %%DATADIR%%/scripts/Edit/AppPreferences/InputPreferences/ts/InputPreferences_zh_CN.ts
 %%DATADIR%%/scripts/Edit/AppPreferences/InputPreferences/ts/InputPreferences_zh_TW.qm
@@ -7369,6 +7579,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Edit/AppPreferences/LanguagePreferences/ts/LanguagePreferences_sl.ts
 %%DATADIR%%/scripts/Edit/AppPreferences/LanguagePreferences/ts/LanguagePreferences_sv.qm
 %%DATADIR%%/scripts/Edit/AppPreferences/LanguagePreferences/ts/LanguagePreferences_sv.ts
+%%DATADIR%%/scripts/Edit/AppPreferences/LanguagePreferences/ts/LanguagePreferences_tr.qm
+%%DATADIR%%/scripts/Edit/AppPreferences/LanguagePreferences/ts/LanguagePreferences_tr.ts
 %%DATADIR%%/scripts/Edit/AppPreferences/LanguagePreferences/ts/LanguagePreferences_zh_CN.qm
 %%DATADIR%%/scripts/Edit/AppPreferences/LanguagePreferences/ts/LanguagePreferences_zh_CN.ts
 %%DATADIR%%/scripts/Edit/AppPreferences/LanguagePreferences/ts/LanguagePreferences_zh_TW.qm
@@ -7411,6 +7623,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Edit/AppPreferences/LayerCompatibility/ts/LayerCompatibility_sl.ts
 %%DATADIR%%/scripts/Edit/AppPreferences/LayerCompatibility/ts/LayerCompatibility_sv.qm
 %%DATADIR%%/scripts/Edit/AppPreferences/LayerCompatibility/ts/LayerCompatibility_sv.ts
+%%DATADIR%%/scripts/Edit/AppPreferences/LayerCompatibility/ts/LayerCompatibility_tr.qm
+%%DATADIR%%/scripts/Edit/AppPreferences/LayerCompatibility/ts/LayerCompatibility_tr.ts
 %%DATADIR%%/scripts/Edit/AppPreferences/LayerCompatibility/ts/LayerCompatibility_zh_CN.qm
 %%DATADIR%%/scripts/Edit/AppPreferences/LayerCompatibility/ts/LayerCompatibility_zh_CN.ts
 %%DATADIR%%/scripts/Edit/AppPreferences/LayerCompatibility/ts/LayerCompatibility_zh_TW.qm
@@ -7453,6 +7667,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Edit/AppPreferences/ScriptingPreferences/ts/ScriptingPreferences_sl.ts
 %%DATADIR%%/scripts/Edit/AppPreferences/ScriptingPreferences/ts/ScriptingPreferences_sv.qm
 %%DATADIR%%/scripts/Edit/AppPreferences/ScriptingPreferences/ts/ScriptingPreferences_sv.ts
+%%DATADIR%%/scripts/Edit/AppPreferences/ScriptingPreferences/ts/ScriptingPreferences_tr.qm
+%%DATADIR%%/scripts/Edit/AppPreferences/ScriptingPreferences/ts/ScriptingPreferences_tr.ts
 %%DATADIR%%/scripts/Edit/AppPreferences/ScriptingPreferences/ts/ScriptingPreferences_zh_CN.qm
 %%DATADIR%%/scripts/Edit/AppPreferences/ScriptingPreferences/ts/ScriptingPreferences_zh_CN.ts
 %%DATADIR%%/scripts/Edit/AppPreferences/ScriptingPreferences/ts/ScriptingPreferences_zh_TW.qm
@@ -7495,6 +7711,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Edit/AppPreferences/StartupPreferences/ts/StartupPreferences_sl.ts
 %%DATADIR%%/scripts/Edit/AppPreferences/StartupPreferences/ts/StartupPreferences_sv.qm
 %%DATADIR%%/scripts/Edit/AppPreferences/StartupPreferences/ts/StartupPreferences_sv.ts
+%%DATADIR%%/scripts/Edit/AppPreferences/StartupPreferences/ts/StartupPreferences_tr.qm
+%%DATADIR%%/scripts/Edit/AppPreferences/StartupPreferences/ts/StartupPreferences_tr.ts
 %%DATADIR%%/scripts/Edit/AppPreferences/StartupPreferences/ts/StartupPreferences_zh_CN.qm
 %%DATADIR%%/scripts/Edit/AppPreferences/StartupPreferences/ts/StartupPreferences_zh_CN.ts
 %%DATADIR%%/scripts/Edit/AppPreferences/StartupPreferences/ts/StartupPreferences_zh_TW.qm
@@ -7537,6 +7755,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Edit/AppPreferences/TextPreferences/ts/TextPreferences_sl.ts
 %%DATADIR%%/scripts/Edit/AppPreferences/TextPreferences/ts/TextPreferences_sv.qm
 %%DATADIR%%/scripts/Edit/AppPreferences/TextPreferences/ts/TextPreferences_sv.ts
+%%DATADIR%%/scripts/Edit/AppPreferences/TextPreferences/ts/TextPreferences_tr.qm
+%%DATADIR%%/scripts/Edit/AppPreferences/TextPreferences/ts/TextPreferences_tr.ts
 %%DATADIR%%/scripts/Edit/AppPreferences/TextPreferences/ts/TextPreferences_zh_CN.qm
 %%DATADIR%%/scripts/Edit/AppPreferences/TextPreferences/ts/TextPreferences_zh_CN.ts
 %%DATADIR%%/scripts/Edit/AppPreferences/TextPreferences/ts/TextPreferences_zh_TW.qm
@@ -7579,6 +7799,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Edit/AppPreferences/ThemePreferences/ts/ThemePreferences_sl.ts
 %%DATADIR%%/scripts/Edit/AppPreferences/ThemePreferences/ts/ThemePreferences_sv.qm
 %%DATADIR%%/scripts/Edit/AppPreferences/ThemePreferences/ts/ThemePreferences_sv.ts
+%%DATADIR%%/scripts/Edit/AppPreferences/ThemePreferences/ts/ThemePreferences_tr.qm
+%%DATADIR%%/scripts/Edit/AppPreferences/ThemePreferences/ts/ThemePreferences_tr.ts
 %%DATADIR%%/scripts/Edit/AppPreferences/ThemePreferences/ts/ThemePreferences_zh_CN.qm
 %%DATADIR%%/scripts/Edit/AppPreferences/ThemePreferences/ts/ThemePreferences_zh_CN.ts
 %%DATADIR%%/scripts/Edit/AppPreferences/ThemePreferences/ts/ThemePreferences_zh_TW.qm
@@ -7621,6 +7843,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Edit/AppPreferences/ToolBarPreferences/ts/ToolBarPreferences_sl.ts
 %%DATADIR%%/scripts/Edit/AppPreferences/ToolBarPreferences/ts/ToolBarPreferences_sv.qm
 %%DATADIR%%/scripts/Edit/AppPreferences/ToolBarPreferences/ts/ToolBarPreferences_sv.ts
+%%DATADIR%%/scripts/Edit/AppPreferences/ToolBarPreferences/ts/ToolBarPreferences_tr.qm
+%%DATADIR%%/scripts/Edit/AppPreferences/ToolBarPreferences/ts/ToolBarPreferences_tr.ts
 %%DATADIR%%/scripts/Edit/AppPreferences/ToolBarPreferences/ts/ToolBarPreferences_zh_CN.qm
 %%DATADIR%%/scripts/Edit/AppPreferences/ToolBarPreferences/ts/ToolBarPreferences_zh_CN.ts
 %%DATADIR%%/scripts/Edit/AppPreferences/ToolBarPreferences/ts/ToolBarPreferences_zh_TW.qm
@@ -7672,6 +7896,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Edit/AppPreferences/ts/AppPreferences_sl.ts
 %%DATADIR%%/scripts/Edit/AppPreferences/ts/AppPreferences_sv.qm
 %%DATADIR%%/scripts/Edit/AppPreferences/ts/AppPreferences_sv.ts
+%%DATADIR%%/scripts/Edit/AppPreferences/ts/AppPreferences_tr.qm
+%%DATADIR%%/scripts/Edit/AppPreferences/ts/AppPreferences_tr.ts
 %%DATADIR%%/scripts/Edit/AppPreferences/ts/AppPreferences_zh_CN.qm
 %%DATADIR%%/scripts/Edit/AppPreferences/ts/AppPreferences_zh_CN.ts
 %%DATADIR%%/scripts/Edit/AppPreferences/ts/AppPreferences_zh_TW.qm
@@ -7729,6 +7955,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Edit/ConvertUnit/ts/ConvertUnit_sl.ts
 %%DATADIR%%/scripts/Edit/ConvertUnit/ts/ConvertUnit_sv.qm
 %%DATADIR%%/scripts/Edit/ConvertUnit/ts/ConvertUnit_sv.ts
+%%DATADIR%%/scripts/Edit/ConvertUnit/ts/ConvertUnit_tr.qm
+%%DATADIR%%/scripts/Edit/ConvertUnit/ts/ConvertUnit_tr.ts
 %%DATADIR%%/scripts/Edit/ConvertUnit/ts/ConvertUnit_zh_CN.qm
 %%DATADIR%%/scripts/Edit/ConvertUnit/ts/ConvertUnit_zh_CN.ts
 %%DATADIR%%/scripts/Edit/ConvertUnit/ts/ConvertUnit_zh_TW.qm
@@ -7812,6 +8040,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Edit/Copy/ts/Copy_sl.ts
 %%DATADIR%%/scripts/Edit/Copy/ts/Copy_sv.qm
 %%DATADIR%%/scripts/Edit/Copy/ts/Copy_sv.ts
+%%DATADIR%%/scripts/Edit/Copy/ts/Copy_tr.qm
+%%DATADIR%%/scripts/Edit/Copy/ts/Copy_tr.ts
 %%DATADIR%%/scripts/Edit/Copy/ts/Copy_zh_CN.qm
 %%DATADIR%%/scripts/Edit/Copy/ts/Copy_zh_CN.ts
 %%DATADIR%%/scripts/Edit/Copy/ts/Copy_zh_TW.qm
@@ -7884,6 +8114,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Edit/CopyWithReference/ts/CopyWithReference_sl.ts
 %%DATADIR%%/scripts/Edit/CopyWithReference/ts/CopyWithReference_sv.qm
 %%DATADIR%%/scripts/Edit/CopyWithReference/ts/CopyWithReference_sv.ts
+%%DATADIR%%/scripts/Edit/CopyWithReference/ts/CopyWithReference_tr.qm
+%%DATADIR%%/scripts/Edit/CopyWithReference/ts/CopyWithReference_tr.ts
 %%DATADIR%%/scripts/Edit/CopyWithReference/ts/CopyWithReference_zh_CN.qm
 %%DATADIR%%/scripts/Edit/CopyWithReference/ts/CopyWithReference_zh_CN.ts
 %%DATADIR%%/scripts/Edit/CopyWithReference/ts/CopyWithReference_zh_TW.qm
@@ -7948,6 +8180,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Edit/Cut/ts/Cut_sl.ts
 %%DATADIR%%/scripts/Edit/Cut/ts/Cut_sv.qm
 %%DATADIR%%/scripts/Edit/Cut/ts/Cut_sv.ts
+%%DATADIR%%/scripts/Edit/Cut/ts/Cut_tr.qm
+%%DATADIR%%/scripts/Edit/Cut/ts/Cut_tr.ts
 %%DATADIR%%/scripts/Edit/Cut/ts/Cut_zh_CN.qm
 %%DATADIR%%/scripts/Edit/Cut/ts/Cut_zh_CN.ts
 %%DATADIR%%/scripts/Edit/Cut/ts/Cut_zh_TW.qm
@@ -8012,6 +8246,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Edit/CutWithReference/ts/CutWithReference_sl.ts
 %%DATADIR%%/scripts/Edit/CutWithReference/ts/CutWithReference_sv.qm
 %%DATADIR%%/scripts/Edit/CutWithReference/ts/CutWithReference_sv.ts
+%%DATADIR%%/scripts/Edit/CutWithReference/ts/CutWithReference_tr.qm
+%%DATADIR%%/scripts/Edit/CutWithReference/ts/CutWithReference_tr.ts
 %%DATADIR%%/scripts/Edit/CutWithReference/ts/CutWithReference_zh_CN.qm
 %%DATADIR%%/scripts/Edit/CutWithReference/ts/CutWithReference_zh_CN.ts
 %%DATADIR%%/scripts/Edit/CutWithReference/ts/CutWithReference_zh_TW.qm
@@ -8075,6 +8311,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Edit/Delete/ts/Delete_sl.ts
 %%DATADIR%%/scripts/Edit/Delete/ts/Delete_sv.qm
 %%DATADIR%%/scripts/Edit/Delete/ts/Delete_sv.ts
+%%DATADIR%%/scripts/Edit/Delete/ts/Delete_tr.qm
+%%DATADIR%%/scripts/Edit/Delete/ts/Delete_tr.ts
 %%DATADIR%%/scripts/Edit/Delete/ts/Delete_zh_CN.qm
 %%DATADIR%%/scripts/Edit/Delete/ts/Delete_zh_CN.ts
 %%DATADIR%%/scripts/Edit/Delete/ts/Delete_zh_TW.qm
@@ -8123,6 +8361,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Edit/DrawingPreferences/ColorSettings/ts/ColorSettings_sl.ts
 %%DATADIR%%/scripts/Edit/DrawingPreferences/ColorSettings/ts/ColorSettings_sv.qm
 %%DATADIR%%/scripts/Edit/DrawingPreferences/ColorSettings/ts/ColorSettings_sv.ts
+%%DATADIR%%/scripts/Edit/DrawingPreferences/ColorSettings/ts/ColorSettings_tr.qm
+%%DATADIR%%/scripts/Edit/DrawingPreferences/ColorSettings/ts/ColorSettings_tr.ts
 %%DATADIR%%/scripts/Edit/DrawingPreferences/ColorSettings/ts/ColorSettings_zh_CN.qm
 %%DATADIR%%/scripts/Edit/DrawingPreferences/ColorSettings/ts/ColorSettings_zh_CN.ts
 %%DATADIR%%/scripts/Edit/DrawingPreferences/ColorSettings/ts/ColorSettings_zh_TW.qm
@@ -8165,6 +8405,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Edit/DrawingPreferences/DimensionSettings/ts/DimensionSettings_sl.ts
 %%DATADIR%%/scripts/Edit/DrawingPreferences/DimensionSettings/ts/DimensionSettings_sv.qm
 %%DATADIR%%/scripts/Edit/DrawingPreferences/DimensionSettings/ts/DimensionSettings_sv.ts
+%%DATADIR%%/scripts/Edit/DrawingPreferences/DimensionSettings/ts/DimensionSettings_tr.qm
+%%DATADIR%%/scripts/Edit/DrawingPreferences/DimensionSettings/ts/DimensionSettings_tr.ts
 %%DATADIR%%/scripts/Edit/DrawingPreferences/DimensionSettings/ts/DimensionSettings_zh_CN.qm
 %%DATADIR%%/scripts/Edit/DrawingPreferences/DimensionSettings/ts/DimensionSettings_zh_CN.ts
 %%DATADIR%%/scripts/Edit/DrawingPreferences/DimensionSettings/ts/DimensionSettings_zh_TW.qm
@@ -8211,6 +8453,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Edit/DrawingPreferences/GridSettings/ts/GridSettings_sl.ts
 %%DATADIR%%/scripts/Edit/DrawingPreferences/GridSettings/ts/GridSettings_sv.qm
 %%DATADIR%%/scripts/Edit/DrawingPreferences/GridSettings/ts/GridSettings_sv.ts
+%%DATADIR%%/scripts/Edit/DrawingPreferences/GridSettings/ts/GridSettings_tr.qm
+%%DATADIR%%/scripts/Edit/DrawingPreferences/GridSettings/ts/GridSettings_tr.ts
 %%DATADIR%%/scripts/Edit/DrawingPreferences/GridSettings/ts/GridSettings_zh_CN.qm
 %%DATADIR%%/scripts/Edit/DrawingPreferences/GridSettings/ts/GridSettings_zh_CN.ts
 %%DATADIR%%/scripts/Edit/DrawingPreferences/GridSettings/ts/GridSettings_zh_TW.qm
@@ -8253,6 +8497,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Edit/DrawingPreferences/LinetypeSettings/ts/LinetypeSettings_sl.ts
 %%DATADIR%%/scripts/Edit/DrawingPreferences/LinetypeSettings/ts/LinetypeSettings_sv.qm
 %%DATADIR%%/scripts/Edit/DrawingPreferences/LinetypeSettings/ts/LinetypeSettings_sv.ts
+%%DATADIR%%/scripts/Edit/DrawingPreferences/LinetypeSettings/ts/LinetypeSettings_tr.qm
+%%DATADIR%%/scripts/Edit/DrawingPreferences/LinetypeSettings/ts/LinetypeSettings_tr.ts
 %%DATADIR%%/scripts/Edit/DrawingPreferences/LinetypeSettings/ts/LinetypeSettings_zh_CN.qm
 %%DATADIR%%/scripts/Edit/DrawingPreferences/LinetypeSettings/ts/LinetypeSettings_zh_CN.ts
 %%DATADIR%%/scripts/Edit/DrawingPreferences/LinetypeSettings/ts/LinetypeSettings_zh_TW.qm
@@ -8295,6 +8541,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Edit/DrawingPreferences/PageSettings/ts/PageSettings_sl.ts
 %%DATADIR%%/scripts/Edit/DrawingPreferences/PageSettings/ts/PageSettings_sv.qm
 %%DATADIR%%/scripts/Edit/DrawingPreferences/PageSettings/ts/PageSettings_sv.ts
+%%DATADIR%%/scripts/Edit/DrawingPreferences/PageSettings/ts/PageSettings_tr.qm
+%%DATADIR%%/scripts/Edit/DrawingPreferences/PageSettings/ts/PageSettings_tr.ts
 %%DATADIR%%/scripts/Edit/DrawingPreferences/PageSettings/ts/PageSettings_zh_CN.qm
 %%DATADIR%%/scripts/Edit/DrawingPreferences/PageSettings/ts/PageSettings_zh_CN.ts
 %%DATADIR%%/scripts/Edit/DrawingPreferences/PageSettings/ts/PageSettings_zh_TW.qm
@@ -8358,6 +8606,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Edit/DrawingPreferences/PointDisplaySettings/ts/PointDisplaySettings_sl.ts
 %%DATADIR%%/scripts/Edit/DrawingPreferences/PointDisplaySettings/ts/PointDisplaySettings_sv.qm
 %%DATADIR%%/scripts/Edit/DrawingPreferences/PointDisplaySettings/ts/PointDisplaySettings_sv.ts
+%%DATADIR%%/scripts/Edit/DrawingPreferences/PointDisplaySettings/ts/PointDisplaySettings_tr.qm
+%%DATADIR%%/scripts/Edit/DrawingPreferences/PointDisplaySettings/ts/PointDisplaySettings_tr.ts
 %%DATADIR%%/scripts/Edit/DrawingPreferences/PointDisplaySettings/ts/PointDisplaySettings_zh_CN.qm
 %%DATADIR%%/scripts/Edit/DrawingPreferences/PointDisplaySettings/ts/PointDisplaySettings_zh_CN.ts
 %%DATADIR%%/scripts/Edit/DrawingPreferences/PointDisplaySettings/ts/PointDisplaySettings_zh_TW.qm
@@ -8400,6 +8650,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Edit/DrawingPreferences/UnitSettings/ts/UnitSettings_sl.ts
 %%DATADIR%%/scripts/Edit/DrawingPreferences/UnitSettings/ts/UnitSettings_sv.qm
 %%DATADIR%%/scripts/Edit/DrawingPreferences/UnitSettings/ts/UnitSettings_sv.ts
+%%DATADIR%%/scripts/Edit/DrawingPreferences/UnitSettings/ts/UnitSettings_tr.qm
+%%DATADIR%%/scripts/Edit/DrawingPreferences/UnitSettings/ts/UnitSettings_tr.ts
 %%DATADIR%%/scripts/Edit/DrawingPreferences/UnitSettings/ts/UnitSettings_zh_CN.qm
 %%DATADIR%%/scripts/Edit/DrawingPreferences/UnitSettings/ts/UnitSettings_zh_CN.ts
 %%DATADIR%%/scripts/Edit/DrawingPreferences/UnitSettings/ts/UnitSettings_zh_TW.qm
@@ -8442,6 +8694,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Edit/DrawingPreferences/ViewportSettings/ts/ViewportSettings_sl.ts
 %%DATADIR%%/scripts/Edit/DrawingPreferences/ViewportSettings/ts/ViewportSettings_sv.qm
 %%DATADIR%%/scripts/Edit/DrawingPreferences/ViewportSettings/ts/ViewportSettings_sv.ts
+%%DATADIR%%/scripts/Edit/DrawingPreferences/ViewportSettings/ts/ViewportSettings_tr.qm
+%%DATADIR%%/scripts/Edit/DrawingPreferences/ViewportSettings/ts/ViewportSettings_tr.ts
 %%DATADIR%%/scripts/Edit/DrawingPreferences/ViewportSettings/ts/ViewportSettings_zh_CN.qm
 %%DATADIR%%/scripts/Edit/DrawingPreferences/ViewportSettings/ts/ViewportSettings_zh_CN.ts
 %%DATADIR%%/scripts/Edit/DrawingPreferences/ViewportSettings/ts/ViewportSettings_zh_TW.qm
@@ -8494,6 +8748,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Edit/DrawingPreferences/ts/DrawingPreferences_sl.ts
 %%DATADIR%%/scripts/Edit/DrawingPreferences/ts/DrawingPreferences_sv.qm
 %%DATADIR%%/scripts/Edit/DrawingPreferences/ts/DrawingPreferences_sv.ts
+%%DATADIR%%/scripts/Edit/DrawingPreferences/ts/DrawingPreferences_tr.qm
+%%DATADIR%%/scripts/Edit/DrawingPreferences/ts/DrawingPreferences_tr.ts
 %%DATADIR%%/scripts/Edit/DrawingPreferences/ts/DrawingPreferences_zh_CN.qm
 %%DATADIR%%/scripts/Edit/DrawingPreferences/ts/DrawingPreferences_zh_CN.ts
 %%DATADIR%%/scripts/Edit/DrawingPreferences/ts/DrawingPreferences_zh_TW.qm
@@ -8564,6 +8820,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Edit/Duplicate/ts/Duplicate_sl.ts
 %%DATADIR%%/scripts/Edit/Duplicate/ts/Duplicate_sv.qm
 %%DATADIR%%/scripts/Edit/Duplicate/ts/Duplicate_sv.ts
+%%DATADIR%%/scripts/Edit/Duplicate/ts/Duplicate_tr.qm
+%%DATADIR%%/scripts/Edit/Duplicate/ts/Duplicate_tr.ts
 %%DATADIR%%/scripts/Edit/Duplicate/ts/Duplicate_zh_CN.qm
 %%DATADIR%%/scripts/Edit/Duplicate/ts/Duplicate_zh_CN.ts
 %%DATADIR%%/scripts/Edit/Duplicate/ts/Duplicate_zh_TW.qm
@@ -8626,6 +8884,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Edit/Esc/ts/Esc_sl.ts
 %%DATADIR%%/scripts/Edit/Esc/ts/Esc_sv.qm
 %%DATADIR%%/scripts/Edit/Esc/ts/Esc_sv.ts
+%%DATADIR%%/scripts/Edit/Esc/ts/Esc_tr.qm
+%%DATADIR%%/scripts/Edit/Esc/ts/Esc_tr.ts
 %%DATADIR%%/scripts/Edit/Esc/ts/Esc_zh_CN.qm
 %%DATADIR%%/scripts/Edit/Esc/ts/Esc_zh_CN.ts
 %%DATADIR%%/scripts/Edit/Esc/ts/Esc_zh_TW.qm
@@ -8713,6 +8973,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Edit/Paste/ts/Paste_sl.ts
 %%DATADIR%%/scripts/Edit/Paste/ts/Paste_sv.qm
 %%DATADIR%%/scripts/Edit/Paste/ts/Paste_sv.ts
+%%DATADIR%%/scripts/Edit/Paste/ts/Paste_tr.qm
+%%DATADIR%%/scripts/Edit/Paste/ts/Paste_tr.ts
 %%DATADIR%%/scripts/Edit/Paste/ts/Paste_zh_CN.qm
 %%DATADIR%%/scripts/Edit/Paste/ts/Paste_zh_CN.ts
 %%DATADIR%%/scripts/Edit/Paste/ts/Paste_zh_TW.qm
@@ -8774,6 +9036,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Edit/Redo/ts/Redo_sl.ts
 %%DATADIR%%/scripts/Edit/Redo/ts/Redo_sv.qm
 %%DATADIR%%/scripts/Edit/Redo/ts/Redo_sv.ts
+%%DATADIR%%/scripts/Edit/Redo/ts/Redo_tr.qm
+%%DATADIR%%/scripts/Edit/Redo/ts/Redo_tr.ts
 %%DATADIR%%/scripts/Edit/Redo/ts/Redo_zh_CN.qm
 %%DATADIR%%/scripts/Edit/Redo/ts/Redo_zh_CN.ts
 %%DATADIR%%/scripts/Edit/Redo/ts/Redo_zh_TW.qm
@@ -8835,6 +9099,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Edit/Undo/ts/Undo_sl.ts
 %%DATADIR%%/scripts/Edit/Undo/ts/Undo_sv.qm
 %%DATADIR%%/scripts/Edit/Undo/ts/Undo_sv.ts
+%%DATADIR%%/scripts/Edit/Undo/ts/Undo_tr.qm
+%%DATADIR%%/scripts/Edit/Undo/ts/Undo_tr.ts
 %%DATADIR%%/scripts/Edit/Undo/ts/Undo_zh_CN.qm
 %%DATADIR%%/scripts/Edit/Undo/ts/Undo_zh_CN.ts
 %%DATADIR%%/scripts/Edit/Undo/ts/Undo_zh_TW.qm
@@ -8885,6 +9151,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Edit/ts/Edit_sl.ts
 %%DATADIR%%/scripts/Edit/ts/Edit_sv.qm
 %%DATADIR%%/scripts/Edit/ts/Edit_sv.ts
+%%DATADIR%%/scripts/Edit/ts/Edit_tr.qm
+%%DATADIR%%/scripts/Edit/ts/Edit_tr.ts
 %%DATADIR%%/scripts/Edit/ts/Edit_zh_CN.qm
 %%DATADIR%%/scripts/Edit/ts/Edit_zh_CN.ts
 %%DATADIR%%/scripts/Edit/ts/Edit_zh_TW.qm
@@ -8931,6 +9199,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/File/AutoSave/ts/AutoSave_sl.ts
 %%DATADIR%%/scripts/File/AutoSave/ts/AutoSave_sv.qm
 %%DATADIR%%/scripts/File/AutoSave/ts/AutoSave_sv.ts
+%%DATADIR%%/scripts/File/AutoSave/ts/AutoSave_tr.qm
+%%DATADIR%%/scripts/File/AutoSave/ts/AutoSave_tr.ts
 %%DATADIR%%/scripts/File/AutoSave/ts/AutoSave_zh_CN.qm
 %%DATADIR%%/scripts/File/AutoSave/ts/AutoSave_zh_CN.ts
 %%DATADIR%%/scripts/File/AutoSave/ts/AutoSave_zh_TW.qm
@@ -9003,6 +9273,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/File/BitmapExport/ts/BitmapExport_sl.ts
 %%DATADIR%%/scripts/File/BitmapExport/ts/BitmapExport_sv.qm
 %%DATADIR%%/scripts/File/BitmapExport/ts/BitmapExport_sv.ts
+%%DATADIR%%/scripts/File/BitmapExport/ts/BitmapExport_tr.qm
+%%DATADIR%%/scripts/File/BitmapExport/ts/BitmapExport_tr.ts
 %%DATADIR%%/scripts/File/BitmapExport/ts/BitmapExport_zh_CN.qm
 %%DATADIR%%/scripts/File/BitmapExport/ts/BitmapExport_zh_CN.ts
 %%DATADIR%%/scripts/File/BitmapExport/ts/BitmapExport_zh_TW.qm
@@ -9064,6 +9336,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/File/CloseFile/ts/CloseFile_sl.ts
 %%DATADIR%%/scripts/File/CloseFile/ts/CloseFile_sv.qm
 %%DATADIR%%/scripts/File/CloseFile/ts/CloseFile_sv.ts
+%%DATADIR%%/scripts/File/CloseFile/ts/CloseFile_tr.qm
+%%DATADIR%%/scripts/File/CloseFile/ts/CloseFile_tr.ts
 %%DATADIR%%/scripts/File/CloseFile/ts/CloseFile_zh_CN.qm
 %%DATADIR%%/scripts/File/CloseFile/ts/CloseFile_zh_CN.ts
 %%DATADIR%%/scripts/File/CloseFile/ts/CloseFile_zh_TW.qm
@@ -9121,6 +9395,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/File/ImportFile/ts/ImportFile_sl.ts
 %%DATADIR%%/scripts/File/ImportFile/ts/ImportFile_sv.qm
 %%DATADIR%%/scripts/File/ImportFile/ts/ImportFile_sv.ts
+%%DATADIR%%/scripts/File/ImportFile/ts/ImportFile_tr.qm
+%%DATADIR%%/scripts/File/ImportFile/ts/ImportFile_tr.ts
 %%DATADIR%%/scripts/File/ImportFile/ts/ImportFile_zh_CN.qm
 %%DATADIR%%/scripts/File/ImportFile/ts/ImportFile_zh_CN.ts
 %%DATADIR%%/scripts/File/ImportFile/ts/ImportFile_zh_TW.qm
@@ -9187,6 +9463,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/File/NewFile/ts/NewFile_sl.ts
 %%DATADIR%%/scripts/File/NewFile/ts/NewFile_sv.qm
 %%DATADIR%%/scripts/File/NewFile/ts/NewFile_sv.ts
+%%DATADIR%%/scripts/File/NewFile/ts/NewFile_tr.qm
+%%DATADIR%%/scripts/File/NewFile/ts/NewFile_tr.ts
 %%DATADIR%%/scripts/File/NewFile/ts/NewFile_zh_CN.qm
 %%DATADIR%%/scripts/File/NewFile/ts/NewFile_zh_CN.ts
 %%DATADIR%%/scripts/File/NewFile/ts/NewFile_zh_TW.qm
@@ -9248,6 +9526,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/File/OpenFile/ts/OpenFile_sl.ts
 %%DATADIR%%/scripts/File/OpenFile/ts/OpenFile_sv.qm
 %%DATADIR%%/scripts/File/OpenFile/ts/OpenFile_sv.ts
+%%DATADIR%%/scripts/File/OpenFile/ts/OpenFile_tr.qm
+%%DATADIR%%/scripts/File/OpenFile/ts/OpenFile_tr.ts
 %%DATADIR%%/scripts/File/OpenFile/ts/OpenFile_zh_CN.qm
 %%DATADIR%%/scripts/File/OpenFile/ts/OpenFile_zh_CN.ts
 %%DATADIR%%/scripts/File/OpenFile/ts/OpenFile_zh_TW.qm
@@ -9308,6 +9588,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/File/PdfExport/ts/PdfExport_sl.ts
 %%DATADIR%%/scripts/File/PdfExport/ts/PdfExport_sv.qm
 %%DATADIR%%/scripts/File/PdfExport/ts/PdfExport_sv.ts
+%%DATADIR%%/scripts/File/PdfExport/ts/PdfExport_tr.qm
+%%DATADIR%%/scripts/File/PdfExport/ts/PdfExport_tr.ts
 %%DATADIR%%/scripts/File/PdfExport/ts/PdfExport_zh_CN.qm
 %%DATADIR%%/scripts/File/PdfExport/ts/PdfExport_zh_CN.ts
 %%DATADIR%%/scripts/File/PdfExport/ts/PdfExport_zh_TW.qm
@@ -9367,6 +9649,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/File/Print/ts/Print_sl.ts
 %%DATADIR%%/scripts/File/Print/ts/Print_sv.qm
 %%DATADIR%%/scripts/File/Print/ts/Print_sv.ts
+%%DATADIR%%/scripts/File/Print/ts/Print_tr.qm
+%%DATADIR%%/scripts/File/Print/ts/Print_tr.ts
 %%DATADIR%%/scripts/File/Print/ts/Print_zh_CN.qm
 %%DATADIR%%/scripts/File/Print/ts/Print_zh_CN.ts
 %%DATADIR%%/scripts/File/Print/ts/Print_zh_TW.qm
@@ -9428,6 +9712,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/File/PrintCurrentView/ts/PrintCurrentView_sl.ts
 %%DATADIR%%/scripts/File/PrintCurrentView/ts/PrintCurrentView_sv.qm
 %%DATADIR%%/scripts/File/PrintCurrentView/ts/PrintCurrentView_sv.ts
+%%DATADIR%%/scripts/File/PrintCurrentView/ts/PrintCurrentView_tr.qm
+%%DATADIR%%/scripts/File/PrintCurrentView/ts/PrintCurrentView_tr.ts
 %%DATADIR%%/scripts/File/PrintCurrentView/ts/PrintCurrentView_zh_CN.qm
 %%DATADIR%%/scripts/File/PrintCurrentView/ts/PrintCurrentView_zh_CN.ts
 %%DATADIR%%/scripts/File/PrintCurrentView/ts/PrintCurrentView_zh_TW.qm
@@ -9518,6 +9804,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/File/PrintPreview/ts/PrintPreview_sl.ts
 %%DATADIR%%/scripts/File/PrintPreview/ts/PrintPreview_sv.qm
 %%DATADIR%%/scripts/File/PrintPreview/ts/PrintPreview_sv.ts
+%%DATADIR%%/scripts/File/PrintPreview/ts/PrintPreview_tr.qm
+%%DATADIR%%/scripts/File/PrintPreview/ts/PrintPreview_tr.ts
 %%DATADIR%%/scripts/File/PrintPreview/ts/PrintPreview_zh_CN.qm
 %%DATADIR%%/scripts/File/PrintPreview/ts/PrintPreview_zh_CN.ts
 %%DATADIR%%/scripts/File/PrintPreview/ts/PrintPreview_zh_TW.qm
@@ -9576,6 +9864,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/File/Quit/ts/Quit_sl.ts
 %%DATADIR%%/scripts/File/Quit/ts/Quit_sv.qm
 %%DATADIR%%/scripts/File/Quit/ts/Quit_sv.ts
+%%DATADIR%%/scripts/File/Quit/ts/Quit_tr.qm
+%%DATADIR%%/scripts/File/Quit/ts/Quit_tr.ts
 %%DATADIR%%/scripts/File/Quit/ts/Quit_zh_CN.qm
 %%DATADIR%%/scripts/File/Quit/ts/Quit_zh_CN.ts
 %%DATADIR%%/scripts/File/Quit/ts/Quit_zh_TW.qm
@@ -9618,6 +9908,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/File/RecentFiles/ts/RecentFiles_sl.ts
 %%DATADIR%%/scripts/File/RecentFiles/ts/RecentFiles_sv.qm
 %%DATADIR%%/scripts/File/RecentFiles/ts/RecentFiles_sv.ts
+%%DATADIR%%/scripts/File/RecentFiles/ts/RecentFiles_tr.qm
+%%DATADIR%%/scripts/File/RecentFiles/ts/RecentFiles_tr.ts
 %%DATADIR%%/scripts/File/RecentFiles/ts/RecentFiles_zh_CN.qm
 %%DATADIR%%/scripts/File/RecentFiles/ts/RecentFiles_zh_CN.ts
 %%DATADIR%%/scripts/File/RecentFiles/ts/RecentFiles_zh_TW.qm
@@ -9678,6 +9970,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/File/Save/ts/Save_sl.ts
 %%DATADIR%%/scripts/File/Save/ts/Save_sv.qm
 %%DATADIR%%/scripts/File/Save/ts/Save_sv.ts
+%%DATADIR%%/scripts/File/Save/ts/Save_tr.qm
+%%DATADIR%%/scripts/File/Save/ts/Save_tr.ts
 %%DATADIR%%/scripts/File/Save/ts/Save_zh_CN.qm
 %%DATADIR%%/scripts/File/Save/ts/Save_zh_CN.ts
 %%DATADIR%%/scripts/File/Save/ts/Save_zh_TW.qm
@@ -9739,6 +10033,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/File/SaveAs/ts/SaveAs_sl.ts
 %%DATADIR%%/scripts/File/SaveAs/ts/SaveAs_sv.qm
 %%DATADIR%%/scripts/File/SaveAs/ts/SaveAs_sv.ts
+%%DATADIR%%/scripts/File/SaveAs/ts/SaveAs_tr.qm
+%%DATADIR%%/scripts/File/SaveAs/ts/SaveAs_tr.ts
 %%DATADIR%%/scripts/File/SaveAs/ts/SaveAs_zh_CN.qm
 %%DATADIR%%/scripts/File/SaveAs/ts/SaveAs_zh_CN.ts
 %%DATADIR%%/scripts/File/SaveAs/ts/SaveAs_zh_TW.qm
@@ -9802,6 +10098,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/File/SvgImport/ts/SvgImport_sl.ts
 %%DATADIR%%/scripts/File/SvgImport/ts/SvgImport_sv.qm
 %%DATADIR%%/scripts/File/SvgImport/ts/SvgImport_sv.ts
+%%DATADIR%%/scripts/File/SvgImport/ts/SvgImport_tr.qm
+%%DATADIR%%/scripts/File/SvgImport/ts/SvgImport_tr.ts
 %%DATADIR%%/scripts/File/SvgImport/ts/SvgImport_zh_CN.qm
 %%DATADIR%%/scripts/File/SvgImport/ts/SvgImport_zh_CN.ts
 %%DATADIR%%/scripts/File/SvgImport/ts/SvgImport_zh_TW.qm
@@ -9849,6 +10147,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/File/ts/File_sl.ts
 %%DATADIR%%/scripts/File/ts/File_sv.qm
 %%DATADIR%%/scripts/File/ts/File_sv.ts
+%%DATADIR%%/scripts/File/ts/File_tr.qm
+%%DATADIR%%/scripts/File/ts/File_tr.ts
 %%DATADIR%%/scripts/File/ts/File_zh_CN.qm
 %%DATADIR%%/scripts/File/ts/File_zh_CN.ts
 %%DATADIR%%/scripts/File/ts/File_zh_TW.qm
@@ -9905,6 +10205,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Help/About/ts/About_sl.ts
 %%DATADIR%%/scripts/Help/About/ts/About_sv.qm
 %%DATADIR%%/scripts/Help/About/ts/About_sv.ts
+%%DATADIR%%/scripts/Help/About/ts/About_tr.qm
+%%DATADIR%%/scripts/Help/About/ts/About_tr.ts
 %%DATADIR%%/scripts/Help/About/ts/About_zh_CN.qm
 %%DATADIR%%/scripts/Help/About/ts/About_zh_CN.ts
 %%DATADIR%%/scripts/Help/About/ts/About_zh_TW.qm
@@ -9948,6 +10250,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Help/BrowseUserManual/ts/BrowseUserManual_sl.ts
 %%DATADIR%%/scripts/Help/BrowseUserManual/ts/BrowseUserManual_sv.qm
 %%DATADIR%%/scripts/Help/BrowseUserManual/ts/BrowseUserManual_sv.ts
+%%DATADIR%%/scripts/Help/BrowseUserManual/ts/BrowseUserManual_tr.qm
+%%DATADIR%%/scripts/Help/BrowseUserManual/ts/BrowseUserManual_tr.ts
 %%DATADIR%%/scripts/Help/BrowseUserManual/ts/BrowseUserManual_zh_CN.qm
 %%DATADIR%%/scripts/Help/BrowseUserManual/ts/BrowseUserManual_zh_CN.ts
 %%DATADIR%%/scripts/Help/BrowseUserManual/ts/BrowseUserManual_zh_TW.qm
@@ -10000,6 +10304,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Help/CheckForUpdates/ts/CheckForUpdates_sl.ts
 %%DATADIR%%/scripts/Help/CheckForUpdates/ts/CheckForUpdates_sv.qm
 %%DATADIR%%/scripts/Help/CheckForUpdates/ts/CheckForUpdates_sv.ts
+%%DATADIR%%/scripts/Help/CheckForUpdates/ts/CheckForUpdates_tr.qm
+%%DATADIR%%/scripts/Help/CheckForUpdates/ts/CheckForUpdates_tr.ts
 %%DATADIR%%/scripts/Help/CheckForUpdates/ts/CheckForUpdates_zh_CN.qm
 %%DATADIR%%/scripts/Help/CheckForUpdates/ts/CheckForUpdates_zh_CN.ts
 %%DATADIR%%/scripts/Help/CheckForUpdates/ts/CheckForUpdates_zh_TW.qm
@@ -10052,6 +10358,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Help/FAQ/ts/FAQ_sl.ts
 %%DATADIR%%/scripts/Help/FAQ/ts/FAQ_sv.qm
 %%DATADIR%%/scripts/Help/FAQ/ts/FAQ_sv.ts
+%%DATADIR%%/scripts/Help/FAQ/ts/FAQ_tr.qm
+%%DATADIR%%/scripts/Help/FAQ/ts/FAQ_tr.ts
 %%DATADIR%%/scripts/Help/FAQ/ts/FAQ_zh_CN.qm
 %%DATADIR%%/scripts/Help/FAQ/ts/FAQ_zh_CN.ts
 %%DATADIR%%/scripts/Help/FAQ/ts/FAQ_zh_TW.qm
@@ -10104,6 +10412,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Help/Forum/ts/Forum_sl.ts
 %%DATADIR%%/scripts/Help/Forum/ts/Forum_sv.qm
 %%DATADIR%%/scripts/Help/Forum/ts/Forum_sv.ts
+%%DATADIR%%/scripts/Help/Forum/ts/Forum_tr.qm
+%%DATADIR%%/scripts/Help/Forum/ts/Forum_tr.ts
 %%DATADIR%%/scripts/Help/Forum/ts/Forum_zh_CN.qm
 %%DATADIR%%/scripts/Help/Forum/ts/Forum_zh_CN.ts
 %%DATADIR%%/scripts/Help/Forum/ts/Forum_zh_TW.qm
@@ -10158,6 +10468,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Help/ReportBug/ts/ReportBug_sl.ts
 %%DATADIR%%/scripts/Help/ReportBug/ts/ReportBug_sv.qm
 %%DATADIR%%/scripts/Help/ReportBug/ts/ReportBug_sv.ts
+%%DATADIR%%/scripts/Help/ReportBug/ts/ReportBug_tr.qm
+%%DATADIR%%/scripts/Help/ReportBug/ts/ReportBug_tr.ts
 %%DATADIR%%/scripts/Help/ReportBug/ts/ReportBug_zh_CN.qm
 %%DATADIR%%/scripts/Help/ReportBug/ts/ReportBug_zh_CN.ts
 %%DATADIR%%/scripts/Help/ReportBug/ts/ReportBug_zh_TW.qm
@@ -10202,6 +10514,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Help/ReportTranslationError/ts/ReportTranslationError_sl.ts
 %%DATADIR%%/scripts/Help/ReportTranslationError/ts/ReportTranslationError_sv.qm
 %%DATADIR%%/scripts/Help/ReportTranslationError/ts/ReportTranslationError_sv.ts
+%%DATADIR%%/scripts/Help/ReportTranslationError/ts/ReportTranslationError_tr.qm
+%%DATADIR%%/scripts/Help/ReportTranslationError/ts/ReportTranslationError_tr.ts
 %%DATADIR%%/scripts/Help/ReportTranslationError/ts/ReportTranslationError_zh_CN.qm
 %%DATADIR%%/scripts/Help/ReportTranslationError/ts/ReportTranslationError_zh_CN.ts
 %%DATADIR%%/scripts/Help/ReportTranslationError/ts/ReportTranslationError_zh_TW.qm
@@ -10247,6 +10561,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Help/ShowReadme/ts/ShowReadme_sl.ts
 %%DATADIR%%/scripts/Help/ShowReadme/ts/ShowReadme_sv.qm
 %%DATADIR%%/scripts/Help/ShowReadme/ts/ShowReadme_sv.ts
+%%DATADIR%%/scripts/Help/ShowReadme/ts/ShowReadme_tr.qm
+%%DATADIR%%/scripts/Help/ShowReadme/ts/ShowReadme_tr.ts
 %%DATADIR%%/scripts/Help/ShowReadme/ts/ShowReadme_zh_CN.qm
 %%DATADIR%%/scripts/Help/ShowReadme/ts/ShowReadme_zh_CN.ts
 %%DATADIR%%/scripts/Help/ShowReadme/ts/ShowReadme_zh_TW.qm
@@ -10299,6 +10615,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Help/Website/ts/Website_sl.ts
 %%DATADIR%%/scripts/Help/Website/ts/Website_sv.qm
 %%DATADIR%%/scripts/Help/Website/ts/Website_sv.ts
+%%DATADIR%%/scripts/Help/Website/ts/Website_tr.qm
+%%DATADIR%%/scripts/Help/Website/ts/Website_tr.ts
 %%DATADIR%%/scripts/Help/Website/ts/Website_zh_CN.qm
 %%DATADIR%%/scripts/Help/Website/ts/Website_zh_CN.ts
 %%DATADIR%%/scripts/Help/Website/ts/Website_zh_TW.qm
@@ -10340,6 +10658,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Help/ts/Help_sl.ts
 %%DATADIR%%/scripts/Help/ts/Help_sv.qm
 %%DATADIR%%/scripts/Help/ts/Help_sv.ts
+%%DATADIR%%/scripts/Help/ts/Help_tr.qm
+%%DATADIR%%/scripts/Help/ts/Help_tr.ts
 %%DATADIR%%/scripts/Help/ts/Help_zh_CN.qm
 %%DATADIR%%/scripts/Help/ts/Help_zh_CN.ts
 %%DATADIR%%/scripts/Help/ts/Help_zh_TW.qm
@@ -10414,6 +10734,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Information/InfoAngle/ts/InfoAngle_sl.ts
 %%DATADIR%%/scripts/Information/InfoAngle/ts/InfoAngle_sv.qm
 %%DATADIR%%/scripts/Information/InfoAngle/ts/InfoAngle_sv.ts
+%%DATADIR%%/scripts/Information/InfoAngle/ts/InfoAngle_tr.qm
+%%DATADIR%%/scripts/Information/InfoAngle/ts/InfoAngle_tr.ts
 %%DATADIR%%/scripts/Information/InfoAngle/ts/InfoAngle_zh_CN.qm
 %%DATADIR%%/scripts/Information/InfoAngle/ts/InfoAngle_zh_CN.ts
 %%DATADIR%%/scripts/Information/InfoAngle/ts/InfoAngle_zh_TW.qm
@@ -10481,6 +10803,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Information/InfoArcCircleArea/ts/InfoArcCircleArea_sl.ts
 %%DATADIR%%/scripts/Information/InfoArcCircleArea/ts/InfoArcCircleArea_sv.qm
 %%DATADIR%%/scripts/Information/InfoArcCircleArea/ts/InfoArcCircleArea_sv.ts
+%%DATADIR%%/scripts/Information/InfoArcCircleArea/ts/InfoArcCircleArea_tr.qm
+%%DATADIR%%/scripts/Information/InfoArcCircleArea/ts/InfoArcCircleArea_tr.ts
 %%DATADIR%%/scripts/Information/InfoArcCircleArea/ts/InfoArcCircleArea_zh_CN.qm
 %%DATADIR%%/scripts/Information/InfoArcCircleArea/ts/InfoArcCircleArea_zh_CN.ts
 %%DATADIR%%/scripts/Information/InfoArcCircleArea/ts/InfoArcCircleArea_zh_TW.qm
@@ -10557,6 +10881,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Information/InfoArea/ts/InfoArea_sl.ts
 %%DATADIR%%/scripts/Information/InfoArea/ts/InfoArea_sv.qm
 %%DATADIR%%/scripts/Information/InfoArea/ts/InfoArea_sv.ts
+%%DATADIR%%/scripts/Information/InfoArea/ts/InfoArea_tr.qm
+%%DATADIR%%/scripts/Information/InfoArea/ts/InfoArea_tr.ts
 %%DATADIR%%/scripts/Information/InfoArea/ts/InfoArea_zh_CN.qm
 %%DATADIR%%/scripts/Information/InfoArea/ts/InfoArea_zh_CN.ts
 %%DATADIR%%/scripts/Information/InfoArea/ts/InfoArea_zh_TW.qm
@@ -10637,6 +10963,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Information/InfoDistanceEE/ts/InfoDistanceEE_sl.ts
 %%DATADIR%%/scripts/Information/InfoDistanceEE/ts/InfoDistanceEE_sv.qm
 %%DATADIR%%/scripts/Information/InfoDistanceEE/ts/InfoDistanceEE_sv.ts
+%%DATADIR%%/scripts/Information/InfoDistanceEE/ts/InfoDistanceEE_tr.qm
+%%DATADIR%%/scripts/Information/InfoDistanceEE/ts/InfoDistanceEE_tr.ts
 %%DATADIR%%/scripts/Information/InfoDistanceEE/ts/InfoDistanceEE_zh_CN.qm
 %%DATADIR%%/scripts/Information/InfoDistanceEE/ts/InfoDistanceEE_zh_CN.ts
 %%DATADIR%%/scripts/Information/InfoDistanceEE/ts/InfoDistanceEE_zh_TW.qm
@@ -10709,6 +11037,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Information/InfoDistanceEP/ts/InfoDistanceEP_sl.ts
 %%DATADIR%%/scripts/Information/InfoDistanceEP/ts/InfoDistanceEP_sv.qm
 %%DATADIR%%/scripts/Information/InfoDistanceEP/ts/InfoDistanceEP_sv.ts
+%%DATADIR%%/scripts/Information/InfoDistanceEP/ts/InfoDistanceEP_tr.qm
+%%DATADIR%%/scripts/Information/InfoDistanceEP/ts/InfoDistanceEP_tr.ts
 %%DATADIR%%/scripts/Information/InfoDistanceEP/ts/InfoDistanceEP_zh_CN.qm
 %%DATADIR%%/scripts/Information/InfoDistanceEP/ts/InfoDistanceEP_zh_CN.ts
 %%DATADIR%%/scripts/Information/InfoDistanceEP/ts/InfoDistanceEP_zh_TW.qm
@@ -10781,6 +11111,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Information/InfoDistancePP/ts/InfoDistancePP_sl.ts
 %%DATADIR%%/scripts/Information/InfoDistancePP/ts/InfoDistancePP_sv.qm
 %%DATADIR%%/scripts/Information/InfoDistancePP/ts/InfoDistancePP_sv.ts
+%%DATADIR%%/scripts/Information/InfoDistancePP/ts/InfoDistancePP_tr.qm
+%%DATADIR%%/scripts/Information/InfoDistancePP/ts/InfoDistancePP_tr.ts
 %%DATADIR%%/scripts/Information/InfoDistancePP/ts/InfoDistancePP_zh_CN.qm
 %%DATADIR%%/scripts/Information/InfoDistancePP/ts/InfoDistancePP_zh_CN.ts
 %%DATADIR%%/scripts/Information/InfoDistancePP/ts/InfoDistancePP_zh_TW.qm
@@ -10847,6 +11179,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Information/InfoPolylineArea/ts/InfoPolylineArea_sl.ts
 %%DATADIR%%/scripts/Information/InfoPolylineArea/ts/InfoPolylineArea_sv.qm
 %%DATADIR%%/scripts/Information/InfoPolylineArea/ts/InfoPolylineArea_sv.ts
+%%DATADIR%%/scripts/Information/InfoPolylineArea/ts/InfoPolylineArea_tr.qm
+%%DATADIR%%/scripts/Information/InfoPolylineArea/ts/InfoPolylineArea_tr.ts
 %%DATADIR%%/scripts/Information/InfoPolylineArea/ts/InfoPolylineArea_zh_CN.qm
 %%DATADIR%%/scripts/Information/InfoPolylineArea/ts/InfoPolylineArea_zh_CN.ts
 %%DATADIR%%/scripts/Information/InfoPolylineArea/ts/InfoPolylineArea_zh_TW.qm
@@ -10908,6 +11242,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Information/InfoPosition/ts/InfoPosition_sl.ts
 %%DATADIR%%/scripts/Information/InfoPosition/ts/InfoPosition_sv.qm
 %%DATADIR%%/scripts/Information/InfoPosition/ts/InfoPosition_sv.ts
+%%DATADIR%%/scripts/Information/InfoPosition/ts/InfoPosition_tr.qm
+%%DATADIR%%/scripts/Information/InfoPosition/ts/InfoPosition_tr.ts
 %%DATADIR%%/scripts/Information/InfoPosition/ts/InfoPosition_zh_CN.qm
 %%DATADIR%%/scripts/Information/InfoPosition/ts/InfoPosition_zh_CN.ts
 %%DATADIR%%/scripts/Information/InfoPosition/ts/InfoPosition_zh_TW.qm
@@ -10966,6 +11302,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Information/InfoPositionPol/ts/InfoPositionPol_sl.ts
 %%DATADIR%%/scripts/Information/InfoPositionPol/ts/InfoPositionPol_sv.qm
 %%DATADIR%%/scripts/Information/InfoPositionPol/ts/InfoPositionPol_sv.ts
+%%DATADIR%%/scripts/Information/InfoPositionPol/ts/InfoPositionPol_tr.qm
+%%DATADIR%%/scripts/Information/InfoPositionPol/ts/InfoPositionPol_tr.ts
 %%DATADIR%%/scripts/Information/InfoPositionPol/ts/InfoPositionPol_zh_CN.qm
 %%DATADIR%%/scripts/Information/InfoPositionPol/ts/InfoPositionPol_zh_CN.ts
 %%DATADIR%%/scripts/Information/InfoPositionPol/ts/InfoPositionPol_zh_TW.qm
@@ -11024,6 +11362,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Information/InfoPositionPolRel/ts/InfoPositionPolRel_sl.ts
 %%DATADIR%%/scripts/Information/InfoPositionPolRel/ts/InfoPositionPolRel_sv.qm
 %%DATADIR%%/scripts/Information/InfoPositionPolRel/ts/InfoPositionPolRel_sv.ts
+%%DATADIR%%/scripts/Information/InfoPositionPolRel/ts/InfoPositionPolRel_tr.qm
+%%DATADIR%%/scripts/Information/InfoPositionPolRel/ts/InfoPositionPolRel_tr.ts
 %%DATADIR%%/scripts/Information/InfoPositionPolRel/ts/InfoPositionPolRel_zh_CN.qm
 %%DATADIR%%/scripts/Information/InfoPositionPolRel/ts/InfoPositionPolRel_zh_CN.ts
 %%DATADIR%%/scripts/Information/InfoPositionPolRel/ts/InfoPositionPolRel_zh_TW.qm
@@ -11082,6 +11422,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Information/InfoPositionRel/ts/InfoPositionRel_sl.ts
 %%DATADIR%%/scripts/Information/InfoPositionRel/ts/InfoPositionRel_sv.qm
 %%DATADIR%%/scripts/Information/InfoPositionRel/ts/InfoPositionRel_sv.ts
+%%DATADIR%%/scripts/Information/InfoPositionRel/ts/InfoPositionRel_tr.qm
+%%DATADIR%%/scripts/Information/InfoPositionRel/ts/InfoPositionRel_tr.ts
 %%DATADIR%%/scripts/Information/InfoPositionRel/ts/InfoPositionRel_zh_CN.qm
 %%DATADIR%%/scripts/Information/InfoPositionRel/ts/InfoPositionRel_zh_CN.ts
 %%DATADIR%%/scripts/Information/InfoPositionRel/ts/InfoPositionRel_zh_TW.qm
@@ -11138,6 +11480,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Information/ts/Information_sl.ts
 %%DATADIR%%/scripts/Information/ts/Information_sv.qm
 %%DATADIR%%/scripts/Information/ts/Information_sv.ts
+%%DATADIR%%/scripts/Information/ts/Information_tr.qm
+%%DATADIR%%/scripts/Information/ts/Information_tr.ts
 %%DATADIR%%/scripts/Information/ts/Information_zh_CN.qm
 %%DATADIR%%/scripts/Information/ts/Information_zh_CN.ts
 %%DATADIR%%/scripts/Information/ts/Information_zh_TW.qm
@@ -11207,6 +11551,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Layer/AddLayer/ts/AddLayer_sl.ts
 %%DATADIR%%/scripts/Layer/AddLayer/ts/AddLayer_sv.qm
 %%DATADIR%%/scripts/Layer/AddLayer/ts/AddLayer_sv.ts
+%%DATADIR%%/scripts/Layer/AddLayer/ts/AddLayer_tr.qm
+%%DATADIR%%/scripts/Layer/AddLayer/ts/AddLayer_tr.ts
 %%DATADIR%%/scripts/Layer/AddLayer/ts/AddLayer_zh_CN.qm
 %%DATADIR%%/scripts/Layer/AddLayer/ts/AddLayer_zh_CN.ts
 %%DATADIR%%/scripts/Layer/AddLayer/ts/AddLayer_zh_TW.qm
@@ -11265,6 +11611,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Layer/DeselectLayer/ts/DeselectLayer_sl.ts
 %%DATADIR%%/scripts/Layer/DeselectLayer/ts/DeselectLayer_sv.qm
 %%DATADIR%%/scripts/Layer/DeselectLayer/ts/DeselectLayer_sv.ts
+%%DATADIR%%/scripts/Layer/DeselectLayer/ts/DeselectLayer_tr.qm
+%%DATADIR%%/scripts/Layer/DeselectLayer/ts/DeselectLayer_tr.ts
 %%DATADIR%%/scripts/Layer/DeselectLayer/ts/DeselectLayer_zh_CN.qm
 %%DATADIR%%/scripts/Layer/DeselectLayer/ts/DeselectLayer_zh_CN.ts
 %%DATADIR%%/scripts/Layer/DeselectLayer/ts/DeselectLayer_zh_TW.qm
@@ -11325,6 +11673,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Layer/EditLayer/ts/EditLayer_sl.ts
 %%DATADIR%%/scripts/Layer/EditLayer/ts/EditLayer_sv.qm
 %%DATADIR%%/scripts/Layer/EditLayer/ts/EditLayer_sv.ts
+%%DATADIR%%/scripts/Layer/EditLayer/ts/EditLayer_tr.qm
+%%DATADIR%%/scripts/Layer/EditLayer/ts/EditLayer_tr.ts
 %%DATADIR%%/scripts/Layer/EditLayer/ts/EditLayer_zh_CN.qm
 %%DATADIR%%/scripts/Layer/EditLayer/ts/EditLayer_zh_CN.ts
 %%DATADIR%%/scripts/Layer/EditLayer/ts/EditLayer_zh_TW.qm
@@ -11386,6 +11736,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Layer/HideAllLayers/ts/HideAllLayers_sl.ts
 %%DATADIR%%/scripts/Layer/HideAllLayers/ts/HideAllLayers_sv.qm
 %%DATADIR%%/scripts/Layer/HideAllLayers/ts/HideAllLayers_sv.ts
+%%DATADIR%%/scripts/Layer/HideAllLayers/ts/HideAllLayers_tr.qm
+%%DATADIR%%/scripts/Layer/HideAllLayers/ts/HideAllLayers_tr.ts
 %%DATADIR%%/scripts/Layer/HideAllLayers/ts/HideAllLayers_zh_CN.qm
 %%DATADIR%%/scripts/Layer/HideAllLayers/ts/HideAllLayers_zh_CN.ts
 %%DATADIR%%/scripts/Layer/HideAllLayers/ts/HideAllLayers_zh_TW.qm
@@ -11454,6 +11806,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Layer/LockAllLayers/ts/LockAllLayers_sl.ts
 %%DATADIR%%/scripts/Layer/LockAllLayers/ts/LockAllLayers_sv.qm
 %%DATADIR%%/scripts/Layer/LockAllLayers/ts/LockAllLayers_sv.ts
+%%DATADIR%%/scripts/Layer/LockAllLayers/ts/LockAllLayers_tr.qm
+%%DATADIR%%/scripts/Layer/LockAllLayers/ts/LockAllLayers_tr.ts
 %%DATADIR%%/scripts/Layer/LockAllLayers/ts/LockAllLayers_zh_CN.qm
 %%DATADIR%%/scripts/Layer/LockAllLayers/ts/LockAllLayers_zh_CN.ts
 %%DATADIR%%/scripts/Layer/LockAllLayers/ts/LockAllLayers_zh_TW.qm
@@ -11514,6 +11868,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Layer/RemoveLayer/ts/RemoveLayer_sl.ts
 %%DATADIR%%/scripts/Layer/RemoveLayer/ts/RemoveLayer_sv.qm
 %%DATADIR%%/scripts/Layer/RemoveLayer/ts/RemoveLayer_sv.ts
+%%DATADIR%%/scripts/Layer/RemoveLayer/ts/RemoveLayer_tr.qm
+%%DATADIR%%/scripts/Layer/RemoveLayer/ts/RemoveLayer_tr.ts
 %%DATADIR%%/scripts/Layer/RemoveLayer/ts/RemoveLayer_zh_CN.qm
 %%DATADIR%%/scripts/Layer/RemoveLayer/ts/RemoveLayer_zh_CN.ts
 %%DATADIR%%/scripts/Layer/RemoveLayer/ts/RemoveLayer_zh_TW.qm
@@ -11570,6 +11926,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Layer/SelectLayer/ts/SelectLayer_sl.ts
 %%DATADIR%%/scripts/Layer/SelectLayer/ts/SelectLayer_sv.qm
 %%DATADIR%%/scripts/Layer/SelectLayer/ts/SelectLayer_sv.ts
+%%DATADIR%%/scripts/Layer/SelectLayer/ts/SelectLayer_tr.qm
+%%DATADIR%%/scripts/Layer/SelectLayer/ts/SelectLayer_tr.ts
 %%DATADIR%%/scripts/Layer/SelectLayer/ts/SelectLayer_zh_CN.qm
 %%DATADIR%%/scripts/Layer/SelectLayer/ts/SelectLayer_zh_CN.ts
 %%DATADIR%%/scripts/Layer/SelectLayer/ts/SelectLayer_zh_TW.qm
@@ -11631,6 +11989,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Layer/ShowActiveLayer/ts/ShowActiveLayer_sl.ts
 %%DATADIR%%/scripts/Layer/ShowActiveLayer/ts/ShowActiveLayer_sv.qm
 %%DATADIR%%/scripts/Layer/ShowActiveLayer/ts/ShowActiveLayer_sv.ts
+%%DATADIR%%/scripts/Layer/ShowActiveLayer/ts/ShowActiveLayer_tr.qm
+%%DATADIR%%/scripts/Layer/ShowActiveLayer/ts/ShowActiveLayer_tr.ts
 %%DATADIR%%/scripts/Layer/ShowActiveLayer/ts/ShowActiveLayer_zh_CN.qm
 %%DATADIR%%/scripts/Layer/ShowActiveLayer/ts/ShowActiveLayer_zh_CN.ts
 %%DATADIR%%/scripts/Layer/ShowActiveLayer/ts/ShowActiveLayer_zh_TW.qm
@@ -11692,6 +12052,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Layer/ShowAllLayers/ts/ShowAllLayers_sl.ts
 %%DATADIR%%/scripts/Layer/ShowAllLayers/ts/ShowAllLayers_sv.qm
 %%DATADIR%%/scripts/Layer/ShowAllLayers/ts/ShowAllLayers_sv.ts
+%%DATADIR%%/scripts/Layer/ShowAllLayers/ts/ShowAllLayers_tr.qm
+%%DATADIR%%/scripts/Layer/ShowAllLayers/ts/ShowAllLayers_tr.ts
 %%DATADIR%%/scripts/Layer/ShowAllLayers/ts/ShowAllLayers_zh_CN.qm
 %%DATADIR%%/scripts/Layer/ShowAllLayers/ts/ShowAllLayers_zh_CN.ts
 %%DATADIR%%/scripts/Layer/ShowAllLayers/ts/ShowAllLayers_zh_TW.qm
@@ -11753,6 +12115,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Layer/ToggleLayerVisibility/ts/ToggleLayerVisibility_sl.ts
 %%DATADIR%%/scripts/Layer/ToggleLayerVisibility/ts/ToggleLayerVisibility_sv.qm
 %%DATADIR%%/scripts/Layer/ToggleLayerVisibility/ts/ToggleLayerVisibility_sv.ts
+%%DATADIR%%/scripts/Layer/ToggleLayerVisibility/ts/ToggleLayerVisibility_tr.qm
+%%DATADIR%%/scripts/Layer/ToggleLayerVisibility/ts/ToggleLayerVisibility_tr.ts
 %%DATADIR%%/scripts/Layer/ToggleLayerVisibility/ts/ToggleLayerVisibility_zh_CN.qm
 %%DATADIR%%/scripts/Layer/ToggleLayerVisibility/ts/ToggleLayerVisibility_zh_CN.ts
 %%DATADIR%%/scripts/Layer/ToggleLayerVisibility/ts/ToggleLayerVisibility_zh_TW.qm
@@ -11814,6 +12178,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Layer/UnlockAllLayers/ts/UnlockAllLayers_sl.ts
 %%DATADIR%%/scripts/Layer/UnlockAllLayers/ts/UnlockAllLayers_sv.qm
 %%DATADIR%%/scripts/Layer/UnlockAllLayers/ts/UnlockAllLayers_sv.ts
+%%DATADIR%%/scripts/Layer/UnlockAllLayers/ts/UnlockAllLayers_tr.qm
+%%DATADIR%%/scripts/Layer/UnlockAllLayers/ts/UnlockAllLayers_tr.ts
 %%DATADIR%%/scripts/Layer/UnlockAllLayers/ts/UnlockAllLayers_zh_CN.qm
 %%DATADIR%%/scripts/Layer/UnlockAllLayers/ts/UnlockAllLayers_zh_CN.ts
 %%DATADIR%%/scripts/Layer/UnlockAllLayers/ts/UnlockAllLayers_zh_TW.qm
@@ -11866,6 +12232,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Layer/ts/Layer_sl.ts
 %%DATADIR%%/scripts/Layer/ts/Layer_sv.qm
 %%DATADIR%%/scripts/Layer/ts/Layer_sv.ts
+%%DATADIR%%/scripts/Layer/ts/Layer_tr.qm
+%%DATADIR%%/scripts/Layer/ts/Layer_tr.ts
 %%DATADIR%%/scripts/Layer/ts/Layer_zh_CN.qm
 %%DATADIR%%/scripts/Layer/ts/Layer_zh_CN.ts
 %%DATADIR%%/scripts/Layer/ts/Layer_zh_TW.qm
@@ -12498,6 +12866,36 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Misc/MiscDraw/PointPowerCenter/ts/PointPowerCenter_sk.ts
 %%DATADIR%%/scripts/Misc/MiscDraw/PointPowerCenter/ts/PointPowerCenter_sl.qm
 %%DATADIR%%/scripts/Misc/MiscDraw/PointPowerCenter/ts/PointPowerCenter_sl.ts
+%%DATADIR%%/scripts/Misc/MiscDraw/TextAlong/Clockwise-inverse.svg
+%%DATADIR%%/scripts/Misc/MiscDraw/TextAlong/Clockwise.svg
+%%DATADIR%%/scripts/Misc/MiscDraw/TextAlong/CounterClockwise-inverse.svg
+%%DATADIR%%/scripts/Misc/MiscDraw/TextAlong/CounterClockwise.svg
+%%DATADIR%%/scripts/Misc/MiscDraw/TextAlong/TextAlong-inverse.svg
+%%DATADIR%%/scripts/Misc/MiscDraw/TextAlong/TextAlong.js
+%%DATADIR%%/scripts/Misc/MiscDraw/TextAlong/TextAlong.pro
+%%DATADIR%%/scripts/Misc/MiscDraw/TextAlong/TextAlong.svg
+%%DATADIR%%/scripts/Misc/MiscDraw/TextAlong/TextAlong.ui
+%%DATADIR%%/scripts/Misc/MiscDraw/TextAlong/TextAlongInit.js
+%%DATADIR%%/scripts/Misc/MiscDraw/TextAlong/doc/AlongArc.png
+%%DATADIR%%/scripts/Misc/MiscDraw/TextAlong/doc/AlongLine.png
+%%DATADIR%%/scripts/Misc/MiscDraw/TextAlong/doc/AlongToolbarOptions.png
+%%DATADIR%%/scripts/Misc/MiscDraw/TextAlong/doc/Clockwise.png
+%%DATADIR%%/scripts/Misc/MiscDraw/TextAlong/doc/CounterClockwise.png
+%%DATADIR%%/scripts/Misc/MiscDraw/TextAlong/doc/TextAlong.png
+%%DATADIR%%/scripts/Misc/MiscDraw/TextAlong/doc/TextAlong.txt
+%%DATADIR%%/scripts/Misc/MiscDraw/TextAlong/doc/TextAlong_desc_en.html
+%%DATADIR%%/scripts/Misc/MiscDraw/TextAlong/doc/TextAlong_en.html
+%%DATADIR%%/scripts/Misc/MiscDraw/TextAlong/doc/TextAlong_proc_en.html
+%%DATADIR%%/scripts/Misc/MiscDraw/TextAlong/ts/TextAlong_de.qm
+%%DATADIR%%/scripts/Misc/MiscDraw/TextAlong/ts/TextAlong_de.ts
+%%DATADIR%%/scripts/Misc/MiscDraw/TextAlong/ts/TextAlong_it.qm
+%%DATADIR%%/scripts/Misc/MiscDraw/TextAlong/ts/TextAlong_it.ts
+%%DATADIR%%/scripts/Misc/MiscDraw/TextAlong/ts/TextAlong_ru.qm
+%%DATADIR%%/scripts/Misc/MiscDraw/TextAlong/ts/TextAlong_ru.ts
+%%DATADIR%%/scripts/Misc/MiscDraw/TextAlong/ts/TextAlong_sk.qm
+%%DATADIR%%/scripts/Misc/MiscDraw/TextAlong/ts/TextAlong_sk.ts
+%%DATADIR%%/scripts/Misc/MiscDraw/TextAlong/ts/TextAlong_sl.qm
+%%DATADIR%%/scripts/Misc/MiscDraw/TextAlong/ts/TextAlong_sl.ts
 %%DATADIR%%/scripts/Misc/MiscDraw/XLineHorizontal/XLineHorizontal-inverse.svg
 %%DATADIR%%/scripts/Misc/MiscDraw/XLineHorizontal/XLineHorizontal.js
 %%DATADIR%%/scripts/Misc/MiscDraw/XLineHorizontal/XLineHorizontal.pro
@@ -12821,6 +13219,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Misc/ts/Misc_sl.ts
 %%DATADIR%%/scripts/Misc/ts/Misc_sv.qm
 %%DATADIR%%/scripts/Misc/ts/Misc_sv.ts
+%%DATADIR%%/scripts/Misc/ts/Misc_tr.qm
+%%DATADIR%%/scripts/Misc/ts/Misc_tr.ts
 %%DATADIR%%/scripts/Misc/ts/Misc_zh_CN.qm
 %%DATADIR%%/scripts/Misc/ts/Misc_zh_CN.ts
 %%DATADIR%%/scripts/Misc/ts/Misc_zh_TW.qm
@@ -12838,7 +13238,12 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Modify/AutoTrim/Tests/AutoTrimTest04.js
 %%DATADIR%%/scripts/Modify/AutoTrim/Tests/AutoTrimTest05.js
 %%DATADIR%%/scripts/Modify/AutoTrim/Tests/AutoTrimTest06.js
+%%DATADIR%%/scripts/Modify/AutoTrim/Tests/AutoTrimTest07.js
+%%DATADIR%%/scripts/Modify/AutoTrim/Tests/AutoTrimTest08.js
+%%DATADIR%%/scripts/Modify/AutoTrim/Tests/AutoTrimTest09.js
 %%DATADIR%%/scripts/Modify/AutoTrim/Tests/actual/.gitignore
+%%DATADIR%%/scripts/Modify/AutoTrim/Tests/data/ellipses.dxf
+%%DATADIR%%/scripts/Modify/AutoTrim/Tests/data/line.dxf
 %%DATADIR%%/scripts/Modify/AutoTrim/Tests/data/line_arc_circle.dxf
 %%DATADIR%%/scripts/Modify/AutoTrim/Tests/data/line_xline_ray.bak000.dxf
 %%DATADIR%%/scripts/Modify/AutoTrim/Tests/data/line_xline_ray.dxf
@@ -12851,6 +13256,9 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Modify/AutoTrim/Tests/required/AutoTrimTest04_000.dxf
 %%DATADIR%%/scripts/Modify/AutoTrim/Tests/required/AutoTrimTest05_000.dxf
 %%DATADIR%%/scripts/Modify/AutoTrim/Tests/required/AutoTrimTest06_000.dxf
+%%DATADIR%%/scripts/Modify/AutoTrim/Tests/required/AutoTrimTest07_000.dxf
+%%DATADIR%%/scripts/Modify/AutoTrim/Tests/required/AutoTrimTest08_000.dxf
+%%DATADIR%%/scripts/Modify/AutoTrim/Tests/required/AutoTrimTest09_000.dxf
 %%DATADIR%%/scripts/Modify/AutoTrim/doc/AutoTrim.png
 %%DATADIR%%/scripts/Modify/AutoTrim/doc/AutoTrim_de.html
 %%DATADIR%%/scripts/Modify/AutoTrim/doc/AutoTrim_desc_de.html
@@ -12911,6 +13319,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Modify/AutoTrim/ts/AutoTrim_sl.ts
 %%DATADIR%%/scripts/Modify/AutoTrim/ts/AutoTrim_sv.qm
 %%DATADIR%%/scripts/Modify/AutoTrim/ts/AutoTrim_sv.ts
+%%DATADIR%%/scripts/Modify/AutoTrim/ts/AutoTrim_tr.qm
+%%DATADIR%%/scripts/Modify/AutoTrim/ts/AutoTrim_tr.ts
 %%DATADIR%%/scripts/Modify/AutoTrim/ts/AutoTrim_zh_CN.qm
 %%DATADIR%%/scripts/Modify/AutoTrim/ts/AutoTrim_zh_CN.ts
 %%DATADIR%%/scripts/Modify/AutoTrim/ts/AutoTrim_zh_TW.qm
@@ -13004,6 +13414,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Modify/Bevel/ts/Bevel_sl.ts
 %%DATADIR%%/scripts/Modify/Bevel/ts/Bevel_sv.qm
 %%DATADIR%%/scripts/Modify/Bevel/ts/Bevel_sv.ts
+%%DATADIR%%/scripts/Modify/Bevel/ts/Bevel_tr.qm
+%%DATADIR%%/scripts/Modify/Bevel/ts/Bevel_tr.ts
 %%DATADIR%%/scripts/Modify/Bevel/ts/Bevel_zh_CN.qm
 %%DATADIR%%/scripts/Modify/Bevel/ts/Bevel_zh_CN.ts
 %%DATADIR%%/scripts/Modify/Bevel/ts/Bevel_zh_TW.qm
@@ -13115,6 +13527,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Modify/BreakOut/ts/BreakOut_sl.ts
 %%DATADIR%%/scripts/Modify/BreakOut/ts/BreakOut_sv.qm
 %%DATADIR%%/scripts/Modify/BreakOut/ts/BreakOut_sv.ts
+%%DATADIR%%/scripts/Modify/BreakOut/ts/BreakOut_tr.qm
+%%DATADIR%%/scripts/Modify/BreakOut/ts/BreakOut_tr.ts
 %%DATADIR%%/scripts/Modify/BreakOut/ts/BreakOut_zh_CN.qm
 %%DATADIR%%/scripts/Modify/BreakOut/ts/BreakOut_zh_CN.ts
 %%DATADIR%%/scripts/Modify/BreakOut/ts/BreakOut_zh_TW.qm
@@ -13172,6 +13586,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Modify/BreakOutGap/ts/BreakOutGap_sl.ts
 %%DATADIR%%/scripts/Modify/BreakOutGap/ts/BreakOutGap_sv.qm
 %%DATADIR%%/scripts/Modify/BreakOutGap/ts/BreakOutGap_sv.ts
+%%DATADIR%%/scripts/Modify/BreakOutGap/ts/BreakOutGap_tr.qm
+%%DATADIR%%/scripts/Modify/BreakOutGap/ts/BreakOutGap_tr.ts
 %%DATADIR%%/scripts/Modify/BreakOutGap/ts/BreakOutGap_zh_CN.qm
 %%DATADIR%%/scripts/Modify/BreakOutGap/ts/BreakOutGap_zh_CN.ts
 %%DATADIR%%/scripts/Modify/BreakOutGap/ts/BreakOutGap_zh_TW.qm
@@ -13236,6 +13652,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Modify/BreakOutManual/ts/BreakOutManual_sl.ts
 %%DATADIR%%/scripts/Modify/BreakOutManual/ts/BreakOutManual_sv.qm
 %%DATADIR%%/scripts/Modify/BreakOutManual/ts/BreakOutManual_sv.ts
+%%DATADIR%%/scripts/Modify/BreakOutManual/ts/BreakOutManual_tr.qm
+%%DATADIR%%/scripts/Modify/BreakOutManual/ts/BreakOutManual_tr.ts
 %%DATADIR%%/scripts/Modify/BreakOutManual/ts/BreakOutManual_zh_CN.qm
 %%DATADIR%%/scripts/Modify/BreakOutManual/ts/BreakOutManual_zh_CN.ts
 %%DATADIR%%/scripts/Modify/BreakOutManual/ts/BreakOutManual_zh_TW.qm
@@ -13312,6 +13730,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Modify/Divide/ts/Divide_sl.ts
 %%DATADIR%%/scripts/Modify/Divide/ts/Divide_sv.qm
 %%DATADIR%%/scripts/Modify/Divide/ts/Divide_sv.ts
+%%DATADIR%%/scripts/Modify/Divide/ts/Divide_tr.qm
+%%DATADIR%%/scripts/Modify/Divide/ts/Divide_tr.ts
 %%DATADIR%%/scripts/Modify/Divide/ts/Divide_zh_CN.qm
 %%DATADIR%%/scripts/Modify/Divide/ts/Divide_zh_CN.ts
 %%DATADIR%%/scripts/Modify/Divide/ts/Divide_zh_TW.qm
@@ -13381,6 +13801,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Modify/EditHatch/ts/EditHatch_sl.ts
 %%DATADIR%%/scripts/Modify/EditHatch/ts/EditHatch_sv.qm
 %%DATADIR%%/scripts/Modify/EditHatch/ts/EditHatch_sv.ts
+%%DATADIR%%/scripts/Modify/EditHatch/ts/EditHatch_tr.qm
+%%DATADIR%%/scripts/Modify/EditHatch/ts/EditHatch_tr.ts
 %%DATADIR%%/scripts/Modify/EditHatch/ts/EditHatch_zh_CN.qm
 %%DATADIR%%/scripts/Modify/EditHatch/ts/EditHatch_zh_CN.ts
 %%DATADIR%%/scripts/Modify/EditHatch/ts/EditHatch_zh_TW.qm
@@ -13450,6 +13872,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Modify/EditText/ts/EditText_sl.ts
 %%DATADIR%%/scripts/Modify/EditText/ts/EditText_sv.qm
 %%DATADIR%%/scripts/Modify/EditText/ts/EditText_sv.ts
+%%DATADIR%%/scripts/Modify/EditText/ts/EditText_tr.qm
+%%DATADIR%%/scripts/Modify/EditText/ts/EditText_tr.ts
 %%DATADIR%%/scripts/Modify/EditText/ts/EditText_zh_CN.qm
 %%DATADIR%%/scripts/Modify/EditText/ts/EditText_zh_CN.ts
 %%DATADIR%%/scripts/Modify/EditText/ts/EditText_zh_TW.qm
@@ -13465,7 +13889,9 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Modify/Explode/Tests/ExplodeTest01.js
 %%DATADIR%%/scripts/Modify/Explode/Tests/ExplodeTest02.js
 %%DATADIR%%/scripts/Modify/Explode/Tests/ExplodeTest03.js
+%%DATADIR%%/scripts/Modify/Explode/Tests/ExplodeTest04.js
 %%DATADIR%%/scripts/Modify/Explode/Tests/actual/.gitignore
+%%DATADIR%%/scripts/Modify/Explode/Tests/data/attributes.dxf
 %%DATADIR%%/scripts/Modify/Explode/Tests/data/block.dxf
 %%DATADIR%%/scripts/Modify/Explode/Tests/data/explodable.dxf
 %%DATADIR%%/scripts/Modify/Explode/Tests/data/splines.dxf
@@ -13473,6 +13899,7 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Modify/Explode/Tests/required/ExplodeTest01_000.dxf
 %%DATADIR%%/scripts/Modify/Explode/Tests/required/ExplodeTest02_000.dxf
 %%DATADIR%%/scripts/Modify/Explode/Tests/required/ExplodeTest03_000.dxf
+%%DATADIR%%/scripts/Modify/Explode/Tests/required/ExplodeTest04_000.dxf
 %%DATADIR%%/scripts/Modify/Explode/doc/Explode.png
 %%DATADIR%%/scripts/Modify/Explode/doc/Explode_de.html
 %%DATADIR%%/scripts/Modify/Explode/doc/Explode_desc_de.html
@@ -13533,6 +13960,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Modify/Explode/ts/Explode_sl.ts
 %%DATADIR%%/scripts/Modify/Explode/ts/Explode_sv.qm
 %%DATADIR%%/scripts/Modify/Explode/ts/Explode_sv.ts
+%%DATADIR%%/scripts/Modify/Explode/ts/Explode_tr.qm
+%%DATADIR%%/scripts/Modify/Explode/ts/Explode_tr.ts
 %%DATADIR%%/scripts/Modify/Explode/ts/Explode_zh_CN.qm
 %%DATADIR%%/scripts/Modify/Explode/ts/Explode_zh_CN.ts
 %%DATADIR%%/scripts/Modify/Explode/ts/Explode_zh_TW.qm
@@ -13587,6 +14016,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Modify/FlipHorizontal/ts/FlipHorizontal_sl.ts
 %%DATADIR%%/scripts/Modify/FlipHorizontal/ts/FlipHorizontal_sv.qm
 %%DATADIR%%/scripts/Modify/FlipHorizontal/ts/FlipHorizontal_sv.ts
+%%DATADIR%%/scripts/Modify/FlipHorizontal/ts/FlipHorizontal_tr.qm
+%%DATADIR%%/scripts/Modify/FlipHorizontal/ts/FlipHorizontal_tr.ts
 %%DATADIR%%/scripts/Modify/FlipHorizontal/ts/FlipHorizontal_zh_CN.qm
 %%DATADIR%%/scripts/Modify/FlipHorizontal/ts/FlipHorizontal_zh_CN.ts
 %%DATADIR%%/scripts/Modify/FlipHorizontal/ts/FlipHorizontal_zh_TW.qm
@@ -13641,6 +14072,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Modify/FlipVertical/ts/FlipVertical_sl.ts
 %%DATADIR%%/scripts/Modify/FlipVertical/ts/FlipVertical_sv.qm
 %%DATADIR%%/scripts/Modify/FlipVertical/ts/FlipVertical_sv.ts
+%%DATADIR%%/scripts/Modify/FlipVertical/ts/FlipVertical_tr.qm
+%%DATADIR%%/scripts/Modify/FlipVertical/ts/FlipVertical_tr.ts
 %%DATADIR%%/scripts/Modify/FlipVertical/ts/FlipVertical_zh_CN.qm
 %%DATADIR%%/scripts/Modify/FlipVertical/ts/FlipVertical_zh_CN.ts
 %%DATADIR%%/scripts/Modify/FlipVertical/ts/FlipVertical_zh_TW.qm
@@ -13724,6 +14157,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Modify/Lengthen/ts/Lengthen_sl.ts
 %%DATADIR%%/scripts/Modify/Lengthen/ts/Lengthen_sv.qm
 %%DATADIR%%/scripts/Modify/Lengthen/ts/Lengthen_sv.ts
+%%DATADIR%%/scripts/Modify/Lengthen/ts/Lengthen_tr.qm
+%%DATADIR%%/scripts/Modify/Lengthen/ts/Lengthen_tr.ts
 %%DATADIR%%/scripts/Modify/Lengthen/ts/Lengthen_zh_CN.qm
 %%DATADIR%%/scripts/Modify/Lengthen/ts/Lengthen_zh_CN.ts
 %%DATADIR%%/scripts/Modify/Lengthen/ts/Lengthen_zh_TW.qm
@@ -13803,6 +14238,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Modify/Mirror/ts/Mirror_sl.ts
 %%DATADIR%%/scripts/Modify/Mirror/ts/Mirror_sv.qm
 %%DATADIR%%/scripts/Modify/Mirror/ts/Mirror_sv.ts
+%%DATADIR%%/scripts/Modify/Mirror/ts/Mirror_tr.qm
+%%DATADIR%%/scripts/Modify/Mirror/ts/Mirror_tr.ts
 %%DATADIR%%/scripts/Modify/Mirror/ts/Mirror_zh_CN.qm
 %%DATADIR%%/scripts/Modify/Mirror/ts/Mirror_zh_CN.ts
 %%DATADIR%%/scripts/Modify/Mirror/ts/Mirror_zh_TW.qm
@@ -13886,6 +14323,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Modify/Offset/ts/Offset_sl.ts
 %%DATADIR%%/scripts/Modify/Offset/ts/Offset_sv.qm
 %%DATADIR%%/scripts/Modify/Offset/ts/Offset_sv.ts
+%%DATADIR%%/scripts/Modify/Offset/ts/Offset_tr.qm
+%%DATADIR%%/scripts/Modify/Offset/ts/Offset_tr.ts
 %%DATADIR%%/scripts/Modify/Offset/ts/Offset_zh_CN.qm
 %%DATADIR%%/scripts/Modify/Offset/ts/Offset_zh_CN.ts
 %%DATADIR%%/scripts/Modify/Offset/ts/Offset_zh_TW.qm
@@ -13956,6 +14395,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Modify/OffsetThrough/ts/OffsetThrough_sl.ts
 %%DATADIR%%/scripts/Modify/OffsetThrough/ts/OffsetThrough_sv.qm
 %%DATADIR%%/scripts/Modify/OffsetThrough/ts/OffsetThrough_sv.ts
+%%DATADIR%%/scripts/Modify/OffsetThrough/ts/OffsetThrough_tr.qm
+%%DATADIR%%/scripts/Modify/OffsetThrough/ts/OffsetThrough_tr.ts
 %%DATADIR%%/scripts/Modify/OffsetThrough/ts/OffsetThrough_zh_CN.qm
 %%DATADIR%%/scripts/Modify/OffsetThrough/ts/OffsetThrough_zh_CN.ts
 %%DATADIR%%/scripts/Modify/OffsetThrough/ts/OffsetThrough_zh_TW.qm
@@ -14021,6 +14462,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Modify/Reverse/ts/Reverse_sl.ts
 %%DATADIR%%/scripts/Modify/Reverse/ts/Reverse_sv.qm
 %%DATADIR%%/scripts/Modify/Reverse/ts/Reverse_sv.ts
+%%DATADIR%%/scripts/Modify/Reverse/ts/Reverse_tr.qm
+%%DATADIR%%/scripts/Modify/Reverse/ts/Reverse_tr.ts
 %%DATADIR%%/scripts/Modify/Reverse/ts/Reverse_zh_CN.qm
 %%DATADIR%%/scripts/Modify/Reverse/ts/Reverse_zh_CN.ts
 %%DATADIR%%/scripts/Modify/Reverse/ts/Reverse_zh_TW.qm
@@ -14102,6 +14545,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Modify/Rotate/ts/Rotate_sl.ts
 %%DATADIR%%/scripts/Modify/Rotate/ts/Rotate_sv.qm
 %%DATADIR%%/scripts/Modify/Rotate/ts/Rotate_sv.ts
+%%DATADIR%%/scripts/Modify/Rotate/ts/Rotate_tr.qm
+%%DATADIR%%/scripts/Modify/Rotate/ts/Rotate_tr.ts
 %%DATADIR%%/scripts/Modify/Rotate/ts/Rotate_zh_CN.qm
 %%DATADIR%%/scripts/Modify/Rotate/ts/Rotate_zh_CN.ts
 %%DATADIR%%/scripts/Modify/Rotate/ts/Rotate_zh_TW.qm
@@ -14198,6 +14643,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Modify/Rotate2/ts/Rotate2_sl.ts
 %%DATADIR%%/scripts/Modify/Rotate2/ts/Rotate2_sv.qm
 %%DATADIR%%/scripts/Modify/Rotate2/ts/Rotate2_sv.ts
+%%DATADIR%%/scripts/Modify/Rotate2/ts/Rotate2_tr.qm
+%%DATADIR%%/scripts/Modify/Rotate2/ts/Rotate2_tr.ts
 %%DATADIR%%/scripts/Modify/Rotate2/ts/Rotate2_zh_CN.qm
 %%DATADIR%%/scripts/Modify/Rotate2/ts/Rotate2_zh_CN.ts
 %%DATADIR%%/scripts/Modify/Rotate2/ts/Rotate2_zh_TW.qm
@@ -14277,6 +14724,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Modify/Round/ts/Round_sl.ts
 %%DATADIR%%/scripts/Modify/Round/ts/Round_sv.qm
 %%DATADIR%%/scripts/Modify/Round/ts/Round_sv.ts
+%%DATADIR%%/scripts/Modify/Round/ts/Round_tr.qm
+%%DATADIR%%/scripts/Modify/Round/ts/Round_tr.ts
 %%DATADIR%%/scripts/Modify/Round/ts/Round_zh_CN.qm
 %%DATADIR%%/scripts/Modify/Round/ts/Round_zh_CN.ts
 %%DATADIR%%/scripts/Modify/Round/ts/Round_zh_TW.qm
@@ -14299,11 +14748,13 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Modify/Scale/Tests/ScaleTest05.js
 %%DATADIR%%/scripts/Modify/Scale/Tests/ScaleTest06.js
 %%DATADIR%%/scripts/Modify/Scale/Tests/ScaleTest07.js
+%%DATADIR%%/scripts/Modify/Scale/Tests/ScaleTest08.js
 %%DATADIR%%/scripts/Modify/Scale/Tests/actual/.gitignore
 %%DATADIR%%/scripts/Modify/Scale/Tests/data/arcs.dxf
 %%DATADIR%%/scripts/Modify/Scale/Tests/data/circles.dxf
 %%DATADIR%%/scripts/Modify/Scale/Tests/data/ellipses_ellipse_arcs.dxf
 %%DATADIR%%/scripts/Modify/Scale/Tests/data/lines.dxf
+%%DATADIR%%/scripts/Modify/Scale/Tests/data/mtext.dxf
 %%DATADIR%%/scripts/Modify/Scale/Tests/data/points.dxf
 %%DATADIR%%/scripts/Modify/Scale/Tests/data/polyline.dxf
 %%DATADIR%%/scripts/Modify/Scale/Tests/data/spline.dxf
@@ -14316,6 +14767,7 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Modify/Scale/Tests/required/ScaleTest05_000.dxf
 %%DATADIR%%/scripts/Modify/Scale/Tests/required/ScaleTest06_000.dxf
 %%DATADIR%%/scripts/Modify/Scale/Tests/required/ScaleTest07_000.dxf
+%%DATADIR%%/scripts/Modify/Scale/Tests/required/ScaleTest08_000.dxf
 %%DATADIR%%/scripts/Modify/Scale/doc/ByMouse.png
 %%DATADIR%%/scripts/Modify/Scale/doc/KeepProportionsOff.png
 %%DATADIR%%/scripts/Modify/Scale/doc/KeepProportionsOn.png
@@ -14380,6 +14832,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Modify/Scale/ts/Scale_sl.ts
 %%DATADIR%%/scripts/Modify/Scale/ts/Scale_sv.qm
 %%DATADIR%%/scripts/Modify/Scale/ts/Scale_sv.ts
+%%DATADIR%%/scripts/Modify/Scale/ts/Scale_tr.qm
+%%DATADIR%%/scripts/Modify/Scale/ts/Scale_tr.ts
 %%DATADIR%%/scripts/Modify/Scale/ts/Scale_zh_CN.qm
 %%DATADIR%%/scripts/Modify/Scale/ts/Scale_zh_CN.ts
 %%DATADIR%%/scripts/Modify/Scale/ts/Scale_zh_TW.qm
@@ -14391,11 +14845,13 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Modify/Stretch/StretchInit.js
 %%DATADIR%%/scripts/Modify/Stretch/Tests/StretchTest00.js
 %%DATADIR%%/scripts/Modify/Stretch/Tests/StretchTest01.js
+%%DATADIR%%/scripts/Modify/Stretch/Tests/StretchTest02.js
 %%DATADIR%%/scripts/Modify/Stretch/Tests/actual/.gitignore
 %%DATADIR%%/scripts/Modify/Stretch/Tests/data/entities0.dxf
 %%DATADIR%%/scripts/Modify/Stretch/Tests/data/entities1.dxf
 %%DATADIR%%/scripts/Modify/Stretch/Tests/required/StretchTest00_000.dxf
 %%DATADIR%%/scripts/Modify/Stretch/Tests/required/StretchTest01_000.dxf
+%%DATADIR%%/scripts/Modify/Stretch/Tests/required/StretchTest02_000.dxf
 %%DATADIR%%/scripts/Modify/Stretch/doc/Stretch.png
 %%DATADIR%%/scripts/Modify/Stretch/doc/StretchFigure.dxf
 %%DATADIR%%/scripts/Modify/Stretch/doc/StretchFigure.png
@@ -14459,6 +14915,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Modify/Stretch/ts/Stretch_sl.ts
 %%DATADIR%%/scripts/Modify/Stretch/ts/Stretch_sv.qm
 %%DATADIR%%/scripts/Modify/Stretch/ts/Stretch_sv.ts
+%%DATADIR%%/scripts/Modify/Stretch/ts/Stretch_tr.qm
+%%DATADIR%%/scripts/Modify/Stretch/ts/Stretch_tr.ts
 %%DATADIR%%/scripts/Modify/Stretch/ts/Stretch_zh_CN.qm
 %%DATADIR%%/scripts/Modify/Stretch/ts/Stretch_zh_CN.ts
 %%DATADIR%%/scripts/Modify/Stretch/ts/Stretch_zh_TW.qm
@@ -14528,6 +14986,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Modify/ToBack/ts/ToBack_sl.ts
 %%DATADIR%%/scripts/Modify/ToBack/ts/ToBack_sv.qm
 %%DATADIR%%/scripts/Modify/ToBack/ts/ToBack_sv.ts
+%%DATADIR%%/scripts/Modify/ToBack/ts/ToBack_tr.qm
+%%DATADIR%%/scripts/Modify/ToBack/ts/ToBack_tr.ts
 %%DATADIR%%/scripts/Modify/ToBack/ts/ToBack_zh_CN.qm
 %%DATADIR%%/scripts/Modify/ToBack/ts/ToBack_zh_CN.ts
 %%DATADIR%%/scripts/Modify/ToBack/ts/ToBack_zh_TW.qm
@@ -14597,6 +15057,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Modify/ToFront/ts/ToFront_sl.ts
 %%DATADIR%%/scripts/Modify/ToFront/ts/ToFront_sv.qm
 %%DATADIR%%/scripts/Modify/ToFront/ts/ToFront_sv.ts
+%%DATADIR%%/scripts/Modify/ToFront/ts/ToFront_tr.qm
+%%DATADIR%%/scripts/Modify/ToFront/ts/ToFront_tr.ts
 %%DATADIR%%/scripts/Modify/ToFront/ts/ToFront_zh_CN.qm
 %%DATADIR%%/scripts/Modify/ToFront/ts/ToFront_zh_CN.ts
 %%DATADIR%%/scripts/Modify/ToFront/ts/ToFront_zh_TW.qm
@@ -14681,6 +15143,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Modify/Translate/ts/Translate_sl.ts
 %%DATADIR%%/scripts/Modify/Translate/ts/Translate_sv.qm
 %%DATADIR%%/scripts/Modify/Translate/ts/Translate_sv.ts
+%%DATADIR%%/scripts/Modify/Translate/ts/Translate_tr.qm
+%%DATADIR%%/scripts/Modify/Translate/ts/Translate_tr.ts
 %%DATADIR%%/scripts/Modify/Translate/ts/Translate_zh_CN.qm
 %%DATADIR%%/scripts/Modify/Translate/ts/Translate_zh_CN.ts
 %%DATADIR%%/scripts/Modify/Translate/ts/Translate_zh_TW.qm
@@ -14765,6 +15229,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Modify/TranslateRotate/ts/TranslateRotate_sl.ts
 %%DATADIR%%/scripts/Modify/TranslateRotate/ts/TranslateRotate_sv.qm
 %%DATADIR%%/scripts/Modify/TranslateRotate/ts/TranslateRotate_sv.ts
+%%DATADIR%%/scripts/Modify/TranslateRotate/ts/TranslateRotate_tr.qm
+%%DATADIR%%/scripts/Modify/TranslateRotate/ts/TranslateRotate_tr.ts
 %%DATADIR%%/scripts/Modify/TranslateRotate/ts/TranslateRotate_zh_CN.qm
 %%DATADIR%%/scripts/Modify/TranslateRotate/ts/TranslateRotate_zh_CN.ts
 %%DATADIR%%/scripts/Modify/TranslateRotate/ts/TranslateRotate_zh_TW.qm
@@ -14867,6 +15333,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Modify/Trim/ts/Trim_sl.ts
 %%DATADIR%%/scripts/Modify/Trim/ts/Trim_sv.qm
 %%DATADIR%%/scripts/Modify/Trim/ts/Trim_sv.ts
+%%DATADIR%%/scripts/Modify/Trim/ts/Trim_tr.qm
+%%DATADIR%%/scripts/Modify/Trim/ts/Trim_tr.ts
 %%DATADIR%%/scripts/Modify/Trim/ts/Trim_zh_CN.qm
 %%DATADIR%%/scripts/Modify/Trim/ts/Trim_zh_CN.ts
 %%DATADIR%%/scripts/Modify/Trim/ts/Trim_zh_TW.qm
@@ -14955,6 +15423,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Modify/TrimBoth/ts/TrimBoth_sl.ts
 %%DATADIR%%/scripts/Modify/TrimBoth/ts/TrimBoth_sv.qm
 %%DATADIR%%/scripts/Modify/TrimBoth/ts/TrimBoth_sv.ts
+%%DATADIR%%/scripts/Modify/TrimBoth/ts/TrimBoth_tr.qm
+%%DATADIR%%/scripts/Modify/TrimBoth/ts/TrimBoth_tr.ts
 %%DATADIR%%/scripts/Modify/TrimBoth/ts/TrimBoth_zh_CN.qm
 %%DATADIR%%/scripts/Modify/TrimBoth/ts/TrimBoth_zh_CN.ts
 %%DATADIR%%/scripts/Modify/TrimBoth/ts/TrimBoth_zh_TW.qm
@@ -15002,6 +15472,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Modify/ts/Modify_sl.ts
 %%DATADIR%%/scripts/Modify/ts/Modify_sv.qm
 %%DATADIR%%/scripts/Modify/ts/Modify_sv.ts
+%%DATADIR%%/scripts/Modify/ts/Modify_tr.qm
+%%DATADIR%%/scripts/Modify/ts/Modify_tr.ts
 %%DATADIR%%/scripts/Modify/ts/Modify_zh_CN.qm
 %%DATADIR%%/scripts/Modify/ts/Modify_zh_CN.ts
 %%DATADIR%%/scripts/Modify/ts/Modify_zh_TW.qm
@@ -15044,6 +15516,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Navigation/DefaultNavigation/ts/DefaultNavigation_sl.ts
 %%DATADIR%%/scripts/Navigation/DefaultNavigation/ts/DefaultNavigation_sv.qm
 %%DATADIR%%/scripts/Navigation/DefaultNavigation/ts/DefaultNavigation_sv.ts
+%%DATADIR%%/scripts/Navigation/DefaultNavigation/ts/DefaultNavigation_tr.qm
+%%DATADIR%%/scripts/Navigation/DefaultNavigation/ts/DefaultNavigation_tr.ts
 %%DATADIR%%/scripts/Navigation/DefaultNavigation/ts/DefaultNavigation_zh_CN.qm
 %%DATADIR%%/scripts/Navigation/DefaultNavigation/ts/DefaultNavigation_zh_CN.ts
 %%DATADIR%%/scripts/Navigation/DefaultNavigation/ts/DefaultNavigation_zh_TW.qm
@@ -15158,6 +15632,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Projection/IsometricProjection/IsoProject/ts/IsoProject_sl.ts
 %%DATADIR%%/scripts/Projection/IsometricProjection/IsoProject/ts/IsoProject_sv.qm
 %%DATADIR%%/scripts/Projection/IsometricProjection/IsoProject/ts/IsoProject_sv.ts
+%%DATADIR%%/scripts/Projection/IsometricProjection/IsoProject/ts/IsoProject_tr.qm
+%%DATADIR%%/scripts/Projection/IsometricProjection/IsoProject/ts/IsoProject_tr.ts
 %%DATADIR%%/scripts/Projection/IsometricProjection/IsoProject/ts/IsoProject_zh_CN.qm
 %%DATADIR%%/scripts/Projection/IsometricProjection/IsoProject/ts/IsoProject_zh_CN.ts
 %%DATADIR%%/scripts/Projection/IsometricProjection/IsoProject/ts/IsoProject_zh_TW.qm
@@ -15198,6 +15674,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Projection/IsometricProjection/ts/IsometricProjection_sl.ts
 %%DATADIR%%/scripts/Projection/IsometricProjection/ts/IsometricProjection_sv.qm
 %%DATADIR%%/scripts/Projection/IsometricProjection/ts/IsometricProjection_sv.ts
+%%DATADIR%%/scripts/Projection/IsometricProjection/ts/IsometricProjection_tr.qm
+%%DATADIR%%/scripts/Projection/IsometricProjection/ts/IsometricProjection_tr.ts
 %%DATADIR%%/scripts/Projection/IsometricProjection/ts/IsometricProjection_zh_CN.qm
 %%DATADIR%%/scripts/Projection/IsometricProjection/ts/IsometricProjection_zh_CN.ts
 %%DATADIR%%/scripts/Projection/IsometricProjection/ts/IsometricProjection_zh_TW.qm
@@ -15242,6 +15720,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Projection/ts/Projection_sl.ts
 %%DATADIR%%/scripts/Projection/ts/Projection_sv.qm
 %%DATADIR%%/scripts/Projection/ts/Projection_sv.ts
+%%DATADIR%%/scripts/Projection/ts/Projection_tr.qm
+%%DATADIR%%/scripts/Projection/ts/Projection_tr.ts
 %%DATADIR%%/scripts/Projection/ts/Projection_zh_CN.qm
 %%DATADIR%%/scripts/Projection/ts/Projection_zh_CN.ts
 %%DATADIR%%/scripts/Projection/ts/Projection_zh_TW.qm
@@ -15304,6 +15784,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Reset/ts/Reset_sl.ts
 %%DATADIR%%/scripts/Reset/ts/Reset_sv.qm
 %%DATADIR%%/scripts/Reset/ts/Reset_sv.ts
+%%DATADIR%%/scripts/Reset/ts/Reset_tr.qm
+%%DATADIR%%/scripts/Reset/ts/Reset_tr.ts
 %%DATADIR%%/scripts/Reset/ts/Reset_zh_CN.qm
 %%DATADIR%%/scripts/Reset/ts/Reset_zh_CN.ts
 %%DATADIR%%/scripts/Reset/ts/Reset_zh_TW.qm
@@ -15367,6 +15849,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Select/DeselectAll/ts/DeselectAll_sl.ts
 %%DATADIR%%/scripts/Select/DeselectAll/ts/DeselectAll_sv.qm
 %%DATADIR%%/scripts/Select/DeselectAll/ts/DeselectAll_sv.ts
+%%DATADIR%%/scripts/Select/DeselectAll/ts/DeselectAll_tr.qm
+%%DATADIR%%/scripts/Select/DeselectAll/ts/DeselectAll_tr.ts
 %%DATADIR%%/scripts/Select/DeselectAll/ts/DeselectAll_zh_CN.qm
 %%DATADIR%%/scripts/Select/DeselectAll/ts/DeselectAll_zh_CN.ts
 %%DATADIR%%/scripts/Select/DeselectAll/ts/DeselectAll_zh_TW.qm
@@ -15428,6 +15912,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Select/InvertSelection/ts/InvertSelection_sl.ts
 %%DATADIR%%/scripts/Select/InvertSelection/ts/InvertSelection_sv.qm
 %%DATADIR%%/scripts/Select/InvertSelection/ts/InvertSelection_sv.ts
+%%DATADIR%%/scripts/Select/InvertSelection/ts/InvertSelection_tr.qm
+%%DATADIR%%/scripts/Select/InvertSelection/ts/InvertSelection_tr.ts
 %%DATADIR%%/scripts/Select/InvertSelection/ts/InvertSelection_zh_CN.qm
 %%DATADIR%%/scripts/Select/InvertSelection/ts/InvertSelection_zh_CN.ts
 %%DATADIR%%/scripts/Select/InvertSelection/ts/InvertSelection_zh_TW.qm
@@ -15493,6 +15979,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Select/SelectAll/ts/SelectAll_sl.ts
 %%DATADIR%%/scripts/Select/SelectAll/ts/SelectAll_sv.qm
 %%DATADIR%%/scripts/Select/SelectAll/ts/SelectAll_sv.ts
+%%DATADIR%%/scripts/Select/SelectAll/ts/SelectAll_tr.qm
+%%DATADIR%%/scripts/Select/SelectAll/ts/SelectAll_tr.ts
 %%DATADIR%%/scripts/Select/SelectAll/ts/SelectAll_zh_CN.qm
 %%DATADIR%%/scripts/Select/SelectAll/ts/SelectAll_zh_CN.ts
 %%DATADIR%%/scripts/Select/SelectAll/ts/SelectAll_zh_TW.qm
@@ -15563,6 +16051,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Select/SelectContour/ts/SelectContour_sl.ts
 %%DATADIR%%/scripts/Select/SelectContour/ts/SelectContour_sv.qm
 %%DATADIR%%/scripts/Select/SelectContour/ts/SelectContour_sv.ts
+%%DATADIR%%/scripts/Select/SelectContour/ts/SelectContour_tr.qm
+%%DATADIR%%/scripts/Select/SelectContour/ts/SelectContour_tr.ts
 %%DATADIR%%/scripts/Select/SelectContour/ts/SelectContour_zh_CN.qm
 %%DATADIR%%/scripts/Select/SelectContour/ts/SelectContour_zh_CN.ts
 %%DATADIR%%/scripts/Select/SelectContour/ts/SelectContour_zh_TW.qm
@@ -15633,6 +16123,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Select/SelectIntersectedEntities/ts/SelectIntersectedEntities_sl.ts
 %%DATADIR%%/scripts/Select/SelectIntersectedEntities/ts/SelectIntersectedEntities_sv.qm
 %%DATADIR%%/scripts/Select/SelectIntersectedEntities/ts/SelectIntersectedEntities_sv.ts
+%%DATADIR%%/scripts/Select/SelectIntersectedEntities/ts/SelectIntersectedEntities_tr.qm
+%%DATADIR%%/scripts/Select/SelectIntersectedEntities/ts/SelectIntersectedEntities_tr.ts
 %%DATADIR%%/scripts/Select/SelectIntersectedEntities/ts/SelectIntersectedEntities_zh_CN.qm
 %%DATADIR%%/scripts/Select/SelectIntersectedEntities/ts/SelectIntersectedEntities_zh_CN.ts
 %%DATADIR%%/scripts/Select/SelectIntersectedEntities/ts/SelectIntersectedEntities_zh_TW.qm
@@ -15703,6 +16195,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Select/SelectLayerByEntity/ts/SelectLayerByEntity_sl.ts
 %%DATADIR%%/scripts/Select/SelectLayerByEntity/ts/SelectLayerByEntity_sv.qm
 %%DATADIR%%/scripts/Select/SelectLayerByEntity/ts/SelectLayerByEntity_sv.ts
+%%DATADIR%%/scripts/Select/SelectLayerByEntity/ts/SelectLayerByEntity_tr.qm
+%%DATADIR%%/scripts/Select/SelectLayerByEntity/ts/SelectLayerByEntity_tr.ts
 %%DATADIR%%/scripts/Select/SelectLayerByEntity/ts/SelectLayerByEntity_zh_CN.qm
 %%DATADIR%%/scripts/Select/SelectLayerByEntity/ts/SelectLayerByEntity_zh_CN.ts
 %%DATADIR%%/scripts/Select/SelectLayerByEntity/ts/SelectLayerByEntity_zh_TW.qm
@@ -15773,6 +16267,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Select/SelectRectangle/ts/SelectRectangle_sl.ts
 %%DATADIR%%/scripts/Select/SelectRectangle/ts/SelectRectangle_sv.qm
 %%DATADIR%%/scripts/Select/SelectRectangle/ts/SelectRectangle_sv.ts
+%%DATADIR%%/scripts/Select/SelectRectangle/ts/SelectRectangle_tr.qm
+%%DATADIR%%/scripts/Select/SelectRectangle/ts/SelectRectangle_tr.ts
 %%DATADIR%%/scripts/Select/SelectRectangle/ts/SelectRectangle_zh_CN.qm
 %%DATADIR%%/scripts/Select/SelectRectangle/ts/SelectRectangle_zh_CN.ts
 %%DATADIR%%/scripts/Select/SelectRectangle/ts/SelectRectangle_zh_TW.qm
@@ -15841,6 +16337,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Select/ts/Select_sl.ts
 %%DATADIR%%/scripts/Select/ts/Select_sv.qm
 %%DATADIR%%/scripts/Select/ts/Select_sv.ts
+%%DATADIR%%/scripts/Select/ts/Select_tr.qm
+%%DATADIR%%/scripts/Select/ts/Select_tr.ts
 %%DATADIR%%/scripts/Select/ts/Select_zh_CN.qm
 %%DATADIR%%/scripts/Select/ts/Select_zh_CN.ts
 %%DATADIR%%/scripts/Select/ts/Select_zh_TW.qm
@@ -15904,6 +16402,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Snap/LockRelativeZero/ts/LockRelativeZero_sl.ts
 %%DATADIR%%/scripts/Snap/LockRelativeZero/ts/LockRelativeZero_sv.qm
 %%DATADIR%%/scripts/Snap/LockRelativeZero/ts/LockRelativeZero_sv.ts
+%%DATADIR%%/scripts/Snap/LockRelativeZero/ts/LockRelativeZero_tr.qm
+%%DATADIR%%/scripts/Snap/LockRelativeZero/ts/LockRelativeZero_tr.ts
 %%DATADIR%%/scripts/Snap/LockRelativeZero/ts/LockRelativeZero_zh_CN.qm
 %%DATADIR%%/scripts/Snap/LockRelativeZero/ts/LockRelativeZero_zh_CN.ts
 %%DATADIR%%/scripts/Snap/LockRelativeZero/ts/LockRelativeZero_zh_TW.qm
@@ -15954,6 +16454,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Snap/RestrictAngleLength/ts/RestrictAngleLength_sl.ts
 %%DATADIR%%/scripts/Snap/RestrictAngleLength/ts/RestrictAngleLength_sv.qm
 %%DATADIR%%/scripts/Snap/RestrictAngleLength/ts/RestrictAngleLength_sv.ts
+%%DATADIR%%/scripts/Snap/RestrictAngleLength/ts/RestrictAngleLength_tr.qm
+%%DATADIR%%/scripts/Snap/RestrictAngleLength/ts/RestrictAngleLength_tr.ts
 %%DATADIR%%/scripts/Snap/RestrictAngleLength/ts/RestrictAngleLength_zh_CN.qm
 %%DATADIR%%/scripts/Snap/RestrictAngleLength/ts/RestrictAngleLength_zh_CN.ts
 %%DATADIR%%/scripts/Snap/RestrictAngleLength/ts/RestrictAngleLength_zh_TW.qm
@@ -16015,6 +16517,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Snap/RestrictHorizontal/ts/RestrictHorizontal_sl.ts
 %%DATADIR%%/scripts/Snap/RestrictHorizontal/ts/RestrictHorizontal_sv.qm
 %%DATADIR%%/scripts/Snap/RestrictHorizontal/ts/RestrictHorizontal_sv.ts
+%%DATADIR%%/scripts/Snap/RestrictHorizontal/ts/RestrictHorizontal_tr.qm
+%%DATADIR%%/scripts/Snap/RestrictHorizontal/ts/RestrictHorizontal_tr.ts
 %%DATADIR%%/scripts/Snap/RestrictHorizontal/ts/RestrictHorizontal_zh_CN.qm
 %%DATADIR%%/scripts/Snap/RestrictHorizontal/ts/RestrictHorizontal_zh_CN.ts
 %%DATADIR%%/scripts/Snap/RestrictHorizontal/ts/RestrictHorizontal_zh_TW.qm
@@ -16076,6 +16580,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Snap/RestrictOff/ts/RestrictOff_sl.ts
 %%DATADIR%%/scripts/Snap/RestrictOff/ts/RestrictOff_sv.qm
 %%DATADIR%%/scripts/Snap/RestrictOff/ts/RestrictOff_sv.ts
+%%DATADIR%%/scripts/Snap/RestrictOff/ts/RestrictOff_tr.qm
+%%DATADIR%%/scripts/Snap/RestrictOff/ts/RestrictOff_tr.ts
 %%DATADIR%%/scripts/Snap/RestrictOff/ts/RestrictOff_zh_CN.qm
 %%DATADIR%%/scripts/Snap/RestrictOff/ts/RestrictOff_zh_CN.ts
 %%DATADIR%%/scripts/Snap/RestrictOff/ts/RestrictOff_zh_TW.qm
@@ -16137,6 +16643,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Snap/RestrictOrthogonal/ts/RestrictOrthogonal_sl.ts
 %%DATADIR%%/scripts/Snap/RestrictOrthogonal/ts/RestrictOrthogonal_sv.qm
 %%DATADIR%%/scripts/Snap/RestrictOrthogonal/ts/RestrictOrthogonal_sv.ts
+%%DATADIR%%/scripts/Snap/RestrictOrthogonal/ts/RestrictOrthogonal_tr.qm
+%%DATADIR%%/scripts/Snap/RestrictOrthogonal/ts/RestrictOrthogonal_tr.ts
 %%DATADIR%%/scripts/Snap/RestrictOrthogonal/ts/RestrictOrthogonal_zh_CN.qm
 %%DATADIR%%/scripts/Snap/RestrictOrthogonal/ts/RestrictOrthogonal_zh_CN.ts
 %%DATADIR%%/scripts/Snap/RestrictOrthogonal/ts/RestrictOrthogonal_zh_TW.qm
@@ -16198,6 +16706,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Snap/RestrictVertical/ts/RestrictVertical_sl.ts
 %%DATADIR%%/scripts/Snap/RestrictVertical/ts/RestrictVertical_sv.qm
 %%DATADIR%%/scripts/Snap/RestrictVertical/ts/RestrictVertical_sv.ts
+%%DATADIR%%/scripts/Snap/RestrictVertical/ts/RestrictVertical_tr.qm
+%%DATADIR%%/scripts/Snap/RestrictVertical/ts/RestrictVertical_tr.ts
 %%DATADIR%%/scripts/Snap/RestrictVertical/ts/RestrictVertical_zh_CN.qm
 %%DATADIR%%/scripts/Snap/RestrictVertical/ts/RestrictVertical_zh_CN.ts
 %%DATADIR%%/scripts/Snap/RestrictVertical/ts/RestrictVertical_zh_TW.qm
@@ -16267,6 +16777,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Snap/SetRelativeZero/ts/SetRelativeZero_sl.ts
 %%DATADIR%%/scripts/Snap/SetRelativeZero/ts/SetRelativeZero_sv.qm
 %%DATADIR%%/scripts/Snap/SetRelativeZero/ts/SetRelativeZero_sv.ts
+%%DATADIR%%/scripts/Snap/SetRelativeZero/ts/SetRelativeZero_tr.qm
+%%DATADIR%%/scripts/Snap/SetRelativeZero/ts/SetRelativeZero_tr.ts
 %%DATADIR%%/scripts/Snap/SetRelativeZero/ts/SetRelativeZero_zh_CN.qm
 %%DATADIR%%/scripts/Snap/SetRelativeZero/ts/SetRelativeZero_zh_CN.ts
 %%DATADIR%%/scripts/Snap/SetRelativeZero/ts/SetRelativeZero_zh_TW.qm
@@ -16333,6 +16845,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Snap/SnapAuto/ts/SnapAuto_sl.ts
 %%DATADIR%%/scripts/Snap/SnapAuto/ts/SnapAuto_sv.qm
 %%DATADIR%%/scripts/Snap/SnapAuto/ts/SnapAuto_sv.ts
+%%DATADIR%%/scripts/Snap/SnapAuto/ts/SnapAuto_tr.qm
+%%DATADIR%%/scripts/Snap/SnapAuto/ts/SnapAuto_tr.ts
 %%DATADIR%%/scripts/Snap/SnapAuto/ts/SnapAuto_zh_CN.qm
 %%DATADIR%%/scripts/Snap/SnapAuto/ts/SnapAuto_zh_CN.ts
 %%DATADIR%%/scripts/Snap/SnapAuto/ts/SnapAuto_zh_TW.qm
@@ -16397,6 +16911,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Snap/SnapCenter/ts/SnapCenter_sl.ts
 %%DATADIR%%/scripts/Snap/SnapCenter/ts/SnapCenter_sv.qm
 %%DATADIR%%/scripts/Snap/SnapCenter/ts/SnapCenter_sv.ts
+%%DATADIR%%/scripts/Snap/SnapCenter/ts/SnapCenter_tr.qm
+%%DATADIR%%/scripts/Snap/SnapCenter/ts/SnapCenter_tr.ts
 %%DATADIR%%/scripts/Snap/SnapCenter/ts/SnapCenter_zh_CN.qm
 %%DATADIR%%/scripts/Snap/SnapCenter/ts/SnapCenter_zh_CN.ts
 %%DATADIR%%/scripts/Snap/SnapCenter/ts/SnapCenter_zh_TW.qm
@@ -16470,6 +16986,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Snap/SnapCoordinate/ts/SnapCoordinate_sl.ts
 %%DATADIR%%/scripts/Snap/SnapCoordinate/ts/SnapCoordinate_sv.qm
 %%DATADIR%%/scripts/Snap/SnapCoordinate/ts/SnapCoordinate_sv.ts
+%%DATADIR%%/scripts/Snap/SnapCoordinate/ts/SnapCoordinate_tr.qm
+%%DATADIR%%/scripts/Snap/SnapCoordinate/ts/SnapCoordinate_tr.ts
 %%DATADIR%%/scripts/Snap/SnapCoordinate/ts/SnapCoordinate_zh_CN.qm
 %%DATADIR%%/scripts/Snap/SnapCoordinate/ts/SnapCoordinate_zh_CN.ts
 %%DATADIR%%/scripts/Snap/SnapCoordinate/ts/SnapCoordinate_zh_TW.qm
@@ -16543,6 +17061,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Snap/SnapCoordinatePolar/ts/SnapCoordinatePolar_sl.ts
 %%DATADIR%%/scripts/Snap/SnapCoordinatePolar/ts/SnapCoordinatePolar_sv.qm
 %%DATADIR%%/scripts/Snap/SnapCoordinatePolar/ts/SnapCoordinatePolar_sv.ts
+%%DATADIR%%/scripts/Snap/SnapCoordinatePolar/ts/SnapCoordinatePolar_tr.qm
+%%DATADIR%%/scripts/Snap/SnapCoordinatePolar/ts/SnapCoordinatePolar_tr.ts
 %%DATADIR%%/scripts/Snap/SnapCoordinatePolar/ts/SnapCoordinatePolar_zh_CN.qm
 %%DATADIR%%/scripts/Snap/SnapCoordinatePolar/ts/SnapCoordinatePolar_zh_CN.ts
 %%DATADIR%%/scripts/Snap/SnapCoordinatePolar/ts/SnapCoordinatePolar_zh_TW.qm
@@ -16608,6 +17128,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Snap/SnapDistance/ts/SnapDistance_sl.ts
 %%DATADIR%%/scripts/Snap/SnapDistance/ts/SnapDistance_sv.qm
 %%DATADIR%%/scripts/Snap/SnapDistance/ts/SnapDistance_sv.ts
+%%DATADIR%%/scripts/Snap/SnapDistance/ts/SnapDistance_tr.qm
+%%DATADIR%%/scripts/Snap/SnapDistance/ts/SnapDistance_tr.ts
 %%DATADIR%%/scripts/Snap/SnapDistance/ts/SnapDistance_zh_CN.qm
 %%DATADIR%%/scripts/Snap/SnapDistance/ts/SnapDistance_zh_CN.ts
 %%DATADIR%%/scripts/Snap/SnapDistance/ts/SnapDistance_zh_TW.qm
@@ -16672,6 +17194,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Snap/SnapDistanceManual/ts/SnapDistanceManual_sl.ts
 %%DATADIR%%/scripts/Snap/SnapDistanceManual/ts/SnapDistanceManual_sv.qm
 %%DATADIR%%/scripts/Snap/SnapDistanceManual/ts/SnapDistanceManual_sv.ts
+%%DATADIR%%/scripts/Snap/SnapDistanceManual/ts/SnapDistanceManual_tr.qm
+%%DATADIR%%/scripts/Snap/SnapDistanceManual/ts/SnapDistanceManual_tr.ts
 %%DATADIR%%/scripts/Snap/SnapDistanceManual/ts/SnapDistanceManual_zh_CN.qm
 %%DATADIR%%/scripts/Snap/SnapDistanceManual/ts/SnapDistanceManual_zh_CN.ts
 %%DATADIR%%/scripts/Snap/SnapDistanceManual/ts/SnapDistanceManual_zh_TW.qm
@@ -16736,6 +17260,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Snap/SnapEnd/ts/SnapEnd_sl.ts
 %%DATADIR%%/scripts/Snap/SnapEnd/ts/SnapEnd_sv.qm
 %%DATADIR%%/scripts/Snap/SnapEnd/ts/SnapEnd_sv.ts
+%%DATADIR%%/scripts/Snap/SnapEnd/ts/SnapEnd_tr.qm
+%%DATADIR%%/scripts/Snap/SnapEnd/ts/SnapEnd_tr.ts
 %%DATADIR%%/scripts/Snap/SnapEnd/ts/SnapEnd_zh_CN.qm
 %%DATADIR%%/scripts/Snap/SnapEnd/ts/SnapEnd_zh_CN.ts
 %%DATADIR%%/scripts/Snap/SnapEnd/ts/SnapEnd_zh_TW.qm
@@ -16797,6 +17323,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Snap/SnapFree/ts/SnapFree_sl.ts
 %%DATADIR%%/scripts/Snap/SnapFree/ts/SnapFree_sv.qm
 %%DATADIR%%/scripts/Snap/SnapFree/ts/SnapFree_sv.ts
+%%DATADIR%%/scripts/Snap/SnapFree/ts/SnapFree_tr.qm
+%%DATADIR%%/scripts/Snap/SnapFree/ts/SnapFree_tr.ts
 %%DATADIR%%/scripts/Snap/SnapFree/ts/SnapFree_zh_CN.qm
 %%DATADIR%%/scripts/Snap/SnapFree/ts/SnapFree_zh_CN.ts
 %%DATADIR%%/scripts/Snap/SnapFree/ts/SnapFree_zh_TW.qm
@@ -16858,6 +17386,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Snap/SnapGrid/ts/SnapGrid_sl.ts
 %%DATADIR%%/scripts/Snap/SnapGrid/ts/SnapGrid_sv.qm
 %%DATADIR%%/scripts/Snap/SnapGrid/ts/SnapGrid_sv.ts
+%%DATADIR%%/scripts/Snap/SnapGrid/ts/SnapGrid_tr.qm
+%%DATADIR%%/scripts/Snap/SnapGrid/ts/SnapGrid_tr.ts
 %%DATADIR%%/scripts/Snap/SnapGrid/ts/SnapGrid_zh_CN.qm
 %%DATADIR%%/scripts/Snap/SnapGrid/ts/SnapGrid_zh_CN.ts
 %%DATADIR%%/scripts/Snap/SnapGrid/ts/SnapGrid_zh_TW.qm
@@ -16941,6 +17471,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Snap/SnapIntersection/ts/SnapIntersection_sl.ts
 %%DATADIR%%/scripts/Snap/SnapIntersection/ts/SnapIntersection_sv.qm
 %%DATADIR%%/scripts/Snap/SnapIntersection/ts/SnapIntersection_sv.ts
+%%DATADIR%%/scripts/Snap/SnapIntersection/ts/SnapIntersection_tr.qm
+%%DATADIR%%/scripts/Snap/SnapIntersection/ts/SnapIntersection_tr.ts
 %%DATADIR%%/scripts/Snap/SnapIntersection/ts/SnapIntersection_zh_CN.qm
 %%DATADIR%%/scripts/Snap/SnapIntersection/ts/SnapIntersection_zh_CN.ts
 %%DATADIR%%/scripts/Snap/SnapIntersection/ts/SnapIntersection_zh_TW.qm
@@ -17018,6 +17550,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Snap/SnapIntersectionManual/ts/SnapIntersectionManual_sl.ts
 %%DATADIR%%/scripts/Snap/SnapIntersectionManual/ts/SnapIntersectionManual_sv.qm
 %%DATADIR%%/scripts/Snap/SnapIntersectionManual/ts/SnapIntersectionManual_sv.ts
+%%DATADIR%%/scripts/Snap/SnapIntersectionManual/ts/SnapIntersectionManual_tr.qm
+%%DATADIR%%/scripts/Snap/SnapIntersectionManual/ts/SnapIntersectionManual_tr.ts
 %%DATADIR%%/scripts/Snap/SnapIntersectionManual/ts/SnapIntersectionManual_zh_CN.qm
 %%DATADIR%%/scripts/Snap/SnapIntersectionManual/ts/SnapIntersectionManual_zh_CN.ts
 %%DATADIR%%/scripts/Snap/SnapIntersectionManual/ts/SnapIntersectionManual_zh_TW.qm
@@ -17082,6 +17616,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Snap/SnapMiddle/ts/SnapMiddle_sl.ts
 %%DATADIR%%/scripts/Snap/SnapMiddle/ts/SnapMiddle_sv.qm
 %%DATADIR%%/scripts/Snap/SnapMiddle/ts/SnapMiddle_sv.ts
+%%DATADIR%%/scripts/Snap/SnapMiddle/ts/SnapMiddle_tr.qm
+%%DATADIR%%/scripts/Snap/SnapMiddle/ts/SnapMiddle_tr.ts
 %%DATADIR%%/scripts/Snap/SnapMiddle/ts/SnapMiddle_zh_CN.qm
 %%DATADIR%%/scripts/Snap/SnapMiddle/ts/SnapMiddle_zh_CN.ts
 %%DATADIR%%/scripts/Snap/SnapMiddle/ts/SnapMiddle_zh_TW.qm
@@ -17157,6 +17693,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Snap/SnapMiddleManual/ts/SnapMiddleManual_sl.ts
 %%DATADIR%%/scripts/Snap/SnapMiddleManual/ts/SnapMiddleManual_sv.qm
 %%DATADIR%%/scripts/Snap/SnapMiddleManual/ts/SnapMiddleManual_sv.ts
+%%DATADIR%%/scripts/Snap/SnapMiddleManual/ts/SnapMiddleManual_tr.qm
+%%DATADIR%%/scripts/Snap/SnapMiddleManual/ts/SnapMiddleManual_tr.ts
 %%DATADIR%%/scripts/Snap/SnapMiddleManual/ts/SnapMiddleManual_zh_CN.qm
 %%DATADIR%%/scripts/Snap/SnapMiddleManual/ts/SnapMiddleManual_zh_CN.ts
 %%DATADIR%%/scripts/Snap/SnapMiddleManual/ts/SnapMiddleManual_zh_TW.qm
@@ -17221,6 +17759,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Snap/SnapOnEntity/ts/SnapOnEntity_sl.ts
 %%DATADIR%%/scripts/Snap/SnapOnEntity/ts/SnapOnEntity_sv.qm
 %%DATADIR%%/scripts/Snap/SnapOnEntity/ts/SnapOnEntity_sv.ts
+%%DATADIR%%/scripts/Snap/SnapOnEntity/ts/SnapOnEntity_tr.qm
+%%DATADIR%%/scripts/Snap/SnapOnEntity/ts/SnapOnEntity_tr.ts
 %%DATADIR%%/scripts/Snap/SnapOnEntity/ts/SnapOnEntity_zh_CN.qm
 %%DATADIR%%/scripts/Snap/SnapOnEntity/ts/SnapOnEntity_zh_CN.ts
 %%DATADIR%%/scripts/Snap/SnapOnEntity/ts/SnapOnEntity_zh_TW.qm
@@ -17282,6 +17822,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Snap/SnapPerpendicular/ts/SnapPerpendicular_sl.ts
 %%DATADIR%%/scripts/Snap/SnapPerpendicular/ts/SnapPerpendicular_sv.qm
 %%DATADIR%%/scripts/Snap/SnapPerpendicular/ts/SnapPerpendicular_sv.ts
+%%DATADIR%%/scripts/Snap/SnapPerpendicular/ts/SnapPerpendicular_tr.qm
+%%DATADIR%%/scripts/Snap/SnapPerpendicular/ts/SnapPerpendicular_tr.ts
 %%DATADIR%%/scripts/Snap/SnapPerpendicular/ts/SnapPerpendicular_zh_CN.qm
 %%DATADIR%%/scripts/Snap/SnapPerpendicular/ts/SnapPerpendicular_zh_CN.ts
 %%DATADIR%%/scripts/Snap/SnapPerpendicular/ts/SnapPerpendicular_zh_TW.qm
@@ -17346,6 +17888,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Snap/SnapReference/ts/SnapReference_sl.ts
 %%DATADIR%%/scripts/Snap/SnapReference/ts/SnapReference_sv.qm
 %%DATADIR%%/scripts/Snap/SnapReference/ts/SnapReference_sv.ts
+%%DATADIR%%/scripts/Snap/SnapReference/ts/SnapReference_tr.qm
+%%DATADIR%%/scripts/Snap/SnapReference/ts/SnapReference_tr.ts
 %%DATADIR%%/scripts/Snap/SnapReference/ts/SnapReference_zh_CN.qm
 %%DATADIR%%/scripts/Snap/SnapReference/ts/SnapReference_zh_CN.ts
 %%DATADIR%%/scripts/Snap/SnapReference/ts/SnapReference_zh_TW.qm
@@ -17397,6 +17941,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Snap/SnapSelectionCenter/ts/SnapSelectionCenter_sl.ts
 %%DATADIR%%/scripts/Snap/SnapSelectionCenter/ts/SnapSelectionCenter_sv.qm
 %%DATADIR%%/scripts/Snap/SnapSelectionCenter/ts/SnapSelectionCenter_sv.ts
+%%DATADIR%%/scripts/Snap/SnapSelectionCenter/ts/SnapSelectionCenter_tr.qm
+%%DATADIR%%/scripts/Snap/SnapSelectionCenter/ts/SnapSelectionCenter_tr.ts
 %%DATADIR%%/scripts/Snap/SnapSelectionCenter/ts/SnapSelectionCenter_zh_CN.qm
 %%DATADIR%%/scripts/Snap/SnapSelectionCenter/ts/SnapSelectionCenter_zh_CN.ts
 %%DATADIR%%/scripts/Snap/SnapSelectionCenter/ts/SnapSelectionCenter_zh_TW.qm
@@ -17455,6 +18001,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Snap/SnapTangential/ts/SnapTangential_sl.ts
 %%DATADIR%%/scripts/Snap/SnapTangential/ts/SnapTangential_sv.qm
 %%DATADIR%%/scripts/Snap/SnapTangential/ts/SnapTangential_sv.ts
+%%DATADIR%%/scripts/Snap/SnapTangential/ts/SnapTangential_tr.qm
+%%DATADIR%%/scripts/Snap/SnapTangential/ts/SnapTangential_tr.ts
 %%DATADIR%%/scripts/Snap/SnapTangential/ts/SnapTangential_zh_CN.qm
 %%DATADIR%%/scripts/Snap/SnapTangential/ts/SnapTangential_zh_CN.ts
 %%DATADIR%%/scripts/Snap/SnapTangential/ts/SnapTangential_zh_TW.qm
@@ -17513,6 +18061,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Snap/SnapXManual/ts/SnapXManual_sl.ts
 %%DATADIR%%/scripts/Snap/SnapXManual/ts/SnapXManual_sv.qm
 %%DATADIR%%/scripts/Snap/SnapXManual/ts/SnapXManual_sv.ts
+%%DATADIR%%/scripts/Snap/SnapXManual/ts/SnapXManual_tr.qm
+%%DATADIR%%/scripts/Snap/SnapXManual/ts/SnapXManual_tr.ts
 %%DATADIR%%/scripts/Snap/SnapXManual/ts/SnapXManual_zh_CN.qm
 %%DATADIR%%/scripts/Snap/SnapXManual/ts/SnapXManual_zh_CN.ts
 %%DATADIR%%/scripts/Snap/SnapXManual/ts/SnapXManual_zh_TW.qm
@@ -17567,6 +18117,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Snap/SnapYManual/ts/SnapYManual_sl.ts
 %%DATADIR%%/scripts/Snap/SnapYManual/ts/SnapYManual_sv.qm
 %%DATADIR%%/scripts/Snap/SnapYManual/ts/SnapYManual_sv.ts
+%%DATADIR%%/scripts/Snap/SnapYManual/ts/SnapYManual_tr.qm
+%%DATADIR%%/scripts/Snap/SnapYManual/ts/SnapYManual_tr.ts
 %%DATADIR%%/scripts/Snap/SnapYManual/ts/SnapYManual_zh_CN.qm
 %%DATADIR%%/scripts/Snap/SnapYManual/ts/SnapYManual_zh_CN.ts
 %%DATADIR%%/scripts/Snap/SnapYManual/ts/SnapYManual_zh_TW.qm
@@ -17614,6 +18166,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Snap/ts/Snap_sl.ts
 %%DATADIR%%/scripts/Snap/ts/Snap_sv.qm
 %%DATADIR%%/scripts/Snap/ts/Snap_sv.ts
+%%DATADIR%%/scripts/Snap/ts/Snap_tr.qm
+%%DATADIR%%/scripts/Snap/ts/Snap_tr.ts
 %%DATADIR%%/scripts/Snap/ts/Snap_zh_CN.qm
 %%DATADIR%%/scripts/Snap/ts/Snap_zh_CN.ts
 %%DATADIR%%/scripts/Snap/ts/Snap_zh_TW.qm
@@ -17678,6 +18232,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/View/AntialiasingMode/ts/AntialiasingMode_sl.ts
 %%DATADIR%%/scripts/View/AntialiasingMode/ts/AntialiasingMode_sv.qm
 %%DATADIR%%/scripts/View/AntialiasingMode/ts/AntialiasingMode_sv.ts
+%%DATADIR%%/scripts/View/AntialiasingMode/ts/AntialiasingMode_tr.qm
+%%DATADIR%%/scripts/View/AntialiasingMode/ts/AntialiasingMode_tr.ts
 %%DATADIR%%/scripts/View/AntialiasingMode/ts/AntialiasingMode_zh_CN.qm
 %%DATADIR%%/scripts/View/AntialiasingMode/ts/AntialiasingMode_zh_CN.ts
 %%DATADIR%%/scripts/View/AntialiasingMode/ts/AntialiasingMode_zh_TW.qm
@@ -17736,6 +18292,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/View/CommandLineFocus/ts/CommandLineFocus_sl.ts
 %%DATADIR%%/scripts/View/CommandLineFocus/ts/CommandLineFocus_sv.qm
 %%DATADIR%%/scripts/View/CommandLineFocus/ts/CommandLineFocus_sv.ts
+%%DATADIR%%/scripts/View/CommandLineFocus/ts/CommandLineFocus_tr.qm
+%%DATADIR%%/scripts/View/CommandLineFocus/ts/CommandLineFocus_tr.ts
 %%DATADIR%%/scripts/View/CommandLineFocus/ts/CommandLineFocus_zh_CN.qm
 %%DATADIR%%/scripts/View/CommandLineFocus/ts/CommandLineFocus_zh_CN.ts
 %%DATADIR%%/scripts/View/CommandLineFocus/ts/CommandLineFocus_zh_TW.qm
@@ -17785,6 +18343,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/View/DisplayDistanceAngle/ts/DisplayDistanceAngle_sl.ts
 %%DATADIR%%/scripts/View/DisplayDistanceAngle/ts/DisplayDistanceAngle_sv.qm
 %%DATADIR%%/scripts/View/DisplayDistanceAngle/ts/DisplayDistanceAngle_sv.ts
+%%DATADIR%%/scripts/View/DisplayDistanceAngle/ts/DisplayDistanceAngle_tr.qm
+%%DATADIR%%/scripts/View/DisplayDistanceAngle/ts/DisplayDistanceAngle_tr.ts
 %%DATADIR%%/scripts/View/DisplayDistanceAngle/ts/DisplayDistanceAngle_zh_CN.qm
 %%DATADIR%%/scripts/View/DisplayDistanceAngle/ts/DisplayDistanceAngle_zh_CN.ts
 %%DATADIR%%/scripts/View/DisplayDistanceAngle/ts/DisplayDistanceAngle_zh_TW.qm
@@ -17845,6 +18405,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/View/DraftMode/ts/DraftMode_sl.ts
 %%DATADIR%%/scripts/View/DraftMode/ts/DraftMode_sv.qm
 %%DATADIR%%/scripts/View/DraftMode/ts/DraftMode_sv.ts
+%%DATADIR%%/scripts/View/DraftMode/ts/DraftMode_tr.qm
+%%DATADIR%%/scripts/View/DraftMode/ts/DraftMode_tr.ts
 %%DATADIR%%/scripts/View/DraftMode/ts/DraftMode_zh_CN.qm
 %%DATADIR%%/scripts/View/DraftMode/ts/DraftMode_zh_CN.ts
 %%DATADIR%%/scripts/View/DraftMode/ts/DraftMode_zh_TW.qm
@@ -17896,6 +18458,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/View/IsometricView/IsometricGridLeft/ts/IsometricGridLeft_sl.ts
 %%DATADIR%%/scripts/View/IsometricView/IsometricGridLeft/ts/IsometricGridLeft_sv.qm
 %%DATADIR%%/scripts/View/IsometricView/IsometricGridLeft/ts/IsometricGridLeft_sv.ts
+%%DATADIR%%/scripts/View/IsometricView/IsometricGridLeft/ts/IsometricGridLeft_tr.qm
+%%DATADIR%%/scripts/View/IsometricView/IsometricGridLeft/ts/IsometricGridLeft_tr.ts
 %%DATADIR%%/scripts/View/IsometricView/IsometricGridLeft/ts/IsometricGridLeft_zh_CN.qm
 %%DATADIR%%/scripts/View/IsometricView/IsometricGridLeft/ts/IsometricGridLeft_zh_CN.ts
 %%DATADIR%%/scripts/View/IsometricView/IsometricGridLeft/ts/IsometricGridLeft_zh_TW.qm
@@ -17947,6 +18511,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/View/IsometricView/IsometricGridOff/ts/IsometricGridOff_sl.ts
 %%DATADIR%%/scripts/View/IsometricView/IsometricGridOff/ts/IsometricGridOff_sv.qm
 %%DATADIR%%/scripts/View/IsometricView/IsometricGridOff/ts/IsometricGridOff_sv.ts
+%%DATADIR%%/scripts/View/IsometricView/IsometricGridOff/ts/IsometricGridOff_tr.qm
+%%DATADIR%%/scripts/View/IsometricView/IsometricGridOff/ts/IsometricGridOff_tr.ts
 %%DATADIR%%/scripts/View/IsometricView/IsometricGridOff/ts/IsometricGridOff_zh_CN.qm
 %%DATADIR%%/scripts/View/IsometricView/IsometricGridOff/ts/IsometricGridOff_zh_CN.ts
 %%DATADIR%%/scripts/View/IsometricView/IsometricGridOff/ts/IsometricGridOff_zh_TW.qm
@@ -17998,6 +18564,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/View/IsometricView/IsometricGridRight/ts/IsometricGridRight_sl.ts
 %%DATADIR%%/scripts/View/IsometricView/IsometricGridRight/ts/IsometricGridRight_sv.qm
 %%DATADIR%%/scripts/View/IsometricView/IsometricGridRight/ts/IsometricGridRight_sv.ts
+%%DATADIR%%/scripts/View/IsometricView/IsometricGridRight/ts/IsometricGridRight_tr.qm
+%%DATADIR%%/scripts/View/IsometricView/IsometricGridRight/ts/IsometricGridRight_tr.ts
 %%DATADIR%%/scripts/View/IsometricView/IsometricGridRight/ts/IsometricGridRight_zh_CN.qm
 %%DATADIR%%/scripts/View/IsometricView/IsometricGridRight/ts/IsometricGridRight_zh_CN.ts
 %%DATADIR%%/scripts/View/IsometricView/IsometricGridRight/ts/IsometricGridRight_zh_TW.qm
@@ -18049,6 +18617,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/View/IsometricView/IsometricGridTop/ts/IsometricGridTop_sl.ts
 %%DATADIR%%/scripts/View/IsometricView/IsometricGridTop/ts/IsometricGridTop_sv.qm
 %%DATADIR%%/scripts/View/IsometricView/IsometricGridTop/ts/IsometricGridTop_sv.ts
+%%DATADIR%%/scripts/View/IsometricView/IsometricGridTop/ts/IsometricGridTop_tr.qm
+%%DATADIR%%/scripts/View/IsometricView/IsometricGridTop/ts/IsometricGridTop_tr.ts
 %%DATADIR%%/scripts/View/IsometricView/IsometricGridTop/ts/IsometricGridTop_zh_CN.qm
 %%DATADIR%%/scripts/View/IsometricView/IsometricGridTop/ts/IsometricGridTop_zh_CN.ts
 %%DATADIR%%/scripts/View/IsometricView/IsometricGridTop/ts/IsometricGridTop_zh_TW.qm
@@ -18089,6 +18659,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/View/IsometricView/ts/IsometricView_sl.ts
 %%DATADIR%%/scripts/View/IsometricView/ts/IsometricView_sv.qm
 %%DATADIR%%/scripts/View/IsometricView/ts/IsometricView_sv.ts
+%%DATADIR%%/scripts/View/IsometricView/ts/IsometricView_tr.qm
+%%DATADIR%%/scripts/View/IsometricView/ts/IsometricView_tr.ts
 %%DATADIR%%/scripts/View/IsometricView/ts/IsometricView_zh_CN.qm
 %%DATADIR%%/scripts/View/IsometricView/ts/IsometricView_zh_CN.ts
 %%DATADIR%%/scripts/View/IsometricView/ts/IsometricView_zh_TW.qm
@@ -18147,6 +18719,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/View/LinetypeMode/ts/LinetypeMode_sl.ts
 %%DATADIR%%/scripts/View/LinetypeMode/ts/LinetypeMode_sv.qm
 %%DATADIR%%/scripts/View/LinetypeMode/ts/LinetypeMode_sv.ts
+%%DATADIR%%/scripts/View/LinetypeMode/ts/LinetypeMode_tr.qm
+%%DATADIR%%/scripts/View/LinetypeMode/ts/LinetypeMode_tr.ts
 %%DATADIR%%/scripts/View/LinetypeMode/ts/LinetypeMode_zh_CN.qm
 %%DATADIR%%/scripts/View/LinetypeMode/ts/LinetypeMode_zh_CN.ts
 %%DATADIR%%/scripts/View/LinetypeMode/ts/LinetypeMode_zh_TW.qm
@@ -18196,6 +18770,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/View/OptionsToolBarFocus/ts/OptionsToolBarFocus_sl.ts
 %%DATADIR%%/scripts/View/OptionsToolBarFocus/ts/OptionsToolBarFocus_sv.qm
 %%DATADIR%%/scripts/View/OptionsToolBarFocus/ts/OptionsToolBarFocus_sv.ts
+%%DATADIR%%/scripts/View/OptionsToolBarFocus/ts/OptionsToolBarFocus_tr.qm
+%%DATADIR%%/scripts/View/OptionsToolBarFocus/ts/OptionsToolBarFocus_tr.ts
 %%DATADIR%%/scripts/View/OptionsToolBarFocus/ts/OptionsToolBarFocus_zh_CN.qm
 %%DATADIR%%/scripts/View/OptionsToolBarFocus/ts/OptionsToolBarFocus_zh_CN.ts
 %%DATADIR%%/scripts/View/OptionsToolBarFocus/ts/OptionsToolBarFocus_zh_TW.qm
@@ -18258,6 +18834,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/View/ToggleGrid/ts/ToggleGrid_sl.ts
 %%DATADIR%%/scripts/View/ToggleGrid/ts/ToggleGrid_sv.qm
 %%DATADIR%%/scripts/View/ToggleGrid/ts/ToggleGrid_sv.ts
+%%DATADIR%%/scripts/View/ToggleGrid/ts/ToggleGrid_tr.qm
+%%DATADIR%%/scripts/View/ToggleGrid/ts/ToggleGrid_tr.ts
 %%DATADIR%%/scripts/View/ToggleGrid/ts/ToggleGrid_zh_CN.qm
 %%DATADIR%%/scripts/View/ToggleGrid/ts/ToggleGrid_zh_CN.ts
 %%DATADIR%%/scripts/View/ToggleGrid/ts/ToggleGrid_zh_TW.qm
@@ -18303,6 +18881,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/View/ViewToolBars/ts/ViewToolBars_sl.ts
 %%DATADIR%%/scripts/View/ViewToolBars/ts/ViewToolBars_sv.qm
 %%DATADIR%%/scripts/View/ViewToolBars/ts/ViewToolBars_sv.ts
+%%DATADIR%%/scripts/View/ViewToolBars/ts/ViewToolBars_tr.qm
+%%DATADIR%%/scripts/View/ViewToolBars/ts/ViewToolBars_tr.ts
 %%DATADIR%%/scripts/View/ViewToolBars/ts/ViewToolBars_zh_CN.qm
 %%DATADIR%%/scripts/View/ViewToolBars/ts/ViewToolBars_zh_CN.ts
 %%DATADIR%%/scripts/View/ViewToolBars/ts/ViewToolBars_zh_TW.qm
@@ -18364,6 +18944,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/View/Zoom/AutoZoom/ts/AutoZoom_sl.ts
 %%DATADIR%%/scripts/View/Zoom/AutoZoom/ts/AutoZoom_sv.qm
 %%DATADIR%%/scripts/View/Zoom/AutoZoom/ts/AutoZoom_sv.ts
+%%DATADIR%%/scripts/View/Zoom/AutoZoom/ts/AutoZoom_tr.qm
+%%DATADIR%%/scripts/View/Zoom/AutoZoom/ts/AutoZoom_tr.ts
 %%DATADIR%%/scripts/View/Zoom/AutoZoom/ts/AutoZoom_zh_CN.qm
 %%DATADIR%%/scripts/View/Zoom/AutoZoom/ts/AutoZoom_zh_CN.ts
 %%DATADIR%%/scripts/View/Zoom/AutoZoom/ts/AutoZoom_zh_TW.qm
@@ -18425,6 +19007,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/View/Zoom/PanZoom/ts/PanZoom_sl.ts
 %%DATADIR%%/scripts/View/Zoom/PanZoom/ts/PanZoom_sv.qm
 %%DATADIR%%/scripts/View/Zoom/PanZoom/ts/PanZoom_sv.ts
+%%DATADIR%%/scripts/View/Zoom/PanZoom/ts/PanZoom_tr.qm
+%%DATADIR%%/scripts/View/Zoom/PanZoom/ts/PanZoom_tr.ts
 %%DATADIR%%/scripts/View/Zoom/PanZoom/ts/PanZoom_zh_CN.qm
 %%DATADIR%%/scripts/View/Zoom/PanZoom/ts/PanZoom_zh_CN.ts
 %%DATADIR%%/scripts/View/Zoom/PanZoom/ts/PanZoom_zh_TW.qm
@@ -18486,6 +19070,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/View/Zoom/PreviousView/ts/PreviousView_sl.ts
 %%DATADIR%%/scripts/View/Zoom/PreviousView/ts/PreviousView_sv.qm
 %%DATADIR%%/scripts/View/Zoom/PreviousView/ts/PreviousView_sv.ts
+%%DATADIR%%/scripts/View/Zoom/PreviousView/ts/PreviousView_tr.qm
+%%DATADIR%%/scripts/View/Zoom/PreviousView/ts/PreviousView_tr.ts
 %%DATADIR%%/scripts/View/Zoom/PreviousView/ts/PreviousView_zh_CN.qm
 %%DATADIR%%/scripts/View/Zoom/PreviousView/ts/PreviousView_zh_CN.ts
 %%DATADIR%%/scripts/View/Zoom/PreviousView/ts/PreviousView_zh_TW.qm
@@ -18560,6 +19146,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/View/Zoom/WindowZoom/ts/WindowZoom_sl.ts
 %%DATADIR%%/scripts/View/Zoom/WindowZoom/ts/WindowZoom_sv.qm
 %%DATADIR%%/scripts/View/Zoom/WindowZoom/ts/WindowZoom_sv.ts
+%%DATADIR%%/scripts/View/Zoom/WindowZoom/ts/WindowZoom_tr.qm
+%%DATADIR%%/scripts/View/Zoom/WindowZoom/ts/WindowZoom_tr.ts
 %%DATADIR%%/scripts/View/Zoom/WindowZoom/ts/WindowZoom_zh_CN.qm
 %%DATADIR%%/scripts/View/Zoom/WindowZoom/ts/WindowZoom_zh_CN.ts
 %%DATADIR%%/scripts/View/Zoom/WindowZoom/ts/WindowZoom_zh_TW.qm
@@ -18625,6 +19213,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/View/Zoom/ZoomIn/ts/ZoomIn_sl.ts
 %%DATADIR%%/scripts/View/Zoom/ZoomIn/ts/ZoomIn_sv.qm
 %%DATADIR%%/scripts/View/Zoom/ZoomIn/ts/ZoomIn_sv.ts
+%%DATADIR%%/scripts/View/Zoom/ZoomIn/ts/ZoomIn_tr.qm
+%%DATADIR%%/scripts/View/Zoom/ZoomIn/ts/ZoomIn_tr.ts
 %%DATADIR%%/scripts/View/Zoom/ZoomIn/ts/ZoomIn_zh_CN.qm
 %%DATADIR%%/scripts/View/Zoom/ZoomIn/ts/ZoomIn_zh_CN.ts
 %%DATADIR%%/scripts/View/Zoom/ZoomIn/ts/ZoomIn_zh_TW.qm
@@ -18686,6 +19276,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/View/Zoom/ZoomOut/ts/ZoomOut_sl.ts
 %%DATADIR%%/scripts/View/Zoom/ZoomOut/ts/ZoomOut_sv.qm
 %%DATADIR%%/scripts/View/Zoom/ZoomOut/ts/ZoomOut_sv.ts
+%%DATADIR%%/scripts/View/Zoom/ZoomOut/ts/ZoomOut_tr.qm
+%%DATADIR%%/scripts/View/Zoom/ZoomOut/ts/ZoomOut_tr.ts
 %%DATADIR%%/scripts/View/Zoom/ZoomOut/ts/ZoomOut_zh_CN.qm
 %%DATADIR%%/scripts/View/Zoom/ZoomOut/ts/ZoomOut_zh_CN.ts
 %%DATADIR%%/scripts/View/Zoom/ZoomOut/ts/ZoomOut_zh_TW.qm
@@ -18747,6 +19339,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/View/Zoom/ZoomToSelection/ts/ZoomToSelection_sl.ts
 %%DATADIR%%/scripts/View/Zoom/ZoomToSelection/ts/ZoomToSelection_sv.qm
 %%DATADIR%%/scripts/View/Zoom/ZoomToSelection/ts/ZoomToSelection_sv.ts
+%%DATADIR%%/scripts/View/Zoom/ZoomToSelection/ts/ZoomToSelection_tr.qm
+%%DATADIR%%/scripts/View/Zoom/ZoomToSelection/ts/ZoomToSelection_tr.ts
 %%DATADIR%%/scripts/View/Zoom/ZoomToSelection/ts/ZoomToSelection_zh_CN.qm
 %%DATADIR%%/scripts/View/Zoom/ZoomToSelection/ts/ZoomToSelection_zh_CN.ts
 %%DATADIR%%/scripts/View/Zoom/ZoomToSelection/ts/ZoomToSelection_zh_TW.qm
@@ -18786,6 +19380,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/View/Zoom/ts/Zoom_sl.ts
 %%DATADIR%%/scripts/View/Zoom/ts/Zoom_sv.qm
 %%DATADIR%%/scripts/View/Zoom/ts/Zoom_sv.ts
+%%DATADIR%%/scripts/View/Zoom/ts/Zoom_tr.qm
+%%DATADIR%%/scripts/View/Zoom/ts/Zoom_tr.ts
 %%DATADIR%%/scripts/View/Zoom/ts/Zoom_zh_CN.qm
 %%DATADIR%%/scripts/View/Zoom/ts/Zoom_zh_CN.ts
 %%DATADIR%%/scripts/View/Zoom/ts/Zoom_zh_TW.qm
@@ -18834,6 +19430,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/View/ts/View_sl.ts
 %%DATADIR%%/scripts/View/ts/View_sv.qm
 %%DATADIR%%/scripts/View/ts/View_sv.ts
+%%DATADIR%%/scripts/View/ts/View_tr.qm
+%%DATADIR%%/scripts/View/ts/View_tr.ts
 %%DATADIR%%/scripts/View/ts/View_zh_CN.qm
 %%DATADIR%%/scripts/View/ts/View_zh_CN.ts
 %%DATADIR%%/scripts/View/ts/View_zh_TW.qm
@@ -18902,6 +19500,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Widgets/BlockList/ts/BlockList_sl.ts
 %%DATADIR%%/scripts/Widgets/BlockList/ts/BlockList_sv.qm
 %%DATADIR%%/scripts/Widgets/BlockList/ts/BlockList_sv.ts
+%%DATADIR%%/scripts/Widgets/BlockList/ts/BlockList_tr.qm
+%%DATADIR%%/scripts/Widgets/BlockList/ts/BlockList_tr.ts
 %%DATADIR%%/scripts/Widgets/BlockList/ts/BlockList_zh_CN.qm
 %%DATADIR%%/scripts/Widgets/BlockList/ts/BlockList_zh_CN.ts
 %%DATADIR%%/scripts/Widgets/BlockList/ts/BlockList_zh_TW.qm
@@ -18947,6 +19547,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Widgets/CadToolBar/ts/CadToolBar_sl.ts
 %%DATADIR%%/scripts/Widgets/CadToolBar/ts/CadToolBar_sv.qm
 %%DATADIR%%/scripts/Widgets/CadToolBar/ts/CadToolBar_sv.ts
+%%DATADIR%%/scripts/Widgets/CadToolBar/ts/CadToolBar_tr.qm
+%%DATADIR%%/scripts/Widgets/CadToolBar/ts/CadToolBar_tr.ts
 %%DATADIR%%/scripts/Widgets/CadToolBar/ts/CadToolBar_zh_CN.qm
 %%DATADIR%%/scripts/Widgets/CadToolBar/ts/CadToolBar_zh_CN.ts
 %%DATADIR%%/scripts/Widgets/CadToolBar/ts/CadToolBar_zh_TW.qm
@@ -18991,6 +19593,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Widgets/CadToolMatrix/ts/CadToolMatrix_sl.ts
 %%DATADIR%%/scripts/Widgets/CadToolMatrix/ts/CadToolMatrix_sv.qm
 %%DATADIR%%/scripts/Widgets/CadToolMatrix/ts/CadToolMatrix_sv.ts
+%%DATADIR%%/scripts/Widgets/CadToolMatrix/ts/CadToolMatrix_tr.qm
+%%DATADIR%%/scripts/Widgets/CadToolMatrix/ts/CadToolMatrix_tr.ts
 %%DATADIR%%/scripts/Widgets/CadToolMatrix/ts/CadToolMatrix_zh_CN.qm
 %%DATADIR%%/scripts/Widgets/CadToolMatrix/ts/CadToolMatrix_zh_CN.ts
 %%DATADIR%%/scripts/Widgets/CadToolMatrix/ts/CadToolMatrix_zh_TW.qm
@@ -19055,6 +19659,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Widgets/CommandLine/ts/CommandLine_sl.ts
 %%DATADIR%%/scripts/Widgets/CommandLine/ts/CommandLine_sv.qm
 %%DATADIR%%/scripts/Widgets/CommandLine/ts/CommandLine_sv.ts
+%%DATADIR%%/scripts/Widgets/CommandLine/ts/CommandLine_tr.qm
+%%DATADIR%%/scripts/Widgets/CommandLine/ts/CommandLine_tr.ts
 %%DATADIR%%/scripts/Widgets/CommandLine/ts/CommandLine_zh_CN.qm
 %%DATADIR%%/scripts/Widgets/CommandLine/ts/CommandLine_zh_CN.ts
 %%DATADIR%%/scripts/Widgets/CommandLine/ts/CommandLine_zh_TW.qm
@@ -19096,6 +19702,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Widgets/CoordinateDisplay/ts/CoordinateDisplay_sl.ts
 %%DATADIR%%/scripts/Widgets/CoordinateDisplay/ts/CoordinateDisplay_sv.qm
 %%DATADIR%%/scripts/Widgets/CoordinateDisplay/ts/CoordinateDisplay_sv.ts
+%%DATADIR%%/scripts/Widgets/CoordinateDisplay/ts/CoordinateDisplay_tr.qm
+%%DATADIR%%/scripts/Widgets/CoordinateDisplay/ts/CoordinateDisplay_tr.ts
 %%DATADIR%%/scripts/Widgets/CoordinateDisplay/ts/CoordinateDisplay_zh_CN.qm
 %%DATADIR%%/scripts/Widgets/CoordinateDisplay/ts/CoordinateDisplay_zh_CN.ts
 %%DATADIR%%/scripts/Widgets/CoordinateDisplay/ts/CoordinateDisplay_zh_TW.qm
@@ -19141,6 +19749,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Widgets/DirectoryList/ts/DirectoryList_sl.ts
 %%DATADIR%%/scripts/Widgets/DirectoryList/ts/DirectoryList_sv.qm
 %%DATADIR%%/scripts/Widgets/DirectoryList/ts/DirectoryList_sv.ts
+%%DATADIR%%/scripts/Widgets/DirectoryList/ts/DirectoryList_tr.qm
+%%DATADIR%%/scripts/Widgets/DirectoryList/ts/DirectoryList_tr.ts
 %%DATADIR%%/scripts/Widgets/DirectoryList/ts/DirectoryList_zh_CN.qm
 %%DATADIR%%/scripts/Widgets/DirectoryList/ts/DirectoryList_zh_CN.ts
 %%DATADIR%%/scripts/Widgets/DirectoryList/ts/DirectoryList_zh_TW.qm
@@ -19184,6 +19794,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Widgets/FirstStart/ts/FirstStart_sl.ts
 %%DATADIR%%/scripts/Widgets/FirstStart/ts/FirstStart_sv.qm
 %%DATADIR%%/scripts/Widgets/FirstStart/ts/FirstStart_sv.ts
+%%DATADIR%%/scripts/Widgets/FirstStart/ts/FirstStart_tr.qm
+%%DATADIR%%/scripts/Widgets/FirstStart/ts/FirstStart_tr.ts
 %%DATADIR%%/scripts/Widgets/FirstStart/ts/FirstStart_zh_CN.qm
 %%DATADIR%%/scripts/Widgets/FirstStart/ts/FirstStart_zh_CN.ts
 %%DATADIR%%/scripts/Widgets/FirstStart/ts/FirstStart_zh_TW.qm
@@ -19247,6 +19859,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Widgets/LayerList/ts/LayerList_sl.ts
 %%DATADIR%%/scripts/Widgets/LayerList/ts/LayerList_sv.qm
 %%DATADIR%%/scripts/Widgets/LayerList/ts/LayerList_sv.ts
+%%DATADIR%%/scripts/Widgets/LayerList/ts/LayerList_tr.qm
+%%DATADIR%%/scripts/Widgets/LayerList/ts/LayerList_tr.ts
 %%DATADIR%%/scripts/Widgets/LayerList/ts/LayerList_zh_CN.qm
 %%DATADIR%%/scripts/Widgets/LayerList/ts/LayerList_zh_CN.ts
 %%DATADIR%%/scripts/Widgets/LayerList/ts/LayerList_zh_TW.qm
@@ -19384,6 +19998,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Widgets/LibraryBrowser/ts/LibraryBrowser_sl.ts
 %%DATADIR%%/scripts/Widgets/LibraryBrowser/ts/LibraryBrowser_sv.qm
 %%DATADIR%%/scripts/Widgets/LibraryBrowser/ts/LibraryBrowser_sv.ts
+%%DATADIR%%/scripts/Widgets/LibraryBrowser/ts/LibraryBrowser_tr.qm
+%%DATADIR%%/scripts/Widgets/LibraryBrowser/ts/LibraryBrowser_tr.ts
 %%DATADIR%%/scripts/Widgets/LibraryBrowser/ts/LibraryBrowser_zh_CN.qm
 %%DATADIR%%/scripts/Widgets/LibraryBrowser/ts/LibraryBrowser_zh_CN.ts
 %%DATADIR%%/scripts/Widgets/LibraryBrowser/ts/LibraryBrowser_zh_TW.qm
@@ -19432,6 +20048,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Widgets/PenToolBar/ts/PenToolBar_sl.ts
 %%DATADIR%%/scripts/Widgets/PenToolBar/ts/PenToolBar_sv.qm
 %%DATADIR%%/scripts/Widgets/PenToolBar/ts/PenToolBar_sv.ts
+%%DATADIR%%/scripts/Widgets/PenToolBar/ts/PenToolBar_tr.qm
+%%DATADIR%%/scripts/Widgets/PenToolBar/ts/PenToolBar_tr.ts
 %%DATADIR%%/scripts/Widgets/PenToolBar/ts/PenToolBar_zh_CN.qm
 %%DATADIR%%/scripts/Widgets/PenToolBar/ts/PenToolBar_zh_CN.ts
 %%DATADIR%%/scripts/Widgets/PenToolBar/ts/PenToolBar_zh_TW.qm
@@ -19499,6 +20117,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Widgets/PropertyEditor/ts/PropertyEditor_sl.ts
 %%DATADIR%%/scripts/Widgets/PropertyEditor/ts/PropertyEditor_sv.qm
 %%DATADIR%%/scripts/Widgets/PropertyEditor/ts/PropertyEditor_sv.ts
+%%DATADIR%%/scripts/Widgets/PropertyEditor/ts/PropertyEditor_tr.qm
+%%DATADIR%%/scripts/Widgets/PropertyEditor/ts/PropertyEditor_tr.ts
 %%DATADIR%%/scripts/Widgets/PropertyEditor/ts/PropertyEditor_zh_CN.qm
 %%DATADIR%%/scripts/Widgets/PropertyEditor/ts/PropertyEditor_zh_CN.ts
 %%DATADIR%%/scripts/Widgets/PropertyEditor/ts/PropertyEditor_zh_TW.qm
@@ -19540,6 +20160,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Widgets/SelectionDisplay/ts/SelectionDisplay_sl.ts
 %%DATADIR%%/scripts/Widgets/SelectionDisplay/ts/SelectionDisplay_sv.qm
 %%DATADIR%%/scripts/Widgets/SelectionDisplay/ts/SelectionDisplay_sv.ts
+%%DATADIR%%/scripts/Widgets/SelectionDisplay/ts/SelectionDisplay_tr.qm
+%%DATADIR%%/scripts/Widgets/SelectionDisplay/ts/SelectionDisplay_tr.ts
 %%DATADIR%%/scripts/Widgets/SelectionDisplay/ts/SelectionDisplay_zh_CN.qm
 %%DATADIR%%/scripts/Widgets/SelectionDisplay/ts/SelectionDisplay_zh_CN.ts
 %%DATADIR%%/scripts/Widgets/SelectionDisplay/ts/SelectionDisplay_zh_TW.qm
@@ -19586,6 +20208,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Widgets/StatusBar/ts/StatusBar_sl.ts
 %%DATADIR%%/scripts/Widgets/StatusBar/ts/StatusBar_sv.qm
 %%DATADIR%%/scripts/Widgets/StatusBar/ts/StatusBar_sv.ts
+%%DATADIR%%/scripts/Widgets/StatusBar/ts/StatusBar_tr.qm
+%%DATADIR%%/scripts/Widgets/StatusBar/ts/StatusBar_tr.ts
 %%DATADIR%%/scripts/Widgets/StatusBar/ts/StatusBar_zh_CN.qm
 %%DATADIR%%/scripts/Widgets/StatusBar/ts/StatusBar_zh_CN.ts
 %%DATADIR%%/scripts/Widgets/StatusBar/ts/StatusBar_zh_TW.qm
@@ -19629,6 +20253,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Widgets/TabBar/ts/TabBar_sl.ts
 %%DATADIR%%/scripts/Widgets/TabBar/ts/TabBar_sv.qm
 %%DATADIR%%/scripts/Widgets/TabBar/ts/TabBar_sv.ts
+%%DATADIR%%/scripts/Widgets/TabBar/ts/TabBar_tr.qm
+%%DATADIR%%/scripts/Widgets/TabBar/ts/TabBar_tr.ts
 %%DATADIR%%/scripts/Widgets/TabBar/ts/TabBar_zh_CN.qm
 %%DATADIR%%/scripts/Widgets/TabBar/ts/TabBar_zh_CN.ts
 %%DATADIR%%/scripts/Widgets/TabBar/ts/TabBar_zh_TW.qm
@@ -19684,6 +20310,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Widgets/ViewportWidget/ts/ViewportWidget_sl.ts
 %%DATADIR%%/scripts/Widgets/ViewportWidget/ts/ViewportWidget_sv.qm
 %%DATADIR%%/scripts/Widgets/ViewportWidget/ts/ViewportWidget_sv.ts
+%%DATADIR%%/scripts/Widgets/ViewportWidget/ts/ViewportWidget_tr.qm
+%%DATADIR%%/scripts/Widgets/ViewportWidget/ts/ViewportWidget_tr.ts
 %%DATADIR%%/scripts/Widgets/ViewportWidget/ts/ViewportWidget_zh_CN.qm
 %%DATADIR%%/scripts/Widgets/ViewportWidget/ts/ViewportWidget_zh_CN.ts
 %%DATADIR%%/scripts/Widgets/ViewportWidget/ts/ViewportWidget_zh_TW.qm
@@ -19724,6 +20352,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Widgets/ts/Widgets_sl.ts
 %%DATADIR%%/scripts/Widgets/ts/Widgets_sv.qm
 %%DATADIR%%/scripts/Widgets/ts/Widgets_sv.ts
+%%DATADIR%%/scripts/Widgets/ts/Widgets_tr.qm
+%%DATADIR%%/scripts/Widgets/ts/Widgets_tr.ts
 %%DATADIR%%/scripts/Widgets/ts/Widgets_zh_CN.qm
 %%DATADIR%%/scripts/Widgets/ts/Widgets_zh_CN.ts
 %%DATADIR%%/scripts/Widgets/ts/Widgets_zh_TW.qm
@@ -19786,6 +20416,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Window/CloseAll/ts/CloseAll_sl.ts
 %%DATADIR%%/scripts/Window/CloseAll/ts/CloseAll_sv.qm
 %%DATADIR%%/scripts/Window/CloseAll/ts/CloseAll_sv.ts
+%%DATADIR%%/scripts/Window/CloseAll/ts/CloseAll_tr.qm
+%%DATADIR%%/scripts/Window/CloseAll/ts/CloseAll_tr.ts
 %%DATADIR%%/scripts/Window/CloseAll/ts/CloseAll_zh_CN.qm
 %%DATADIR%%/scripts/Window/CloseAll/ts/CloseAll_zh_CN.ts
 %%DATADIR%%/scripts/Window/CloseAll/ts/CloseAll_zh_TW.qm
@@ -19847,6 +20479,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Window/NextWindow/ts/NextWindow_sl.ts
 %%DATADIR%%/scripts/Window/NextWindow/ts/NextWindow_sv.qm
 %%DATADIR%%/scripts/Window/NextWindow/ts/NextWindow_sv.ts
+%%DATADIR%%/scripts/Window/NextWindow/ts/NextWindow_tr.qm
+%%DATADIR%%/scripts/Window/NextWindow/ts/NextWindow_tr.ts
 %%DATADIR%%/scripts/Window/NextWindow/ts/NextWindow_zh_CN.qm
 %%DATADIR%%/scripts/Window/NextWindow/ts/NextWindow_zh_CN.ts
 %%DATADIR%%/scripts/Window/NextWindow/ts/NextWindow_zh_TW.qm
@@ -19908,6 +20542,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Window/PreviousWindow/ts/PreviousWindow_sl.ts
 %%DATADIR%%/scripts/Window/PreviousWindow/ts/PreviousWindow_sv.qm
 %%DATADIR%%/scripts/Window/PreviousWindow/ts/PreviousWindow_sv.ts
+%%DATADIR%%/scripts/Window/PreviousWindow/ts/PreviousWindow_tr.qm
+%%DATADIR%%/scripts/Window/PreviousWindow/ts/PreviousWindow_tr.ts
 %%DATADIR%%/scripts/Window/PreviousWindow/ts/PreviousWindow_zh_CN.qm
 %%DATADIR%%/scripts/Window/PreviousWindow/ts/PreviousWindow_zh_CN.ts
 %%DATADIR%%/scripts/Window/PreviousWindow/ts/PreviousWindow_zh_TW.qm
@@ -19956,6 +20592,8 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/Window/ts/Window_sl.ts
 %%DATADIR%%/scripts/Window/ts/Window_sv.qm
 %%DATADIR%%/scripts/Window/ts/Window_sv.ts
+%%DATADIR%%/scripts/Window/ts/Window_tr.qm
+%%DATADIR%%/scripts/Window/ts/Window_tr.ts
 %%DATADIR%%/scripts/Window/ts/Window_zh_CN.qm
 %%DATADIR%%/scripts/Window/ts/Window_zh_CN.ts
 %%DATADIR%%/scripts/Window/ts/Window_zh_TW.qm
@@ -20021,26 +20659,14 @@ lib/libstemmer.a
 %%DATADIR%%/scripts/ts/Scripts_sl.ts
 %%DATADIR%%/scripts/ts/Scripts_sv.qm
 %%DATADIR%%/scripts/ts/Scripts_sv.ts
+%%DATADIR%%/scripts/ts/Scripts_tr.qm
+%%DATADIR%%/scripts/ts/Scripts_tr.ts
 %%DATADIR%%/scripts/ts/Scripts_zh_CN.qm
 %%DATADIR%%/scripts/ts/Scripts_zh_CN.ts
 %%DATADIR%%/scripts/ts/Scripts_zh_TW.qm
 %%DATADIR%%/scripts/ts/Scripts_zh_TW.ts
 %%DATADIR%%/scripts/ts/ts.pro
 %%DATADIR%%/ts/Makefile
-%%DATADIR%%/ts/assistant_cs.qm
-%%DATADIR%%/ts/assistant_da.qm
-%%DATADIR%%/ts/assistant_de.qm
-%%DATADIR%%/ts/assistant_fr.qm
-%%DATADIR%%/ts/assistant_hu.qm
-%%DATADIR%%/ts/assistant_ja.qm
-%%DATADIR%%/ts/assistant_ko.qm
-%%DATADIR%%/ts/assistant_pl.qm
-%%DATADIR%%/ts/assistant_ru.qm
-%%DATADIR%%/ts/assistant_sk.qm
-%%DATADIR%%/ts/assistant_sl.qm
-%%DATADIR%%/ts/assistant_uk.qm
-%%DATADIR%%/ts/assistant_zh_CN.qm
-%%DATADIR%%/ts/assistant_zh_TW.qm
 %%DATADIR%%/ts/qcadcore_cs.qm
 %%DATADIR%%/ts/qcadcore_cs.ts
 %%DATADIR%%/ts/qcadcore_de.qm
@@ -20149,59 +20775,5 @@ lib/libstemmer.a
 %%DATADIR%%/ts/qcadgui_zh_CN.ts
 %%DATADIR%%/ts/qcadgui_zh_TW.qm
 %%DATADIR%%/ts/qcadgui_zh_TW.ts
-%%DATADIR%%/ts/qt_ar.qm
-%%DATADIR%%/ts/qt_ca.qm
-%%DATADIR%%/ts/qt_cs.qm
-%%DATADIR%%/ts/qt_da.qm
-%%DATADIR%%/ts/qt_de.qm
-%%DATADIR%%/ts/qt_es.qm
-%%DATADIR%%/ts/qt_fa.qm
-%%DATADIR%%/ts/qt_fi.qm
-%%DATADIR%%/ts/qt_fr.qm
-%%DATADIR%%/ts/qt_gl.qm
-%%DATADIR%%/ts/qt_he.qm
-%%DATADIR%%/ts/qt_help_cs.qm
-%%DATADIR%%/ts/qt_help_da.qm
-%%DATADIR%%/ts/qt_help_de.qm
-%%DATADIR%%/ts/qt_help_fr.qm
-%%DATADIR%%/ts/qt_help_gl.qm
-%%DATADIR%%/ts/qt_help_hu.qm
-%%DATADIR%%/ts/qt_help_it.qm
-%%DATADIR%%/ts/qt_help_ja.qm
-%%DATADIR%%/ts/qt_help_ko.qm
-%%DATADIR%%/ts/qt_help_pl.qm
-%%DATADIR%%/ts/qt_help_ru.qm
-%%DATADIR%%/ts/qt_help_sk.qm
-%%DATADIR%%/ts/qt_help_sl.qm
-%%DATADIR%%/ts/qt_help_uk.qm
-%%DATADIR%%/ts/qt_help_zh_CN.qm
-%%DATADIR%%/ts/qt_help_zh_TW.qm
-%%DATADIR%%/ts/qt_hu.qm
-%%DATADIR%%/ts/qt_it.qm
-%%DATADIR%%/ts/qt_ja.qm
-%%DATADIR%%/ts/qt_ko.qm
-%%DATADIR%%/ts/qt_lt.qm
-%%DATADIR%%/ts/qt_pl.qm
-%%DATADIR%%/ts/qt_pt.qm
-%%DATADIR%%/ts/qt_ru.qm
-%%DATADIR%%/ts/qt_sk.qm
-%%DATADIR%%/ts/qt_sl.qm
-%%DATADIR%%/ts/qt_sv.qm
-%%DATADIR%%/ts/qt_uk.qm
-%%DATADIR%%/ts/qt_zh_CN.qm
-%%DATADIR%%/ts/qt_zh_TW.qm
-%%DATADIR%%/ts/qtbase_ca.qm
-%%DATADIR%%/ts/qtbase_cs.qm
-%%DATADIR%%/ts/qtbase_de.qm
-%%DATADIR%%/ts/qtbase_fi.qm
-%%DATADIR%%/ts/qtbase_fr.qm
-%%DATADIR%%/ts/qtbase_he.qm
-%%DATADIR%%/ts/qtbase_hu.qm
-%%DATADIR%%/ts/qtbase_it.qm
-%%DATADIR%%/ts/qtbase_ja.qm
-%%DATADIR%%/ts/qtbase_ko.qm
-%%DATADIR%%/ts/qtbase_lv.qm
-%%DATADIR%%/ts/qtbase_ru.qm
 %%DATADIR%%/ts/qtbase_sk.qm
-%%DATADIR%%/ts/qtbase_uk.qm
 %%DATADIR%%/ts/ts.pro
diff --git a/databases/Makefile b/databases/Makefile
index 0f01bb30fce..20864cb628b 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -569,6 +569,7 @@
     SUBDIR += pg_activity
     SUBDIR += pg_citus
     SUBDIR += pg_dirtyread
+    SUBDIR += pg_partman
     SUBDIR += pg_qualstats
     SUBDIR += pg_reorg
     SUBDIR += pg_repack
@@ -677,6 +678,14 @@
     SUBDIR += postgresql-repmgr2
     SUBDIR += postgresql-tds_fdw
     SUBDIR += postgresql-zhparser
+    SUBDIR += postgresql10-client
+    SUBDIR += postgresql10-contrib
+    SUBDIR += postgresql10-docs
+    SUBDIR += postgresql10-pgtcl
+    SUBDIR += postgresql10-plperl
+    SUBDIR += postgresql10-plpython
+    SUBDIR += postgresql10-pltcl
+    SUBDIR += postgresql10-server
     SUBDIR += postgresql92-client
     SUBDIR += postgresql92-contrib
     SUBDIR += postgresql92-docs
@@ -727,8 +736,10 @@
     SUBDIR += proftpd-mod_sql_tds
     SUBDIR += puppetdb-terminus3
     SUBDIR += puppetdb-terminus4
+    SUBDIR += puppetdb-terminus5
     SUBDIR += puppetdb3
     SUBDIR += puppetdb4
+    SUBDIR += puppetdb5
     SUBDIR += pure-sql3
     SUBDIR += puredb
     SUBDIR += pxlib
diff --git a/databases/cego/Makefile b/databases/cego/Makefile
index 6515bb6abe8..0015347a9a3 100644
--- a/databases/cego/Makefile
+++ b/databases/cego/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cego
-PORTVERSION=	2.33.22
+PORTVERSION=	2.34.0
 CATEGORIES=	databases
 MASTER_SITES=	http://www.lemke-it.com/
 
diff --git a/databases/cego/distinfo b/databases/cego/distinfo
index bec2f16638f..b536bd6ac8f 100644
--- a/databases/cego/distinfo
+++ b/databases/cego/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501933684
-SHA256 (cego-2.33.22.tar.gz) = bbb65e7896eefe69249748fa71bb89f4c6dd4e4a71c9db13a36f9e09133aa262
-SIZE (cego-2.33.22.tar.gz) = 1410925
+TIMESTAMP = 1502539223
+SHA256 (cego-2.34.0.tar.gz) = 1df5c1b2ab154fcb34bb2b27480ba087f3c2bcbf0b3820c11015684cc3e2bd67
+SIZE (cego-2.34.0.tar.gz) = 1413328
diff --git a/databases/db6/Makefile b/databases/db6/Makefile
index 415d97289c9..c995dde9f73 100644
--- a/databases/db6/Makefile
+++ b/databases/db6/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	db6
-PORTVERSION=	6.2.23
-PORTREVISION=	2
+PORTVERSION=	6.2.32
 CATEGORIES=	databases java
 MASTER_SITES=	http://download.oracle.com/berkeley-db/
 PKGNAMEPREFIX?=
diff --git a/databases/db6/distinfo b/databases/db6/distinfo
index f1fd4f27af3..e8561d18387 100644
--- a/databases/db6/distinfo
+++ b/databases/db6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1464030344
-SHA256 (bdb/db-6.2.23.tar.gz) = 47612c8991aa9ac2f6be721267c8d3cdccf5ac83105df8e50809daea24e95dc7
-SIZE (bdb/db-6.2.23.tar.gz) = 44305964
+TIMESTAMP = 1502528680
+SHA256 (bdb/db-6.2.32.tar.gz) = a9c5e2b004a5777aa03510cfe5cd766a4a3b777713406b02809c17c8e0e7a8fb
+SIZE (bdb/db-6.2.32.tar.gz) = 45342417
diff --git a/databases/db6/pkg-plist b/databases/db6/pkg-plist
index 7d573fa5ee4..4b5960251fe 100644
--- a/databases/db6/pkg-plist
+++ b/databases/db6/pkg-plist
@@ -1,5 +1,6 @@
 bin/db%%BDBMAJ%%/db_archive
 bin/db%%BDBMAJ%%/db_checkpoint
+bin/db%%BDBMAJ%%/db_convert
 bin/db%%BDBMAJ%%/db_deadlock
 bin/db%%BDBMAJ%%/db_dump
 bin/db%%BDBMAJ%%/db_dump185
@@ -18,6 +19,7 @@ bin/db%%BDBMAJ%%/db_verify
 %%SQL%%bin/db%%BDBMAJ%%/dbsql
 bin/db_archive-%%BDBVER%%
 bin/db_checkpoint-%%BDBVER%%
+bin/db_convert-%%BDBVER%%
 bin/db_deadlock-%%BDBVER%%
 bin/db_dump-%%BDBVER%%
 bin/db_dump185-%%BDBVER%%
diff --git a/databases/elixir-mariaex/Makefile b/databases/elixir-mariaex/Makefile
index 67634065a9f..92fe6f6fed4 100644
--- a/databases/elixir-mariaex/Makefile
+++ b/databases/elixir-mariaex/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	mariaex
-PORTVERSION=	0.8.2
+PORTVERSION=	0.8.3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 PKGNAMEPREFIX=	elixir-
diff --git a/databases/elixir-mariaex/distinfo b/databases/elixir-mariaex/distinfo
index 356488f6394..2e6fb4b0163 100644
--- a/databases/elixir-mariaex/distinfo
+++ b/databases/elixir-mariaex/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1490663176
-SHA256 (xerions-mariaex-v0.8.2_GH0.tar.gz) = e973dfae0734229e6e8f96edd79b3ac750ab15c2e569ce7b38cf6f3791cbcc70
-SIZE (xerions-mariaex-v0.8.2_GH0.tar.gz) = 33889
+TIMESTAMP = 1502455440
+SHA256 (xerions-mariaex-v0.8.3_GH0.tar.gz) = 1243b34f72137f765500e94f7fe8d945dd350cc70597555669172d926c0f785c
+SIZE (xerions-mariaex-v0.8.3_GH0.tar.gz) = 33677
diff --git a/databases/mariadb100-server/Makefile b/databases/mariadb100-server/Makefile
index 7229eee32ab..4c9158a77c2 100644
--- a/databases/mariadb100-server/Makefile
+++ b/databases/mariadb100-server/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME?=	mariadb
-PORTVERSION=	10.0.31
-PORTREVISION?=	1
+PORTVERSION=	10.0.32
+PORTREVISION?=	0
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://ftp.osuosl.org/pub/${SITESDIR}/ \
 		http://mirrors.supportex.net/${SITESDIR}/ \
diff --git a/databases/mariadb100-server/distinfo b/databases/mariadb100-server/distinfo
index f829e51d8a6..b03c88e9c33 100644
--- a/databases/mariadb100-server/distinfo
+++ b/databases/mariadb100-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495565124
-SHA256 (mariadb-10.0.31.tar.gz) = 371f2dae0b9e1a92939fba1efca77ac83ba15b6b6dcfd389ca5cbf79eb8b842a
-SIZE (mariadb-10.0.31.tar.gz) = 63461177
+TIMESTAMP = 1502136321
+SHA256 (mariadb-10.0.32.tar.gz) = f7a8d9ba88b01d426f5d69e5044e505e444a5ce73e22c9c50913dade43725936
+SIZE (mariadb-10.0.32.tar.gz) = 63567828
diff --git a/databases/mariadb101-server/Makefile b/databases/mariadb101-server/Makefile
index bcb8a03653a..6ab7d2e2fe0 100644
--- a/databases/mariadb101-server/Makefile
+++ b/databases/mariadb101-server/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME?=	mariadb
-PORTVERSION=	10.1.25
+PORTVERSION=	10.1.26
 PORTREVISION?=	0
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://ftp.osuosl.org/pub/${SITESDIR}/ \
@@ -28,7 +28,7 @@ SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 SLAVEDIRS=	databases/mariadb101-client
-USES=		bison:build cmake compiler:c++11-lib cpe execinfo ncurses \
+USES=		bison:build cmake compiler:c++11-lib cpe execinfo libedit ncurses \
 		shebangfix ssl
 USE_LDCONFIG=	${PREFIX}/lib/mysql
 SHEBANG_FILES=	scripts/*.sh
diff --git a/databases/mariadb101-server/distinfo b/databases/mariadb101-server/distinfo
index c0afd5bea32..06c00d7d7b3 100644
--- a/databases/mariadb101-server/distinfo
+++ b/databases/mariadb101-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499243885
-SHA256 (mariadb-10.1.25.tar.gz) = 7205ecaa6f1bc16335ad88faa5c46be52b3ac628a5e795cb942a3f4335b2a0d6
-SIZE (mariadb-10.1.25.tar.gz) = 61790542
+TIMESTAMP = 1502489306
+SHA256 (mariadb-10.1.26.tar.gz) = ba88b1cb9967dea2909938a34ba89373b162b0d83e5c98a0f1c94540156bf73d
+SIZE (mariadb-10.1.26.tar.gz) = 61887132
diff --git a/databases/neo4j/Makefile b/databases/neo4j/Makefile
index 89e10a31efb..dabf89c5fde 100644
--- a/databases/neo4j/Makefile
+++ b/databases/neo4j/Makefile
@@ -1,11 +1,12 @@
 # $FreeBSD$
 
 PORTNAME=	neo4j
-DISTVERSION=	3.0.4
-PORTREVISION=	2
+DISTVERSION=	3.2.1
+PORTREVISION=	1
 CATEGORIES=	databases java
 MASTER_SITES=	http://dist.neo4j.org/
 DISTNAME=	${PORTNAME}-community-${DISTVERSION}-unix
+LICENSE=	GPLv3
 
 MAINTAINER=	crees@FreeBSD.org
 COMMENT=	High performance graph store and database
@@ -15,29 +16,29 @@ RUN_DEPENDS=	bash:shells/bash
 WRKSRC=		${WRKDIR}/${DISTNAME:S,-unix,,}
 NO_BUILD=	yes
 USES=		shebangfix
-SHEBANG_FILES=	bin/neo4j-shell bin/neo4j-import
+SHEBANG_FILES=	bin/cypher-shell bin/neo4j-admin bin/neo4j-shell bin/neo4j-import
 USE_JAVA=	yes
 USE_RC_SUBR=	${PORTNAME}
 SUB_FILES=	${PORTNAME}.sh
 
+DBDIR=		/var/db/${PORTNAME}
+
 post-patch:
-	${REINPLACE_CMD} 's,%%DATADIR%%,${DATADIR},g;s,%%PREFIX%%,${PREFIX},g' \
-		${WRKSRC}/bin/neo4j-shared.sh ${WRKSRC}/conf/neo4j.conf
+	${REINPLACE_CMD} 's,%%DBDIR%%,${DBDIR},g;s,%%PREFIX%%,${PREFIX},g' \
+		${WRKSRC}/bin/cypher-shell ${WRKSRC}/bin/neo4j* \
+		${WRKSRC}/conf/neo4j.conf
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/tools
+	${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}/libexec/tools
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/tools/* \
-		${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/tools
-.for j in j j-admin j-import j-shell
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/neo4$j ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}
-	-cd ${STAGEDIR}${PREFIX}/bin && ${LN} ${PORTNAME} neo4$j 2>/dev/null
+		${STAGEDIR}${PREFIX}/${PORTNAME}/libexec/tools
+.for name in cypher-shell neo4j neo4j-admin neo4j-import neo4j-shell
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/${name} ${STAGEDIR}${PREFIX}/bin
 .endfor
-	${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/plugins
-	${INSTALL_SCRIPT} ${WRKSRC}/lib/* ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/${PORTNAME}-shared.sh \
-		${STAGEDIR}${PREFIX}/libexec/${PORTNAME}
-.for f in ${PORTNAME}.conf ${PORTNAME}-wrapper.conf
+	${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}/lib/plugins
+	${INSTALL_SCRIPT} ${WRKSRC}/lib/* ${STAGEDIR}${PREFIX}/${PORTNAME}/lib
+.for f in ${PORTNAME}.conf
 	${INSTALL_DATA} ${WRKSRC}/conf/$f \
 		${STAGEDIR}${PREFIX}/etc/$f.sample
 .endfor
diff --git a/databases/neo4j/distinfo b/databases/neo4j/distinfo
index a860c415fe4..602c7c0d2bf 100644
--- a/databases/neo4j/distinfo
+++ b/databases/neo4j/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1472081606
-SHA256 (neo4j-community-3.0.4-unix.tar.gz) = e1da51163eb18380623788eabea34dfe23ee21c99deca4e7922094b0d242e805
-SIZE (neo4j-community-3.0.4-unix.tar.gz) = 61425809
+TIMESTAMP = 1498754546
+SHA256 (neo4j-community-3.2.1-unix.tar.gz) = 24fd6a704e0d80c4b4f9a3d17ce0db23f258a8cdcfa1eb28d7803b7d1811ee96
+SIZE (neo4j-community-3.2.1-unix.tar.gz) = 77979397
diff --git a/databases/neo4j/files/neo4j.in b/databases/neo4j/files/neo4j.in
index 31705c8a436..db100a197ec 100644
--- a/databases/neo4j/files/neo4j.in
+++ b/databases/neo4j/files/neo4j.in
@@ -20,7 +20,7 @@ load_rc_config $name
 
 : ${neo4j_enable:=NO}
 
-command=%%PREFIX%%/libexec/neo4j/neo4j
+command=%%PREFIX%%/bin/neo4j
 start_cmd="$command start"
 start_precmd=neo4j_prestart
 stop_cmd="$command stop"
@@ -29,7 +29,7 @@ status_cmd="$command status"
 neo4j_prestart()
 {
 	NEO4J_DATA=%%DATADIR%%
-	NEO4J_LIB=%%PREFIX%%/lib/neo4j
+	NEO4J_LIB=%%PREFIX%%/neo4j/lib
 	NEO4J_LOGS=/var/log/neo4j
 	NEO4J_PLUGINS=${NEO4J_LIB}/plugins
 	NEO4J_RUN=/var/run/neo4j
diff --git a/databases/neo4j/files/neo4j.sh.in b/databases/neo4j/files/neo4j.sh.in
index 3edd106647a..8aa90d6c424 100644
--- a/databases/neo4j/files/neo4j.sh.in
+++ b/databases/neo4j/files/neo4j.sh.in
@@ -2,6 +2,4 @@
 #
 # $FreeBSD$
 
-. %%PREFIX%%/libexec/neo4j/neo4j-shared.sh
-
-exec %%PREFIX%%/libexec/neo4j/$(basename $0) ${1+"$@"}
+exec %%PREFIX%%/bin/$(basename $0) ${1+"$@"}
diff --git a/databases/neo4j/files/patch-bin-neo4j-shared-sh b/databases/neo4j/files/patch-bin-neo4j-shared-sh
deleted file mode 100644
index fadf6b3ab19..00000000000
--- a/databases/neo4j/files/patch-bin-neo4j-shared-sh
+++ /dev/null
@@ -1,27 +0,0 @@
---- bin/neo4j-shared.sh.orig	2016-08-25 00:54:03.496139435 +0100
-+++ bin/neo4j-shared.sh	2016-08-25 01:02:34.689503862 +0100
-@@ -124,7 +124,7 @@
-   if [[ -z "${NEO4J_HOME:-}" ]]; then
-     NEO4J_HOME="$(cd "$(dirname "$0")"/.. && pwd)"
-   fi
--  : "${NEO4J_CONF:="${NEO4J_HOME}/conf"}"
-+  export NEO4J_CONF=%%PREFIX%%/etc
-   readonly NEO4J_HOME NEO4J_CONF
- }
- 
-@@ -159,10 +159,10 @@
- }
- 
- _setup_configurable_paths() {
--  NEO4J_DATA=$(resolve_path "${dbms_directories_data:-data}")
--  NEO4J_LIB=$(resolve_path "${dbms_directories_lib:-lib}")
--  NEO4J_LOGS=$(resolve_path "${dbms_directories_logs:-logs}")
--  NEO4J_PLUGINS=$(resolve_path "${dbms_directories_plugins:-plugins}")
--  NEO4J_RUN=$(resolve_path "${dbms_directories_run:-run}")
-+  export NEO4J_DATA=%%DATADIR%%
-+  export NEO4J_LIB=%%PREFIX%%/lib/neo4j
-+  export NEO4J_LOGS=/var/log/neo4j
-+  export NEO4J_PLUGINS=${NEO4J_LIB}/plugins
-+  export NEO4J_RUN=/var/run
-   readonly NEO4J_DATA NEO4J_LIB NEO4J_LOGS NEO4J_PLUGINS NEO4J_RUN
- }
diff --git a/databases/neo4j/files/patch-bin_cypher-shell b/databases/neo4j/files/patch-bin_cypher-shell
new file mode 100644
index 00000000000..7c9bea6e472
--- /dev/null
+++ b/databases/neo4j/files/patch-bin_cypher-shell
@@ -0,0 +1,11 @@
+--- bin/cypher-shell.orig	2017-07-04 01:59:39 UTC
++++ bin/cypher-shell
+@@ -72,7 +72,7 @@ build_classpath() {
+ 
+   # Then try installation directory (prefix/bin and prefix/share/cypher-shell/lib)
+   if [[ -z "${JARPATH}" ]]; then
+-    APP_HOME="${APP_HOME}/../share/cypher-shell"
++    APP_HOME="${APP_HOME}/../neo4j/lib"
+     JARPATH="$(find "${APP_HOME}" -name "cypher-shell-all.jar" )"
+   fi
+ }
diff --git a/databases/neo4j/files/patch-bin_neo4j b/databases/neo4j/files/patch-bin_neo4j
new file mode 100644
index 00000000000..3cb38d4c0c1
--- /dev/null
+++ b/databases/neo4j/files/patch-bin_neo4j
@@ -0,0 +1,20 @@
+--- bin/neo4j.orig	2017-07-04 01:59:39 UTC
++++ bin/neo4j
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/usr/local/bin/bash
+ # Copyright (c) 2002-2016 "Neo Technology,"
+ # Network Engine for Objects in Lund AB [http://neotechnology.com]
+ #
+@@ -162,9 +162,9 @@ _show_java_help() {
+ 
+ _setup_calculated_paths() {
+   if [[ -z "${NEO4J_HOME:-}" ]]; then
+-    NEO4J_HOME="$(cd "$(dirname "$0")"/.. && pwd)"
++    NEO4J_HOME="$(cd "$(dirname "$0")"/../neo4j && pwd)"
+   fi
+-  : "${NEO4J_CONF:="${NEO4J_HOME}/conf"}"
++  : "${NEO4J_CONF:="${NEO4J_HOME}/../etc"}"
+   readonly NEO4J_HOME NEO4J_CONF
+ }
+ 
diff --git a/databases/neo4j/files/patch-bin_neo4j-admin b/databases/neo4j/files/patch-bin_neo4j-admin
new file mode 100644
index 00000000000..17bbec1bcdc
--- /dev/null
+++ b/databases/neo4j/files/patch-bin_neo4j-admin
@@ -0,0 +1,12 @@
+--- bin/neo4j-admin.orig	2017-07-04 01:59:39 UTC
++++ bin/neo4j-admin
+@@ -140,7 +140,7 @@ _setup_calculated_paths() {
+   if [[ -z "${NEO4J_HOME:-}" ]]; then
+-    NEO4J_HOME="$(cd "$(dirname "$0")"/.. && pwd)"
++    NEO4J_HOME="$(cd "$(dirname "$0")"/../neo4j && pwd)"
+   fi
+-  : "${NEO4J_CONF:="${NEO4J_HOME}/conf"}"
++  : "${NEO4J_CONF:="${NEO4J_HOME}/../etc"}"
+   readonly NEO4J_HOME NEO4J_CONF
+ }
+ 
diff --git a/databases/neo4j/files/patch-bin_neo4j-import b/databases/neo4j/files/patch-bin_neo4j-import
new file mode 100644
index 00000000000..fcebfeece4b
--- /dev/null
+++ b/databases/neo4j/files/patch-bin_neo4j-import
@@ -0,0 +1,12 @@
+--- bin/neo4j-import.orig	2017-07-04 01:59:39 UTC
++++ bin/neo4j-import
+@@ -140,7 +140,7 @@ _setup_calculated_paths() {
+   if [[ -z "${NEO4J_HOME:-}" ]]; then
+-    NEO4J_HOME="$(cd "$(dirname "$0")"/.. && pwd)"
++    NEO4J_HOME="$(cd "$(dirname "$0")"/../neo4j && pwd)"
+   fi
+-  : "${NEO4J_CONF:="${NEO4J_HOME}/conf"}"
++  : "${NEO4J_CONF:="${NEO4J_HOME}/../etc"}"
+   readonly NEO4J_HOME NEO4J_CONF
+ }
+ 
diff --git a/databases/neo4j/files/patch-bin_neo4j-shell b/databases/neo4j/files/patch-bin_neo4j-shell
new file mode 100644
index 00000000000..f1801c40b4d
--- /dev/null
+++ b/databases/neo4j/files/patch-bin_neo4j-shell
@@ -0,0 +1,12 @@
+--- bin/neo4j-shell.orig	2017-07-04 01:59:39 UTC
++++ bin/neo4j-shell
+@@ -140,7 +140,7 @@ _setup_calculated_paths() {
+   if [[ -z "${NEO4J_HOME:-}" ]]; then
+-    NEO4J_HOME="$(cd "$(dirname "$0")"/.. && pwd)"
++    NEO4J_HOME="$(cd "$(dirname "$0")"/../neo4j && pwd)"
+   fi
+-  : "${NEO4J_CONF:="${NEO4J_HOME}/conf"}"
++  : "${NEO4J_CONF:="${NEO4J_HOME}/../etc"}"
+   readonly NEO4J_HOME NEO4J_CONF
+ }
+ 
diff --git a/databases/neo4j/files/patch-conf-neo4j-conf b/databases/neo4j/files/patch-conf-neo4j-conf
index 5d99f4f2c78..7ddbe28f526 100644
--- a/databases/neo4j/files/patch-conf-neo4j-conf
+++ b/databases/neo4j/files/patch-conf-neo4j-conf
@@ -1,15 +1,15 @@
---- conf/neo4j.conf.orig	2016-08-25 02:30:25.057742736 +0100
-+++ conf/neo4j.conf	2016-08-25 02:32:53.932724521 +0100
-@@ -6,9 +6,9 @@
+--- conf/neo4j.conf.orig	2017-05-31 21:11:19 UTC
++++ conf/neo4j.conf
+@@ -9,9 +9,9 @@
  #dbms.active_database=graph.db
  
  # Paths of directories in the installation.
 -#dbms.directories.data=data
 -#dbms.directories.plugins=plugins
 -#dbms.directories.certificates=certificates
-+dbms.directories.data=%%DATADIR%%
++dbms.directories.data=%%DBDIR%%
 +dbms.directories.plugins=%%PREFIX%%/lib/neo4j/plugins
 +dbms.directories.certificates=%%PREFIX%%/etc/neo4j-certificates
- 
- # This setting constrains all `LOAD CSV` import files to be under the `import` directory. Remove or uncomment it to
- # allow files to be loaded from anywhere in filesystem; this introduces possible security problems. See the `LOAD CSV`
+ #dbms.directories.logs=logs
+ #dbms.directories.lib=lib
+ #dbms.directories.run=run
diff --git a/databases/neo4j/pkg-plist b/databases/neo4j/pkg-plist
index edb64fb5666..7eda5268681 100644
--- a/databases/neo4j/pkg-plist
+++ b/databases/neo4j/pkg-plist
@@ -1,88 +1,91 @@
+bin/cypher-shell
 bin/neo4j
 bin/neo4j-admin
 bin/neo4j-import
 bin/neo4j-shell
-@sample etc/neo4j-wrapper.conf.sample
 @sample etc/neo4j.conf.sample
-lib/neo4j/asm-5.0.2.jar
-lib/neo4j/bcpkix-jdk15on-1.53.jar
-lib/neo4j/bcprov-jdk15on-1.53.jar
-lib/neo4j/commons-beanutils-1.8.3.jar
-lib/neo4j/commons-configuration-1.10.jar
-lib/neo4j/commons-digester-2.1.jar
-lib/neo4j/commons-io-2.4.jar
-lib/neo4j/commons-lang-2.6.jar
-lib/neo4j/commons-lang3-3.3.2.jar
-lib/neo4j/commons-logging-1.1.1.jar
-lib/neo4j/concurrentlinkedhashmap-lru-1.4.2.jar
-lib/neo4j/jackson-core-asl-1.9.13.jar
-lib/neo4j/jackson-jaxrs-1.9.13.jar
-lib/neo4j/jackson-mapper-asl-1.9.13.jar
-lib/neo4j/javax.servlet-api-3.1.0.jar
-lib/neo4j/jersey-core-1.19.jar
-lib/neo4j/jersey-multipart-1.19.jar
-lib/neo4j/jersey-server-1.19.jar
-lib/neo4j/jersey-servlet-1.19.jar
-lib/neo4j/jetty-http-9.2.9.v20150224.jar
-lib/neo4j/jetty-io-9.2.9.v20150224.jar
-lib/neo4j/jetty-security-9.2.9.v20150224.jar
-lib/neo4j/jetty-server-9.2.9.v20150224.jar
-lib/neo4j/jetty-servlet-9.2.9.v20150224.jar
-lib/neo4j/jetty-util-9.2.9.v20150224.jar
-lib/neo4j/jetty-webapp-9.2.9.v20150224.jar
-lib/neo4j/jetty-xml-9.2.9.v20150224.jar
-lib/neo4j/jline-2.12.jar
-lib/neo4j/jsr311-api-1.1.2.r612.jar
-lib/neo4j/lucene-analyzers-common-5.5.0.jar
-lib/neo4j/lucene-codecs-5.5.0.jar
-lib/neo4j/lucene-core-5.5.0.jar
-lib/neo4j/lucene-queryparser-5.5.0.jar
-lib/neo4j/mimepull-1.9.3.jar
-lib/neo4j/neo4j-bolt-3.0.4.jar
-lib/neo4j/neo4j-browser-1.1.8.jar
-lib/neo4j/neo4j-codegen-3.0.4.jar
-lib/neo4j/neo4j-collections-3.0.4.jar
-lib/neo4j/neo4j-command-line-3.0.4.jar
-lib/neo4j/neo4j-common-3.0.4.jar
-lib/neo4j/neo4j-consistency-check-3.0.4.jar
-lib/neo4j/neo4j-csv-3.0.4.jar
-lib/neo4j/neo4j-cypher-3.0.4.jar
-lib/neo4j/neo4j-cypher-compiler-2.3-2.3.5.jar
-lib/neo4j/neo4j-cypher-compiler-3.0-3.0.4.jar
-lib/neo4j/neo4j-cypher-frontend-2.3-2.3.5.jar
-lib/neo4j/neo4j-cypher-frontend-3.0-3.0.4.jar
-lib/neo4j/neo4j-dbms-3.0.4.jar
-lib/neo4j/neo4j-graph-algo-3.0.4.jar
-lib/neo4j/neo4j-graph-matching-3.0.4.jar
-lib/neo4j/neo4j-graphdb-api-3.0.4.jar
-lib/neo4j/neo4j-import-tool-3.0.4.jar
-lib/neo4j/neo4j-io-3.0.4.jar
-lib/neo4j/neo4j-jmx-3.0.4.jar
-lib/neo4j/neo4j-kernel-3.0.4.jar
-lib/neo4j/neo4j-logging-3.0.4.jar
-lib/neo4j/neo4j-lucene-index-3.0.4.jar
-lib/neo4j/neo4j-lucene-upgrade-3.0.4.jar
-lib/neo4j/neo4j-primitive-collections-3.0.4.jar
-lib/neo4j/neo4j-resource-3.0.4.jar
-lib/neo4j/neo4j-security-3.0.4.jar
-lib/neo4j/neo4j-server-3.0.4.jar
-lib/neo4j/neo4j-shell-3.0.4.jar
-lib/neo4j/neo4j-udc-3.0.4.jar
-lib/neo4j/neo4j-unsafe-3.0.4.jar
-lib/neo4j/netty-all-4.0.28.Final.jar
-lib/neo4j/opencsv-2.3.jar
-lib/neo4j/parboiled-core-1.1.7.jar
-lib/neo4j/parboiled-scala_2.11-1.1.7.jar
-lib/neo4j/rhino-1.7R4.jar
-lib/neo4j/scala-library-2.11.8.jar
-lib/neo4j/scala-reflect-2.11.8.jar
-lib/neo4j/server-api-3.0.4.jar
-libexec/neo4j/neo4j
-libexec/neo4j/neo4j-admin
-libexec/neo4j/neo4j-import
-libexec/neo4j/neo4j-shared.sh
-libexec/neo4j/neo4j-shell
-libexec/neo4j/tools/config-migrator.jar
-@dir lib/neo4j/plugins
+neo4j/lib/asm-5.2.jar
+neo4j/lib/bcpkix-jdk15on-1.53.jar
+neo4j/lib/bcprov-jdk15on-1.53.jar
+neo4j/lib/caffeine-2.3.3.jar
+neo4j/lib/commons-beanutils-1.8.3.jar
+neo4j/lib/commons-compress-1.12.jar
+neo4j/lib/commons-configuration-1.10.jar
+neo4j/lib/commons-digester-2.1.jar
+neo4j/lib/commons-io-2.4.jar
+neo4j/lib/commons-lang-2.6.jar
+neo4j/lib/commons-lang3-3.3.2.jar
+neo4j/lib/commons-logging-1.1.1.jar
+neo4j/lib/concurrentlinkedhashmap-lru-1.4.2.jar
+neo4j/lib/jackson-core-asl-1.9.13.jar
+neo4j/lib/jackson-jaxrs-1.9.13.jar
+neo4j/lib/jackson-mapper-asl-1.9.13.jar
+neo4j/lib/javax.servlet-api-3.1.0.jar
+neo4j/lib/jersey-core-1.19.jar
+neo4j/lib/jersey-multipart-1.19.jar
+neo4j/lib/jersey-server-1.19.jar
+neo4j/lib/jersey-servlet-1.19.jar
+neo4j/lib/jetty-http-9.2.9.v20150224.jar
+neo4j/lib/jetty-io-9.2.9.v20150224.jar
+neo4j/lib/jetty-security-9.2.9.v20150224.jar
+neo4j/lib/jetty-server-9.2.9.v20150224.jar
+neo4j/lib/jetty-servlet-9.2.9.v20150224.jar
+neo4j/lib/jetty-util-9.2.9.v20150224.jar
+neo4j/lib/jetty-webapp-9.2.9.v20150224.jar
+neo4j/lib/jetty-xml-9.2.9.v20150224.jar
+neo4j/lib/jline-2.12.jar
+neo4j/lib/jsr311-api-1.1.2.r612.jar
+neo4j/lib/lucene-analyzers-common-5.5.0.jar
+neo4j/lib/lucene-codecs-5.5.0.jar
+neo4j/lib/lucene-core-5.5.0.jar
+neo4j/lib/lucene-queryparser-5.5.0.jar
+neo4j/lib/mimepull-1.9.3.jar
+neo4j/lib/neo4j-bolt-3.2.1.jar
+neo4j/lib/neo4j-browser-3.0.4.jar
+neo4j/lib/neo4j-codegen-3.2.1.jar
+neo4j/lib/neo4j-collections-3.2.1.jar
+neo4j/lib/neo4j-command-line-3.2.1.jar
+neo4j/lib/neo4j-common-3.2.1.jar
+neo4j/lib/neo4j-configuration-3.2.1.jar
+neo4j/lib/neo4j-consistency-check-3.2.1.jar
+neo4j/lib/neo4j-csv-3.2.1.jar
+neo4j/lib/neo4j-cypher-3.2.1.jar
+neo4j/lib/neo4j-cypher-compiler-2.3-2.3.10.jar
+neo4j/lib/neo4j-cypher-compiler-3.1-3.1.4.jar
+neo4j/lib/neo4j-cypher-compiler-3.2-3.2.1.jar
+neo4j/lib/neo4j-cypher-frontend-2.3-2.3.10.jar
+neo4j/lib/neo4j-cypher-frontend-3.1-3.1.4.jar
+neo4j/lib/neo4j-cypher-frontend-3.2-3.2.1.jar
+neo4j/lib/neo4j-cypher-ir-3.2-3.2.1.jar
+neo4j/lib/neo4j-dbms-3.2.1.jar
+neo4j/lib/neo4j-graph-algo-3.2.1.jar
+neo4j/lib/neo4j-graph-matching-3.1.3.jar
+neo4j/lib/neo4j-graphdb-api-3.2.1.jar
+neo4j/lib/neo4j-import-tool-3.2.1.jar
+neo4j/lib/neo4j-index-3.2.1.jar
+neo4j/lib/neo4j-io-3.2.1.jar
+neo4j/lib/neo4j-jmx-3.2.1.jar
+neo4j/lib/neo4j-kernel-3.2.1.jar
+neo4j/lib/neo4j-logging-3.2.1.jar
+neo4j/lib/neo4j-lucene-index-3.2.1.jar
+neo4j/lib/neo4j-lucene-upgrade-3.2.1.jar
+neo4j/lib/neo4j-primitive-collections-3.2.1.jar
+neo4j/lib/neo4j-resource-3.2.1.jar
+neo4j/lib/neo4j-security-3.2.1.jar
+neo4j/lib/neo4j-server-3.2.1.jar
+neo4j/lib/neo4j-shell-3.2.1.jar
+neo4j/lib/neo4j-udc-3.2.1.jar
+neo4j/lib/neo4j-unsafe-3.2.1.jar
+neo4j/lib/netty-all-4.1.8.Final.jar
+neo4j/lib/opencsv-2.3.jar
+neo4j/lib/parboiled-core-1.1.7.jar
+neo4j/lib/parboiled-scala_2.11-1.1.7.jar
+neo4j/lib/rhino-1.7R4.jar
+neo4j/lib/scala-library-2.11.8.jar
+neo4j/lib/scala-reflect-2.11.8.jar
+neo4j/lib/server-api-3.2.1.jar
+neo4j/libexec/tools/2.x-config-migrator.jar
+neo4j/libexec/tools/cypher-shell-all.jar
+@dir neo4j/lib/plugins
 @dir %%DATADIR%%
 @dir etc/neo4j-certificates
diff --git a/databases/pg_partman/Makefile b/databases/pg_partman/Makefile
new file mode 100644
index 00000000000..21c84f68f6b
--- /dev/null
+++ b/databases/pg_partman/Makefile
@@ -0,0 +1,27 @@
+# $FreeBSD$
+
+PORTNAME=	pg_partman
+PORTVERSION=	3.0.2
+CATEGORIES=	databases
+
+MAINTAINER=	lacey.leanne@gmail.com
+COMMENT=	PostgreSQL Partition Manager
+
+LICENSE=	PostgreSQL
+
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/psycopg2/__init__.py:databases/py-psycopg2
+
+USES=		gmake pgsql:9.4+ python uidfix shebangfix
+WANT_PGSQL=	server
+SHEBANG_GLOB=	*.py
+
+USE_GITHUB=	yes
+GH_TUPLE=	keithf4:${PORTNAME}:v${PORTVERSION}
+
+post-install:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${MV} ${STAGEDIR}${PREFIX}/share/doc/postgresql/extension/*.md ${STAGEDIR}${DOCSDIR}
+	${RMDIR} ${STAGEDIR}${PREFIX}/share/doc/postgresql/extension
+	${RMDIR} ${STAGEDIR}${PREFIX}/share/doc/postgresql
+
+.include <bsd.port.mk>
diff --git a/databases/pg_partman/distinfo b/databases/pg_partman/distinfo
new file mode 100644
index 00000000000..6ca828571dc
--- /dev/null
+++ b/databases/pg_partman/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499899689
+SHA256 (keithf4-pg_partman-3.0.2-v3.0.2_GH0.tar.gz) = 55176580061c8293ef972c78ce02b84f75687f284b13339248cffd44edc95946
+SIZE (keithf4-pg_partman-3.0.2-v3.0.2_GH0.tar.gz) = 816083
diff --git a/databases/pg_partman/pkg-descr b/databases/pg_partman/pkg-descr
new file mode 100644
index 00000000000..7d779b77311
--- /dev/null
+++ b/databases/pg_partman/pkg-descr
@@ -0,0 +1,10 @@
+pg_partman is an extension to create and manage both time-based and
+serial-based table partition sets. Sub-partitoning is also supported. 
+Child table & trigger function creation is all managed by the extension 
+itself. Tables with existing data can also have their data partitioned in 
+easily managed smaller batches. Optional retention policy can automatically 
+drop partitions no longer needed. A background worker (BGW) process is 
+included to automatically run partition maintenance without the need of an 
+external scheduler (cron, etc) in most cases.
+
+WWW: https://github.com/keithf4/pg_partman
diff --git a/databases/pg_partman/pkg-plist b/databases/pg_partman/pkg-plist
new file mode 100644
index 00000000000..6357d0b1f21
--- /dev/null
+++ b/databases/pg_partman/pkg-plist
@@ -0,0 +1,73 @@
+bin/check_unique_constraint.py
+bin/dump_partition.py
+bin/partition_data.py
+bin/reapply_constraints.py
+bin/reapply_foreign_keys.py
+bin/reapply_indexes.py
+bin/undo_partition.py
+bin/vacuum_maintenance.py
+lib/postgresql/pg_partman_bgw.so
+%%PORTDOCS%%%%DOCSDIR%%/migration.md
+%%PORTDOCS%%%%DOCSDIR%%/pg_partman.md
+%%PORTDOCS%%%%DOCSDIR%%/pg_partman_howto.md
+share/postgresql/extension/pg_partman--0.1.0--0.1.1.sql
+share/postgresql/extension/pg_partman--0.1.1--0.1.2.sql
+share/postgresql/extension/pg_partman--0.1.2--0.2.0.sql
+share/postgresql/extension/pg_partman--0.2.0--0.3.0.sql
+share/postgresql/extension/pg_partman--0.3.0--0.3.1.sql
+share/postgresql/extension/pg_partman--0.3.1--0.3.2.sql
+share/postgresql/extension/pg_partman--0.3.2--0.4.0.sql
+share/postgresql/extension/pg_partman--0.4.0--0.4.1.sql
+share/postgresql/extension/pg_partman--0.4.1--0.4.2.sql
+share/postgresql/extension/pg_partman--0.4.2--1.0.0.sql
+share/postgresql/extension/pg_partman--1.0.0--1.1.0.sql
+share/postgresql/extension/pg_partman--1.1.0--1.2.0.sql
+share/postgresql/extension/pg_partman--1.2.0--1.3.0.sql
+share/postgresql/extension/pg_partman--1.3.0--1.4.0.sql
+share/postgresql/extension/pg_partman--1.4.0--1.4.1.sql
+share/postgresql/extension/pg_partman--1.4.1--1.4.2.sql
+share/postgresql/extension/pg_partman--1.4.2--1.4.3.sql
+share/postgresql/extension/pg_partman--1.4.3--1.4.4.sql
+share/postgresql/extension/pg_partman--1.4.4--1.4.5.sql
+share/postgresql/extension/pg_partman--1.4.5--1.5.0.sql
+share/postgresql/extension/pg_partman--1.5.0--1.5.1.sql
+share/postgresql/extension/pg_partman--1.5.1--1.6.0.sql
+share/postgresql/extension/pg_partman--1.6.0--1.6.1.sql
+share/postgresql/extension/pg_partman--1.6.1--1.7.0.sql
+share/postgresql/extension/pg_partman--1.7.0--1.7.1.sql
+share/postgresql/extension/pg_partman--1.7.1--1.7.2.sql
+share/postgresql/extension/pg_partman--1.7.2--1.8.0.sql
+share/postgresql/extension/pg_partman--1.8.0--1.8.1.sql
+share/postgresql/extension/pg_partman--1.8.1--1.8.2.sql
+share/postgresql/extension/pg_partman--1.8.2--1.8.3.sql
+share/postgresql/extension/pg_partman--1.8.3--1.8.4.sql
+share/postgresql/extension/pg_partman--1.8.4--1.8.5.sql
+share/postgresql/extension/pg_partman--1.8.5--1.8.6.sql
+share/postgresql/extension/pg_partman--1.8.6--1.8.7.sql
+share/postgresql/extension/pg_partman--1.8.7--1.8.8.sql
+share/postgresql/extension/pg_partman--1.8.7--2.0.0.sql
+share/postgresql/extension/pg_partman--1.8.8--2.0.0.sql
+share/postgresql/extension/pg_partman--2.0.0--2.1.0.sql
+share/postgresql/extension/pg_partman--2.1.0--2.2.0.sql
+share/postgresql/extension/pg_partman--2.2.0--2.2.1.sql
+share/postgresql/extension/pg_partman--2.2.1--2.2.2.sql
+share/postgresql/extension/pg_partman--2.2.2--2.2.3.sql
+share/postgresql/extension/pg_partman--2.2.3--2.3.0.sql
+share/postgresql/extension/pg_partman--2.3.0--2.3.1.sql
+share/postgresql/extension/pg_partman--2.3.1--2.3.2.sql
+share/postgresql/extension/pg_partman--2.3.2--2.3.3.sql
+share/postgresql/extension/pg_partman--2.3.3--2.3.4.sql
+share/postgresql/extension/pg_partman--2.3.4--2.4.0.sql
+share/postgresql/extension/pg_partman--2.4.0--2.4.1.sql
+share/postgresql/extension/pg_partman--2.4.1--2.5.0.sql
+share/postgresql/extension/pg_partman--2.5.0--2.5.1.sql
+share/postgresql/extension/pg_partman--2.5.1--2.6.0.sql
+share/postgresql/extension/pg_partman--2.6.0--2.6.1.sql
+share/postgresql/extension/pg_partman--2.6.1--2.6.2.sql
+share/postgresql/extension/pg_partman--2.6.2--2.6.3.sql
+share/postgresql/extension/pg_partman--2.6.3--2.6.4.sql
+share/postgresql/extension/pg_partman--2.6.4--3.0.0.sql
+share/postgresql/extension/pg_partman--3.0.0--3.0.1.sql
+share/postgresql/extension/pg_partman--3.0.1--3.0.2.sql
+share/postgresql/extension/pg_partman--3.0.2.sql
+share/postgresql/extension/pg_partman.control
diff --git a/databases/postgresql10-client/Makefile b/databases/postgresql10-client/Makefile
new file mode 100644
index 00000000000..1aa7c3203c0
--- /dev/null
+++ b/databases/postgresql10-client/Makefile
@@ -0,0 +1,21 @@
+# Created by: Palle Girgensohn <girgen@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	postgresql
+PORTREVISION=	0
+
+COMMENT=	PostgreSQL database (client)
+
+MASTERDIR=	${.CURDIR}/../postgresql10-server
+
+BUILD_DIRS=	config src/include src/interfaces src/port \
+		src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \
+		src/bin/pgbench doc src/makefiles src/test/regress
+INSTALL_DIRS=	${BUILD_DIRS}
+
+CLIENT_ONLY=	yes
+COMPONENT=	-client
+USE_LDCONFIG=	yes
+USES=		pkgconfig
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql10-contrib/Makefile b/databases/postgresql10-contrib/Makefile
new file mode 100644
index 00000000000..4173ed45b37
--- /dev/null
+++ b/databases/postgresql10-contrib/Makefile
@@ -0,0 +1,32 @@
+# Created by: Palle Girgensohn <girgen@pingpong.net>
+# $FreeBSD$
+
+PORTNAME=	postgresql
+PORTREVISION=	1
+CATEGORIES=	databases
+
+MAINTAINER=	pgsql@FreeBSD.org
+COMMENT=	The contrib utilities from the PostgreSQL distribution
+
+LIB_DEPENDS=	libxslt.so:textproc/libxslt \
+		libxml2.so:textproc/libxml2
+
+MASTERDIR=	${.CURDIR}/../postgresql10-server
+
+USES=		bison pgsql:10
+
+BUILD_DIRS=	src/port src/include src/common contrib
+INSTALL_DIRS=	contrib
+
+SLAVE_ONLY=	yes
+COMPONENT=	-contrib
+CONFIGURE_ARGS+=--with-libxslt --with-libxml --with-openssl --disable-nls --with-uuid=bsd
+LDFLAGS+=	-lpthread -L${PREFIX}/lib
+
+post-configure: 
+		@cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} symlinks
+
+post-install:
+	@- ${INSTALL_DATA} ${WRKSRC}/contrib/README ${STAGEDIR}${DOCSDIR}/extension/README
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql10-contrib/pkg-descr b/databases/postgresql10-contrib/pkg-descr
new file mode 100644
index 00000000000..f7a01fd35e1
--- /dev/null
+++ b/databases/postgresql10-contrib/pkg-descr
@@ -0,0 +1,23 @@
+This is the port for all stuff that comes in the contrib subtree of
+the postgresql distribution. This subtree contains porting tools,
+analysis utilities, and plug-in features that are not part of the core
+PostgreSQL system, mainly because they address a limited audience or
+are too experimental to be part of the main source tree.  This does
+not preclude their usefulness.
+
+Each subdirectory contains a README file with information about the
+module. Some directories supply new user-defined functions, operators,
+or types.  After you have installed the files you need to register the
+new entities in the database system by running the commands in the
+supplied .sql file.  For example,
+
+        $ psql -d dbname -f module.sql
+
+The .sql files are installed into /usr/local/share/postgresql/contrib
+
+For more information, please see
+/usr/local/share/doc/postgresql/contrib/README*
+
+This software is part of the standard PostgreSQL distribution.
+
+WWW: http://www.postgresql.org/
diff --git a/databases/postgresql10-docs/Makefile b/databases/postgresql10-docs/Makefile
new file mode 100644
index 00000000000..72abd647908
--- /dev/null
+++ b/databases/postgresql10-docs/Makefile
@@ -0,0 +1,6 @@
+# Created by: Palle Girgensohn <girgen@pingpong.net>
+# $FreeBSD$
+
+WANT_PGSQL_VER=10
+
+.include "${.CURDIR}/../postgresql96-docs/Makefile"
diff --git a/databases/postgresql10-pgtcl/Makefile b/databases/postgresql10-pgtcl/Makefile
new file mode 100644
index 00000000000..9738b130236
--- /dev/null
+++ b/databases/postgresql10-pgtcl/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+PKGNAMESUFFIX=	-postgresql10
+
+CONFLICTS=	pgtcl-[0-9]* pgtcl-postgresql9[0123456]-[0-9]*
+
+PGTCL_SLAVE=	10
+MASTERDIR=	${.CURDIR}/../pgtcl
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql10-plperl/Makefile b/databases/postgresql10-plperl/Makefile
new file mode 100644
index 00000000000..a7d098d5532
--- /dev/null
+++ b/databases/postgresql10-plperl/Makefile
@@ -0,0 +1,6 @@
+# Created by: Palle Girgensohn <girgen@partitur.se>
+# $FreeBSD$
+
+WANT_PGSQL_VER=	10
+
+.include "${.CURDIR}/../postgresql95-plperl/Makefile"
diff --git a/databases/postgresql10-plpython/Makefile b/databases/postgresql10-plpython/Makefile
new file mode 100644
index 00000000000..d38f30cc0e9
--- /dev/null
+++ b/databases/postgresql10-plpython/Makefile
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+WANT_PGSQL_VER=	10
+
+.include "${.CURDIR}/../postgresql95-plpython/Makefile"
diff --git a/databases/postgresql10-pltcl/Makefile b/databases/postgresql10-pltcl/Makefile
new file mode 100644
index 00000000000..dada25c3df8
--- /dev/null
+++ b/databases/postgresql10-pltcl/Makefile
@@ -0,0 +1,30 @@
+# Created by: Palle Girgensohn <girgen@partitur.se>
+# $FreeBSD$
+
+PORTNAME=	postgresql
+CATEGORIES=	databases tcl
+PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}
+
+MAINTAINER=	pgsql@FreeBSD.org
+COMMENT=	Module for using Tcl to write SQL functions
+
+MASTERDIR=	${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-server
+
+WANT_PGSQL_VER?=10
+
+USES+=		tcl pgsql:${WANT_PGSQL_VER}
+WANT_PGSQL=	server
+
+CONFIGURE_ARGS=	--with-tcl --without-tk \
+		--with-tclconfig="${TCL_LIBDIR}" \
+		--with-includes="${TCL_INCLUDEDIR}"
+
+CONFIGURE_ENV+=	TCLSH="${TCLSH}"
+MAKE_ENV+=	TCL_INCDIR="${TCL_INCLUDEDIR}"
+
+BUILD_DIRS=	src/backend src/pl/tcl
+INSTALL_DIRS=	src/pl/tcl
+SLAVE_ONLY=	yes
+COMPONENT=	-pltcl
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql10-server/Makefile b/databases/postgresql10-server/Makefile
new file mode 100644
index 00000000000..13d46804628
--- /dev/null
+++ b/databases/postgresql10-server/Makefile
@@ -0,0 +1,29 @@
+# Created by: Marc G. Fournier <scrappy@FreeBSD.org>
+# $FreeBSD$
+
+DISTVERSION?=	10beta3
+PKGNAMESUFFIX?= ${PORTVERSION:R}${COMPONENT}
+
+MAINTAINER?=	pgsql@FreeBSD.org
+
+INSTALL_DIRS?=	src/common src/timezone src/backend \
+		src/backend/utils/mb/conversion_procs \
+		src/backend/snowball src/backend/replication/libpqwalreceiver \
+		src/bin/initdb src/bin/pg_ctl \
+		src/bin/pg_controldata src/bin/pg_resetxlog src/pl \
+		src/bin/pg_basebackup src/bin/pg_archivecleanup \
+		src/bin/pg_rewind \
+		src/bin/pg_test_fsync src/bin/pg_test_timing \
+		src/bin/pg_xlogdump src/bin/pg_upgrade
+
+PG_USER?=	postgres
+PG_GROUP?=	postgres
+PG_UID?=	770
+
+.if defined(SERVER_ONLY)
+CONFIGURE_ARGS+=--with-icu
+LIB_DEPENDS+=	libicudata.so:devel/icu
+USES+=		pkgconfig
+.endif
+
+.include "${.CURDIR}/../postgresql92-server/Makefile"
diff --git a/databases/postgresql10-server/distinfo b/databases/postgresql10-server/distinfo
new file mode 100644
index 00000000000..0e890a4a69b
--- /dev/null
+++ b/databases/postgresql10-server/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1502193060
+SHA256 (postgresql/postgresql-10beta3.tar.bz2) = 6722546739f8e2dd379e8031784e86c5c588638df6c477046ebdd479586bcb3e
+SIZE (postgresql/postgresql-10beta3.tar.bz2) = 19914123
+SHA256 (postgresql/pg-9218-icu-2016-08-10.diff.gz) = 2f9c831b3dff866f0b2f6f2a9ef771a4045486bc252a851aadc73c50d376319d
+SIZE (postgresql/pg-9218-icu-2016-08-10.diff.gz) = 5587
diff --git a/databases/postgresql10-server/files/502.pgsql.in b/databases/postgresql10-server/files/502.pgsql.in
new file mode 100644
index 00000000000..06026b1d831
--- /dev/null
+++ b/databases/postgresql10-server/files/502.pgsql.in
@@ -0,0 +1,116 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# Maintenance shell script to vacuum and backup database
+# Put this in /usr/local/etc/periodic/daily, and it will be run 
+# every night
+#
+# Written by Palle Girgensohn <girgen@pingpong.net>
+#
+# In public domain, do what you like with it,
+# and use it at your own risk... :)
+#
+
+# Define these variables in either /etc/periodic.conf or
+# /etc/periodic.conf.local to override the default values.
+#
+# daily_pgsql_backup_enable="YES" # do backup of all databases
+# daily_pgsql_backup_enable="foo bar db1 db2" # only do backup of a limited selection of databases
+# daily_pgsql_vacuum_enable="YES" # do vacuum
+
+# If there is a global system configuration file, suck it in.
+#
+if [ -r /etc/defaults/periodic.conf ]
+then
+    . /etc/defaults/periodic.conf
+    source_periodic_confs
+fi
+
+: ${daily_pgsql_user:="%%PG_USER%%"}
+: ${daily_pgsql_port:=5432}
+: ${daily_pgsql_vacuum_args:="-U ${daily_pgsql_user} -p ${daily_pgsql_port} -qaz"}
+: ${daily_pgsql_pgdump_args:="-U ${daily_pgsql_user} -p ${daily_pgsql_port} -bF c"}
+: ${daily_pgsql_pgdumpall_globals_args:="-U ${daily_pgsql_user} -p ${daily_pgsql_port}"}
+# backupdir is relative to ~pgsql home directory unless it begins with a slash:
+: ${daily_pgsql_backupdir:="~${daily_pgsql_user}/backups"}
+: ${daily_pgsql_savedays:="7"}
+
+# allow '~´ in dir name
+eval backupdir=${daily_pgsql_backupdir}
+
+rc=0
+
+pgsql_backup() {
+	# daily_pgsql_backupdir must be writeable by user %%PG_USER%%
+	# ~%%PG_USER%% is just that under normal circumstances,
+	# but this might not be where you want the backups...
+	if [ ! -d ${backupdir} ] ; then 
+	    echo Creating ${backupdir}
+	    mkdir -m 700 ${backupdir}; chown ${daily_pgsql_user} ${backupdir}
+	fi
+
+	echo
+	echo "PostgreSQL backups"
+
+	# Protect the data
+	umask 077
+	rc=$?
+	now=`date "+%Y-%m-%dT%H:%M:%S"`
+	file=${daily_pgsql_backupdir}/pgglobals_${now}
+	su -l ${daily_pgsql_user} -c \
+		"umask 077; pg_dumpall -g ${daily_pgsql_pgdumpall_globals_args} | gzip -9 > ${file}.gz"
+
+	db=$1
+	while shift; do
+	    echo -n " $db"
+	    file=${backupdir}/pgdump_${db}_${now}
+	    su -l ${daily_pgsql_user} -c "umask 077; pg_dump ${daily_pgsql_pgdump_args} -f ${file} ${db}"
+	    [ $? -gt 0 ] && rc=3
+		db=$1
+	done
+
+	if [ $rc -gt 0 ]; then
+	    echo
+	    echo "Errors were reported during backup."
+	fi
+
+	# cleaning up old data
+	find ${backupdir} \( -name 'pgdump_*' -o -name 'pgglobals_*' -o -name '*.dat.gz' -o -name 'toc.dat' \) \
+	    -a -mtime +${daily_pgsql_savedays} -delete
+	echo
+}
+
+case "$daily_pgsql_backup_enable" in
+    [Yy][Ee][Ss])
+	dbnames=`su -l ${daily_pgsql_user} -c "umask 077; psql -U ${daily_pgsql_user} -p ${daily_pgsql_port} -q -t -A -d template1 -c SELECT\ datname\ FROM\ pg_database\ WHERE\ datname!=\'template0\'"`
+	pgsql_backup $dbnames
+	;;
+
+	[Nn][Oo])
+	;;
+
+	"")
+	;;
+
+	*)
+	pgsql_backup $daily_pgsql_backup_enable
+	;;
+esac
+
+case "$daily_pgsql_vacuum_enable" in
+    [Yy][Ee][Ss])
+
+	echo
+	echo "PostgreSQL vacuum"
+	su -l ${daily_pgsql_user} -c "vacuumdb ${daily_pgsql_vacuum_args}"
+	if [ $? -gt 0 ]
+	then
+	    echo
+	    echo "Errors were reported during vacuum."
+	    rc=3
+	fi
+	;;
+esac
+
+exit $rc
diff --git a/databases/postgresql10-server/files/dot.cshrc.in b/databases/postgresql10-server/files/dot.cshrc.in
new file mode 100644
index 00000000000..17c9ee69a7d
--- /dev/null
+++ b/databases/postgresql10-server/files/dot.cshrc.in
@@ -0,0 +1,11 @@
+setenv PGLIB %%PREFIX%%/lib
+
+# note: PGDATA can be overridden by the -D startup option
+setenv PGDATA $HOME/data96
+
+#You might want to set some locale stuff here
+#setenv PGDATESTYLE ISO
+#setenv LC_ALL sv_SE.ISO_8859-1
+
+# if you want to make regression tests use this TZ
+#setenv TZ PST8PDT
diff --git a/databases/postgresql10-server/files/dot.profile.in b/databases/postgresql10-server/files/dot.profile.in
new file mode 100644
index 00000000000..5be3e6a36ca
--- /dev/null
+++ b/databases/postgresql10-server/files/dot.profile.in
@@ -0,0 +1,22 @@
+PGLIB=%%PREFIX%%/lib
+
+# note: PGDATA can be overridden by the -D startup option
+PGDATA=${HOME}/data96
+
+export PATH PGLIB PGDATA
+
+# if you use the periodic script from share/postgresql/502.pgsql, you
+# can set these
+#PGDUMP_ARGS="-b -F c"
+#PGBACKUPDIR=${HOME}/backups
+#PGBACKUP_SAVE_DAYS=7
+#export PGBACKUPDIR PGDUMP_ARGS PGBACKUP_SAVE_DAYS
+
+#You might want to set some locale stuff here
+#PGDATESTYLE=ISO
+#LC_ALL=sv_SE.ISO_8859-1
+#export PGDATESTYLE LC_ALL
+
+# if you want to make regression tests use this TZ
+#TZ=PST8PDT
+#export TZ
diff --git a/databases/postgresql10-server/files/patch-doc-Makefile b/databases/postgresql10-server/files/patch-doc-Makefile
new file mode 100644
index 00000000000..d5176bfb64b
--- /dev/null
+++ b/databases/postgresql10-server/files/patch-doc-Makefile
@@ -0,0 +1,9 @@
+--- doc/Makefile.orig	2015-10-08 21:45:57.360084007 +0200
++++ doc/Makefile	2015-10-08 21:46:04.353084097 +0200
+@@ -12,5 +12,5 @@
+ top_builddir = ..
+ include $(top_builddir)/src/Makefile.global
+ 
+-all distprep html man install installdirs uninstall clean distclean maintainer-clean:
++all distprep man install installdirs uninstall clean distclean maintainer-clean:
+ 	$(MAKE) -C src $@
diff --git a/databases/postgresql10-server/files/patch-doc-src-sgml-Makefile b/databases/postgresql10-server/files/patch-doc-src-sgml-Makefile
new file mode 100644
index 00000000000..7a1a5142f78
--- /dev/null
+++ b/databases/postgresql10-server/files/patch-doc-src-sgml-Makefile
@@ -0,0 +1,42 @@
+--- doc/src/sgml/Makefile.orig	2017-08-07 23:08:19.000000000 +0200
++++ doc/src/sgml/Makefile	2017-08-08 14:07:11.461380000 +0200
+@@ -15,7 +15,7 @@
+ 
+ # Make "html" the default target, since that is what most people tend
+ # to want to use.
+-html:
++man:
+ 
+ NO_TEMP_INSTALL=yes
+ 
+@@ -24,7 +24,7 @@
+ include $(top_builddir)/src/Makefile.global
+ 
+ 
+-all: html man
++all: man
+ 
+ distprep: html distprep-man
+ 
+@@ -76,8 +76,6 @@
+ ## Man pages
+ ##
+ 
+-man distprep-man: man-stamp
+-
+ man-stamp: stylesheet-man.xsl postgres.xml
+ 	$(XMLLINT) --noout --valid postgres.xml
+ 	$(XSLTPROC) $(XSLTPROCFLAGS) $(XSLTPROC_MAN_FLAGS) $^
+@@ -245,10 +243,10 @@
+ ## Install
+ ##
+ 
+-install: install-html install-man
++install: install-man
+ 
+ installdirs:
+-	$(MKDIR_P) '$(DESTDIR)$(htmldir)'/html $(addprefix '$(DESTDIR)$(mandir)'/man, 1 3 $(sqlmansectnum))
++	$(MKDIR_P) $(addprefix '$(DESTDIR)$(mandir)'/man, 1 3 $(sqlmansectnum))
+ 
+ # If the install used a man directory shared with other applications, this will remove all files.
+ uninstall:
diff --git a/databases/postgresql10-server/files/patch-src-Makefile.shlib b/databases/postgresql10-server/files/patch-src-Makefile.shlib
new file mode 100644
index 00000000000..2435ffe1d28
--- /dev/null
+++ b/databases/postgresql10-server/files/patch-src-Makefile.shlib
@@ -0,0 +1,11 @@
+--- src/Makefile.shlib.bak	2013-05-06 22:57:06.000000000 +0200
++++ src/Makefile.shlib	2013-05-12 23:33:16.000000000 +0200
+@@ -87,7 +87,7 @@
+ # Testing the soname variable is a reliable way to determine whether a
+ # linkable library is being built.
+ soname		= $(shlib_major)
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
+ else
+ # Naming convention for dynamically loadable modules
+ shlib		= $(NAME)$(DLSUFFIX)
diff --git a/databases/postgresql10-server/files/patch-src-backend-Makefile b/databases/postgresql10-server/files/patch-src-backend-Makefile
new file mode 100644
index 00000000000..4922d143682
--- /dev/null
+++ b/databases/postgresql10-server/files/patch-src-backend-Makefile
@@ -0,0 +1,11 @@
+--- src/backend/Makefile.orig	2009-07-07 15:58:33.000000000 +0200
++++ src/backend/Makefile	2009-07-07 15:58:57.000000000 +0200
+@@ -107,6 +107,8 @@
+ # Update the commonly used headers before building the subdirectories
+ $(SUBDIRS:%=%-recursive): $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/utils/fmgroids.h $(top_builddir)/src/include/utils/probes.h
+ 
++symlinks: $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/utils/fmgroids.h $(top_builddir)/src/include/utils/fmgrprotos.h $(top_builddir)/src/include/utils/probes.h $(top_builddir)/src/include/storage/lwlocknames.h
++
+ 
+ # The postgres.o target is needed by the rule in Makefile.global that
+ # creates the exports file when MAKE_EXPORTS = true.
diff --git a/databases/postgresql10-server/files/patch-src_backend_utils_misc_postgresql.conf.sample b/databases/postgresql10-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
new file mode 100644
index 00000000000..a82826b3b5f
--- /dev/null
+++ b/databases/postgresql10-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
@@ -0,0 +1,21 @@
+--- src/backend/utils/misc/postgresql.conf.sample.orig	2016-10-24 20:08:51 UTC
++++ src/backend/utils/misc/postgresql.conf.sample
+@@ -330,6 +330,7 @@
+ 
+ # - Where to Log -
+ 
++log_destination = 'syslog'
+ #log_destination = 'stderr'		# Valid values are combinations of
+ 					# stderr, csvlog, syslog, and eventlog,
+ 					# depending on platform.  csvlog
+@@ -464,7 +465,9 @@
+ 
+ #cluster_name = ''			# added to process titles if nonempty
+ 					# (change requires restart)
+-#update_process_title = on
++
++# On FreeBSD, this is a performance hog, so keep it off if you need speed
++update_process_title = off
+ 
+ 
+ #------------------------------------------------------------------------------
diff --git a/databases/postgresql10-server/files/pkg-message-client.in b/databases/postgresql10-server/files/pkg-message-client.in
new file mode 100644
index 00000000000..3f98190bbd8
--- /dev/null
+++ b/databases/postgresql10-server/files/pkg-message-client.in
@@ -0,0 +1,32 @@
+The PostgreSQL port has a collection of "side orders":
+
+postgresql-docs
+  For all of the html documentation
+
+p5-Pg
+  A perl5 API for client access to PostgreSQL databases.
+
+postgresql-tcltk 
+  If you want tcl/tk client support.
+
+postgresql-jdbc
+  For Java JDBC support.
+
+postgresql-odbc
+  For client access from unix applications using ODBC as access
+  method. Not needed to access unix PostgreSQL servers from Win32
+  using ODBC. See below.
+
+ruby-postgres, py-PyGreSQL
+  For client access to PostgreSQL databases using the ruby & python
+  languages.
+
+postgresql-plperl, postgresql-pltcl & postgresql-plruby
+  For using perl5, tcl & ruby as procedural languages.
+
+postgresql-contrib
+  Lots of contributed utilities, postgresql functions and
+  datatypes. There you find pg_standby, pgcrypto and many other cool
+  things.
+
+etc...
diff --git a/databases/postgresql10-server/files/pkg-message-contrib.in b/databases/postgresql10-server/files/pkg-message-contrib.in
new file mode 100644
index 00000000000..2b29ffd3304
--- /dev/null
+++ b/databases/postgresql10-server/files/pkg-message-contrib.in
@@ -0,0 +1,3 @@
+The PostgreSQL contrib utilities have been installed. Please see
+%%PREFIX%%/share/doc/postgresql/contrib/README
+for more information.
diff --git a/databases/postgresql10-server/files/pkg-message-plperl.in b/databases/postgresql10-server/files/pkg-message-plperl.in
new file mode 100644
index 00000000000..5d0c8392056
--- /dev/null
+++ b/databases/postgresql10-server/files/pkg-message-plperl.in
@@ -0,0 +1,3 @@
+PL/Perl has been installed. Check the createlang(l) manpage for more
+info. You can install PL/Perl as trusted or untrusted, by using either
+"createlang plperl" or "createlang plperlu".
diff --git a/databases/postgresql10-server/files/pkg-message-plpython.in b/databases/postgresql10-server/files/pkg-message-plpython.in
new file mode 100644
index 00000000000..c413582b629
--- /dev/null
+++ b/databases/postgresql10-server/files/pkg-message-plpython.in
@@ -0,0 +1,3 @@
+PL/Python has been installed. Check the createlang(l) manpage for more
+info. You can install PL/Python by using "createlang plpythonu" (it
+exists as an untrusted language only).
diff --git a/databases/postgresql10-server/files/pkg-message-pltcl.in b/databases/postgresql10-server/files/pkg-message-pltcl.in
new file mode 100644
index 00000000000..0902b858de0
--- /dev/null
+++ b/databases/postgresql10-server/files/pkg-message-pltcl.in
@@ -0,0 +1,3 @@
+PL/Tcl has been  installed. Check the createlang(l) manpage for more
+info. You can install pltcl as trusted or untrusted, by using either
+"createlang pltcl" or "createlang pltclu".
diff --git a/databases/postgresql10-server/files/pkg-message-server.in b/databases/postgresql10-server/files/pkg-message-server.in
new file mode 100644
index 00000000000..d161fcb82f6
--- /dev/null
+++ b/databases/postgresql10-server/files/pkg-message-server.in
@@ -0,0 +1,57 @@
+For procedural languages and postgresql functions, please note that
+you might have to update them when updating the server.
+
+If you have many tables and many clients running, consider raising
+kern.maxfiles using sysctl(8), or reconfigure your kernel
+appropriately.
+
+The port is set up to use autovacuum for new databases, but you might
+also want to vacuum and perhaps backup your database regularly. There
+is a periodic script, %%PREFIX%%/etc/periodic/daily/502.pgsql, that
+you may find useful. You can use it to backup and perform vacuum on all
+databases nightly. Per default, it performs `vacuum analyze'. See the
+script for instructions. For autovacuum settings, please review
+~pgsql/data/postgresql.conf.
+
+If you plan to access your PostgreSQL server using ODBC, please
+consider running the SQL script %%PREFIX%%/share/postgresql/odbc.sql
+to get the functions required for ODBC compliance.
+
+Please note that if you use the rc script,
+%%PREFIX%%/etc/rc.d/postgresql, to initialize the database, unicode
+(UTF-8) will be used to store character data by default.  Set
+postgresql_initdb_flags or use login.conf settings described below to
+alter this behaviour. See the start rc script for more info.
+
+To set limits, environment stuff like locale and collation and other
+things, you can set up a class in /etc/login.conf before initializing
+the database. Add something similar to this to /etc/login.conf:
+---
+postgres:\
+	:lang=en_US.UTF-8:\
+	:setenv=LC_COLLATE=C:\
+	:tc=default:
+---
+and run `cap_mkdb /etc/login.conf'.
+Then add 'postgresql_class="postgres"' to /etc/rc.conf.
+
+======================================================================
+
+To initialize the database, run
+
+  %%PREFIX%%/etc/rc.d/postgresql initdb
+
+You can then start PostgreSQL by running:
+
+  %%PREFIX%%/etc/rc.d/postgresql start
+
+For postmaster settings, see ~pgsql/data/postgresql.conf
+
+NB. FreeBSD's PostgreSQL port logs to syslog by default
+    See ~pgsql/data/postgresql.conf for more info
+
+======================================================================
+
+To run PostgreSQL at startup, add
+'postgresql_enable="YES"' to /etc/rc.conf
+
diff --git a/databases/postgresql10-server/files/pkgIndex.tcl.in b/databases/postgresql10-server/files/pkgIndex.tcl.in
new file mode 100644
index 00000000000..bd8329b15c6
--- /dev/null
+++ b/databases/postgresql10-server/files/pkgIndex.tcl.in
@@ -0,0 +1,4 @@
+# Package-index file for Pgtcl-package. Enables you to load PostgreSQL
+# interface functions right into you TCL-interpreter as simply as
+#	package require Pgtcl
+package ifneeded Pgtcl 1.3 "load %%PREFIX%%/lib/libpgtcl.so"
diff --git a/databases/postgresql10-server/files/postgresql.in b/databases/postgresql10-server/files/postgresql.in
new file mode 100644
index 00000000000..6aec9314907
--- /dev/null
+++ b/databases/postgresql10-server/files/postgresql.in
@@ -0,0 +1,114 @@
+#!/bin/sh
+
+# $FreeBSD$
+#
+# PROVIDE: postgresql
+# REQUIRE: sshd
+# KEYWORD: shutdown
+#
+# Add the following line to /etc/rc.conf to enable PostgreSQL:
+#
+#  postgresql_enable="YES"
+#  # optional
+#  postgresql_data="/var/db/%%PG_USER%%/data96"
+#  postgresql_flags="-w -s -m fast"
+#  postgresql_initdb_flags="--encoding=utf-8 --lc-collate=C"
+#  postgresql_class="default"
+#  postgresql_profiles=""
+#
+# See %%PREFIX%%/share/doc/postgresql/README-server for more info
+#
+# This scripts takes one of the following commands:
+#
+#   start stop restart reload status initdb
+#
+# For postmaster startup options, edit ${postgresql_data}/postgresql.conf
+
+command=%%PREFIX%%/bin/pg_ctl
+
+. /etc/rc.subr
+
+load_rc_config postgresql
+
+# set defaults
+postgresql_enable=${postgresql_enable:-"NO"}
+postgresql_flags=${postgresql_flags:-"-w -s -m fast"}
+postgresql_user=${postgresql_user:-"%%PG_USER%%"}
+eval postgresql_data=${postgresql_data:-"~${postgresql_user}/data96"}
+postgresql_class=${postgresql_class:-"default"}
+postgresql_initdb_flags=${postgresql_initdb_flags:-"--encoding=utf-8 --lc-collate=C"}
+
+name=postgresql
+rcvar=postgresql_enable
+extra_commands="reload initdb"
+
+start_cmd="postgresql_command start"
+stop_cmd="postgresql_command stop"
+restart_cmd="postgresql_command restart"
+reload_cmd="postgresql_command reload"
+status_cmd="postgresql_command status"
+
+initdb_cmd="postgresql_initdb"
+
+if [ -n "$2" ]; then
+	profile="$2"
+	if [ "x${postgresql_profiles}" != "x" ]; then
+		eval postgresql_data="\${postgresql_${profile}_data:-}"
+		if [ "x${postgresql_data}" = "x" ]; then
+			echo "You must define a data directory (postgresql_${profile}_data)"
+			exit 1
+		fi
+		eval postgresql_enable="\${postgresql_${profile}_enable:-${postgresql_enable}}"
+		eval postgresql_data="\${postgresql_${profile}_data:-${postgresql_data}}"
+		eval postgresql_flags="\${postgresql_${profile}_flags:-${postgresql_flags}}"
+		eval postgresql_initdb_flags="\${postgresql_${profile}_initdb_flags:-${postgresql_initdb_flags}}"
+	fi
+else
+	if [ "x${postgresql_profiles}" != "x" -a "x$1" != "x" ]; then
+		for profile in ${postgresql_profiles}; do
+			eval _enable="\${postgresql_${profile}_enable}"
+			case "x${_enable:-${postgresql_enable}}" in
+			x|x[Nn][Oo]|x[Nn][Oo][Nn][Ee])
+				continue
+				;;
+			x[Yy][Ee][Ss])
+				;;
+			*)
+				if test -z "$_enable"; then
+					_var=postgresql_enable
+				else
+					_var=postgresql_"${profile}"_enable
+				fi
+				echo "Bad value" \
+					"'${_enable:-${postgresql_enable}}'" \
+					"for ${_var}. " \
+					"Profile ${profile} skipped."
+				continue
+				;;
+			esac
+			echo "===> postgresql profile: ${profile}"
+			%%PREFIX%%/etc/rc.d/postgresql $1 ${profile}
+			retcode="$?"
+			if [ "0${retcode}" -ne 0 ]; then
+				failed="${profile} (${retcode}) ${failed:-}"
+			else
+				success="${profile} ${success:-}"
+			fi
+		done
+		exit 0
+	fi
+fi
+
+command_args="-D ${postgresql_data} ${postgresql_flags}"
+
+postgresql_command()
+{
+    su -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}"
+}
+
+postgresql_initdb()
+{
+    su -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}"
+}
+
+run_rc_command "$1"
diff --git a/databases/postgresql10-server/pkg-descr b/databases/postgresql10-server/pkg-descr
new file mode 100644
index 00000000000..99641bd6dd1
--- /dev/null
+++ b/databases/postgresql10-server/pkg-descr
@@ -0,0 +1,23 @@
+PostgreSQL is a sophisticated Object-Relational DBMS, supporting
+almost all SQL constructs, including subselects, transactions, and
+user-defined types and functions. It is the most advanced open-source
+database available anywhere. Commercial Support is also available.
+
+The original Postgres code was the effort of many graduate students,
+undergraduate students, and staff programmers working under the direction of
+Professor Michael Stonebraker at the University of California, Berkeley. In
+1995, Andrew Yu and Jolly Chen took on the task of converting the DBMS query
+language to SQL and created a new database system which came to known as
+Postgres95. Many others contributed to the porting, testing, debugging and
+enhancement of the Postgres95 code. As the code improved, and 1995 faded into
+memory, PostgreSQL was born.
+
+PostgreSQL development is presently being performed by a team of Internet
+developers who are now responsible for all current and future development. The
+development team coordinator is Marc G. Fournier (scrappy@PostgreSQL.ORG).
+Support is available from the PostgreSQL developer/user community through the
+support mailing list (questions@PostgreSQL.ORG).
+
+PostgreSQL is free and the complete source is available.
+
+WWW: http://www.postgresql.org/
diff --git a/databases/postgresql10-server/pkg-install-server b/databases/postgresql10-server/pkg-install-server
new file mode 100644
index 00000000000..dff2f434764
--- /dev/null
+++ b/databases/postgresql10-server/pkg-install-server
@@ -0,0 +1,24 @@
+#! /bin/sh
+
+# $FreeBSD$
+
+PATH=/bin:/usr/bin:/usr/sbin
+
+backupwarning() {
+cat <<EOF
+
+  =========== BACKUP YOUR DATA! =============
+  As always, backup your data before
+  upgrading. If the upgrade leads to a higher
+  minor revision (e.g. 8.3.x -> 8.4), a dump
+  and restore of all databases is
+  required. This is *NOT* done by the port!
+  ===========================================
+EOF
+}
+
+case $2 in
+PRE-INSTALL)
+	backupwarning
+	;;
+esac
diff --git a/databases/postgresql10-server/pkg-plist-client b/databases/postgresql10-server/pkg-plist-client
new file mode 100644
index 00000000000..2c9509b9b0f
--- /dev/null
+++ b/databases/postgresql10-server/pkg-plist-client
@@ -0,0 +1,1104 @@
+bin/clusterdb
+bin/createdb
+bin/createuser
+bin/dropdb
+bin/dropuser
+bin/ecpg
+bin/pg_config
+bin/pg_dump
+bin/pg_dumpall
+bin/pg_isready
+bin/pg_restore
+bin/pgbench
+bin/psql
+bin/reindexdb
+bin/vacuumdb
+include/ecpg_config.h
+include/ecpg_informix.h
+include/ecpgerrno.h
+include/ecpglib.h
+include/ecpgtype.h
+include/libpq-events.h
+include/libpq-fe.h
+include/libpq/libpq-fs.h
+include/pg_config.h
+include/pg_config_ext.h
+include/pg_config_manual.h
+include/pg_config_os.h
+include/pgtypes_date.h
+include/pgtypes_error.h
+include/pgtypes_interval.h
+include/pgtypes_numeric.h
+include/pgtypes_timestamp.h
+include/postgres_ext.h
+include/postgresql/informix/esql/datetime.h
+include/postgresql/informix/esql/decimal.h
+include/postgresql/informix/esql/sqltypes.h
+include/postgresql/internal/c.h
+include/postgresql/internal/libpq-int.h
+include/postgresql/internal/libpq/pqcomm.h
+include/postgresql/internal/port.h
+include/postgresql/internal/postgres_fe.h
+include/postgresql/internal/pqexpbuffer.h
+include/postgresql/server/access/amapi.h
+include/postgresql/server/access/amvalidate.h
+include/postgresql/server/access/attnum.h
+include/postgresql/server/access/brin.h
+include/postgresql/server/access/brin_internal.h
+include/postgresql/server/access/brin_page.h
+include/postgresql/server/access/brin_pageops.h
+include/postgresql/server/access/brin_revmap.h
+include/postgresql/server/access/brin_tuple.h
+include/postgresql/server/access/brin_xlog.h
+include/postgresql/server/access/bufmask.h
+include/postgresql/server/access/clog.h
+include/postgresql/server/access/commit_ts.h
+include/postgresql/server/access/genam.h
+include/postgresql/server/access/generic_xlog.h
+include/postgresql/server/access/gin.h
+include/postgresql/server/access/gin_private.h
+include/postgresql/server/access/ginblock.h
+include/postgresql/server/access/ginxlog.h
+include/postgresql/server/access/gist.h
+include/postgresql/server/access/gist_private.h
+include/postgresql/server/access/gistscan.h
+include/postgresql/server/access/gistxlog.h
+include/postgresql/server/access/hash.h
+include/postgresql/server/access/hash_xlog.h
+include/postgresql/server/access/heapam.h
+include/postgresql/server/access/heapam_xlog.h
+include/postgresql/server/access/hio.h
+include/postgresql/server/access/htup.h
+include/postgresql/server/access/htup_details.h
+include/postgresql/server/access/itup.h
+include/postgresql/server/access/multixact.h
+include/postgresql/server/access/nbtree.h
+include/postgresql/server/access/nbtxlog.h
+include/postgresql/server/access/parallel.h
+include/postgresql/server/access/printsimple.h
+include/postgresql/server/access/printtup.h
+include/postgresql/server/access/reloptions.h
+include/postgresql/server/access/relscan.h
+include/postgresql/server/access/rewriteheap.h
+include/postgresql/server/access/rmgr.h
+include/postgresql/server/access/rmgrlist.h
+include/postgresql/server/access/sdir.h
+include/postgresql/server/access/skey.h
+include/postgresql/server/access/slru.h
+include/postgresql/server/access/spgist.h
+include/postgresql/server/access/spgist_private.h
+include/postgresql/server/access/spgxlog.h
+include/postgresql/server/access/stratnum.h
+include/postgresql/server/access/subtrans.h
+include/postgresql/server/access/sysattr.h
+include/postgresql/server/access/timeline.h
+include/postgresql/server/access/transam.h
+include/postgresql/server/access/tsmapi.h
+include/postgresql/server/access/tupconvert.h
+include/postgresql/server/access/tupdesc.h
+include/postgresql/server/access/tupmacs.h
+include/postgresql/server/access/tuptoaster.h
+include/postgresql/server/access/twophase.h
+include/postgresql/server/access/twophase_rmgr.h
+include/postgresql/server/access/valid.h
+include/postgresql/server/access/visibilitymap.h
+include/postgresql/server/access/xact.h
+include/postgresql/server/access/xlog.h
+include/postgresql/server/access/xlog_internal.h
+include/postgresql/server/access/xlogdefs.h
+include/postgresql/server/access/xloginsert.h
+include/postgresql/server/access/xlogreader.h
+include/postgresql/server/access/xlogrecord.h
+include/postgresql/server/access/xlogutils.h
+include/postgresql/server/bootstrap/bootstrap.h
+include/postgresql/server/c.h
+include/postgresql/server/catalog/binary_upgrade.h
+include/postgresql/server/catalog/catalog.h
+include/postgresql/server/catalog/catversion.h
+include/postgresql/server/catalog/dependency.h
+include/postgresql/server/catalog/genbki.h
+include/postgresql/server/catalog/heap.h
+include/postgresql/server/catalog/index.h
+include/postgresql/server/catalog/indexing.h
+include/postgresql/server/catalog/namespace.h
+include/postgresql/server/catalog/objectaccess.h
+include/postgresql/server/catalog/objectaddress.h
+include/postgresql/server/catalog/opfam_internal.h
+include/postgresql/server/catalog/partition.h
+include/postgresql/server/catalog/pg_aggregate.h
+include/postgresql/server/catalog/pg_am.h
+include/postgresql/server/catalog/pg_amop.h
+include/postgresql/server/catalog/pg_amproc.h
+include/postgresql/server/catalog/pg_attrdef.h
+include/postgresql/server/catalog/pg_attribute.h
+include/postgresql/server/catalog/pg_auth_members.h
+include/postgresql/server/catalog/pg_authid.h
+include/postgresql/server/catalog/pg_cast.h
+include/postgresql/server/catalog/pg_class.h
+include/postgresql/server/catalog/pg_collation.h
+include/postgresql/server/catalog/pg_collation_fn.h
+include/postgresql/server/catalog/pg_constraint.h
+include/postgresql/server/catalog/pg_constraint_fn.h
+include/postgresql/server/catalog/pg_control.h
+include/postgresql/server/catalog/pg_conversion.h
+include/postgresql/server/catalog/pg_conversion_fn.h
+include/postgresql/server/catalog/pg_database.h
+include/postgresql/server/catalog/pg_db_role_setting.h
+include/postgresql/server/catalog/pg_default_acl.h
+include/postgresql/server/catalog/pg_depend.h
+include/postgresql/server/catalog/pg_description.h
+include/postgresql/server/catalog/pg_enum.h
+include/postgresql/server/catalog/pg_event_trigger.h
+include/postgresql/server/catalog/pg_extension.h
+include/postgresql/server/catalog/pg_foreign_data_wrapper.h
+include/postgresql/server/catalog/pg_foreign_server.h
+include/postgresql/server/catalog/pg_foreign_table.h
+include/postgresql/server/catalog/pg_index.h
+include/postgresql/server/catalog/pg_inherits.h
+include/postgresql/server/catalog/pg_inherits_fn.h
+include/postgresql/server/catalog/pg_init_privs.h
+include/postgresql/server/catalog/pg_language.h
+include/postgresql/server/catalog/pg_largeobject.h
+include/postgresql/server/catalog/pg_largeobject_metadata.h
+include/postgresql/server/catalog/pg_namespace.h
+include/postgresql/server/catalog/pg_opclass.h
+include/postgresql/server/catalog/pg_operator.h
+include/postgresql/server/catalog/pg_operator_fn.h
+include/postgresql/server/catalog/pg_opfamily.h
+include/postgresql/server/catalog/pg_partitioned_table.h
+include/postgresql/server/catalog/pg_pltemplate.h
+include/postgresql/server/catalog/pg_policy.h
+include/postgresql/server/catalog/pg_proc.h
+include/postgresql/server/catalog/pg_proc_fn.h
+include/postgresql/server/catalog/pg_publication.h
+include/postgresql/server/catalog/pg_publication_rel.h
+include/postgresql/server/catalog/pg_range.h
+include/postgresql/server/catalog/pg_replication_origin.h
+include/postgresql/server/catalog/pg_rewrite.h
+include/postgresql/server/catalog/pg_seclabel.h
+include/postgresql/server/catalog/pg_sequence.h
+include/postgresql/server/catalog/pg_shdepend.h
+include/postgresql/server/catalog/pg_shdescription.h
+include/postgresql/server/catalog/pg_shseclabel.h
+include/postgresql/server/catalog/pg_statistic.h
+include/postgresql/server/catalog/pg_statistic_ext.h
+include/postgresql/server/catalog/pg_subscription.h
+include/postgresql/server/catalog/pg_subscription_rel.h
+include/postgresql/server/catalog/pg_tablespace.h
+include/postgresql/server/catalog/pg_transform.h
+include/postgresql/server/catalog/pg_trigger.h
+include/postgresql/server/catalog/pg_ts_config.h
+include/postgresql/server/catalog/pg_ts_config_map.h
+include/postgresql/server/catalog/pg_ts_dict.h
+include/postgresql/server/catalog/pg_ts_parser.h
+include/postgresql/server/catalog/pg_ts_template.h
+include/postgresql/server/catalog/pg_type.h
+include/postgresql/server/catalog/pg_type_fn.h
+include/postgresql/server/catalog/pg_user_mapping.h
+include/postgresql/server/catalog/schemapg.h
+include/postgresql/server/catalog/storage.h
+include/postgresql/server/catalog/storage_xlog.h
+include/postgresql/server/catalog/toasting.h
+include/postgresql/server/commands/alter.h
+include/postgresql/server/commands/async.h
+include/postgresql/server/commands/cluster.h
+include/postgresql/server/commands/collationcmds.h
+include/postgresql/server/commands/comment.h
+include/postgresql/server/commands/conversioncmds.h
+include/postgresql/server/commands/copy.h
+include/postgresql/server/commands/createas.h
+include/postgresql/server/commands/dbcommands.h
+include/postgresql/server/commands/dbcommands_xlog.h
+include/postgresql/server/commands/defrem.h
+include/postgresql/server/commands/discard.h
+include/postgresql/server/commands/event_trigger.h
+include/postgresql/server/commands/explain.h
+include/postgresql/server/commands/extension.h
+include/postgresql/server/commands/lockcmds.h
+include/postgresql/server/commands/matview.h
+include/postgresql/server/commands/policy.h
+include/postgresql/server/commands/portalcmds.h
+include/postgresql/server/commands/prepare.h
+include/postgresql/server/commands/proclang.h
+include/postgresql/server/commands/progress.h
+include/postgresql/server/commands/publicationcmds.h
+include/postgresql/server/commands/schemacmds.h
+include/postgresql/server/commands/seclabel.h
+include/postgresql/server/commands/sequence.h
+include/postgresql/server/commands/subscriptioncmds.h
+include/postgresql/server/commands/tablecmds.h
+include/postgresql/server/commands/tablespace.h
+include/postgresql/server/commands/trigger.h
+include/postgresql/server/commands/typecmds.h
+include/postgresql/server/commands/user.h
+include/postgresql/server/commands/vacuum.h
+include/postgresql/server/commands/variable.h
+include/postgresql/server/commands/view.h
+include/postgresql/server/common/base64.h
+include/postgresql/server/common/config_info.h
+include/postgresql/server/common/controldata_utils.h
+include/postgresql/server/common/fe_memutils.h
+include/postgresql/server/common/file_utils.h
+include/postgresql/server/common/int128.h
+include/postgresql/server/common/ip.h
+include/postgresql/server/common/keywords.h
+include/postgresql/server/common/md5.h
+include/postgresql/server/common/pg_lzcompress.h
+include/postgresql/server/common/relpath.h
+include/postgresql/server/common/restricted_token.h
+include/postgresql/server/common/saslprep.h
+include/postgresql/server/common/scram-common.h
+include/postgresql/server/common/sha2.h
+include/postgresql/server/common/string.h
+include/postgresql/server/common/unicode_norm.h
+include/postgresql/server/common/unicode_norm_table.h
+include/postgresql/server/common/username.h
+include/postgresql/server/datatype/timestamp.h
+include/postgresql/server/dynloader.h
+include/postgresql/server/executor/execExpr.h
+include/postgresql/server/executor/execParallel.h
+include/postgresql/server/executor/execdebug.h
+include/postgresql/server/executor/execdesc.h
+include/postgresql/server/executor/executor.h
+include/postgresql/server/executor/functions.h
+include/postgresql/server/executor/hashjoin.h
+include/postgresql/server/executor/instrument.h
+include/postgresql/server/executor/nodeAgg.h
+include/postgresql/server/executor/nodeAppend.h
+include/postgresql/server/executor/nodeBitmapAnd.h
+include/postgresql/server/executor/nodeBitmapHeapscan.h
+include/postgresql/server/executor/nodeBitmapIndexscan.h
+include/postgresql/server/executor/nodeBitmapOr.h
+include/postgresql/server/executor/nodeCtescan.h
+include/postgresql/server/executor/nodeCustom.h
+include/postgresql/server/executor/nodeForeignscan.h
+include/postgresql/server/executor/nodeFunctionscan.h
+include/postgresql/server/executor/nodeGather.h
+include/postgresql/server/executor/nodeGatherMerge.h
+include/postgresql/server/executor/nodeGroup.h
+include/postgresql/server/executor/nodeHash.h
+include/postgresql/server/executor/nodeHashjoin.h
+include/postgresql/server/executor/nodeIndexonlyscan.h
+include/postgresql/server/executor/nodeIndexscan.h
+include/postgresql/server/executor/nodeLimit.h
+include/postgresql/server/executor/nodeLockRows.h
+include/postgresql/server/executor/nodeMaterial.h
+include/postgresql/server/executor/nodeMergeAppend.h
+include/postgresql/server/executor/nodeMergejoin.h
+include/postgresql/server/executor/nodeModifyTable.h
+include/postgresql/server/executor/nodeNamedtuplestorescan.h
+include/postgresql/server/executor/nodeNestloop.h
+include/postgresql/server/executor/nodeProjectSet.h
+include/postgresql/server/executor/nodeRecursiveunion.h
+include/postgresql/server/executor/nodeResult.h
+include/postgresql/server/executor/nodeSamplescan.h
+include/postgresql/server/executor/nodeSeqscan.h
+include/postgresql/server/executor/nodeSetOp.h
+include/postgresql/server/executor/nodeSort.h
+include/postgresql/server/executor/nodeSubplan.h
+include/postgresql/server/executor/nodeSubqueryscan.h
+include/postgresql/server/executor/nodeTableFuncscan.h
+include/postgresql/server/executor/nodeTidscan.h
+include/postgresql/server/executor/nodeUnique.h
+include/postgresql/server/executor/nodeValuesscan.h
+include/postgresql/server/executor/nodeWindowAgg.h
+include/postgresql/server/executor/nodeWorktablescan.h
+include/postgresql/server/executor/spi.h
+include/postgresql/server/executor/spi_priv.h
+include/postgresql/server/executor/tablefunc.h
+include/postgresql/server/executor/tqueue.h
+include/postgresql/server/executor/tstoreReceiver.h
+include/postgresql/server/executor/tuptable.h
+include/postgresql/server/fe_utils/mbprint.h
+include/postgresql/server/fe_utils/print.h
+include/postgresql/server/fe_utils/psqlscan.h
+include/postgresql/server/fe_utils/psqlscan_int.h
+include/postgresql/server/fe_utils/simple_list.h
+include/postgresql/server/fe_utils/string_utils.h
+include/postgresql/server/fmgr.h
+include/postgresql/server/foreign/fdwapi.h
+include/postgresql/server/foreign/foreign.h
+include/postgresql/server/funcapi.h
+include/postgresql/server/getaddrinfo.h
+include/postgresql/server/getopt_long.h
+include/postgresql/server/lib/binaryheap.h
+include/postgresql/server/lib/bipartite_match.h
+include/postgresql/server/lib/hyperloglog.h
+include/postgresql/server/lib/ilist.h
+include/postgresql/server/lib/knapsack.h
+include/postgresql/server/lib/pairingheap.h
+include/postgresql/server/lib/rbtree.h
+include/postgresql/server/lib/simplehash.h
+include/postgresql/server/lib/stringinfo.h
+include/postgresql/server/libpq/auth.h
+include/postgresql/server/libpq/be-fsstubs.h
+include/postgresql/server/libpq/crypt.h
+include/postgresql/server/libpq/hba.h
+include/postgresql/server/libpq/ifaddr.h
+include/postgresql/server/libpq/libpq-be.h
+include/postgresql/server/libpq/libpq-fs.h
+include/postgresql/server/libpq/libpq.h
+include/postgresql/server/libpq/pqcomm.h
+include/postgresql/server/libpq/pqformat.h
+include/postgresql/server/libpq/pqmq.h
+include/postgresql/server/libpq/pqsignal.h
+include/postgresql/server/libpq/scram.h
+include/postgresql/server/mb/pg_wchar.h
+include/postgresql/server/miscadmin.h
+include/postgresql/server/nodes/bitmapset.h
+include/postgresql/server/nodes/execnodes.h
+include/postgresql/server/nodes/extensible.h
+include/postgresql/server/nodes/lockoptions.h
+include/postgresql/server/nodes/makefuncs.h
+include/postgresql/server/nodes/memnodes.h
+include/postgresql/server/nodes/nodeFuncs.h
+include/postgresql/server/nodes/nodes.h
+include/postgresql/server/nodes/params.h
+include/postgresql/server/nodes/parsenodes.h
+include/postgresql/server/nodes/pg_list.h
+include/postgresql/server/nodes/plannodes.h
+include/postgresql/server/nodes/primnodes.h
+include/postgresql/server/nodes/print.h
+include/postgresql/server/nodes/readfuncs.h
+include/postgresql/server/nodes/relation.h
+include/postgresql/server/nodes/replnodes.h
+include/postgresql/server/nodes/tidbitmap.h
+include/postgresql/server/nodes/value.h
+include/postgresql/server/optimizer/clauses.h
+include/postgresql/server/optimizer/cost.h
+include/postgresql/server/optimizer/geqo.h
+include/postgresql/server/optimizer/geqo_copy.h
+include/postgresql/server/optimizer/geqo_gene.h
+include/postgresql/server/optimizer/geqo_misc.h
+include/postgresql/server/optimizer/geqo_mutation.h
+include/postgresql/server/optimizer/geqo_pool.h
+include/postgresql/server/optimizer/geqo_random.h
+include/postgresql/server/optimizer/geqo_recombination.h
+include/postgresql/server/optimizer/geqo_selection.h
+include/postgresql/server/optimizer/joininfo.h
+include/postgresql/server/optimizer/orclauses.h
+include/postgresql/server/optimizer/pathnode.h
+include/postgresql/server/optimizer/paths.h
+include/postgresql/server/optimizer/placeholder.h
+include/postgresql/server/optimizer/plancat.h
+include/postgresql/server/optimizer/planmain.h
+include/postgresql/server/optimizer/planner.h
+include/postgresql/server/optimizer/predtest.h
+include/postgresql/server/optimizer/prep.h
+include/postgresql/server/optimizer/restrictinfo.h
+include/postgresql/server/optimizer/subselect.h
+include/postgresql/server/optimizer/tlist.h
+include/postgresql/server/optimizer/var.h
+include/postgresql/server/parser/analyze.h
+include/postgresql/server/parser/gram.h
+include/postgresql/server/parser/gramparse.h
+include/postgresql/server/parser/kwlist.h
+include/postgresql/server/parser/parse_agg.h
+include/postgresql/server/parser/parse_clause.h
+include/postgresql/server/parser/parse_coerce.h
+include/postgresql/server/parser/parse_collate.h
+include/postgresql/server/parser/parse_cte.h
+include/postgresql/server/parser/parse_enr.h
+include/postgresql/server/parser/parse_expr.h
+include/postgresql/server/parser/parse_func.h
+include/postgresql/server/parser/parse_node.h
+include/postgresql/server/parser/parse_oper.h
+include/postgresql/server/parser/parse_param.h
+include/postgresql/server/parser/parse_relation.h
+include/postgresql/server/parser/parse_target.h
+include/postgresql/server/parser/parse_type.h
+include/postgresql/server/parser/parse_utilcmd.h
+include/postgresql/server/parser/parser.h
+include/postgresql/server/parser/parsetree.h
+include/postgresql/server/parser/scanner.h
+include/postgresql/server/parser/scansup.h
+include/postgresql/server/pg_config.h
+include/postgresql/server/pg_config_ext.h
+include/postgresql/server/pg_config_manual.h
+include/postgresql/server/pg_config_os.h
+include/postgresql/server/pg_getopt.h
+include/postgresql/server/pg_trace.h
+include/postgresql/server/pgstat.h
+include/postgresql/server/pgtar.h
+include/postgresql/server/pgtime.h
+include/postgresql/server/port.h
+include/postgresql/server/port/aix.h
+include/postgresql/server/port/atomics.h
+include/postgresql/server/port/atomics/arch-arm.h
+include/postgresql/server/port/atomics/arch-hppa.h
+include/postgresql/server/port/atomics/arch-ia64.h
+include/postgresql/server/port/atomics/arch-ppc.h
+include/postgresql/server/port/atomics/arch-x86.h
+include/postgresql/server/port/atomics/fallback.h
+include/postgresql/server/port/atomics/generic-acc.h
+include/postgresql/server/port/atomics/generic-gcc.h
+include/postgresql/server/port/atomics/generic-msvc.h
+include/postgresql/server/port/atomics/generic-sunpro.h
+include/postgresql/server/port/atomics/generic-xlc.h
+include/postgresql/server/port/atomics/generic.h
+include/postgresql/server/port/cygwin.h
+include/postgresql/server/port/darwin.h
+include/postgresql/server/port/freebsd.h
+include/postgresql/server/port/hpux.h
+include/postgresql/server/port/linux.h
+include/postgresql/server/port/netbsd.h
+include/postgresql/server/port/openbsd.h
+include/postgresql/server/port/pg_bswap.h
+include/postgresql/server/port/pg_crc32c.h
+include/postgresql/server/port/solaris.h
+include/postgresql/server/port/win32.h
+include/postgresql/server/port/win32/arpa/inet.h
+include/postgresql/server/port/win32/dlfcn.h
+include/postgresql/server/port/win32/grp.h
+include/postgresql/server/port/win32/netdb.h
+include/postgresql/server/port/win32/netinet/in.h
+include/postgresql/server/port/win32/pwd.h
+include/postgresql/server/port/win32/sys/socket.h
+include/postgresql/server/port/win32/sys/wait.h
+include/postgresql/server/port/win32_msvc/dirent.h
+include/postgresql/server/port/win32_msvc/sys/file.h
+include/postgresql/server/port/win32_msvc/sys/param.h
+include/postgresql/server/port/win32_msvc/sys/time.h
+include/postgresql/server/port/win32_msvc/unistd.h
+include/postgresql/server/port/win32_msvc/utime.h
+include/postgresql/server/portability/instr_time.h
+include/postgresql/server/portability/mem.h
+include/postgresql/server/postgres.h
+include/postgresql/server/postgres_ext.h
+include/postgresql/server/postgres_fe.h
+include/postgresql/server/postmaster/autovacuum.h
+include/postgresql/server/postmaster/bgworker.h
+include/postgresql/server/postmaster/bgworker_internals.h
+include/postgresql/server/postmaster/bgwriter.h
+include/postgresql/server/postmaster/fork_process.h
+include/postgresql/server/postmaster/pgarch.h
+include/postgresql/server/postmaster/postmaster.h
+include/postgresql/server/postmaster/startup.h
+include/postgresql/server/postmaster/syslogger.h
+include/postgresql/server/postmaster/walwriter.h
+include/postgresql/server/regex/regcustom.h
+include/postgresql/server/regex/regerrs.h
+include/postgresql/server/regex/regex.h
+include/postgresql/server/regex/regexport.h
+include/postgresql/server/regex/regguts.h
+include/postgresql/server/replication/basebackup.h
+include/postgresql/server/replication/decode.h
+include/postgresql/server/replication/logical.h
+include/postgresql/server/replication/logicalfuncs.h
+include/postgresql/server/replication/logicallauncher.h
+include/postgresql/server/replication/logicalproto.h
+include/postgresql/server/replication/logicalrelation.h
+include/postgresql/server/replication/logicalworker.h
+include/postgresql/server/replication/message.h
+include/postgresql/server/replication/origin.h
+include/postgresql/server/replication/output_plugin.h
+include/postgresql/server/replication/pgoutput.h
+include/postgresql/server/replication/reorderbuffer.h
+include/postgresql/server/replication/slot.h
+include/postgresql/server/replication/snapbuild.h
+include/postgresql/server/replication/syncrep.h
+include/postgresql/server/replication/walreceiver.h
+include/postgresql/server/replication/walsender.h
+include/postgresql/server/replication/walsender_private.h
+include/postgresql/server/replication/worker_internal.h
+include/postgresql/server/rewrite/prs2lock.h
+include/postgresql/server/rewrite/rewriteDefine.h
+include/postgresql/server/rewrite/rewriteHandler.h
+include/postgresql/server/rewrite/rewriteManip.h
+include/postgresql/server/rewrite/rewriteRemove.h
+include/postgresql/server/rewrite/rewriteSupport.h
+include/postgresql/server/rewrite/rowsecurity.h
+include/postgresql/server/rusagestub.h
+include/postgresql/server/snowball/header.h
+include/postgresql/server/snowball/libstemmer/api.h
+include/postgresql/server/snowball/libstemmer/header.h
+include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_danish.h
+include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_dutch.h
+include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_english.h
+include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_finnish.h
+include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_french.h
+include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_german.h
+include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_hungarian.h
+include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_italian.h
+include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_norwegian.h
+include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_porter.h
+include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_portuguese.h
+include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_spanish.h
+include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_swedish.h
+include/postgresql/server/snowball/libstemmer/stem_ISO_8859_2_romanian.h
+include/postgresql/server/snowball/libstemmer/stem_KOI8_R_russian.h
+include/postgresql/server/snowball/libstemmer/stem_UTF_8_danish.h
+include/postgresql/server/snowball/libstemmer/stem_UTF_8_dutch.h
+include/postgresql/server/snowball/libstemmer/stem_UTF_8_english.h
+include/postgresql/server/snowball/libstemmer/stem_UTF_8_finnish.h
+include/postgresql/server/snowball/libstemmer/stem_UTF_8_french.h
+include/postgresql/server/snowball/libstemmer/stem_UTF_8_german.h
+include/postgresql/server/snowball/libstemmer/stem_UTF_8_hungarian.h
+include/postgresql/server/snowball/libstemmer/stem_UTF_8_italian.h
+include/postgresql/server/snowball/libstemmer/stem_UTF_8_norwegian.h
+include/postgresql/server/snowball/libstemmer/stem_UTF_8_porter.h
+include/postgresql/server/snowball/libstemmer/stem_UTF_8_portuguese.h
+include/postgresql/server/snowball/libstemmer/stem_UTF_8_romanian.h
+include/postgresql/server/snowball/libstemmer/stem_UTF_8_russian.h
+include/postgresql/server/snowball/libstemmer/stem_UTF_8_spanish.h
+include/postgresql/server/snowball/libstemmer/stem_UTF_8_swedish.h
+include/postgresql/server/snowball/libstemmer/stem_UTF_8_turkish.h
+include/postgresql/server/statistics/extended_stats_internal.h
+include/postgresql/server/statistics/statistics.h
+include/postgresql/server/storage/backendid.h
+include/postgresql/server/storage/block.h
+include/postgresql/server/storage/buf.h
+include/postgresql/server/storage/buf_internals.h
+include/postgresql/server/storage/buffile.h
+include/postgresql/server/storage/bufmgr.h
+include/postgresql/server/storage/bufpage.h
+include/postgresql/server/storage/checksum.h
+include/postgresql/server/storage/checksum_impl.h
+include/postgresql/server/storage/condition_variable.h
+include/postgresql/server/storage/copydir.h
+include/postgresql/server/storage/dsm.h
+include/postgresql/server/storage/dsm_impl.h
+include/postgresql/server/storage/fd.h
+include/postgresql/server/storage/freespace.h
+include/postgresql/server/storage/fsm_internals.h
+include/postgresql/server/storage/indexfsm.h
+include/postgresql/server/storage/ipc.h
+include/postgresql/server/storage/item.h
+include/postgresql/server/storage/itemid.h
+include/postgresql/server/storage/itemptr.h
+include/postgresql/server/storage/large_object.h
+include/postgresql/server/storage/latch.h
+include/postgresql/server/storage/lmgr.h
+include/postgresql/server/storage/lock.h
+include/postgresql/server/storage/lockdefs.h
+include/postgresql/server/storage/lwlock.h
+include/postgresql/server/storage/lwlocknames.h
+include/postgresql/server/storage/off.h
+include/postgresql/server/storage/pg_sema.h
+include/postgresql/server/storage/pg_shmem.h
+include/postgresql/server/storage/pmsignal.h
+include/postgresql/server/storage/predicate.h
+include/postgresql/server/storage/predicate_internals.h
+include/postgresql/server/storage/proc.h
+include/postgresql/server/storage/procarray.h
+include/postgresql/server/storage/proclist.h
+include/postgresql/server/storage/proclist_types.h
+include/postgresql/server/storage/procsignal.h
+include/postgresql/server/storage/reinit.h
+include/postgresql/server/storage/relfilenode.h
+include/postgresql/server/storage/s_lock.h
+include/postgresql/server/storage/shm_mq.h
+include/postgresql/server/storage/shm_toc.h
+include/postgresql/server/storage/shmem.h
+include/postgresql/server/storage/sinval.h
+include/postgresql/server/storage/sinvaladt.h
+include/postgresql/server/storage/smgr.h
+include/postgresql/server/storage/spin.h
+include/postgresql/server/storage/standby.h
+include/postgresql/server/storage/standbydefs.h
+include/postgresql/server/tcop/deparse_utility.h
+include/postgresql/server/tcop/dest.h
+include/postgresql/server/tcop/fastpath.h
+include/postgresql/server/tcop/pquery.h
+include/postgresql/server/tcop/tcopprot.h
+include/postgresql/server/tcop/utility.h
+include/postgresql/server/tsearch/dicts/regis.h
+include/postgresql/server/tsearch/dicts/spell.h
+include/postgresql/server/tsearch/ts_cache.h
+include/postgresql/server/tsearch/ts_locale.h
+include/postgresql/server/tsearch/ts_public.h
+include/postgresql/server/tsearch/ts_type.h
+include/postgresql/server/tsearch/ts_utils.h
+include/postgresql/server/utils/acl.h
+include/postgresql/server/utils/aclchk_internal.h
+include/postgresql/server/utils/array.h
+include/postgresql/server/utils/arrayaccess.h
+include/postgresql/server/utils/ascii.h
+include/postgresql/server/utils/attoptcache.h
+include/postgresql/server/utils/backend_random.h
+include/postgresql/server/utils/builtins.h
+include/postgresql/server/utils/bytea.h
+include/postgresql/server/utils/cash.h
+include/postgresql/server/utils/catcache.h
+include/postgresql/server/utils/combocid.h
+include/postgresql/server/utils/date.h
+include/postgresql/server/utils/datetime.h
+include/postgresql/server/utils/datum.h
+include/postgresql/server/utils/dsa.h
+include/postgresql/server/utils/dynahash.h
+include/postgresql/server/utils/dynamic_loader.h
+include/postgresql/server/utils/elog.h
+include/postgresql/server/utils/errcodes.h
+include/postgresql/server/utils/evtcache.h
+include/postgresql/server/utils/expandeddatum.h
+include/postgresql/server/utils/fmgroids.h
+include/postgresql/server/utils/fmgrprotos.h
+include/postgresql/server/utils/fmgrtab.h
+include/postgresql/server/utils/formatting.h
+include/postgresql/server/utils/freepage.h
+include/postgresql/server/utils/geo_decls.h
+include/postgresql/server/utils/guc.h
+include/postgresql/server/utils/guc_tables.h
+include/postgresql/server/utils/help_config.h
+include/postgresql/server/utils/hsearch.h
+include/postgresql/server/utils/index_selfuncs.h
+include/postgresql/server/utils/inet.h
+include/postgresql/server/utils/int8.h
+include/postgresql/server/utils/inval.h
+include/postgresql/server/utils/json.h
+include/postgresql/server/utils/jsonapi.h
+include/postgresql/server/utils/jsonb.h
+include/postgresql/server/utils/logtape.h
+include/postgresql/server/utils/lsyscache.h
+include/postgresql/server/utils/memdebug.h
+include/postgresql/server/utils/memutils.h
+include/postgresql/server/utils/nabstime.h
+include/postgresql/server/utils/numeric.h
+include/postgresql/server/utils/palloc.h
+include/postgresql/server/utils/pg_crc.h
+include/postgresql/server/utils/pg_locale.h
+include/postgresql/server/utils/pg_lsn.h
+include/postgresql/server/utils/pg_rusage.h
+include/postgresql/server/utils/pidfile.h
+include/postgresql/server/utils/plancache.h
+include/postgresql/server/utils/portal.h
+include/postgresql/server/utils/probes.h
+include/postgresql/server/utils/ps_status.h
+include/postgresql/server/utils/queryenvironment.h
+include/postgresql/server/utils/rangetypes.h
+include/postgresql/server/utils/regproc.h
+include/postgresql/server/utils/rel.h
+include/postgresql/server/utils/relcache.h
+include/postgresql/server/utils/relfilenodemap.h
+include/postgresql/server/utils/relmapper.h
+include/postgresql/server/utils/relptr.h
+include/postgresql/server/utils/reltrigger.h
+include/postgresql/server/utils/resowner.h
+include/postgresql/server/utils/resowner_private.h
+include/postgresql/server/utils/rls.h
+include/postgresql/server/utils/ruleutils.h
+include/postgresql/server/utils/sampling.h
+include/postgresql/server/utils/selfuncs.h
+include/postgresql/server/utils/snapmgr.h
+include/postgresql/server/utils/snapshot.h
+include/postgresql/server/utils/sortsupport.h
+include/postgresql/server/utils/spccache.h
+include/postgresql/server/utils/syscache.h
+include/postgresql/server/utils/timeout.h
+include/postgresql/server/utils/timestamp.h
+include/postgresql/server/utils/tqual.h
+include/postgresql/server/utils/tuplesort.h
+include/postgresql/server/utils/tuplestore.h
+include/postgresql/server/utils/typcache.h
+include/postgresql/server/utils/tzparser.h
+include/postgresql/server/utils/uuid.h
+include/postgresql/server/utils/varbit.h
+include/postgresql/server/utils/varlena.h
+include/postgresql/server/utils/xml.h
+include/postgresql/server/windowapi.h
+include/sql3types.h
+include/sqlca.h
+include/sqlda-compat.h
+include/sqlda-native.h
+include/sqlda.h
+lib/libecpg.a
+lib/libecpg.so
+lib/libecpg.so.6
+lib/libecpg_compat.a
+lib/libecpg_compat.so
+lib/libecpg_compat.so.3
+lib/libpgport.a
+lib/libpgtypes.a
+lib/libpgtypes.so
+lib/libpgtypes.so.3
+lib/libpq.a
+lib/libpq.so
+lib/libpq.so.5
+lib/postgresql/pgxs/config/install-sh
+lib/postgresql/pgxs/config/missing
+lib/postgresql/pgxs/src/Makefile.global
+lib/postgresql/pgxs/src/Makefile.port
+lib/postgresql/pgxs/src/Makefile.shlib
+lib/postgresql/pgxs/src/makefiles/pgxs.mk
+lib/postgresql/pgxs/src/nls-global.mk
+lib/postgresql/pgxs/src/test/regress/pg_regress
+libdata/pkgconfig/libecpg.pc
+libdata/pkgconfig/libecpg_compat.pc
+libdata/pkgconfig/libpgtypes.pc
+libdata/pkgconfig/libpq.pc
+man/man1/clusterdb.1.gz
+man/man1/createdb.1.gz
+man/man1/createuser.1.gz
+man/man1/dropdb.1.gz
+man/man1/dropuser.1.gz
+man/man1/ecpg.1.gz
+man/man1/initdb.1.gz
+man/man1/oid2name.1.gz
+man/man1/pg_archivecleanup.1.gz
+man/man1/pg_basebackup.1.gz
+man/man1/pg_config.1.gz
+man/man1/pg_controldata.1.gz
+man/man1/pg_ctl.1.gz
+man/man1/pg_dump.1.gz
+man/man1/pg_dumpall.1.gz
+man/man1/pg_isready.1.gz
+man/man1/pg_receivewal.1.gz
+man/man1/pg_recvlogical.1.gz
+man/man1/pg_resetwal.1.gz
+man/man1/pg_restore.1.gz
+man/man1/pg_rewind.1.gz
+man/man1/pg_standby.1.gz
+man/man1/pg_test_fsync.1.gz
+man/man1/pg_test_timing.1.gz
+man/man1/pg_upgrade.1.gz
+man/man1/pg_waldump.1.gz
+man/man1/pgbench.1.gz
+man/man1/postgres.1.gz
+man/man1/postmaster.1.gz
+man/man1/psql.1.gz
+man/man1/reindexdb.1.gz
+man/man1/vacuumdb.1.gz
+man/man1/vacuumlo.1.gz
+man/man3/SPI_connect.3.gz
+man/man3/SPI_copytuple.3.gz
+man/man3/SPI_cursor_close.3.gz
+man/man3/SPI_cursor_fetch.3.gz
+man/man3/SPI_cursor_find.3.gz
+man/man3/SPI_cursor_move.3.gz
+man/man3/SPI_cursor_open.3.gz
+man/man3/SPI_cursor_open_with_args.3.gz
+man/man3/SPI_cursor_open_with_paramlist.3.gz
+man/man3/SPI_exec.3.gz
+man/man3/SPI_execp.3.gz
+man/man3/SPI_execute.3.gz
+man/man3/SPI_execute_plan.3.gz
+man/man3/SPI_execute_plan_with_paramlist.3.gz
+man/man3/SPI_execute_with_args.3.gz
+man/man3/SPI_finish.3.gz
+man/man3/SPI_fname.3.gz
+man/man3/SPI_fnumber.3.gz
+man/man3/SPI_freeplan.3.gz
+man/man3/SPI_freetuple.3.gz
+man/man3/SPI_freetuptable.3.gz
+man/man3/SPI_getargcount.3.gz
+man/man3/SPI_getargtypeid.3.gz
+man/man3/SPI_getbinval.3.gz
+man/man3/SPI_getnspname.3.gz
+man/man3/SPI_getrelname.3.gz
+man/man3/SPI_gettype.3.gz
+man/man3/SPI_gettypeid.3.gz
+man/man3/SPI_getvalue.3.gz
+man/man3/SPI_is_cursor_plan.3.gz
+man/man3/SPI_keepplan.3.gz
+man/man3/SPI_modifytuple.3.gz
+man/man3/SPI_palloc.3.gz
+man/man3/SPI_pfree.3.gz
+man/man3/SPI_prepare.3.gz
+man/man3/SPI_prepare_cursor.3.gz
+man/man3/SPI_prepare_params.3.gz
+man/man3/SPI_register_relation.3.gz
+man/man3/SPI_register_trigger_data.3.gz
+man/man3/SPI_repalloc.3.gz
+man/man3/SPI_returntuple.3.gz
+man/man3/SPI_saveplan.3.gz
+man/man3/SPI_scroll_cursor_fetch.3.gz
+man/man3/SPI_scroll_cursor_move.3.gz
+man/man3/SPI_unregister_relation.3.gz
+man/man3/dblink.3.gz
+man/man3/dblink_build_sql_delete.3.gz
+man/man3/dblink_build_sql_insert.3.gz
+man/man3/dblink_build_sql_update.3.gz
+man/man3/dblink_cancel_query.3.gz
+man/man3/dblink_close.3.gz
+man/man3/dblink_connect.3.gz
+man/man3/dblink_connect_u.3.gz
+man/man3/dblink_disconnect.3.gz
+man/man3/dblink_error_message.3.gz
+man/man3/dblink_exec.3.gz
+man/man3/dblink_fetch.3.gz
+man/man3/dblink_get_connections.3.gz
+man/man3/dblink_get_notify.3.gz
+man/man3/dblink_get_pkey.3.gz
+man/man3/dblink_get_result.3.gz
+man/man3/dblink_is_busy.3.gz
+man/man3/dblink_open.3.gz
+man/man3/dblink_send_query.3.gz
+man/man7/ABORT.7.gz
+man/man7/ALTER_AGGREGATE.7.gz
+man/man7/ALTER_COLLATION.7.gz
+man/man7/ALTER_CONVERSION.7.gz
+man/man7/ALTER_DATABASE.7.gz
+man/man7/ALTER_DEFAULT_PRIVILEGES.7.gz
+man/man7/ALTER_DOMAIN.7.gz
+man/man7/ALTER_EVENT_TRIGGER.7.gz
+man/man7/ALTER_EXTENSION.7.gz
+man/man7/ALTER_FOREIGN_DATA_WRAPPER.7.gz
+man/man7/ALTER_FOREIGN_TABLE.7.gz
+man/man7/ALTER_FUNCTION.7.gz
+man/man7/ALTER_GROUP.7.gz
+man/man7/ALTER_INDEX.7.gz
+man/man7/ALTER_LANGUAGE.7.gz
+man/man7/ALTER_LARGE_OBJECT.7.gz
+man/man7/ALTER_MATERIALIZED_VIEW.7.gz
+man/man7/ALTER_OPERATOR.7.gz
+man/man7/ALTER_OPERATOR_CLASS.7.gz
+man/man7/ALTER_OPERATOR_FAMILY.7.gz
+man/man7/ALTER_POLICY.7.gz
+man/man7/ALTER_PUBLICATION.7.gz
+man/man7/ALTER_ROLE.7.gz
+man/man7/ALTER_RULE.7.gz
+man/man7/ALTER_SCHEMA.7.gz
+man/man7/ALTER_SEQUENCE.7.gz
+man/man7/ALTER_SERVER.7.gz
+man/man7/ALTER_STATISTICS.7.gz
+man/man7/ALTER_SUBSCRIPTION.7.gz
+man/man7/ALTER_SYSTEM.7.gz
+man/man7/ALTER_TABLE.7.gz
+man/man7/ALTER_TABLESPACE.7.gz
+man/man7/ALTER_TEXT_SEARCH_CONFIGURATION.7.gz
+man/man7/ALTER_TEXT_SEARCH_DICTIONARY.7.gz
+man/man7/ALTER_TEXT_SEARCH_PARSER.7.gz
+man/man7/ALTER_TEXT_SEARCH_TEMPLATE.7.gz
+man/man7/ALTER_TRIGGER.7.gz
+man/man7/ALTER_TYPE.7.gz
+man/man7/ALTER_USER.7.gz
+man/man7/ALTER_USER_MAPPING.7.gz
+man/man7/ALTER_VIEW.7.gz
+man/man7/ANALYZE.7.gz
+man/man7/BEGIN.7.gz
+man/man7/CHECKPOINT.7.gz
+man/man7/CLOSE.7.gz
+man/man7/CLUSTER.7.gz
+man/man7/COMMENT.7.gz
+man/man7/COMMIT.7.gz
+man/man7/COMMIT_PREPARED.7.gz
+man/man7/COPY.7.gz
+man/man7/CREATE_ACCESS_METHOD.7.gz
+man/man7/CREATE_AGGREGATE.7.gz
+man/man7/CREATE_CAST.7.gz
+man/man7/CREATE_COLLATION.7.gz
+man/man7/CREATE_CONVERSION.7.gz
+man/man7/CREATE_DATABASE.7.gz
+man/man7/CREATE_DOMAIN.7.gz
+man/man7/CREATE_EVENT_TRIGGER.7.gz
+man/man7/CREATE_EXTENSION.7.gz
+man/man7/CREATE_FOREIGN_DATA_WRAPPER.7.gz
+man/man7/CREATE_FOREIGN_TABLE.7.gz
+man/man7/CREATE_FUNCTION.7.gz
+man/man7/CREATE_GROUP.7.gz
+man/man7/CREATE_INDEX.7.gz
+man/man7/CREATE_LANGUAGE.7.gz
+man/man7/CREATE_MATERIALIZED_VIEW.7.gz
+man/man7/CREATE_OPERATOR.7.gz
+man/man7/CREATE_OPERATOR_CLASS.7.gz
+man/man7/CREATE_OPERATOR_FAMILY.7.gz
+man/man7/CREATE_POLICY.7.gz
+man/man7/CREATE_PUBLICATION.7.gz
+man/man7/CREATE_ROLE.7.gz
+man/man7/CREATE_RULE.7.gz
+man/man7/CREATE_SCHEMA.7.gz
+man/man7/CREATE_SEQUENCE.7.gz
+man/man7/CREATE_SERVER.7.gz
+man/man7/CREATE_STATISTICS.7.gz
+man/man7/CREATE_SUBSCRIPTION.7.gz
+man/man7/CREATE_TABLE.7.gz
+man/man7/CREATE_TABLESPACE.7.gz
+man/man7/CREATE_TABLE_AS.7.gz
+man/man7/CREATE_TEXT_SEARCH_CONFIGURATION.7.gz
+man/man7/CREATE_TEXT_SEARCH_DICTIONARY.7.gz
+man/man7/CREATE_TEXT_SEARCH_PARSER.7.gz
+man/man7/CREATE_TEXT_SEARCH_TEMPLATE.7.gz
+man/man7/CREATE_TRANSFORM.7.gz
+man/man7/CREATE_TRIGGER.7.gz
+man/man7/CREATE_TYPE.7.gz
+man/man7/CREATE_USER.7.gz
+man/man7/CREATE_USER_MAPPING.7.gz
+man/man7/CREATE_VIEW.7.gz
+man/man7/DEALLOCATE.7.gz
+man/man7/DECLARE.7.gz
+man/man7/DELETE.7.gz
+man/man7/DISCARD.7.gz
+man/man7/DO.7.gz
+man/man7/DROP_ACCESS_METHOD.7.gz
+man/man7/DROP_AGGREGATE.7.gz
+man/man7/DROP_CAST.7.gz
+man/man7/DROP_COLLATION.7.gz
+man/man7/DROP_CONVERSION.7.gz
+man/man7/DROP_DATABASE.7.gz
+man/man7/DROP_DOMAIN.7.gz
+man/man7/DROP_EVENT_TRIGGER.7.gz
+man/man7/DROP_EXTENSION.7.gz
+man/man7/DROP_FOREIGN_DATA_WRAPPER.7.gz
+man/man7/DROP_FOREIGN_TABLE.7.gz
+man/man7/DROP_FUNCTION.7.gz
+man/man7/DROP_GROUP.7.gz
+man/man7/DROP_INDEX.7.gz
+man/man7/DROP_LANGUAGE.7.gz
+man/man7/DROP_MATERIALIZED_VIEW.7.gz
+man/man7/DROP_OPERATOR.7.gz
+man/man7/DROP_OPERATOR_CLASS.7.gz
+man/man7/DROP_OPERATOR_FAMILY.7.gz
+man/man7/DROP_OWNED.7.gz
+man/man7/DROP_POLICY.7.gz
+man/man7/DROP_PUBLICATION.7.gz
+man/man7/DROP_ROLE.7.gz
+man/man7/DROP_RULE.7.gz
+man/man7/DROP_SCHEMA.7.gz
+man/man7/DROP_SEQUENCE.7.gz
+man/man7/DROP_SERVER.7.gz
+man/man7/DROP_STATISTICS.7.gz
+man/man7/DROP_SUBSCRIPTION.7.gz
+man/man7/DROP_TABLE.7.gz
+man/man7/DROP_TABLESPACE.7.gz
+man/man7/DROP_TEXT_SEARCH_CONFIGURATION.7.gz
+man/man7/DROP_TEXT_SEARCH_DICTIONARY.7.gz
+man/man7/DROP_TEXT_SEARCH_PARSER.7.gz
+man/man7/DROP_TEXT_SEARCH_TEMPLATE.7.gz
+man/man7/DROP_TRANSFORM.7.gz
+man/man7/DROP_TRIGGER.7.gz
+man/man7/DROP_TYPE.7.gz
+man/man7/DROP_USER.7.gz
+man/man7/DROP_USER_MAPPING.7.gz
+man/man7/DROP_VIEW.7.gz
+man/man7/END.7.gz
+man/man7/EXECUTE.7.gz
+man/man7/EXPLAIN.7.gz
+man/man7/FETCH.7.gz
+man/man7/GRANT.7.gz
+man/man7/IMPORT_FOREIGN_SCHEMA.7.gz
+man/man7/INSERT.7.gz
+man/man7/LISTEN.7.gz
+man/man7/LOAD.7.gz
+man/man7/LOCK.7.gz
+man/man7/MOVE.7.gz
+man/man7/NOTIFY.7.gz
+man/man7/PREPARE.7.gz
+man/man7/PREPARE_TRANSACTION.7.gz
+man/man7/REASSIGN_OWNED.7.gz
+man/man7/REFRESH_MATERIALIZED_VIEW.7.gz
+man/man7/REINDEX.7.gz
+man/man7/RELEASE_SAVEPOINT.7.gz
+man/man7/RESET.7.gz
+man/man7/REVOKE.7.gz
+man/man7/ROLLBACK.7.gz
+man/man7/ROLLBACK_PREPARED.7.gz
+man/man7/ROLLBACK_TO_SAVEPOINT.7.gz
+man/man7/SAVEPOINT.7.gz
+man/man7/SECURITY_LABEL.7.gz
+man/man7/SELECT.7.gz
+man/man7/SELECT_INTO.7.gz
+man/man7/SET.7.gz
+man/man7/SET_CONSTRAINTS.7.gz
+man/man7/SET_ROLE.7.gz
+man/man7/SET_SESSION_AUTHORIZATION.7.gz
+man/man7/SET_TRANSACTION.7.gz
+man/man7/SHOW.7.gz
+man/man7/START_TRANSACTION.7.gz
+man/man7/TABLE.7.gz
+man/man7/TRUNCATE.7.gz
+man/man7/UNLISTEN.7.gz
+man/man7/UPDATE.7.gz
+man/man7/VACUUM.7.gz
+man/man7/VALUES.7.gz
+man/man7/WITH.7.gz
+%%PORTDOCS%%%%DOCSDIR%%/README-client
+%%NLS%%share/locale/cs/LC_MESSAGES/ecpg-10.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/ecpglib6-10.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/libpq5-10.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_config-10.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_dump-10.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pgscripts-10.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/psql-10.mo
+%%NLS%%share/locale/de/LC_MESSAGES/ecpg-10.mo
+%%NLS%%share/locale/de/LC_MESSAGES/ecpglib6-10.mo
+%%NLS%%share/locale/de/LC_MESSAGES/libpq5-10.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_config-10.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_dump-10.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pgscripts-10.mo
+%%NLS%%share/locale/de/LC_MESSAGES/psql-10.mo
+%%NLS%%share/locale/es/LC_MESSAGES/ecpg-10.mo
+%%NLS%%share/locale/es/LC_MESSAGES/ecpglib6-10.mo
+%%NLS%%share/locale/es/LC_MESSAGES/libpq5-10.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_config-10.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_dump-10.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pgscripts-10.mo
+%%NLS%%share/locale/es/LC_MESSAGES/psql-10.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/ecpg-10.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/ecpglib6-10.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/libpq5-10.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_config-10.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_dump-10.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pgscripts-10.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/psql-10.mo
+%%NLS%%share/locale/he/LC_MESSAGES/libpq5-10.mo
+%%NLS%%share/locale/he/LC_MESSAGES/pg_config-10.mo
+%%NLS%%share/locale/he/LC_MESSAGES/pgscripts-10.mo
+%%NLS%%share/locale/he/LC_MESSAGES/psql-10.mo
+%%NLS%%share/locale/it/LC_MESSAGES/ecpg-10.mo
+%%NLS%%share/locale/it/LC_MESSAGES/ecpglib6-10.mo
+%%NLS%%share/locale/it/LC_MESSAGES/libpq5-10.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_config-10.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_dump-10.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pgscripts-10.mo
+%%NLS%%share/locale/it/LC_MESSAGES/psql-10.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/ecpg-10.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/ecpglib6-10.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/libpq5-10.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_config-10.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_dump-10.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pgscripts-10.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/psql-10.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/ecpg-10.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/ecpglib6-10.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/libpq5-10.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_config-10.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_dump-10.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pgscripts-10.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/psql-10.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/pg_config-10.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/ecpg-10.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/ecpglib6-10.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/libpq5-10.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pg_config-10.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pg_dump-10.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pgscripts-10.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/psql-10.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/ecpg-10.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/ecpglib6-10.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/libpq5-10.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_config-10.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_dump-10.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pgscripts-10.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/psql-10.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/pg_config-10.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/ecpg-10.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/ecpglib6-10.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/libpq5-10.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_config-10.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_dump-10.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pgscripts-10.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/psql-10.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/libpq5-10.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_config-10.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_dump-10.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pgscripts-10.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/psql-10.mo
+%%NLS%%share/locale/ta/LC_MESSAGES/pg_config-10.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/ecpg-10.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/ecpglib6-10.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/libpq5-10.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_config-10.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/ecpg-10.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/ecpglib6-10.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/libpq5-10.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_config-10.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_dump-10.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pgscripts-10.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/psql-10.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/ecpg-10.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/libpq5-10.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/pg_config-10.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/psql-10.mo
+%%DATADIR%%/pg_service.conf.sample
+%%DATADIR%%/psqlrc.sample
+
diff --git a/databases/postgresql10-server/pkg-plist-contrib b/databases/postgresql10-server/pkg-plist-contrib
new file mode 100644
index 00000000000..7601a91beca
--- /dev/null
+++ b/databases/postgresql10-server/pkg-plist-contrib
@@ -0,0 +1,250 @@
+bin/oid2name
+bin/pg_standby
+bin/vacuumlo
+lib/postgresql/_int.so
+lib/postgresql/adminpack.so
+lib/postgresql/amcheck.so
+lib/postgresql/auth_delay.so
+lib/postgresql/auto_explain.so
+lib/postgresql/autoinc.so
+lib/postgresql/bloom.so
+lib/postgresql/btree_gin.so
+lib/postgresql/btree_gist.so
+lib/postgresql/chkpass.so
+lib/postgresql/citext.so
+lib/postgresql/cube.so
+lib/postgresql/dblink.so
+lib/postgresql/dict_int.so
+lib/postgresql/dict_xsyn.so
+lib/postgresql/earthdistance.so
+lib/postgresql/file_fdw.so
+lib/postgresql/fuzzystrmatch.so
+lib/postgresql/hstore.so
+lib/postgresql/insert_username.so
+lib/postgresql/isn.so
+lib/postgresql/lo.so
+lib/postgresql/ltree.so
+lib/postgresql/moddatetime.so
+lib/postgresql/pageinspect.so
+lib/postgresql/passwordcheck.so
+lib/postgresql/pg_buffercache.so
+lib/postgresql/pg_freespacemap.so
+lib/postgresql/pg_prewarm.so
+lib/postgresql/pg_stat_statements.so
+lib/postgresql/pg_trgm.so
+lib/postgresql/pg_visibility.so
+lib/postgresql/pgcrypto.so
+lib/postgresql/pgrowlocks.so
+lib/postgresql/pgstattuple.so
+lib/postgresql/pgxml.so
+lib/postgresql/postgres_fdw.so
+lib/postgresql/refint.so
+lib/postgresql/seg.so
+lib/postgresql/sslinfo.so
+lib/postgresql/tablefunc.so
+lib/postgresql/tcn.so
+lib/postgresql/test_decoding.so
+lib/postgresql/timetravel.so
+lib/postgresql/tsm_system_rows.so
+lib/postgresql/tsm_system_time.so
+lib/postgresql/unaccent.so
+lib/postgresql/uuid-ossp.so
+%%PORTDOCS%%%%DOCSDIR%%/README-contrib
+%%PORTDOCS%%%%DOCSDIR%%/extension/README
+%%PORTDOCS%%%%DOCSDIR%%/extension/autoinc.example
+%%PORTDOCS%%%%DOCSDIR%%/extension/insert_username.example
+%%PORTDOCS%%%%DOCSDIR%%/extension/moddatetime.example
+%%PORTDOCS%%%%DOCSDIR%%/extension/refint.example
+%%PORTDOCS%%%%DOCSDIR%%/extension/timetravel.example
+%%DATADIR%%/extension/adminpack--1.0.sql
+%%DATADIR%%/extension/adminpack.control
+%%DATADIR%%/extension/amcheck--1.0.sql
+%%DATADIR%%/extension/amcheck.control
+%%DATADIR%%/extension/autoinc--1.0.sql
+%%DATADIR%%/extension/autoinc--unpackaged--1.0.sql
+%%DATADIR%%/extension/autoinc.control
+%%DATADIR%%/extension/bloom--1.0.sql
+%%DATADIR%%/extension/bloom.control
+%%DATADIR%%/extension/btree_gin--1.0--1.1.sql
+%%DATADIR%%/extension/btree_gin--1.0.sql
+%%DATADIR%%/extension/btree_gin--1.1--1.2.sql
+%%DATADIR%%/extension/btree_gin--unpackaged--1.0.sql
+%%DATADIR%%/extension/btree_gin.control
+%%DATADIR%%/extension/btree_gist--1.0--1.1.sql
+%%DATADIR%%/extension/btree_gist--1.1--1.2.sql
+%%DATADIR%%/extension/btree_gist--1.2--1.3.sql
+%%DATADIR%%/extension/btree_gist--1.2.sql
+%%DATADIR%%/extension/btree_gist--1.3--1.4.sql
+%%DATADIR%%/extension/btree_gist--1.4--1.5.sql
+%%DATADIR%%/extension/btree_gist--unpackaged--1.0.sql
+%%DATADIR%%/extension/btree_gist.control
+%%DATADIR%%/extension/chkpass--1.0.sql
+%%DATADIR%%/extension/chkpass--unpackaged--1.0.sql
+%%DATADIR%%/extension/chkpass.control
+%%DATADIR%%/extension/citext--1.0--1.1.sql
+%%DATADIR%%/extension/citext--1.1--1.2.sql
+%%DATADIR%%/extension/citext--1.2--1.3.sql
+%%DATADIR%%/extension/citext--1.3--1.4.sql
+%%DATADIR%%/extension/citext--1.4.sql
+%%DATADIR%%/extension/citext--unpackaged--1.0.sql
+%%DATADIR%%/extension/citext.control
+%%DATADIR%%/extension/cube--1.0--1.1.sql
+%%DATADIR%%/extension/cube--1.1--1.2.sql
+%%DATADIR%%/extension/cube--1.2.sql
+%%DATADIR%%/extension/cube--unpackaged--1.0.sql
+%%DATADIR%%/extension/cube.control
+%%DATADIR%%/extension/dblink--1.0--1.1.sql
+%%DATADIR%%/extension/dblink--1.1--1.2.sql
+%%DATADIR%%/extension/dblink--1.2.sql
+%%DATADIR%%/extension/dblink--unpackaged--1.0.sql
+%%DATADIR%%/extension/dblink.control
+%%DATADIR%%/extension/dict_int--1.0.sql
+%%DATADIR%%/extension/dict_int--unpackaged--1.0.sql
+%%DATADIR%%/extension/dict_int.control
+%%DATADIR%%/extension/dict_xsyn--1.0.sql
+%%DATADIR%%/extension/dict_xsyn--unpackaged--1.0.sql
+%%DATADIR%%/extension/dict_xsyn.control
+%%DATADIR%%/extension/earthdistance--1.0--1.1.sql
+%%DATADIR%%/extension/earthdistance--1.1.sql
+%%DATADIR%%/extension/earthdistance--unpackaged--1.0.sql
+%%DATADIR%%/extension/earthdistance.control
+%%DATADIR%%/extension/file_fdw--1.0.sql
+%%DATADIR%%/extension/file_fdw.control
+%%DATADIR%%/extension/fuzzystrmatch--1.0--1.1.sql
+%%DATADIR%%/extension/fuzzystrmatch--1.1.sql
+%%DATADIR%%/extension/fuzzystrmatch--unpackaged--1.0.sql
+%%DATADIR%%/extension/fuzzystrmatch.control
+%%DATADIR%%/extension/hstore--1.0--1.1.sql
+%%DATADIR%%/extension/hstore--1.1--1.2.sql
+%%DATADIR%%/extension/hstore--1.2--1.3.sql
+%%DATADIR%%/extension/hstore--1.3--1.4.sql
+%%DATADIR%%/extension/hstore--1.4.sql
+%%DATADIR%%/extension/hstore--unpackaged--1.0.sql
+%%DATADIR%%/extension/hstore.control
+%%DATADIR%%/extension/insert_username--1.0.sql
+%%DATADIR%%/extension/insert_username--unpackaged--1.0.sql
+%%DATADIR%%/extension/insert_username.control
+%%DATADIR%%/extension/intagg--1.0--1.1.sql
+%%DATADIR%%/extension/intagg--1.1.sql
+%%DATADIR%%/extension/intagg--unpackaged--1.0.sql
+%%DATADIR%%/extension/intagg.control
+%%DATADIR%%/extension/intarray--1.0--1.1.sql
+%%DATADIR%%/extension/intarray--1.1--1.2.sql
+%%DATADIR%%/extension/intarray--1.2.sql
+%%DATADIR%%/extension/intarray--unpackaged--1.0.sql
+%%DATADIR%%/extension/intarray.control
+%%DATADIR%%/extension/isn--1.0--1.1.sql
+%%DATADIR%%/extension/isn--1.1.sql
+%%DATADIR%%/extension/isn--unpackaged--1.0.sql
+%%DATADIR%%/extension/isn.control
+%%DATADIR%%/extension/lo--1.0--1.1.sql
+%%DATADIR%%/extension/lo--1.1.sql
+%%DATADIR%%/extension/lo--unpackaged--1.0.sql
+%%DATADIR%%/extension/lo.control
+%%DATADIR%%/extension/ltree--1.0--1.1.sql
+%%DATADIR%%/extension/ltree--1.1.sql
+%%DATADIR%%/extension/ltree--unpackaged--1.0.sql
+%%DATADIR%%/extension/ltree.control
+%%DATADIR%%/extension/moddatetime--1.0.sql
+%%DATADIR%%/extension/moddatetime--unpackaged--1.0.sql
+%%DATADIR%%/extension/moddatetime.control
+%%DATADIR%%/extension/pageinspect--1.0--1.1.sql
+%%DATADIR%%/extension/pageinspect--1.1--1.2.sql
+%%DATADIR%%/extension/pageinspect--1.2--1.3.sql
+%%DATADIR%%/extension/pageinspect--1.3--1.4.sql
+%%DATADIR%%/extension/pageinspect--1.4--1.5.sql
+%%DATADIR%%/extension/pageinspect--1.5--1.6.sql
+%%DATADIR%%/extension/pageinspect--1.5.sql
+%%DATADIR%%/extension/pageinspect--unpackaged--1.0.sql
+%%DATADIR%%/extension/pageinspect.control
+%%DATADIR%%/extension/pg_buffercache--1.0--1.1.sql
+%%DATADIR%%/extension/pg_buffercache--1.1--1.2.sql
+%%DATADIR%%/extension/pg_buffercache--1.2--1.3.sql
+%%DATADIR%%/extension/pg_buffercache--1.2.sql
+%%DATADIR%%/extension/pg_buffercache--unpackaged--1.0.sql
+%%DATADIR%%/extension/pg_buffercache.control
+%%DATADIR%%/extension/pg_freespacemap--1.0--1.1.sql
+%%DATADIR%%/extension/pg_freespacemap--1.1--1.2.sql
+%%DATADIR%%/extension/pg_freespacemap--1.1.sql
+%%DATADIR%%/extension/pg_freespacemap--unpackaged--1.0.sql
+%%DATADIR%%/extension/pg_freespacemap.control
+%%DATADIR%%/extension/pg_prewarm--1.0--1.1.sql
+%%DATADIR%%/extension/pg_prewarm--1.1.sql
+%%DATADIR%%/extension/pg_prewarm.control
+%%DATADIR%%/extension/pg_stat_statements--1.0--1.1.sql
+%%DATADIR%%/extension/pg_stat_statements--1.1--1.2.sql
+%%DATADIR%%/extension/pg_stat_statements--1.2--1.3.sql
+%%DATADIR%%/extension/pg_stat_statements--1.3--1.4.sql
+%%DATADIR%%/extension/pg_stat_statements--1.4--1.5.sql
+%%DATADIR%%/extension/pg_stat_statements--1.4.sql
+%%DATADIR%%/extension/pg_stat_statements--unpackaged--1.0.sql
+%%DATADIR%%/extension/pg_stat_statements.control
+%%DATADIR%%/extension/pg_trgm--1.0--1.1.sql
+%%DATADIR%%/extension/pg_trgm--1.1--1.2.sql
+%%DATADIR%%/extension/pg_trgm--1.2--1.3.sql
+%%DATADIR%%/extension/pg_trgm--1.3.sql
+%%DATADIR%%/extension/pg_trgm--unpackaged--1.0.sql
+%%DATADIR%%/extension/pg_trgm.control
+%%DATADIR%%/extension/pg_visibility--1.0--1.1.sql
+%%DATADIR%%/extension/pg_visibility--1.1--1.2.sql
+%%DATADIR%%/extension/pg_visibility--1.1.sql
+%%DATADIR%%/extension/pg_visibility.control
+%%DATADIR%%/extension/pgcrypto--1.0--1.1.sql
+%%DATADIR%%/extension/pgcrypto--1.1--1.2.sql
+%%DATADIR%%/extension/pgcrypto--1.2--1.3.sql
+%%DATADIR%%/extension/pgcrypto--1.3.sql
+%%DATADIR%%/extension/pgcrypto--unpackaged--1.0.sql
+%%DATADIR%%/extension/pgcrypto.control
+%%DATADIR%%/extension/pgrowlocks--1.0--1.1.sql
+%%DATADIR%%/extension/pgrowlocks--1.1--1.2.sql
+%%DATADIR%%/extension/pgrowlocks--1.2.sql
+%%DATADIR%%/extension/pgrowlocks--unpackaged--1.0.sql
+%%DATADIR%%/extension/pgrowlocks.control
+%%DATADIR%%/extension/pgstattuple--1.0--1.1.sql
+%%DATADIR%%/extension/pgstattuple--1.1--1.2.sql
+%%DATADIR%%/extension/pgstattuple--1.2--1.3.sql
+%%DATADIR%%/extension/pgstattuple--1.3--1.4.sql
+%%DATADIR%%/extension/pgstattuple--1.4--1.5.sql
+%%DATADIR%%/extension/pgstattuple--1.4.sql
+%%DATADIR%%/extension/pgstattuple--unpackaged--1.0.sql
+%%DATADIR%%/extension/pgstattuple.control
+%%DATADIR%%/extension/postgres_fdw--1.0.sql
+%%DATADIR%%/extension/postgres_fdw.control
+%%DATADIR%%/extension/refint--1.0.sql
+%%DATADIR%%/extension/refint--unpackaged--1.0.sql
+%%DATADIR%%/extension/refint.control
+%%DATADIR%%/extension/seg--1.0--1.1.sql
+%%DATADIR%%/extension/seg--1.1.sql
+%%DATADIR%%/extension/seg--unpackaged--1.0.sql
+%%DATADIR%%/extension/seg.control
+%%DATADIR%%/extension/sslinfo--1.0--1.1.sql
+%%DATADIR%%/extension/sslinfo--1.1--1.2.sql
+%%DATADIR%%/extension/sslinfo--1.2.sql
+%%DATADIR%%/extension/sslinfo--unpackaged--1.0.sql
+%%DATADIR%%/extension/sslinfo.control
+%%DATADIR%%/extension/tablefunc--1.0.sql
+%%DATADIR%%/extension/tablefunc--unpackaged--1.0.sql
+%%DATADIR%%/extension/tablefunc.control
+%%DATADIR%%/extension/tcn--1.0.sql
+%%DATADIR%%/extension/tcn.control
+%%DATADIR%%/extension/timetravel--1.0.sql
+%%DATADIR%%/extension/timetravel--unpackaged--1.0.sql
+%%DATADIR%%/extension/timetravel.control
+%%DATADIR%%/extension/tsm_system_rows--1.0.sql
+%%DATADIR%%/extension/tsm_system_rows.control
+%%DATADIR%%/extension/tsm_system_time--1.0.sql
+%%DATADIR%%/extension/tsm_system_time.control
+%%DATADIR%%/extension/unaccent--1.0--1.1.sql
+%%DATADIR%%/extension/unaccent--1.1.sql
+%%DATADIR%%/extension/unaccent--unpackaged--1.0.sql
+%%DATADIR%%/extension/unaccent.control
+%%DATADIR%%/extension/uuid-ossp--1.0--1.1.sql
+%%DATADIR%%/extension/uuid-ossp--1.1.sql
+%%DATADIR%%/extension/uuid-ossp--unpackaged--1.0.sql
+%%DATADIR%%/extension/uuid-ossp.control
+%%DATADIR%%/extension/xml2--1.0--1.1.sql
+%%DATADIR%%/extension/xml2--1.1.sql
+%%DATADIR%%/extension/xml2--unpackaged--1.0.sql
+%%DATADIR%%/extension/xml2.control
+%%DATADIR%%/tsearch_data/unaccent.rules
+%%DATADIR%%/tsearch_data/xsyn_sample.rules
diff --git a/databases/postgresql10-server/pkg-plist-plperl b/databases/postgresql10-server/pkg-plist-plperl
new file mode 100644
index 00000000000..989ca3f8e1c
--- /dev/null
+++ b/databases/postgresql10-server/pkg-plist-plperl
@@ -0,0 +1,10 @@
+include/postgresql/server/plperl.h
+include/postgresql/server/ppport.h
+%%DATADIR%%/extension/plperlu--1.0.sql
+%%DATADIR%%/extension/plperl.control
+%%DATADIR%%/extension/plperl--1.0.sql
+%%DATADIR%%/extension/plperlu.control
+%%DATADIR%%/extension/plperlu--unpackaged--1.0.sql
+%%DATADIR%%/extension/plperl--unpackaged--1.0.sql
+%%DOCSDIR%%/README-plperl
+lib/postgresql/plperl.so
diff --git a/databases/postgresql10-server/pkg-plist-plpython b/databases/postgresql10-server/pkg-plist-plpython
new file mode 100644
index 00000000000..49d2377e413
--- /dev/null
+++ b/databases/postgresql10-server/pkg-plist-plpython
@@ -0,0 +1,14 @@
+include/postgresql/server/plpy_util.h
+include/postgresql/server/plpython.h
+%%DOCSDIR%%/README-plpython
+%%PYTHON2%%lib/postgresql/plpython2.so
+%%PYTHON3%%lib/postgresql/plpython3.so
+%%PYTHON2%%%%DATADIR%%/extension/plpython2u--1.0.sql
+%%PYTHON2%%%%DATADIR%%/extension/plpython2u--unpackaged--1.0.sql
+%%PYTHON2%%%%DATADIR%%/extension/plpython2u.control
+%%PYTHON3%%%%DATADIR%%/extension/plpython3u--1.0.sql
+%%PYTHON3%%%%DATADIR%%/extension/plpython3u--unpackaged--1.0.sql
+%%PYTHON3%%%%DATADIR%%/extension/plpython3u.control
+%%PYTHON2%%%%DATADIR%%/extension/plpythonu--1.0.sql
+%%PYTHON2%%%%DATADIR%%/extension/plpythonu--unpackaged--1.0.sql
+%%PYTHON2%%%%DATADIR%%/extension/plpythonu.control
diff --git a/databases/postgresql10-server/pkg-plist-pltcl b/databases/postgresql10-server/pkg-plist-pltcl
new file mode 100644
index 00000000000..348e5921ddc
--- /dev/null
+++ b/databases/postgresql10-server/pkg-plist-pltcl
@@ -0,0 +1,8 @@
+%%DATADIR%%/extension/pltcl--1.0.sql
+%%DATADIR%%/extension/pltcl.control
+%%DATADIR%%/extension/pltclu.control
+%%DATADIR%%/extension/pltclu--1.0.sql
+%%DATADIR%%/extension/pltcl--unpackaged--1.0.sql
+%%DATADIR%%/extension/pltclu--unpackaged--1.0.sql
+%%DOCSDIR%%/README-pltcl
+lib/postgresql/pltcl.so
diff --git a/databases/postgresql10-server/pkg-plist-server b/databases/postgresql10-server/pkg-plist-server
new file mode 100644
index 00000000000..d93799f7ab5
--- /dev/null
+++ b/databases/postgresql10-server/pkg-plist-server
@@ -0,0 +1,795 @@
+bin/initdb
+bin/pg_controldata
+bin/pg_ctl
+bin/pg_receivewal
+bin/pg_recvlogical
+bin/pg_archivecleanup
+bin/pg_basebackup
+bin/pg_rewind
+bin/pg_test_fsync
+bin/pg_test_timing
+bin/pg_upgrade
+bin/postgres
+bin/postmaster
+etc/periodic/daily/502.pgsql
+include/postgresql/server/plpgsql.h
+lib/postgresql/ascii_and_mic.so
+lib/postgresql/cyrillic_and_mic.so
+lib/postgresql/dict_snowball.so
+lib/postgresql/euc2004_sjis2004.so
+lib/postgresql/euc_cn_and_mic.so
+lib/postgresql/euc_jp_and_sjis.so
+lib/postgresql/euc_kr_and_mic.so
+lib/postgresql/euc_tw_and_big5.so
+lib/postgresql/latin2_and_win1250.so
+lib/postgresql/latin_and_mic.so
+lib/postgresql/libpqwalreceiver.so
+lib/postgresql/plpgsql.so
+lib/postgresql/utf8_and_ascii.so
+lib/postgresql/utf8_and_big5.so
+lib/postgresql/utf8_and_cyrillic.so
+lib/postgresql/utf8_and_euc2004.so
+lib/postgresql/utf8_and_euc_cn.so
+lib/postgresql/utf8_and_euc_jp.so
+lib/postgresql/utf8_and_euc_kr.so
+lib/postgresql/utf8_and_euc_tw.so
+lib/postgresql/utf8_and_gb18030.so
+lib/postgresql/utf8_and_gbk.so
+lib/postgresql/utf8_and_iso8859.so
+lib/postgresql/utf8_and_iso8859_1.so
+lib/postgresql/utf8_and_johab.so
+lib/postgresql/utf8_and_sjis.so
+lib/postgresql/utf8_and_sjis2004.so
+lib/postgresql/utf8_and_uhc.so
+lib/postgresql/utf8_and_win.so
+lib/libpgcommon.a
+%%PORTDOCS%%%%DOCSDIR%%/README-server
+%%DATADIR%%/conversion_create.sql
+%%DATADIR%%/information_schema.sql
+%%DATADIR%%/pg_hba.conf.sample
+%%DATADIR%%/pg_ident.conf.sample
+%%DATADIR%%/postgres.bki
+%%DATADIR%%/postgres.description
+%%DATADIR%%/postgresql.conf.sample
+%%DATADIR%%/recovery.conf.sample
+%%DATADIR%%/sql_features.txt
+%%DATADIR%%/system_views.sql
+%%DATADIR%%/extension/plpgsql--1.0.sql
+%%DATADIR%%/extension/plpgsql--unpackaged--1.0.sql
+%%DATADIR%%/extension/plpgsql.control
+%%DATADIR%%/postgres.shdescription
+%%NLS%%share/locale/cs/LC_MESSAGES/initdb-10.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_controldata-10.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_ctl-10.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/plpgsql-10.mo
+%%NLS%%share/locale/de/LC_MESSAGES/initdb-10.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_basebackup-10.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_controldata-10.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_ctl-10.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_rewind-10.mo
+%%NLS%%share/locale/de/LC_MESSAGES/plpgsql-10.mo
+%%NLS%%share/locale/de/LC_MESSAGES/postgres-10.mo
+%%NLS%%share/locale/es/LC_MESSAGES/initdb-10.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_basebackup-10.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_controldata-10.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_ctl-10.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_rewind-10.mo
+%%NLS%%share/locale/es/LC_MESSAGES/plpgsql-10.mo
+%%NLS%%share/locale/es/LC_MESSAGES/postgres-10.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/initdb-10.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_basebackup-10.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_controldata-10.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_ctl-10.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_rewind-10.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/plpgsql-10.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/postgres-10.mo
+%%NLS%%share/locale/id/LC_MESSAGES/postgres-10.mo
+%%NLS%%share/locale/it/LC_MESSAGES/initdb-10.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_basebackup-10.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_controldata-10.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_ctl-10.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_rewind-10.mo
+%%NLS%%share/locale/it/LC_MESSAGES/plpgsql-10.mo
+%%NLS%%share/locale/it/LC_MESSAGES/postgres-10.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/initdb-10.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_controldata-10.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_ctl-10.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_rewind-10.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/plpgsql-10.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/postgres-10.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/initdb-10.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_basebackup-10.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_controldata-10.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_ctl-10.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_rewind-10.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/plpgsql-10.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/initdb-10.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pg_basebackup-10.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pg_controldata-10.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pg_ctl-10.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_archivecleanup-10.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_test_timing-10.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_archivecleanup-10.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_test_fsync-10.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_test_timing-10.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_archivecleanup-10.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_test_fsync-10.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_test_timing-10.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_upgrade-10.mo
+%%NLS%%share/locale/he/LC_MESSAGES/initdb-10.mo
+%%NLS%%share/locale/he/LC_MESSAGES/pg_basebackup-10.mo
+%%NLS%%share/locale/he/LC_MESSAGES/pg_ctl-10.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/%%PG_USER%%-10.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pg_archivecleanup-10.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pg_test_fsync-10.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pg_test_timing-10.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_archivecleanup-10.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_test_fsync-10.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_test_timing-10.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_upgrade-10.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_archivecleanup-10.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_rewind-10.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_test_fsync-10.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_test_timing-10.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/plpgsql-10.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pg_rewind-10.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/plpgsql-10.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/postgres-10.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/initdb-10.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_basebackup-10.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_controldata-10.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_ctl-10.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_rewind-10.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/plpgsql-10.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/postgres-10.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/plpgsql-10.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/initdb-10.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_basebackup-10.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_controldata-10.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_ctl-10.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_rewind-10.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/plpgsql-10.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/postgres-10.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/initdb-10.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_controldata-10.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_ctl-10.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/initdb-10.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_basebackup-10.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_controldata-10.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_ctl-10.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_rewind-10.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/plpgsql-10.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/postgres-10.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/plpgsql-10.mo
+%%DATADIR%%/snowball_create.sql
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Abidjan
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Accra
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Addis_Ababa
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Algiers
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Asmara
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Asmera
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Bamako
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Bangui
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Banjul
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Bissau
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Blantyre
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Brazzaville
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Bujumbura
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Cairo
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Casablanca
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Ceuta
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Conakry
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Dakar
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Dar_es_Salaam
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Djibouti
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Douala
+%%TZDATA%%%%DATADIR%%/timezone/Africa/El_Aaiun
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Freetown
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Gaborone
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Harare
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Johannesburg
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Juba
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Kampala
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Khartoum
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Kigali
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Kinshasa
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Lagos
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Libreville
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Lome
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Luanda
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Lubumbashi
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Lusaka
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Malabo
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Maputo
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Maseru
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Mbabane
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Mogadishu
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Monrovia
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Nairobi
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Ndjamena
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Niamey
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Nouakchott
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Ouagadougou
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Porto-Novo
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Sao_Tome
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Timbuktu
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Tripoli
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Tunis
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Windhoek
+%%TZDATA%%%%DATADIR%%/timezone/America/Adak
+%%TZDATA%%%%DATADIR%%/timezone/America/Anchorage
+%%TZDATA%%%%DATADIR%%/timezone/America/Anguilla
+%%TZDATA%%%%DATADIR%%/timezone/America/Antigua
+%%TZDATA%%%%DATADIR%%/timezone/America/Araguaina
+%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Buenos_Aires
+%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Catamarca
+%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/ComodRivadavia
+%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Cordoba
+%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Jujuy
+%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/La_Rioja
+%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Mendoza
+%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Rio_Gallegos
+%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Salta
+%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/San_Juan
+%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/San_Luis
+%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Tucuman
+%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Ushuaia
+%%TZDATA%%%%DATADIR%%/timezone/America/Aruba
+%%TZDATA%%%%DATADIR%%/timezone/America/Asuncion
+%%TZDATA%%%%DATADIR%%/timezone/America/Atikokan
+%%TZDATA%%%%DATADIR%%/timezone/America/Atka
+%%TZDATA%%%%DATADIR%%/timezone/America/Bahia
+%%TZDATA%%%%DATADIR%%/timezone/America/Bahia_Banderas
+%%TZDATA%%%%DATADIR%%/timezone/America/Barbados
+%%TZDATA%%%%DATADIR%%/timezone/America/Belem
+%%TZDATA%%%%DATADIR%%/timezone/America/Belize
+%%TZDATA%%%%DATADIR%%/timezone/America/Blanc-Sablon
+%%TZDATA%%%%DATADIR%%/timezone/America/Boa_Vista
+%%TZDATA%%%%DATADIR%%/timezone/America/Bogota
+%%TZDATA%%%%DATADIR%%/timezone/America/Boise
+%%TZDATA%%%%DATADIR%%/timezone/America/Buenos_Aires
+%%TZDATA%%%%DATADIR%%/timezone/America/Cambridge_Bay
+%%TZDATA%%%%DATADIR%%/timezone/America/Campo_Grande
+%%TZDATA%%%%DATADIR%%/timezone/America/Cancun
+%%TZDATA%%%%DATADIR%%/timezone/America/Caracas
+%%TZDATA%%%%DATADIR%%/timezone/America/Catamarca
+%%TZDATA%%%%DATADIR%%/timezone/America/Cayenne
+%%TZDATA%%%%DATADIR%%/timezone/America/Cayman
+%%TZDATA%%%%DATADIR%%/timezone/America/Chicago
+%%TZDATA%%%%DATADIR%%/timezone/America/Chihuahua
+%%TZDATA%%%%DATADIR%%/timezone/America/Coral_Harbour
+%%TZDATA%%%%DATADIR%%/timezone/America/Cordoba
+%%TZDATA%%%%DATADIR%%/timezone/America/Costa_Rica
+%%TZDATA%%%%DATADIR%%/timezone/America/Creston
+%%TZDATA%%%%DATADIR%%/timezone/America/Cuiaba
+%%TZDATA%%%%DATADIR%%/timezone/America/Curacao
+%%TZDATA%%%%DATADIR%%/timezone/America/Danmarkshavn
+%%TZDATA%%%%DATADIR%%/timezone/America/Dawson
+%%TZDATA%%%%DATADIR%%/timezone/America/Dawson_Creek
+%%TZDATA%%%%DATADIR%%/timezone/America/Denver
+%%TZDATA%%%%DATADIR%%/timezone/America/Detroit
+%%TZDATA%%%%DATADIR%%/timezone/America/Dominica
+%%TZDATA%%%%DATADIR%%/timezone/America/Edmonton
+%%TZDATA%%%%DATADIR%%/timezone/America/Eirunepe
+%%TZDATA%%%%DATADIR%%/timezone/America/El_Salvador
+%%TZDATA%%%%DATADIR%%/timezone/America/Ensenada
+%%TZDATA%%%%DATADIR%%/timezone/America/Fort_Nelson
+%%TZDATA%%%%DATADIR%%/timezone/America/Fort_Wayne
+%%TZDATA%%%%DATADIR%%/timezone/America/Fortaleza
+%%TZDATA%%%%DATADIR%%/timezone/America/Glace_Bay
+%%TZDATA%%%%DATADIR%%/timezone/America/Godthab
+%%TZDATA%%%%DATADIR%%/timezone/America/Goose_Bay
+%%TZDATA%%%%DATADIR%%/timezone/America/Grand_Turk
+%%TZDATA%%%%DATADIR%%/timezone/America/Grenada
+%%TZDATA%%%%DATADIR%%/timezone/America/Guadeloupe
+%%TZDATA%%%%DATADIR%%/timezone/America/Guatemala
+%%TZDATA%%%%DATADIR%%/timezone/America/Guayaquil
+%%TZDATA%%%%DATADIR%%/timezone/America/Guyana
+%%TZDATA%%%%DATADIR%%/timezone/America/Halifax
+%%TZDATA%%%%DATADIR%%/timezone/America/Havana
+%%TZDATA%%%%DATADIR%%/timezone/America/Hermosillo
+%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Indianapolis
+%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Knox
+%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Marengo
+%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Petersburg
+%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Tell_City
+%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Vevay
+%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Vincennes
+%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Winamac
+%%TZDATA%%%%DATADIR%%/timezone/America/Indianapolis
+%%TZDATA%%%%DATADIR%%/timezone/America/Inuvik
+%%TZDATA%%%%DATADIR%%/timezone/America/Iqaluit
+%%TZDATA%%%%DATADIR%%/timezone/America/Jamaica
+%%TZDATA%%%%DATADIR%%/timezone/America/Jujuy
+%%TZDATA%%%%DATADIR%%/timezone/America/Juneau
+%%TZDATA%%%%DATADIR%%/timezone/America/Kentucky/Louisville
+%%TZDATA%%%%DATADIR%%/timezone/America/Kentucky/Monticello
+%%TZDATA%%%%DATADIR%%/timezone/America/Knox_IN
+%%TZDATA%%%%DATADIR%%/timezone/America/Kralendijk
+%%TZDATA%%%%DATADIR%%/timezone/America/La_Paz
+%%TZDATA%%%%DATADIR%%/timezone/America/Lima
+%%TZDATA%%%%DATADIR%%/timezone/America/Los_Angeles
+%%TZDATA%%%%DATADIR%%/timezone/America/Louisville
+%%TZDATA%%%%DATADIR%%/timezone/America/Lower_Princes
+%%TZDATA%%%%DATADIR%%/timezone/America/Maceio
+%%TZDATA%%%%DATADIR%%/timezone/America/Managua
+%%TZDATA%%%%DATADIR%%/timezone/America/Manaus
+%%TZDATA%%%%DATADIR%%/timezone/America/Marigot
+%%TZDATA%%%%DATADIR%%/timezone/America/Martinique
+%%TZDATA%%%%DATADIR%%/timezone/America/Matamoros
+%%TZDATA%%%%DATADIR%%/timezone/America/Mazatlan
+%%TZDATA%%%%DATADIR%%/timezone/America/Mendoza
+%%TZDATA%%%%DATADIR%%/timezone/America/Menominee
+%%TZDATA%%%%DATADIR%%/timezone/America/Merida
+%%TZDATA%%%%DATADIR%%/timezone/America/Metlakatla
+%%TZDATA%%%%DATADIR%%/timezone/America/Mexico_City
+%%TZDATA%%%%DATADIR%%/timezone/America/Miquelon
+%%TZDATA%%%%DATADIR%%/timezone/America/Moncton
+%%TZDATA%%%%DATADIR%%/timezone/America/Monterrey
+%%TZDATA%%%%DATADIR%%/timezone/America/Montevideo
+%%TZDATA%%%%DATADIR%%/timezone/America/Montreal
+%%TZDATA%%%%DATADIR%%/timezone/America/Montserrat
+%%TZDATA%%%%DATADIR%%/timezone/America/Nassau
+%%TZDATA%%%%DATADIR%%/timezone/America/New_York
+%%TZDATA%%%%DATADIR%%/timezone/America/Nipigon
+%%TZDATA%%%%DATADIR%%/timezone/America/Nome
+%%TZDATA%%%%DATADIR%%/timezone/America/Noronha
+%%TZDATA%%%%DATADIR%%/timezone/America/North_Dakota/Beulah
+%%TZDATA%%%%DATADIR%%/timezone/America/North_Dakota/Center
+%%TZDATA%%%%DATADIR%%/timezone/America/North_Dakota/New_Salem
+%%TZDATA%%%%DATADIR%%/timezone/America/Ojinaga
+%%TZDATA%%%%DATADIR%%/timezone/America/Panama
+%%TZDATA%%%%DATADIR%%/timezone/America/Pangnirtung
+%%TZDATA%%%%DATADIR%%/timezone/America/Paramaribo
+%%TZDATA%%%%DATADIR%%/timezone/America/Phoenix
+%%TZDATA%%%%DATADIR%%/timezone/America/Port-au-Prince
+%%TZDATA%%%%DATADIR%%/timezone/America/Port_of_Spain
+%%TZDATA%%%%DATADIR%%/timezone/America/Porto_Acre
+%%TZDATA%%%%DATADIR%%/timezone/America/Porto_Velho
+%%TZDATA%%%%DATADIR%%/timezone/America/Puerto_Rico
+%%TZDATA%%%%DATADIR%%/timezone/America/Punta_Arenas
+%%TZDATA%%%%DATADIR%%/timezone/America/Rainy_River
+%%TZDATA%%%%DATADIR%%/timezone/America/Rankin_Inlet
+%%TZDATA%%%%DATADIR%%/timezone/America/Recife
+%%TZDATA%%%%DATADIR%%/timezone/America/Regina
+%%TZDATA%%%%DATADIR%%/timezone/America/Resolute
+%%TZDATA%%%%DATADIR%%/timezone/America/Rio_Branco
+%%TZDATA%%%%DATADIR%%/timezone/America/Rosario
+%%TZDATA%%%%DATADIR%%/timezone/America/Santa_Isabel
+%%TZDATA%%%%DATADIR%%/timezone/America/Santarem
+%%TZDATA%%%%DATADIR%%/timezone/America/Santiago
+%%TZDATA%%%%DATADIR%%/timezone/America/Santo_Domingo
+%%TZDATA%%%%DATADIR%%/timezone/America/Sao_Paulo
+%%TZDATA%%%%DATADIR%%/timezone/America/Scoresbysund
+%%TZDATA%%%%DATADIR%%/timezone/America/Shiprock
+%%TZDATA%%%%DATADIR%%/timezone/America/Sitka
+%%TZDATA%%%%DATADIR%%/timezone/America/St_Barthelemy
+%%TZDATA%%%%DATADIR%%/timezone/America/St_Johns
+%%TZDATA%%%%DATADIR%%/timezone/America/St_Kitts
+%%TZDATA%%%%DATADIR%%/timezone/America/St_Lucia
+%%TZDATA%%%%DATADIR%%/timezone/America/St_Thomas
+%%TZDATA%%%%DATADIR%%/timezone/America/St_Vincent
+%%TZDATA%%%%DATADIR%%/timezone/America/Swift_Current
+%%TZDATA%%%%DATADIR%%/timezone/America/Tegucigalpa
+%%TZDATA%%%%DATADIR%%/timezone/America/Thule
+%%TZDATA%%%%DATADIR%%/timezone/America/Thunder_Bay
+%%TZDATA%%%%DATADIR%%/timezone/America/Tijuana
+%%TZDATA%%%%DATADIR%%/timezone/America/Toronto
+%%TZDATA%%%%DATADIR%%/timezone/America/Tortola
+%%TZDATA%%%%DATADIR%%/timezone/America/Vancouver
+%%TZDATA%%%%DATADIR%%/timezone/America/Virgin
+%%TZDATA%%%%DATADIR%%/timezone/America/Whitehorse
+%%TZDATA%%%%DATADIR%%/timezone/America/Winnipeg
+%%TZDATA%%%%DATADIR%%/timezone/America/Yakutat
+%%TZDATA%%%%DATADIR%%/timezone/America/Yellowknife
+%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Casey
+%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Davis
+%%TZDATA%%%%DATADIR%%/timezone/Antarctica/DumontDUrville
+%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Macquarie
+%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Mawson
+%%TZDATA%%%%DATADIR%%/timezone/Antarctica/McMurdo
+%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Palmer
+%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Rothera
+%%TZDATA%%%%DATADIR%%/timezone/Antarctica/South_Pole
+%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Syowa
+%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Troll
+%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Vostok
+%%TZDATA%%%%DATADIR%%/timezone/Arctic/Longyearbyen
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Aden
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Almaty
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Amman
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Anadyr
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Aqtau
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Aqtobe
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Ashgabat
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Ashkhabad
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Atyrau
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Baghdad
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Bahrain
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Baku
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Bangkok
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Barnaul
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Beirut
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Bishkek
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Brunei
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Calcutta
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Chita
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Choibalsan
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Chongqing
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Chungking
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Colombo
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Dacca
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Damascus
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Dhaka
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Dili
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Dubai
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Dushanbe
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Famagusta
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Gaza
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Harbin
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Hebron
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Ho_Chi_Minh
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Hong_Kong
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Hovd
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Irkutsk
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Istanbul
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Jakarta
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Jayapura
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Jerusalem
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Kabul
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Kamchatka
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Karachi
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Kashgar
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Kathmandu
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Katmandu
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Khandyga
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Kolkata
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Krasnoyarsk
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Kuala_Lumpur
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Kuching
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Kuwait
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Macao
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Macau
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Magadan
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Makassar
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Manila
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Muscat
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Nicosia
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Novokuznetsk
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Novosibirsk
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Omsk
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Oral
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Phnom_Penh
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Pontianak
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Pyongyang
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Qatar
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Qyzylorda
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Rangoon
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Riyadh
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Saigon
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Sakhalin
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Samarkand
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Seoul
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Shanghai
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Singapore
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Srednekolymsk
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Taipei
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Tashkent
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Tbilisi
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Tehran
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Tel_Aviv
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Thimbu
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Thimphu
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Tokyo
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Tomsk
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Ujung_Pandang
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Ulaanbaatar
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Ulan_Bator
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Urumqi
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Ust-Nera
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Vientiane
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Vladivostok
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Yakutsk
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Yangon
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Yekaterinburg
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Yerevan
+%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Azores
+%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Bermuda
+%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Canary
+%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Cape_Verde
+%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Faeroe
+%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Faroe
+%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Jan_Mayen
+%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Madeira
+%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Reykjavik
+%%TZDATA%%%%DATADIR%%/timezone/Atlantic/South_Georgia
+%%TZDATA%%%%DATADIR%%/timezone/Atlantic/St_Helena
+%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Stanley
+%%TZDATA%%%%DATADIR%%/timezone/Australia/ACT
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Adelaide
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Brisbane
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Broken_Hill
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Canberra
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Currie
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Darwin
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Eucla
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Hobart
+%%TZDATA%%%%DATADIR%%/timezone/Australia/LHI
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Lindeman
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Lord_Howe
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Melbourne
+%%TZDATA%%%%DATADIR%%/timezone/Australia/NSW
+%%TZDATA%%%%DATADIR%%/timezone/Australia/North
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Perth
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Queensland
+%%TZDATA%%%%DATADIR%%/timezone/Australia/South
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Sydney
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Tasmania
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Victoria
+%%TZDATA%%%%DATADIR%%/timezone/Australia/West
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Yancowinna
+%%TZDATA%%%%DATADIR%%/timezone/Brazil/Acre
+%%TZDATA%%%%DATADIR%%/timezone/Brazil/DeNoronha
+%%TZDATA%%%%DATADIR%%/timezone/Brazil/East
+%%TZDATA%%%%DATADIR%%/timezone/Brazil/West
+%%TZDATA%%%%DATADIR%%/timezone/CET
+%%TZDATA%%%%DATADIR%%/timezone/CST6CDT
+%%TZDATA%%%%DATADIR%%/timezone/Canada/Atlantic
+%%TZDATA%%%%DATADIR%%/timezone/Canada/Central
+%%TZDATA%%%%DATADIR%%/timezone/Canada/East-Saskatchewan
+%%TZDATA%%%%DATADIR%%/timezone/Canada/Eastern
+%%TZDATA%%%%DATADIR%%/timezone/Canada/Mountain
+%%TZDATA%%%%DATADIR%%/timezone/Canada/Newfoundland
+%%TZDATA%%%%DATADIR%%/timezone/Canada/Pacific
+%%TZDATA%%%%DATADIR%%/timezone/Canada/Saskatchewan
+%%TZDATA%%%%DATADIR%%/timezone/Canada/Yukon
+%%TZDATA%%%%DATADIR%%/timezone/Chile/Continental
+%%TZDATA%%%%DATADIR%%/timezone/Chile/EasterIsland
+%%TZDATA%%%%DATADIR%%/timezone/Cuba
+%%TZDATA%%%%DATADIR%%/timezone/EET
+%%TZDATA%%%%DATADIR%%/timezone/EST
+%%TZDATA%%%%DATADIR%%/timezone/EST5EDT
+%%TZDATA%%%%DATADIR%%/timezone/Egypt
+%%TZDATA%%%%DATADIR%%/timezone/Eire
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+0
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+1
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+10
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+11
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+12
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+2
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+3
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+4
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+5
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+6
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+7
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+8
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+9
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-0
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-1
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-10
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-11
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-12
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-13
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-14
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-2
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-3
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-4
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-5
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-6
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-7
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-8
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-9
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT0
+%%TZDATA%%%%DATADIR%%/timezone/Etc/Greenwich
+%%TZDATA%%%%DATADIR%%/timezone/Etc/UCT
+%%TZDATA%%%%DATADIR%%/timezone/Etc/UTC
+%%TZDATA%%%%DATADIR%%/timezone/Etc/Universal
+%%TZDATA%%%%DATADIR%%/timezone/Etc/Zulu
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Amsterdam
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Andorra
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Astrakhan
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Athens
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Belfast
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Belgrade
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Berlin
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Bratislava
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Brussels
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Bucharest
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Budapest
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Busingen
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Chisinau
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Copenhagen
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Dublin
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Gibraltar
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Guernsey
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Helsinki
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Isle_of_Man
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Istanbul
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Jersey
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Kaliningrad
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Kiev
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Kirov
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Lisbon
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Ljubljana
+%%TZDATA%%%%DATADIR%%/timezone/Europe/London
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Luxembourg
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Madrid
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Malta
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Mariehamn
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Minsk
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Monaco
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Moscow
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Nicosia
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Oslo
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Paris
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Podgorica
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Prague
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Riga
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Rome
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Samara
+%%TZDATA%%%%DATADIR%%/timezone/Europe/San_Marino
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Sarajevo
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Saratov
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Simferopol
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Skopje
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Sofia
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Stockholm
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Tallinn
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Tirane
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Tiraspol
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Ulyanovsk
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Uzhgorod
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Vaduz
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Vatican
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Vienna
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Vilnius
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Volgograd
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Warsaw
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Zagreb
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Zaporozhye
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Zurich
+%%TZDATA%%%%DATADIR%%/timezone/Factory
+%%TZDATA%%%%DATADIR%%/timezone/GB
+%%TZDATA%%%%DATADIR%%/timezone/GB-Eire
+%%TZDATA%%%%DATADIR%%/timezone/GMT
+%%TZDATA%%%%DATADIR%%/timezone/GMT+0
+%%TZDATA%%%%DATADIR%%/timezone/GMT-0
+%%TZDATA%%%%DATADIR%%/timezone/GMT0
+%%TZDATA%%%%DATADIR%%/timezone/Greenwich
+%%TZDATA%%%%DATADIR%%/timezone/HST
+%%TZDATA%%%%DATADIR%%/timezone/Hongkong
+%%TZDATA%%%%DATADIR%%/timezone/Iceland
+%%TZDATA%%%%DATADIR%%/timezone/Indian/Antananarivo
+%%TZDATA%%%%DATADIR%%/timezone/Indian/Chagos
+%%TZDATA%%%%DATADIR%%/timezone/Indian/Christmas
+%%TZDATA%%%%DATADIR%%/timezone/Indian/Cocos
+%%TZDATA%%%%DATADIR%%/timezone/Indian/Comoro
+%%TZDATA%%%%DATADIR%%/timezone/Indian/Kerguelen
+%%TZDATA%%%%DATADIR%%/timezone/Indian/Mahe
+%%TZDATA%%%%DATADIR%%/timezone/Indian/Maldives
+%%TZDATA%%%%DATADIR%%/timezone/Indian/Mauritius
+%%TZDATA%%%%DATADIR%%/timezone/Indian/Mayotte
+%%TZDATA%%%%DATADIR%%/timezone/Indian/Reunion
+%%TZDATA%%%%DATADIR%%/timezone/Iran
+%%TZDATA%%%%DATADIR%%/timezone/Israel
+%%TZDATA%%%%DATADIR%%/timezone/Jamaica
+%%TZDATA%%%%DATADIR%%/timezone/Japan
+%%TZDATA%%%%DATADIR%%/timezone/Kwajalein
+%%TZDATA%%%%DATADIR%%/timezone/Libya
+%%TZDATA%%%%DATADIR%%/timezone/MET
+%%TZDATA%%%%DATADIR%%/timezone/MST
+%%TZDATA%%%%DATADIR%%/timezone/MST7MDT
+%%TZDATA%%%%DATADIR%%/timezone/Mexico/BajaNorte
+%%TZDATA%%%%DATADIR%%/timezone/Mexico/BajaSur
+%%TZDATA%%%%DATADIR%%/timezone/Mexico/General
+%%TZDATA%%%%DATADIR%%/timezone/NZ
+%%TZDATA%%%%DATADIR%%/timezone/NZ-CHAT
+%%TZDATA%%%%DATADIR%%/timezone/Navajo
+%%TZDATA%%%%DATADIR%%/timezone/PRC
+%%TZDATA%%%%DATADIR%%/timezone/PST8PDT
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Apia
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Auckland
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Bougainville
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Chatham
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Chuuk
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Easter
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Efate
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Enderbury
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Fakaofo
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Fiji
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Funafuti
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Galapagos
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Gambier
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Guadalcanal
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Guam
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Honolulu
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Johnston
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Kiritimati
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Kosrae
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Kwajalein
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Majuro
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Marquesas
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Midway
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Nauru
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Niue
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Norfolk
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Noumea
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Pago_Pago
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Palau
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Pitcairn
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Pohnpei
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Ponape
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Port_Moresby
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Rarotonga
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Saipan
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Samoa
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Tahiti
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Tarawa
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Tongatapu
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Truk
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Wake
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Wallis
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Yap
+%%TZDATA%%%%DATADIR%%/timezone/Poland
+%%TZDATA%%%%DATADIR%%/timezone/Portugal
+%%TZDATA%%%%DATADIR%%/timezone/ROC
+%%TZDATA%%%%DATADIR%%/timezone/ROK
+%%TZDATA%%%%DATADIR%%/timezone/Singapore
+%%TZDATA%%%%DATADIR%%/timezone/Turkey
+%%TZDATA%%%%DATADIR%%/timezone/UCT
+%%TZDATA%%%%DATADIR%%/timezone/US/Alaska
+%%TZDATA%%%%DATADIR%%/timezone/US/Aleutian
+%%TZDATA%%%%DATADIR%%/timezone/US/Arizona
+%%TZDATA%%%%DATADIR%%/timezone/US/Central
+%%TZDATA%%%%DATADIR%%/timezone/US/East-Indiana
+%%TZDATA%%%%DATADIR%%/timezone/US/Eastern
+%%TZDATA%%%%DATADIR%%/timezone/US/Hawaii
+%%TZDATA%%%%DATADIR%%/timezone/US/Indiana-Starke
+%%TZDATA%%%%DATADIR%%/timezone/US/Michigan
+%%TZDATA%%%%DATADIR%%/timezone/US/Mountain
+%%TZDATA%%%%DATADIR%%/timezone/US/Pacific
+%%TZDATA%%%%DATADIR%%/timezone/US/Pacific-New
+%%TZDATA%%%%DATADIR%%/timezone/US/Samoa
+%%TZDATA%%%%DATADIR%%/timezone/UTC
+%%TZDATA%%%%DATADIR%%/timezone/Universal
+%%TZDATA%%%%DATADIR%%/timezone/W-SU
+%%TZDATA%%%%DATADIR%%/timezone/WET
+%%TZDATA%%%%DATADIR%%/timezone/Zulu
+%%TZDATA%%%%DATADIR%%/timezone/posixrules
+%%DATADIR%%/timezonesets/Africa.txt
+%%DATADIR%%/timezonesets/America.txt
+%%DATADIR%%/timezonesets/Antarctica.txt
+%%DATADIR%%/timezonesets/Asia.txt
+%%DATADIR%%/timezonesets/Atlantic.txt
+%%DATADIR%%/timezonesets/Australia
+%%DATADIR%%/timezonesets/Australia.txt
+%%DATADIR%%/timezonesets/Default
+%%DATADIR%%/timezonesets/Etc.txt
+%%DATADIR%%/timezonesets/Europe.txt
+%%DATADIR%%/timezonesets/India
+%%DATADIR%%/timezonesets/Indian.txt
+%%DATADIR%%/timezonesets/Pacific.txt
+%%DATADIR%%/tsearch_data/danish.stop
+%%DATADIR%%/tsearch_data/dutch.stop
+%%DATADIR%%/tsearch_data/english.stop
+%%DATADIR%%/tsearch_data/finnish.stop
+%%DATADIR%%/tsearch_data/french.stop
+%%DATADIR%%/tsearch_data/german.stop
+%%DATADIR%%/tsearch_data/hungarian.stop
+%%DATADIR%%/tsearch_data/hunspell_sample.affix
+%%DATADIR%%/tsearch_data/hunspell_sample_long.affix
+%%DATADIR%%/tsearch_data/hunspell_sample_long.dict
+%%DATADIR%%/tsearch_data/hunspell_sample_num.affix
+%%DATADIR%%/tsearch_data/hunspell_sample_num.dict
+%%DATADIR%%/tsearch_data/ispell_sample.affix
+%%DATADIR%%/tsearch_data/ispell_sample.dict
+%%DATADIR%%/tsearch_data/italian.stop
+%%DATADIR%%/tsearch_data/norwegian.stop
+%%DATADIR%%/tsearch_data/portuguese.stop
+%%DATADIR%%/tsearch_data/russian.stop
+%%DATADIR%%/tsearch_data/spanish.stop
+%%DATADIR%%/tsearch_data/swedish.stop
+%%DATADIR%%/tsearch_data/synonym_sample.syn
+%%DATADIR%%/tsearch_data/thesaurus_sample.ths
+%%DATADIR%%/tsearch_data/turkish.stop
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index 5c9eaef84b5..6c4b74d03e7 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME?=	postgresql
-DISTVERSION?=	9.2.21
+DISTVERSION?=	9.2.22
 PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	PGSQL/source/v${DISTVERSION}
@@ -61,7 +61,7 @@ INSTALL_TARGET?=install-strip
 SERVER_ONLY=	yes
 COMPONENT=	-server
 USE_RC_SUBR=	postgresql
-USES+=		pgsql:${DISTVERSION:C/([0-9][0-9]*\.[0-9][0-9]*).*/\1/g}
+USES+=		pgsql:${DISTVERSION:C/([0-9]\.?[0-9]).*/\1/g}
 USERS=		${PG_USER}
 GROUPS=	${PG_GROUP}
 SUB_FILES+=	502.pgsql
@@ -83,9 +83,11 @@ DTRACE_DESC=	Build with DTrace probes
 TZDATA_DESC=	Use internal timezone database
 XML_DESC=	Build with XML data type
 
+.if ${DISTVERSION:C/([0-9]*).*/\1/} != 10
 # See http://people.freebsd.org/~girgen/postgresql-icu/README.html for more info
 OPTIONS_DEFINE+=	ICU
 ICU_DESC=	Use ICU for unicode collation
+.endif
 
 # See http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/76999 for more info
 # (requires dump/restore if modified.)
@@ -96,8 +98,10 @@ OPTIONS_DEFAULT+=	XML TZDATA INTDATE
 
 .if !defined(SLAVE_ONLY)
 OPTIONS_DEFINE+=	NLS PAM GSSAPI OPTIMIZED_CFLAGS DEBUG
-OPTIONS_RADIO= KRB5
-OPTIONS_RADIO_KRB5= MIT_KRB5 HEIMDAL_KRB5
+. if ${DISTVERSION:R} == 9.2 || ${DISTVERSION:R} == 9.3
+  OPTIONS_RADIO= KRB5
+  OPTIONS_RADIO_KRB5= MIT_KRB5 HEIMDAL_KRB5
+. endif
 
 KRB5_DESC=       Build with kerberos provider support
 NLS_DESC=	Use internationalized messages
diff --git a/databases/postgresql92-server/distinfo b/databases/postgresql92-server/distinfo
index 0cef4cac67f..b65d365e2e6 100644
--- a/databases/postgresql92-server/distinfo
+++ b/databases/postgresql92-server/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1494282359
-SHA256 (postgresql/postgresql-9.2.21.tar.bz2) = 0697e843523ee60c563f987f9c65bc4201294b18525d6e5e4b2c50c6d4058ef9
-SIZE (postgresql/postgresql-9.2.21.tar.bz2) = 16508040
+TIMESTAMP = 1502191515
+SHA256 (postgresql/postgresql-9.2.22.tar.bz2) = a70e94fa58776b559a8f7b5301371ac4922c9e3ed313ccbef20862514de7c192
+SIZE (postgresql/postgresql-9.2.22.tar.bz2) = 16531224
 SHA256 (postgresql/pg-9218-icu-2016-08-10.diff.gz) = 2f9c831b3dff866f0b2f6f2a9ef771a4045486bc252a851aadc73c50d376319d
 SIZE (postgresql/pg-9218-icu-2016-08-10.diff.gz) = 5587
diff --git a/databases/postgresql93-server/Makefile b/databases/postgresql93-server/Makefile
index 765be055e41..97af137357c 100644
--- a/databases/postgresql93-server/Makefile
+++ b/databases/postgresql93-server/Makefile
@@ -1,7 +1,7 @@
 # Created by: Marc G. Fournier <scrappy@FreeBSD.org>
 # $FreeBSD$
 
-DISTVERSION?=	9.3.17
+DISTVERSION?=	9.3.18
 PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}
 
 MAINTAINER?=	pgsql@FreeBSD.org
diff --git a/databases/postgresql93-server/distinfo b/databases/postgresql93-server/distinfo
index 7e8291d1022..c0e5fd56e58 100644
--- a/databases/postgresql93-server/distinfo
+++ b/databases/postgresql93-server/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1494282359
-SHA256 (postgresql/postgresql-9.3.17.tar.bz2) = 9c03e5f280cfe9bd202fa01af773eb146abd8ab3065f7279d574c568f6948dbe
-SIZE (postgresql/postgresql-9.3.17.tar.bz2) = 17158802
+TIMESTAMP = 1502191516
+SHA256 (postgresql/postgresql-9.3.18.tar.bz2) = ad60d12a5a3dd0f6f5904c41b87e43eff49d3f74e45129fe52c5744366ff2fe0
+SIZE (postgresql/postgresql-9.3.18.tar.bz2) = 17194269
 SHA256 (postgresql/pg-9314-icu-2016-08-10.diff.gz) = 4be31ad9899d5caf9f57ad7ebfc0d14f0fcf58ad539c82fb353b016fb76c0c30
 SIZE (postgresql/pg-9314-icu-2016-08-10.diff.gz) = 5583
diff --git a/databases/postgresql94-server/Makefile b/databases/postgresql94-server/Makefile
index bdfb2de62de..d683180cc8e 100644
--- a/databases/postgresql94-server/Makefile
+++ b/databases/postgresql94-server/Makefile
@@ -1,7 +1,7 @@
 # Created by: Marc G. Fournier <scrappy@FreeBSD.org>
 # $FreeBSD$
 
-DISTVERSION?=	9.4.12
+DISTVERSION?=	9.4.13
 
 MAINTAINER?=	pgsql@FreeBSD.org
 
diff --git a/databases/postgresql94-server/distinfo b/databases/postgresql94-server/distinfo
index e2c159278e8..005080bb1bc 100644
--- a/databases/postgresql94-server/distinfo
+++ b/databases/postgresql94-server/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1494282360
-SHA256 (postgresql/postgresql-9.4.12.tar.bz2) = fca055481875d1c49e31c28443f56472a1474b3fbe25b7ae64440c6118f82e64
-SIZE (postgresql/postgresql-9.4.12.tar.bz2) = 17833119
+TIMESTAMP = 1502191519
+SHA256 (postgresql/postgresql-9.4.13.tar.bz2) = 0080f55d65194de8b96a2dab153443f8248ff2b2b10e6ab4cda2dcadcac7f2ab
+SIZE (postgresql/postgresql-9.4.13.tar.bz2) = 17867502
 SHA256 (postgresql/pg-949-icu-2016-10-02.diff.gz) = 34612e685a79874db04bc6b66c700bfc6412042840c532eef0da7832d1f70d43
 SIZE (postgresql/pg-949-icu-2016-10-02.diff.gz) = 5289
diff --git a/databases/postgresql96-docs/Makefile b/databases/postgresql96-docs/Makefile
index c79f5c8f444..1e24b9ad9b7 100644
--- a/databases/postgresql96-docs/Makefile
+++ b/databases/postgresql96-docs/Makefile
@@ -9,8 +9,6 @@ MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	The PostgreSQL documentation set
 
 MASTERDIR=	${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-server
-
-USES+=		pgsql:${WANT_PGSQL_VER}
 WANT_PGSQL_VER?=9.6
 
 SLAVE_ONLY=	YES
@@ -27,6 +25,8 @@ BUILD_DEPENDS+=	onsgmls:textproc/opensp			\
 		${sgmldir}/iso8879/catalog:textproc/iso8879	\
 		${dbdir}/dsssl/modular/catalog:textproc/dsssl-docbook-modular \
 		docbook-sgml>0:textproc/docbook-sgml
+CONFIGURE_ARGS= --without-readline
+NO_ARCH=	yes
 
 do-build:
 	${MAKE_CMD} -C ${WRKSRC} html
diff --git a/databases/postgresql96-server/Makefile b/databases/postgresql96-server/Makefile
index c9813b35513..53fd1e9a692 100644
--- a/databases/postgresql96-server/Makefile
+++ b/databases/postgresql96-server/Makefile
@@ -1,7 +1,7 @@
 # Created by: Marc G. Fournier <scrappy@FreeBSD.org>
 # $FreeBSD$
 
-DISTVERSION?=	9.6.3
+DISTVERSION?=	9.6.4
 PORTREVISION?=	3
 
 MAINTAINER?=	pgsql@FreeBSD.org
diff --git a/databases/postgresql96-server/distinfo b/databases/postgresql96-server/distinfo
index 0fa4d348ccd..ef857b2bfff 100644
--- a/databases/postgresql96-server/distinfo
+++ b/databases/postgresql96-server/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1494282361
-SHA256 (postgresql/postgresql-9.6.3.tar.bz2) = 1645b3736901f6d854e695a937389e68ff2066ce0cde9d73919d6ab7c995b9c6
-SIZE (postgresql/postgresql-9.6.3.tar.bz2) = 19534323
+TIMESTAMP = 1502191482
+SHA256 (postgresql/postgresql-9.6.4.tar.bz2) = 2b3ab16d82e21cead54c08b95ce3ac480696944a68603b6c11b3205b7376ce13
+SIZE (postgresql/postgresql-9.6.4.tar.bz2) = 19566875
 SHA256 (postgresql/pg-96b4-icu-2016-10-02.diff.gz) = 85f81baa0fc8f692bcf802c8645196d9e3afdef4f760cef712d940b87655486e
 SIZE (postgresql/pg-96b4-icu-2016-10-02.diff.gz) = 5998
diff --git a/databases/postgresql96-server/pkg-plist-client b/databases/postgresql96-server/pkg-plist-client
index dcfe4f12798..f2c98913f3f 100644
--- a/databases/postgresql96-server/pkg-plist-client
+++ b/databases/postgresql96-server/pkg-plist-client
@@ -1019,6 +1019,7 @@ man/man7/WITH.7.gz
 %%NLS%%share/locale/ru/LC_MESSAGES/psql-9.6.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/pg_config-9.6.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/pgscripts-9.6.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/psql-9.6.mo
 %%NLS%%share/locale/ta/LC_MESSAGES/pg_config-9.6.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/ecpg-9.6.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/ecpglib6-9.6.mo
diff --git a/databases/powa-archivist/Makefile b/databases/powa-archivist/Makefile
index f8cde4c616b..b7ac71ab3cf 100644
--- a/databases/powa-archivist/Makefile
+++ b/databases/powa-archivist/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	powa-archivist
-DISTVERSIONPREFIX=	REL_
-DISTVERSION=	3_1_0
+PORTVERSION=	3.1.1.a.20161106
 CATEGORIES=	databases
 
 MAINTAINER=	girgen@FreeBSD.org
@@ -16,6 +15,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/postgresql/pg_stat_kcache.so:databases/pg_stat_kca
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	dalibo
+GH_TAGNAME=	521fdf
 
 USES=		gmake pgsql:9.4+
 WANT_PGSQL=	server contrib
diff --git a/databases/powa-archivist/distinfo b/databases/powa-archivist/distinfo
index 0f9dd7ea58f..65f232c44d1 100644
--- a/databases/powa-archivist/distinfo
+++ b/databases/powa-archivist/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1477433154
-SHA256 (dalibo-powa-archivist-REL_3_1_0_GH0.tar.gz) = 9dc7f80b24202ca47f2a21e9a08240096a9deb02ce93c939d45088c98180a803
-SIZE (dalibo-powa-archivist-REL_3_1_0_GH0.tar.gz) = 46328
+TIMESTAMP = 1496357604
+SHA256 (dalibo-powa-archivist-3.1.1.a.20161106-521fdf_GH0.tar.gz) = 9d1a613800ba527e987af0b37fa571924be17d66e7c783faa9190e88fc60e533
+SIZE (dalibo-powa-archivist-3.1.1.a.20161106-521fdf_GH0.tar.gz) = 58175
diff --git a/databases/powa-archivist/pkg-plist b/databases/powa-archivist/pkg-plist
index 00ed2b79e0a..d1a1f87483b 100644
--- a/databases/powa-archivist/pkg-plist
+++ b/databases/powa-archivist/pkg-plist
@@ -12,4 +12,6 @@ share/postgresql/extension/powa--3.0.0.sql
 share/postgresql/extension/powa--3.0.1.sql
 share/postgresql/extension/powa--3.0.1--3.1.0.sql
 share/postgresql/extension/powa--3.1.0.sql
+share/postgresql/extension/powa--3.1.0--3.1.1.sql
+share/postgresql/extension/powa--3.1.1.sql
 share/postgresql/extension/powa.control
diff --git a/databases/puppetdb-terminus3/Makefile b/databases/puppetdb-terminus3/Makefile
index 549be1fe6a1..991192a3385 100644
--- a/databases/puppetdb-terminus3/Makefile
+++ b/databases/puppetdb-terminus3/Makefile
@@ -13,7 +13,7 @@ LICENSE=	APACHE20
 
 BUILD_DEPENDS=	puppet:sysutils/puppet4
 
-CONFLICTS_INSTALL=	puppetdb-terminus-* puppetdb-terminus4-*
+CONFLICTS_INSTALL=	puppetdb-terminus4-* puppetdb-terminus5-*
 USE_RUBY=	yes
 NO_BUILD=	yes
 
diff --git a/databases/puppetdb-terminus4/Makefile b/databases/puppetdb-terminus4/Makefile
index 64e7f8b3ea0..9d523077a48 100644
--- a/databases/puppetdb-terminus4/Makefile
+++ b/databases/puppetdb-terminus4/Makefile
@@ -14,7 +14,7 @@ LICENSE=	APACHE20
 
 BUILD_DEPENDS=	puppet4>=0:sysutils/puppet4
 
-CONFLICTS_INSTALL=	puppetdb-terminus-* puppetdb-terminus3-*
+CONFLICTS_INSTALL=	puppetdb-terminus3-* puppetdb-terminus5-*
 USE_RUBY=	yes
 NO_BUILD=	yes
 USES=		gmake
diff --git a/databases/puppetdb-terminus5/Makefile b/databases/puppetdb-terminus5/Makefile
new file mode 100644
index 00000000000..12a55d972f7
--- /dev/null
+++ b/databases/puppetdb-terminus5/Makefile
@@ -0,0 +1,28 @@
+# $FreeBSD$
+
+PORTNAME=	puppetdb-terminus
+PORTVERSION=	5.0.1
+CATEGORIES=	databases ruby
+MASTER_SITES=	http://downloads.puppetlabs.com/puppetdb/
+PKGNAMESUFFIX=	5
+DISTNAME=	puppetdb-${PORTVERSION}
+
+MAINTAINER=	puppet@FreeBSD.org
+COMMENT=	PuppetDB storeconfigs backend terminus module
+
+LICENSE=	APACHE20
+
+BUILD_DEPENDS=	puppet5>=0:sysutils/puppet5
+
+CONFLICTS_INSTALL=	puppetdb-terminus3-* puppetdb-terminus4-*
+USE_RUBY=	yes
+NO_BUILD=	yes
+USES=		gmake
+
+post-patch:
+	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/Makefile
+
+do-install:
+	@cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} ${GMAKE} install-puppetdb-termini
+
+.include <bsd.port.mk>
diff --git a/databases/puppetdb-terminus5/distinfo b/databases/puppetdb-terminus5/distinfo
new file mode 100644
index 00000000000..23a1755b80e
--- /dev/null
+++ b/databases/puppetdb-terminus5/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499445452
+SHA256 (puppetdb-5.0.1.tar.gz) = ac75c40c16ecfd14a64c3122811adcceaa2f32c1874e07c763ad0b1ec7338a27
+SIZE (puppetdb-5.0.1.tar.gz) = 24055687
diff --git a/databases/puppetdb-terminus5/files/patch-Makefile b/databases/puppetdb-terminus5/files/patch-Makefile
new file mode 100644
index 00000000000..11bbbff369e
--- /dev/null
+++ b/databases/puppetdb-terminus5/files/patch-Makefile
@@ -0,0 +1,62 @@
+--- Makefile.orig
++++ Makefile
+@@ -1,7 +1,7 @@
+ prefix = /usr/local
+ datadir = $(prefix)/share
+ confdir = /etc
+-rubylibdir = $(shell ruby -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']")
++rubylibdir = $(shell %%PREFIX%%/bin/ruby -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']")
+ rundir = /var/run
+ bindir = /usr/bin
+ 
+@@ -34,22 +34,34 @@
+ 
+ 
+ install-puppetdb-termini:
+-	install -Dm 0644 puppet/face/node/deactivate.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/deactivate.rb"
+-	install -Dm 0644 puppet/face/node/status.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/status.rb"
+-	install -Dm 0644 puppet/functions/puppetdb_query.rb "$(DESTDIR)$(rubylibdir)/puppet/functions/puppetdb_query.rb"
+-	install -Dm 0644 puppet/indirector/catalog/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog/puppetdb.rb"
+-	install -Dm 0644 puppet/indirector/facts/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb.rb"
+-	install -Dm 0644 puppet/indirector/facts/puppetdb_apply.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb_apply.rb"
+-	install -Dm 0644 puppet/indirector/node/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/node/puppetdb.rb"
+-	install -Dm 0644 puppet/indirector/resource/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource/puppetdb.rb"
+-	install -Dm 0644 puppet/reports/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/reports/puppetdb.rb"
+-	install -Dm 0644 puppet/util/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.rb"
+-	install -Dm 0644 puppet/util/puppetdb/atom.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/atom.rb"
+-	install -Dm 0644 puppet/util/puppetdb/char_encoding.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/char_encoding.rb"
+-	install -Dm 0644 puppet/util/puppetdb/command.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command.rb"
+-	install -Dm 0644 puppet/util/puppetdb/command_names.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command_names.rb"
+-	install -Dm 0644 puppet/util/puppetdb/config.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/config.rb"
+-	install -Dm 0644 puppet/util/puppetdb/http.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/http.rb"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/face"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/face/node"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/functions"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/node"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/reports"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/util"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb"
++	install -m 0644 puppet/face/node/deactivate.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/deactivate.rb"
++	install -m 0644 puppet/face/node/status.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/status.rb"
++	install -m 0644 puppet/functions/puppetdb_query.rb "$(DESTDIR)$(rubylibdir)/puppet/functions/puppetdb_query.rb"
++	install -m 0644 puppet/indirector/catalog/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog/puppetdb.rb"
++	install -m 0644 puppet/indirector/facts/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb.rb"
++	install -m 0644 puppet/indirector/facts/puppetdb_apply.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb_apply.rb"
++	install -m 0644 puppet/indirector/node/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/node/puppetdb.rb"
++	install -m 0644 puppet/indirector/resource/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource/puppetdb.rb"
++	install -m 0644 puppet/reports/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/reports/puppetdb.rb"
++	install -m 0644 puppet/util/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.rb"
++	install -m 0644 puppet/util/puppetdb/atom.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/atom.rb"
++	install -m 0644 puppet/util/puppetdb/char_encoding.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/char_encoding.rb"
++	install -m 0644 puppet/util/puppetdb/command.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command.rb"
++	install -m 0644 puppet/util/puppetdb/command_names.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command_names.rb"
++	install -m 0644 puppet/util/puppetdb/config.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/config.rb"
++	install -m 0644 puppet/util/puppetdb/http.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/http.rb"
+ 
+ install-rpm-sysv-init: install-rpm-preinst
+ 	install -d -m 0755 "$(DESTDIR)$(initdir)"
diff --git a/databases/puppetdb-terminus5/pkg-descr b/databases/puppetdb-terminus5/pkg-descr
new file mode 100644
index 00000000000..82720763fd9
--- /dev/null
+++ b/databases/puppetdb-terminus5/pkg-descr
@@ -0,0 +1,3 @@
+The PuppetDB storeconfigs backend terminus module.
+
+WWW: https://docs.puppetlabs.com/puppetdb/latest/
diff --git a/databases/puppetdb-terminus5/pkg-plist b/databases/puppetdb-terminus5/pkg-plist
new file mode 100644
index 00000000000..a12b86eb6a1
--- /dev/null
+++ b/databases/puppetdb-terminus5/pkg-plist
@@ -0,0 +1,17 @@
+%%RUBY_SITELIBDIR%%/puppet/face/node/deactivate.rb
+%%RUBY_SITELIBDIR%%/puppet/face/node/status.rb
+%%RUBY_SITELIBDIR%%/puppet/functions/puppetdb_query.rb
+%%RUBY_SITELIBDIR%%/puppet/indirector/catalog/puppetdb.rb
+%%RUBY_SITELIBDIR%%/puppet/indirector/facts/puppetdb.rb
+%%RUBY_SITELIBDIR%%/puppet/indirector/facts/puppetdb_apply.rb
+%%RUBY_SITELIBDIR%%/puppet/indirector/node/puppetdb.rb
+%%RUBY_SITELIBDIR%%/puppet/indirector/resource/puppetdb.rb
+%%RUBY_SITELIBDIR%%/puppet/reports/puppetdb.rb
+%%RUBY_SITELIBDIR%%/puppet/util/puppetdb.rb
+%%RUBY_SITELIBDIR%%/puppet/util/puppetdb/atom.rb
+%%RUBY_SITELIBDIR%%/puppet/util/puppetdb/char_encoding.rb
+%%RUBY_SITELIBDIR%%/puppet/util/puppetdb/command.rb
+%%RUBY_SITELIBDIR%%/puppet/util/puppetdb/command_names.rb
+%%RUBY_SITELIBDIR%%/puppet/util/puppetdb/config.rb
+%%RUBY_SITELIBDIR%%/puppet/util/puppetdb/http.rb
+
diff --git a/databases/puppetdb3/Makefile b/databases/puppetdb3/Makefile
index 91d651f1df2..e5cb08afb1e 100644
--- a/databases/puppetdb3/Makefile
+++ b/databases/puppetdb3/Makefile
@@ -13,12 +13,11 @@ LICENSE=	APACHE20
 
 RUN_DEPENDS=	bash:shells/bash \
 		puppet:sysutils/puppet4
-BUILD_DEPENDS=	rubygem-facter>=0:sysutils/rubygem-facter \
-		rubygem-rake>=0:devel/rubygem-rake
+BUILD_DEPENDS=	rubygem-rake>=0:devel/rubygem-rake
 
 USE_RC_SUBR=	puppetdb
 
-CONFLICTS_INSTALL=	puppetdb-* puppetdb4-*
+CONFLICTS_INSTALL=	puppetdb4-* puppetdb5-*
 USE_JAVA=	yes
 NO_BUILD=	yes
 JAVA_VERSION=	1.7+
diff --git a/databases/puppetdb4/Makefile b/databases/puppetdb4/Makefile
index 8a0f2d02f06..ebefff0d1e8 100644
--- a/databases/puppetdb4/Makefile
+++ b/databases/puppetdb4/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS=	bash:shells/bash \
 
 USE_RC_SUBR=	puppetdb
 
-CONFLICTS_INSTALL=	puppetdb-* puppetdb3-*
+CONFLICTS_INSTALL=	puppetdb3-* puppetdb5-*
 USES=		shebangfix
 SHEBANG_FILES=	ext/bin/puppetdb \
 		ext/cli/anonymize \
diff --git a/databases/puppetdb5/Makefile b/databases/puppetdb5/Makefile
new file mode 100644
index 00000000000..f4c73db3879
--- /dev/null
+++ b/databases/puppetdb5/Makefile
@@ -0,0 +1,53 @@
+# $FreeBSD$
+
+PORTNAME=	puppetdb
+PORTVERSION=	5.0.1
+CATEGORIES=	databases java
+MASTER_SITES=	http://downloads.puppetlabs.com/puppetdb/
+PKGNAMESUFFIX=	5
+
+MAINTAINER=	puppet@FreeBSD.org
+COMMENT=	PuppetDB storeconfigs backend
+
+LICENSE=	APACHE20
+
+RUN_DEPENDS=	bash:shells/bash \
+		puppet:sysutils/puppet5
+
+USE_RC_SUBR=	puppetdb
+
+CONFLICTS_INSTALL=	puppetdb3-* puppetdb4-*
+USES=		shebangfix
+SHEBANG_FILES=	ext/bin/puppetdb \
+		ext/cli/anonymize \
+		ext/cli/config-migration \
+		ext/cli/foreground \
+		ext/cli/ssl-setup \
+		ext/cli/start \
+		ext/cli/stop \
+		ext/cli/reload \
+		ext/ezbake-functions.sh
+USE_JAVA=	yes
+NO_ARCH=	yes
+NO_BUILD=	yes
+JAVA_VERSION=	1.7+
+
+USERS=		puppetdb
+GROUPS=		puppetdb
+
+SUB_LIST=	JAVA_HOME=${JAVA_HOME}
+SUB_FILES=	pkg-message
+
+PKGMESSAGE=	${WRKDIR}/pkg-message
+
+post-patch:
+.for file in Makefile ext/bin/puppetdb ext/cli/ssl-setup \
+	ext/config/conf.d/jetty.ini ext/config/conf.d/config.ini
+	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/${file}
+.endfor
+	@${REINPLACE_CMD} -e "s|%%DATADIR%%|${DATADIR}|" ${WRKSRC}/ext/bin/puppetdb
+
+do-install:
+	@cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} make install-puppetdb
+
+.include <bsd.port.mk>
diff --git a/databases/puppetdb5/distinfo b/databases/puppetdb5/distinfo
new file mode 100644
index 00000000000..3589ef5786e
--- /dev/null
+++ b/databases/puppetdb5/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499445330
+SHA256 (puppetdb-5.0.1.tar.gz) = ac75c40c16ecfd14a64c3122811adcceaa2f32c1874e07c763ad0b1ec7338a27
+SIZE (puppetdb-5.0.1.tar.gz) = 24055687
diff --git a/databases/puppetdb5/files/patch-Makefile b/databases/puppetdb5/files/patch-Makefile
new file mode 100644
index 00000000000..5466cf74ae2
--- /dev/null
+++ b/databases/puppetdb5/files/patch-Makefile
@@ -0,0 +1,37 @@
+--- Makefile.orig
++++ Makefile
+@@ -1,23 +1,23 @@
+-prefix = /usr/local
++prefix = %%PREFIX%%
+ datadir = $(prefix)/share
+-confdir = /etc
++confdir = %%PREFIX%%/etc
+ rubylibdir = $(shell ruby -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']")
+ rundir = /var/run
+-bindir = /usr/bin
++bindir = %%PREFIX%%/bin
+ 
+ install-puppetdb:
+ 	install -d -m 0755 "$(DESTDIR)$(datadir)/puppetdb"
+ 	install -m 0644 puppetdb.jar "$(DESTDIR)$(datadir)/puppetdb"
+ 	install -m 0774 ext/ezbake-functions.sh "$(DESTDIR)$(datadir)/puppetdb"
+ 	install -m 0644 ext/ezbake.manifest "$(DESTDIR)$(datadir)/puppetdb"
+-	install -d -m 0755 "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d"
+-	install -m 0644 ext/config/bootstrap.cfg "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/bootstrap.cfg"
+-	install -m 0644 ext/config/conf.d/config.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/config.ini"
+-	install -m 0644 ext/config/conf.d/database.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/database.ini"
+-	install -m 0644 ext/config/conf.d/jetty.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/jetty.ini"
+-	install -m 0644 ext/config/conf.d/repl.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/repl.ini"
+-	install -m 0644 ext/config/logback.xml "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/logback.xml"
+-	install -m 0644 ext/config/request-logging.xml "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/request-logging.xml"
++	install -d -m 0755 "$(DESTDIR)$(confdir)/puppetdb/conf.d"
++	install -m 0644 ext/config/bootstrap.cfg "$(DESTDIR)$(confdir)/puppetdb/bootstrap.cfg.sample"
++	install -m 0644 ext/config/conf.d/config.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/config.ini.sample"
++	install -m 0644 ext/config/conf.d/database.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/database.ini.sample"
++	install -m 0644 ext/config/conf.d/jetty.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/jetty.ini.sample"
++	install -m 0644 ext/config/conf.d/repl.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/repl.ini.sample"
++	install -m 0644 ext/config/logback.xml "$(DESTDIR)$(confdir)/puppetdb/logback.xml.sample"
++	install -m 0644 ext/config/request-logging.xml "$(DESTDIR)$(confdir)/puppetdb/request-logging.xml.sample"
+ 	install -d -m 0755 "$(DESTDIR)$(datadir)/puppetdb/cli"
+ 	install -d -m 0755 "$(DESTDIR)$(datadir)/puppetdb/cli/apps"
+ 	install -d -m 0755 "$(DESTDIR)$(bindir)"
diff --git a/databases/puppetdb5/files/patch-ext_bin_puppetdb b/databases/puppetdb5/files/patch-ext_bin_puppetdb
new file mode 100644
index 00000000000..0a139b110d2
--- /dev/null
+++ b/databases/puppetdb5/files/patch-ext_bin_puppetdb
@@ -0,0 +1,15 @@
+--- ext/bin/puppetdb.orig	2016-03-17 04:17:10 UTC
++++ ext/bin/puppetdb
+@@ -5,6 +5,12 @@ if [ -r "/etc/default/puppetdb" ] ; then
+     . /etc/default/puppetdb
+ elif [ -r "/etc/sysconfig/puppetdb" ] ; then
+     . /etc/sysconfig/puppetdb
++elif [ `uname` == "FreeBSD" ] ; then
++    CONFIG="%%PREFIX%%/etc/puppetdb/conf.d"
++    INSTALL_DIR="%%DATADIR%%"
++    JAVA_BIN="%%PREFIX%%/bin/java"
++    JAVA_ARGS="-Xmx192m"
++    USER="puppet"
+ elif [ `uname` == "OpenBSD" ] ; then
+     JAVA_BIN=$(javaPathHelper -c puppetdb)
+     JAVA_ARGS="-Xmx192m"
diff --git a/databases/puppetdb5/files/patch-ext_cli_ssl-setup b/databases/puppetdb5/files/patch-ext_cli_ssl-setup
new file mode 100644
index 00000000000..ab86d849142
--- /dev/null
+++ b/databases/puppetdb5/files/patch-ext_cli_ssl-setup
@@ -0,0 +1,11 @@
+--- ext/cli/ssl-setup.orig	2016-03-17 04:17:10 UTC
++++ ext/cli/ssl-setup
+@@ -230,7 +230,7 @@ else
+   user=puppetdb
+   group=puppetdb
+ 
+-  puppetdb_confdir="/etc/puppetlabs/puppetdb"
++  puppetdb_confdir="%%PREFIX%%/etc/puppetdb"
+ fi
+ 
+ set -e
diff --git a/databases/puppetdb5/files/patch-ext_config_conf.d_config.ini b/databases/puppetdb5/files/patch-ext_config_conf.d_config.ini
new file mode 100644
index 00000000000..39006884050
--- /dev/null
+++ b/databases/puppetdb5/files/patch-ext_config_conf.d_config.ini
@@ -0,0 +1,15 @@
+--- ext/config/conf.d/config.ini.orig	2016-03-17 04:17:06 UTC
++++ ext/config/conf.d/config.ini
+@@ -3,10 +3,10 @@
+ 
+ [global]
+ # Store mq/db data in a custom directory
+-vardir = /opt/puppetlabs/server/data/puppetdb
++vardir = /var/db/puppetdb
+ 
+ # Use an external logback config file
+-logging-config = /etc/puppetlabs/puppetdb/logback.xml
++logging-config = %%PREFIX%%/etc/puppetdb/logback.xml
+ 
+ [command-processing]
+ # How many command-processing threads to use, defaults to (CPUs / 2)
diff --git a/databases/puppetdb5/files/patch-ext_config_conf.d_jetty.ini b/databases/puppetdb5/files/patch-ext_config_conf.d_jetty.ini
new file mode 100644
index 00000000000..42d5665a0f6
--- /dev/null
+++ b/databases/puppetdb5/files/patch-ext_config_conf.d_jetty.ini
@@ -0,0 +1,8 @@
+--- ext/config/conf.d/jetty.ini.orig	2016-03-17 04:17:06 UTC
++++ ext/config/conf.d/jetty.ini
+@@ -30,4 +30,4 @@ port = 8080
+ 
+ # Access logging configuration path. To turn off access logging
+ # comment out the line with `access-log-config=...`
+-access-log-config = /etc/puppetlabs/puppetdb/request-logging.xml
++access-log-config = %%PREFIX%%/etc/puppetdb/request-logging.xml
diff --git a/databases/puppetdb5/files/patch-ext_config_logback.xml b/databases/puppetdb5/files/patch-ext_config_logback.xml
new file mode 100644
index 00000000000..08cb543440a
--- /dev/null
+++ b/databases/puppetdb5/files/patch-ext_config_logback.xml
@@ -0,0 +1,29 @@
+--- ext/config/logback.xml.orig	2017-04-24 12:27:57.366296793 -0700
++++ ext/config/logback.xml	2017-04-24 12:28:48.723259627 -0700
+@@ -6,10 +6,10 @@
+     </appender>
+ 
+     <appender name="F1" class="ch.qos.logback.core.rolling.RollingFileAppender">
+-        <file>/var/log/puppetlabs/puppetdb/puppetdb.log</file>
++        <file>/var/log/puppetdb/puppetdb.log</file>
+         <append>true</append>
+         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+-            <fileNamePattern>/var/log/puppetlabs/puppetdb/puppetdb-%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
++            <fileNamePattern>/var/log/puppetdb/puppetdb-%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+             <!-- each file should be at most 200MB, keep 90 days worth of history, but at most 1GB total-->
+             <maxFileSize>200MB</maxFileSize>
+             <maxHistory>90</maxHistory>
+@@ -31,11 +31,11 @@
+         level="info"/>
+ 
+     <appender name="STATUS" class="ch.qos.logback.core.rolling.RollingFileAppender">
+-        <file>/var/log/puppetlabs/puppetdb/puppetdb-status.log</file>
++        <file>/var/log/puppetdb/puppetdb-status.log</file>
+         <append>true</append>
+         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+             <!-- rollover daily -->
+-            <fileNamePattern>/var/log/puppetlabs/puppetdb/puppetdb-status-%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
++            <fileNamePattern>/var/log/puppetdb/puppetdb-status-%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+             <!-- each file should be at most 200MB, keep 90 days worth of history, but at most 1GB total-->
+             <maxFileSize>200MB</maxFileSize>
+             <maxHistory>90</maxHistory>
diff --git a/databases/puppetdb5/files/patch-ext_config_request-logging.xml b/databases/puppetdb5/files/patch-ext_config_request-logging.xml
new file mode 100644
index 00000000000..51b90d0e844
--- /dev/null
+++ b/databases/puppetdb5/files/patch-ext_config_request-logging.xml
@@ -0,0 +1,14 @@
+--- ext/config/request-logging.xml.orig	2017-04-24 12:32:16.604464262 -0700
++++ ext/config/request-logging.xml	2017-04-24 12:32:46.404637027 -0700
+@@ -1,9 +1,9 @@
+ <configuration debug="false">
+     <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+-        <file>/var/log/puppetlabs/puppetdb/puppetdb-access.log</file>
++        <file>/var/log/puppetdb/puppetdb-access.log</file>
+         <append>true</append>
+         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+-            <fileNamePattern>/var/log/puppetlabs/puppetdb/puppetdb-access-%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
++            <fileNamePattern>/var/log/puppetdb/puppetdb-access-%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+             <!-- each file should be at most 200MB, keep 90 days worth of history, but at most 1GB total-->
+             <maxFileSize>200MB</maxFileSize>
+             <maxHistory>90</maxHistory>
diff --git a/databases/puppetdb5/files/pkg-message.in b/databases/puppetdb5/files/pkg-message.in
new file mode 100644
index 00000000000..4e13534c21f
--- /dev/null
+++ b/databases/puppetdb5/files/pkg-message.in
@@ -0,0 +1,6 @@
+If this is a new installation, please run the follow to setup your SSL/puppetdb
+server:
+
+%%PREFIX%%/bin/puppetdb ssl-setup
+
+Please also remember to add puppetdb_enable="YES" into your rc.conf.
diff --git a/databases/puppetdb5/files/puppetdb.in b/databases/puppetdb5/files/puppetdb.in
new file mode 100644
index 00000000000..66bcf18618e
--- /dev/null
+++ b/databases/puppetdb5/files/puppetdb.in
@@ -0,0 +1,91 @@
+#!/bin/sh
+
+# $FreeBSD$
+#
+# PROVIDE: puppetdb
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+
+#
+# Configuration settings for puppetdb in /etc/rc.conf:
+#
+# puppetdb_enable (bool):
+#   Set to "NO" by default.
+#   Set it to "YES" to enable puppetdb
+#
+# puppetdb_args (str):
+#   Extra arguments passed to start command
+#
+# puppetdb_java_home (str):
+#   Set to "%%JAVA_HOME%%" by default.
+#   Set the Java virtual machine to run puppetdb
+#
+# puppetdb_java_opts (str):
+#   Set to "" by default.
+#   Java VM args to use.
+#
+# puppetdb_user (str):
+#   Set to "puppetdb" by default.
+#   User to run puppetdb as.
+#
+# puppetdb_group (str):
+#   Set to "puppetdb" by default.
+#   Group for data file ownership.
+#
+# puppetdb_log_file (str):
+#   Set to "/var/log/puppetdb/puppetdb.log" by default.
+#   Log file location.
+#
+
+. /etc/rc.subr
+
+name="puppetdb"
+rcvar=puppetdb_enable
+
+load_rc_config "${name}"
+
+: ${puppetdb_enable="NO"}
+: ${puppetdb_args="services -c %%PREFIX%%/etc/puppetdb/conf.d"}
+: ${puppetdb_java_home="%%JAVA_HOME%%"}
+: ${puppetdb_user="puppetdb"}
+: ${puppetdb_group="puppetdb"}
+: ${puppetdb_log_file="/var/log/puppetdb/puppetdb.log"}
+
+pidfile="/var/run/puppetdb/puppetdb.pid"
+command="/usr/sbin/daemon"
+java_cmd="${puppetdb_java_home}/bin/java"
+procname="${java_cmd}"
+command_args="-p ${pidfile} ${java_cmd} -Djava.security.egd=/dev/urandom -cp %%DATADIR%%/puppetdb.jar clojure.main -m puppetlabs.puppetdb.main  ${puppetdb_args} > ${puppetdb_log_file} 2>&1"
+
+
+required_files="${java_cmd}"
+
+start_precmd="puppetdb_prestart"
+
+puppetdb_prestart() {
+  if [ ! -d "/var/log/puppetdb" ]; then
+    install -d -o "${puppetdb_user}" -g "${puppetdb_group}" -m 750 "/var/log/puppetdb"
+  fi
+  if [ ! -f "${puppetdb_log_file}" ]; then
+    touch "${puppetdb_log_file}"
+    chown "${puppetdb_user}:${puppetdb_group}" "${puppetdb_log_file}"
+    chmod 640 "${puppetdb_log_file}"
+  fi
+  if [ ! -d "/var/run/puppetdb" ]; then
+    install -d -o "${puppetdb_user}" -g "${puppetdb_group}" -m 750 "/var/run/puppetdb"
+  fi
+
+  chown -R "root:${puppetdb_group}" "%%PREFIX%%/etc/puppetdb/conf.d"
+  chmod 0750 "%%PREFIX%%/etc/puppetdb/conf.d"
+
+  chown "root:${puppetdb_group}" "%%PREFIX%%/etc/puppetdb/logback.xml"
+  chmod 0640 "%%PREFIX%%/etc/puppetdb/logback.xml"
+
+  if [ ! -d "/var/db/puppetdb" ]; then
+    install -d -o "${puppetdb_user}" -g "${puppetdb_group}" -m 750 "/var/db/puppetdb"
+  fi
+  chown -R "${puppetdb_user}:${puppetdb_group}" "/var/db/puppetdb"
+  chmod 0750 "/var/db/puppetdb"
+}
+
+run_rc_command "$1"
diff --git a/databases/puppetdb5/pkg-descr b/databases/puppetdb5/pkg-descr
new file mode 100644
index 00000000000..47fcde3773c
--- /dev/null
+++ b/databases/puppetdb5/pkg-descr
@@ -0,0 +1,3 @@
+The PuppetDB storeconfigs backend
+
+WWW: https://docs.puppetlabs.com/puppetdb/latest/
diff --git a/databases/puppetdb5/pkg-plist b/databases/puppetdb5/pkg-plist
new file mode 100644
index 00000000000..e342cff8af5
--- /dev/null
+++ b/databases/puppetdb5/pkg-plist
@@ -0,0 +1,20 @@
+bin/puppetdb
+%%DATADIR%%/cli/apps/anonymize
+%%DATADIR%%/cli/apps/config-migration
+%%DATADIR%%/cli/apps/foreground
+%%DATADIR%%/cli/apps/ssl-setup
+%%DATADIR%%/cli/apps/start
+%%DATADIR%%/cli/apps/stop
+%%DATADIR%%/cli/apps/reload
+%%DATADIR%%/ezbake-functions.sh
+%%DATADIR%%/ezbake.manifest
+%%DATADIR%%/puppetdb.jar
+@group puppetdb
+@sample etc/puppetdb/bootstrap.cfg.sample
+@sample etc/puppetdb/conf.d/config.ini.sample
+@sample etc/puppetdb/conf.d/database.ini.sample
+@sample etc/puppetdb/conf.d/jetty.ini.sample
+@sample etc/puppetdb/conf.d/repl.ini.sample
+@sample etc/puppetdb/logback.xml.sample
+@sample etc/puppetdb/request-logging.xml.sample
+@group
diff --git a/databases/py-mycli/Makefile b/databases/py-mycli/Makefile
index 5f1dc49669d..c1195a220ea 100644
--- a/databases/py-mycli/Makefile
+++ b/databases/py-mycli/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mycli
-PORTVERSION=	1.12.0
+PORTVERSION=	1.12.1
 CATEGORIES=	databases python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +13,7 @@ COMMENT=	CLI for MySQL Database with auto-completion and syntax highlighting
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cli-helpers>=0.2.0:devel/py-cli-helpers \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cli-helpers>=0.2.3:devel/py-cli-helpers \
 		${PYTHON_PKGNAMEPREFIX}click>=4.1:devel/py-click \
 		${PYTHON_PKGNAMEPREFIX}configobj>=5.0.5:devel/py-configobj \
 		${PYTHON_PKGNAMEPREFIX}cryptography>=1.0.0:security/py-cryptography \
diff --git a/databases/py-mycli/distinfo b/databases/py-mycli/distinfo
index 166e5c7bd2e..4f85f48d782 100644
--- a/databases/py-mycli/distinfo
+++ b/databases/py-mycli/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501694341
-SHA256 (mycli-1.12.0.tar.gz) = 155bc080844e8170e2877b92c34571b6ed821104a0081b1ab76a57cf25305acf
-SIZE (mycli-1.12.0.tar.gz) = 265501
+TIMESTAMP = 1502473889
+SHA256 (mycli-1.12.1.tar.gz) = 391dee20c88ecfc83a4b0def1b1839b0bd3ba0d3cd4922085490456137d3876a
+SIZE (mycli-1.12.1.tar.gz) = 267087
diff --git a/databases/py-sqlalchemy11/Makefile b/databases/py-sqlalchemy11/Makefile
index 0f7988c0157..b68372475cd 100644
--- a/databases/py-sqlalchemy11/Makefile
+++ b/databases/py-sqlalchemy11/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	sqlalchemy
 PORTVERSION=	1.1.13
+PORTREVISION=	1
 CATEGORIES=	databases python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -31,7 +32,7 @@ USES=		python
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
-MSSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mssql>=0:databases/py-mssql
+MSSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mssql>=0:databases/py-pymssql
 MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pymysql>=0:databases/py-pymysql
 PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.0:databases/py-psycopg2
 SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3
diff --git a/databases/rocksdb/Makefile b/databases/rocksdb/Makefile
index 38a18564b97..432ea889ca8 100644
--- a/databases/rocksdb/Makefile
+++ b/databases/rocksdb/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	rocksdb
-PORTVERSION=	5.6.1
-DISTVERSIONPREFIX=	v
+PORTVERSION=	5.7.1
+DISTVERSIONPREFIX=	${PORTNAME}-
 CATEGORIES=	databases
 
 MAINTAINER?=	sunpoet@FreeBSD.org
diff --git a/databases/rocksdb/distinfo b/databases/rocksdb/distinfo
index 395c7dbcf12..c8e3cab1d85 100644
--- a/databases/rocksdb/distinfo
+++ b/databases/rocksdb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501085717
-SHA256 (facebook-rocksdb-v5.6.1_GH0.tar.gz) = 9165c3d032d0578536aaaf80e7986ca0cc3491a1c5e644038697f2d3cdfc7c93
-SIZE (facebook-rocksdb-v5.6.1_GH0.tar.gz) = 3308084
+TIMESTAMP = 1502528505
+SHA256 (facebook-rocksdb-rocksdb-5.7.1_GH0.tar.gz) = 3c4a4d072b5d577822552b9cdace49026da7d3d5dbb24db52cf5afa9acbfd60c
+SIZE (facebook-rocksdb-rocksdb-5.7.1_GH0.tar.gz) = 3864837
diff --git a/databases/rocksdb/pkg-plist b/databases/rocksdb/pkg-plist
index 4edb3040ae8..42771509520 100644
--- a/databases/rocksdb/pkg-plist
+++ b/databases/rocksdb/pkg-plist
@@ -24,6 +24,7 @@ include/rocksdb/db.h
 include/rocksdb/db_bench_tool.h
 include/rocksdb/db_dump_tool.h
 include/rocksdb/env.h
+include/rocksdb/env_encryption.h
 include/rocksdb/experimental.h
 include/rocksdb/filter_policy.h
 include/rocksdb/flush_block_policy.h
diff --git a/databases/rubygem-mysql2/Makefile b/databases/rubygem-mysql2/Makefile
index a8b27f30104..43f9b6ab3d0 100644
--- a/databases/rubygem-mysql2/Makefile
+++ b/databases/rubygem-mysql2/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mysql2
-PORTVERSION=	0.4.8
+PORTVERSION=	0.4.9
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 
diff --git a/databases/rubygem-mysql2/distinfo b/databases/rubygem-mysql2/distinfo
index c8d644353d0..73218957993 100644
--- a/databases/rubygem-mysql2/distinfo
+++ b/databases/rubygem-mysql2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499771080
-SHA256 (rubygem/mysql2-0.4.8.gem) = a2042371c6bdda5351f0cc4cfd96adad04856207173ab3fd8fdc333c349c26ed
-SIZE (rubygem/mysql2-0.4.8.gem) = 77312
+TIMESTAMP = 1502473969
+SHA256 (rubygem/mysql2-0.4.9.gem) = 8af8b3d3b5aa33d8a686a1caa1f8acd9298cbeb40b09f8c2475a6ecf90b1a622
+SIZE (rubygem/mysql2-0.4.9.gem) = 77312
diff --git a/databases/rubygem-pghero-rails50/Makefile b/databases/rubygem-pghero-rails50/Makefile
index 9c9786d88f1..b4e12137542 100644
--- a/databases/rubygem-pghero-rails50/Makefile
+++ b/databases/rubygem-pghero-rails50/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	pghero
-PORTVERSION=	2.0.0
+PORTVERSION=	2.0.2
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	-rails50
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 RUN_DEPENDS=	rubygem-activerecord50>=0:databases/rubygem-activerecord50
 
 NO_ARCH=	yes
-USE_RUBY=	yes
 USES=		gem
+USE_RUBY=	yes
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-pghero-rails50/distinfo b/databases/rubygem-pghero-rails50/distinfo
index 23293ea0d22..ab72ad3d17c 100644
--- a/databases/rubygem-pghero-rails50/distinfo
+++ b/databases/rubygem-pghero-rails50/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502295339
-SHA256 (rubygem/pghero-2.0.0.gem) = e2c27ba074789c653e92b2111673b41c0b6fd5d9a7ead69eeb25acd85f7a6e31
-SIZE (rubygem/pghero-2.0.0.gem) = 271872
+TIMESTAMP = 1502461734
+SHA256 (rubygem/pghero-2.0.2.gem) = ab1135a79be3646d51b42e9bbf21df1474218174321704dea7be0f88170a45e4
+SIZE (rubygem/pghero-2.0.2.gem) = 271872
diff --git a/databases/rubygem-pghero/Makefile b/databases/rubygem-pghero/Makefile
index f6ad9ae84c6..cda7f2cf1ea 100644
--- a/databases/rubygem-pghero/Makefile
+++ b/databases/rubygem-pghero/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	pghero
-PORTVERSION=	2.0.0
+PORTVERSION=	2.0.2
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 RUN_DEPENDS=	rubygem-activerecord4>=0:databases/rubygem-activerecord4
 
 NO_ARCH=	yes
-USE_RUBY=	yes
 USES=		gem
+USE_RUBY=	yes
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-pghero/distinfo b/databases/rubygem-pghero/distinfo
index 1d5127085d9..e32b9e4fae3 100644
--- a/databases/rubygem-pghero/distinfo
+++ b/databases/rubygem-pghero/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502295329
-SHA256 (rubygem/pghero-2.0.0.gem) = e2c27ba074789c653e92b2111673b41c0b6fd5d9a7ead69eeb25acd85f7a6e31
-SIZE (rubygem/pghero-2.0.0.gem) = 271872
+TIMESTAMP = 1502461576
+SHA256 (rubygem/pghero-2.0.2.gem) = ab1135a79be3646d51b42e9bbf21df1474218174321704dea7be0f88170a45e4
+SIZE (rubygem/pghero-2.0.2.gem) = 271872
diff --git a/databases/tcl-sqlite3/Makefile b/databases/tcl-sqlite3/Makefile
index 10a33e60474..5d039239961 100644
--- a/databases/tcl-sqlite3/Makefile
+++ b/databases/tcl-sqlite3/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	sqlite3
-PORTVERSION=	3.19.3
+PORTVERSION=	3.20.0
 CATEGORIES=	databases tcl
 MASTER_SITES=	https://www.sqlite.org/2017/ http://www2.sqlite.org/2017/ http://www3.sqlite.org/2017/
 PKGNAMEPREFIX=	tcl-
diff --git a/databases/tcl-sqlite3/distinfo b/databases/tcl-sqlite3/distinfo
index 19278132836..8df0d88e957 100644
--- a/databases/tcl-sqlite3/distinfo
+++ b/databases/tcl-sqlite3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1497080522
-SHA256 (sqlite-autoconf-3190300.tar.gz) = 06129c03dced9f87733a8cba408871bd60673b8f93b920ba8d815efab0a06301
-SIZE (sqlite-autoconf-3190300.tar.gz) = 2542682
+TIMESTAMP = 1502286131
+SHA256 (sqlite-autoconf-3200000.tar.gz) = 3814c6f629ff93968b2b37a70497cfe98b366bf587a2261a56a5f750af6ae6a0
+SIZE (sqlite-autoconf-3200000.tar.gz) = 2565548
diff --git a/databases/tile38/Makefile b/databases/tile38/Makefile
index eda97775957..051f18c2250 100644
--- a/databases/tile38/Makefile
+++ b/databases/tile38/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	tile38
-PORTVERSION=	1.5.2
+PORTVERSION=	1.9.0
 CATEGORIES=	databases
 
 MAINTAINER=	olevole@olevole.ru
diff --git a/databases/tile38/distinfo b/databases/tile38/distinfo
index a20fa574e2a..547155bc7f3 100644
--- a/databases/tile38/distinfo
+++ b/databases/tile38/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1477411595
-SHA256 (tidwall-tile38-1.5.2_GH0.tar.gz) = a6b8bdbcb30db698d64390649b2b72bb6673eab895a6497235b71d75bdf27b03
-SIZE (tidwall-tile38-1.5.2_GH0.tar.gz) = 3445237
+TIMESTAMP = 1496812821
+SHA256 (tidwall-tile38-1.9.0_GH0.tar.gz) = 2e33d1e281a265d6a068efaad1b2a5664e322e2ccf2f7df0a4c872d7c0731d9c
+SIZE (tidwall-tile38-1.9.0_GH0.tar.gz) = 3924096
diff --git a/deskutils/syncthing-gtk/Makefile b/deskutils/syncthing-gtk/Makefile
index 4019e60e13a..ed5bec4a816 100644
--- a/deskutils/syncthing-gtk/Makefile
+++ b/deskutils/syncthing-gtk/Makefile
@@ -1,16 +1,17 @@
 # $FreeBSD$
 
 PORTNAME=	syncthing-gtk
-PORTVERSION=	0.8.2
+PORTVERSION=	0.9.2.5
 DISTVERSIONPREFIX=	v
 CATEGORIES=	deskutils python
 
-MAINTAINER=	bsd@abinet.ru
+MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Python based GUI for Syncthing
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}bcrypt>0:security/py-bcrypt
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	syncthing
diff --git a/deskutils/syncthing-gtk/distinfo b/deskutils/syncthing-gtk/distinfo
index e4b882398a1..684e9eaffc2 100644
--- a/deskutils/syncthing-gtk/distinfo
+++ b/deskutils/syncthing-gtk/distinfo
@@ -1,2 +1,3 @@
-SHA256 (syncthing-syncthing-gtk-v0.8.2_GH0.tar.gz) = b0dcf134e2ec34b93eb2f19d27dc346745939c66d35b6e809766d5e786c8c583
-SIZE (syncthing-syncthing-gtk-v0.8.2_GH0.tar.gz) = 603186
+TIMESTAMP = 1500609531
+SHA256 (syncthing-syncthing-gtk-v0.9.2.5_GH0.tar.gz) = a0e866009aa819f604cde611ad58922855da32107efb3df7297f84e06b83c605
+SIZE (syncthing-syncthing-gtk-v0.9.2.5_GH0.tar.gz) = 850519
diff --git a/deskutils/syncthing-gtk/files/patch-syncthing-gtk.desktop b/deskutils/syncthing-gtk/files/patch-syncthing-gtk.desktop
deleted file mode 100644
index 58a12ba333c..00000000000
--- a/deskutils/syncthing-gtk/files/patch-syncthing-gtk.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
---- syncthing-gtk.desktop.orig	2015-10-06 17:39:30 UTC
-+++ syncthing-gtk.desktop
-@@ -2,7 +2,7 @@
- Name=Syncthing GTK
- GenericName=Syncthing GTK
- Comment=GUI for Syncthing
--Exec=/usr/bin/syncthing-gtk
-+Exec=%%LOCALBASE%%/bin/syncthing-gtk
- Type=Application
- Icon=syncthing-gtk
- Categories=Network
diff --git a/deskutils/syncthing-gtk/files/patch-syncthing__gtk_configuration.py b/deskutils/syncthing-gtk/files/patch-syncthing__gtk_configuration.py
index 694d25a0cbb..cfc1983f430 100644
--- a/deskutils/syncthing-gtk/files/patch-syncthing__gtk_configuration.py
+++ b/deskutils/syncthing-gtk/files/patch-syncthing__gtk_configuration.py
@@ -1,4 +1,4 @@
---- syncthing_gtk/configuration.py.orig	2015-10-06 17:40:00 UTC
+--- syncthing_gtk/configuration.py.orig	2017-07-03 19:06:48 UTC
 +++ syncthing_gtk/configuration.py
 @@ -30,7 +30,7 @@ class _Configuration(object):
  		"autokill_daemon"			: (int, 2),	# 0 - never kill, 1 - always kill, 2 - ask
@@ -6,6 +6,6 @@
  		"max_cpus"					: (int, 0), # 0 for all cpus
 -		"syncthing_binary"			: (str, "/usr/bin/syncthing"),
 +		"syncthing_binary"			: (str, "%%LOCALBASE%%/bin/syncthing"),
+ 		"syncthing_arguments"		: (str, ""),
  		"minimize_on_start"			: (bool, False),
  		"folder_as_path"			: (bool, True),
- 		"use_inotify"				: (list, []),
diff --git a/devel/Makefile b/devel/Makefile
index 29d0079772f..bdb9dfe5965 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -5464,6 +5464,7 @@
     SUBDIR += rubygem-hike
     SUBDIR += rubygem-hike1
     SUBDIR += rubygem-hitimes
+    SUBDIR += rubygem-hocon
     SUBDIR += rubygem-hoe
     SUBDIR += rubygem-holidays
     SUBDIR += rubygem-http_accept_language
diff --git a/devel/argtable/Makefile b/devel/argtable/Makefile
index 0fec234bac2..fcda7c0afba 100644
--- a/devel/argtable/Makefile
+++ b/devel/argtable/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	argtable
 PORTVERSION=	2.13
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 DISTNAME=	${PORTNAME}${PORTVERSION:S/./-/}
@@ -15,15 +15,15 @@ LICENSE=	LGPL20+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		libtool
+USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^SUBDIRS/s|doc||g ; \
-		 s|^install-data-am: |install-data-am: #|g' ${WRKSRC}/Makefile.in
+		 s|^install-data-am: install-dist_exampleDATA|install-data-am: |g' ${WRKSRC}/Makefile.in
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/argtable2.3 ${STAGEDIR}${MAN3PREFIX}/man/man3
diff --git a/devel/argtable/pkg-plist b/devel/argtable/pkg-plist
index 3bef4930f80..4a2fdd54820 100644
--- a/devel/argtable/pkg-plist
+++ b/devel/argtable/pkg-plist
@@ -3,6 +3,7 @@ lib/libargtable2.a
 lib/libargtable2.so
 lib/libargtable2.so.0
 lib/libargtable2.so.0.1.8
+libdata/pkgconfig/argtable2.pc
 man/man3/argtable2.3.gz
 %%PORTDOCS%%%%DOCSDIR%%/arg_int.gif
 %%PORTDOCS%%%%DOCSDIR%%/argtable2-advanced.html
diff --git a/devel/bazel/Makefile b/devel/bazel/Makefile
index 18c316a6e02..9d15c60f4c3 100644
--- a/devel/bazel/Makefile
+++ b/devel/bazel/Makefile
@@ -13,17 +13,16 @@ COMMENT=		Fast and correct build system
 LICENSE=		APACHE20
 LICENSE_FILE=		${WRKSRC}/LICENSE
 
+BROKEN_armv6=		fails to package: cp: bazel: No such file or directory
+
 BUILD_DEPENDS=		bash:shells/bash \
 			zip:archivers/zip
 
-BROKEN_armv6=		fails to package: cp: bazel: No such file or directory
-
 # In bazel, a release is always code-wise identical to the final release candidate.
 # Hence we can also download that one and so have a simple way to also test earlier release
 # candidates.
 FINALRC=		4
 
-NO_WRKSUBDIR=		YES
 USES=			shebangfix zip
 SHEBANG_REGEX=		.*(sh|txt|_stub|stub_.*|bazel|get_workspace_status|protobuf_support|_so)
 USE_JAVA=		yes
@@ -32,6 +31,8 @@ JAVA_VERSION=		1.8
 JAVA_BUILD=		yes
 JAVA_RUN=		yes
 
+NO_WRKSUBDIR=		YES
+
 CONFLICTS_INSTALL?=	bazel-clang38
 
 OPTIONS_DEFINE=	CLANG38
@@ -39,6 +40,12 @@ CLANG38_DESC=	Use clang38 as default crosstool
 CLANG38_BUILD_DEPENDS=	clang38:devel/llvm38
 CLANG38_RUN_DEPENDS=	clang38:devel/llvm38
 
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "i386"
+EXTRA_PATCHES=	${FILESDIR}/extra-i386_src_BUILD
+.endif
+
 # Have the location of the system-wide rc file reside ${ETCDIR}.
 # Also adapt the sample file to disable persistent java workers as they
 # do not work reliably on FreeBSD.
@@ -71,4 +78,4 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/scripts/packages/debian/bazel.bazelrc ${STAGEDIR}${ETCDIR}/bazel.bazelrc.sample
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/bazel/files/extra-i386_src_BUILD b/devel/bazel/files/extra-i386_src_BUILD
new file mode 100644
index 00000000000..a49ae5e5838
--- /dev/null
+++ b/devel/bazel/files/extra-i386_src_BUILD
@@ -0,0 +1,32 @@
+--- src/BUILD.orig	2017-07-31 10:06:21.426927000 +0200
++++ src/BUILD	2017-07-31 10:06:44.279345000 +0200
+@@ -179,7 +179,7 @@
+             "//src/java_tools/singlejar:SingleJar_deploy.jar",
+         ],
+         "//conditions:default": [
+-            "//src/tools/singlejar:singlejar",
++            "//src/java_tools/singlejar:SingleJar_deploy.jar",
+         ],
+     }) + select({
+         "//tools/jdk:jdk7": [],
+--- src/main/cpp/blaze_util_posix.cc.orig
++++ src/main/cpp/blaze_util_posix.cc
+@@ -29,6 +29,7 @@
+ #include <sys/resource.h>
+ #include <sys/wait.h>
+ #include <unistd.h>
++#include <time.h>
+ 
+ #include <cassert>
+ #include <cinttypes>
+@@ -648,8 +649,8 @@
+ }
+ 
+ void TrySleep(unsigned int milliseconds) {
+-  unsigned int seconds_part = milliseconds / 1000;
+-  unsigned int nanoseconds_part = (milliseconds % 1000) * 1000 * 1000;
++  time_t seconds_part = (time_t) (milliseconds / 1000);
++  long nanoseconds_part = ((long)(milliseconds % 1000)) * 1000 * 1000;
+   struct timespec sleeptime = {seconds_part, nanoseconds_part};
+   nanosleep(&sleeptime, NULL);
+ }
diff --git a/devel/cgit/Makefile b/devel/cgit/Makefile
index e7f31c6beba..040cd14b5c8 100644
--- a/devel/cgit/Makefile
+++ b/devel/cgit/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	cgit
 PORTVERSION=	1.1
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	devel www
 MASTER_SITES=	http://git.zx2c4.com/cgit/snapshot/:cgit \
 		https://www.kernel.org/pub/software/scm/git/:git
@@ -15,7 +15,7 @@ COMMENT=	Fast, lightweight web frontend for Git repositories
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-GIT_VERSION=	2.13.4
+GIT_VERSION=	2.14.1
 USES=		cpe gmake iconv shebangfix ssl tar:xz
 CPE_VENDOR=	lars_hjemli
 SHEBANG_FILES=	filters/html-converters/rst2html
diff --git a/devel/cgit/distinfo b/devel/cgit/distinfo
index 514d122c4d2..018f0aa79c5 100644
--- a/devel/cgit/distinfo
+++ b/devel/cgit/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1501771362
+TIMESTAMP = 1502468404
 SHA256 (cgit-1.1.tar.xz) = 0889af29be15fc981481caa09579f982b9740fe9fd2860ab87dff286f4635890
 SIZE (cgit-1.1.tar.xz) = 86268
-SHA256 (git-2.13.4.tar.xz) = 371a592a52d240a6350d4ec6b63cd8301e1fab6dd03388a339a8c7429305afda
-SIZE (git-2.13.4.tar.xz) = 4755472
+SHA256 (git-2.14.1.tar.xz) = 6f724c6d0e9e13114ab35db6f67e1b2c1934b641e89366e6a0e37618231f2cc6
+SIZE (git-2.14.1.tar.xz) = 4791876
diff --git a/devel/cgit/files/patch-git-2.14 b/devel/cgit/files/patch-git-2.14
new file mode 100644
index 00000000000..6d00dbc1dab
--- /dev/null
+++ b/devel/cgit/files/patch-git-2.14
@@ -0,0 +1,413 @@
+From 86a6d358f7a6c2432fde86b9e3c5011a656f20e4 Mon Sep 17 00:00:00 2001
+From: Jeff Smith <whydoubt@gmail.com>
+Date: Wed, 9 Aug 2017 19:02:56 -0500
+Subject: git: update to v2.14
+
+Numerous changes were made to git functions to use an object_id
+structure rather than sending sha1 hashes as raw unsigned character
+arrays.  The functions that affect cgit are: parse_object,
+lookup_commit_reference, lookup_tag, lookup_tree, parse_tree_indirect,
+diff_root_tree_sha1, diff_tree_sha1, and format_display_notes.
+
+Commit b2141fc (config: don't include config.h by default) made it
+necessary to that config.h be explicitly included when needed.
+
+Commit 07a3d41 (grep: remove regflags from the public grep_opt API)
+removed one way of specifying the ignore-case grep option.
+
+Signed-off-by: Jeff Smith <whydoubt@gmail.com>
+---
+ Makefile      |  2 +-
+ git           |  2 +-
+ scan-tree.c   |  5 +++--
+ shared.c      |  6 +++---
+ ui-blob.c     |  6 +++---
+ ui-clone.c    |  2 +-
+ ui-commit.c   |  6 +++---
+ ui-diff.c     | 18 +++++++++---------
+ ui-log.c      | 10 +++++-----
+ ui-patch.c    |  4 ++--
+ ui-plain.c    |  2 +-
+ ui-snapshot.c |  2 +-
+ ui-tag.c      |  4 ++--
+ ui-tree.c     | 18 +++++++++---------
+ 14 files changed, 44 insertions(+), 43 deletions(-)
+
+diff --git a/scan-tree.c b/scan-tree.c
+index 08f3f1d..6a2f65a 100644
+--- scan-tree.c
++++ scan-tree.c
+@@ -10,6 +10,7 @@
+ #include "scan-tree.h"
+ #include "configfile.h"
+ #include "html.h"
++#include <config.h>
+ 
+ /* return 1 if path contains a objects/ directory and a HEAD file */
+ static int is_git_dir(const char *path)
+@@ -48,7 +49,7 @@ out:
+ static struct cgit_repo *repo;
+ static repo_config_fn config_fn;
+ 
+-static void repo_config(const char *name, const char *value)
++static void scan_tree_repo_config(const char *name, const char *value)
+ {
+ 	config_fn(repo, name, value);
+ }
+@@ -178,7 +179,7 @@ static void add_repo(const char *base, struct strbuf *path, repo_config_fn fn)
+ 
+ 	strbuf_addstr(path, "cgitrc");
+ 	if (!stat(path->buf, &st))
+-		parse_configfile(path->buf, &repo_config);
++		parse_configfile(path->buf, &scan_tree_repo_config);
+ 
+ 	strbuf_release(&rel);
+ }
+diff --git a/shared.c b/shared.c
+index 13a65a9..df3f611 100644
+--- shared.c
++++ shared.c
+@@ -160,7 +160,7 @@ static struct refinfo *cgit_mk_refinfo(const char *refname, const struct object_
+ 
+ 	ref = xmalloc(sizeof (struct refinfo));
+ 	ref->refname = xstrdup(refname);
+-	ref->object = parse_object(oid->hash);
++	ref->object = parse_object(oid);
+ 	switch (ref->object->type) {
+ 	case OBJ_TAG:
+ 		ref->tag = cgit_parse_tag((struct tag *)ref->object);
+@@ -360,9 +360,9 @@ void cgit_diff_tree(const struct object_id *old_oid,
+ 	diff_setup_done(&opt);
+ 
+ 	if (old_oid && !is_null_oid(old_oid))
+-		diff_tree_sha1(old_oid->hash, new_oid->hash, "", &opt);
++		diff_tree_oid(old_oid, new_oid, "", &opt);
+ 	else
+-		diff_root_tree_sha1(new_oid->hash, "", &opt);
++		diff_root_tree_oid(new_oid, "", &opt);
+ 	diffcore_std(&opt);
+ 	diff_flush(&opt);
+ 
+diff --git a/ui-blob.c b/ui-blob.c
+index 793817f..761e886 100644
+--- ui-blob.c
++++ ui-blob.c
+@@ -56,7 +56,7 @@ int cgit_ref_path_exists(const char *path, const char *ref, int file_only)
+ 		goto done;
+ 	if (sha1_object_info(oid.hash, &size) != OBJ_COMMIT)
+ 		goto done;
+-	read_tree_recursive(lookup_commit_reference(oid.hash)->tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx);
++	read_tree_recursive(lookup_commit_reference(&oid)->tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx);
+ 
+ done:
+ 	free(path_items.match);
+@@ -89,7 +89,7 @@ int cgit_print_file(char *path, const char *head, int file_only)
+ 		return -1;
+ 	type = sha1_object_info(oid.hash, &size);
+ 	if (type == OBJ_COMMIT) {
+-		commit = lookup_commit_reference(oid.hash);
++		commit = lookup_commit_reference(&oid);
+ 		read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx);
+ 		if (!walk_tree_ctx.found_path)
+ 			return -1;
+@@ -145,7 +145,7 @@ void cgit_print_blob(const char *hex, char *path, const char *head, int file_onl
+ 	type = sha1_object_info(oid.hash, &size);
+ 
+ 	if ((!hex) && type == OBJ_COMMIT && path) {
+-		commit = lookup_commit_reference(oid.hash);
++		commit = lookup_commit_reference(&oid);
+ 		read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx);
+ 		type = sha1_object_info(oid.hash, &size);
+ 	}
+diff --git a/ui-clone.c b/ui-clone.c
+index 5f6606a..0d11672 100644
+--- ui-clone.c
++++ ui-clone.c
+@@ -17,7 +17,7 @@ static int print_ref_info(const char *refname, const struct object_id *oid,
+ {
+ 	struct object *obj;
+ 
+-	if (!(obj = parse_object(oid->hash)))
++	if (!(obj = parse_object(oid)))
+ 		return 0;
+ 
+ 	htmlf("%s\t%s\n", oid_to_hex(oid), refname);
+diff --git a/ui-commit.c b/ui-commit.c
+index db69d54..586fea0 100644
+--- ui-commit.c
++++ ui-commit.c
+@@ -31,7 +31,7 @@ void cgit_print_commit(char *hex, const char *prefix)
+ 				"Bad object id: %s", hex);
+ 		return;
+ 	}
+-	commit = lookup_commit_reference(oid.hash);
++	commit = lookup_commit_reference(&oid);
+ 	if (!commit) {
+ 		cgit_print_error_page(404, "Not found",
+ 				"Bad commit reference: %s", hex);
+@@ -39,7 +39,7 @@ void cgit_print_commit(char *hex, const char *prefix)
+ 	}
+ 	info = cgit_parse_commit(commit);
+ 
+-	format_display_notes(oid.hash, &notes, PAGE_ENCODING, 0);
++	format_display_notes(&oid, &notes, PAGE_ENCODING, 0);
+ 
+ 	load_ref_decorations(DECORATE_FULL_REFS);
+ 
+@@ -87,7 +87,7 @@ void cgit_print_commit(char *hex, const char *prefix)
+ 	free(tmp);
+ 	html("</td></tr>\n");
+ 	for (p = commit->parents; p; p = p->next) {
+-		parent = lookup_commit_reference(p->item->object.oid.hash);
++		parent = lookup_commit_reference(&p->item->object.oid);
+ 		if (!parent) {
+ 			html("<tr><td colspan='3'>");
+ 			cgit_print_error("Error reading parent commit");
+diff --git a/ui-diff.c b/ui-diff.c
+index 173d351..c7fb49b 100644
+--- ui-diff.c
++++ ui-diff.c
+@@ -385,7 +385,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
+ 		     const char *prefix, int show_ctrls, int raw)
+ {
+ 	struct commit *commit, *commit2;
+-	const unsigned char *old_tree_sha1, *new_tree_sha1;
++	const struct object_id *old_tree_oid, *new_tree_oid;
+ 	diff_type difftype;
+ 
+ 	/*
+@@ -407,13 +407,13 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
+ 			"Bad object name: %s", new_rev);
+ 		return;
+ 	}
+-	commit = lookup_commit_reference(new_rev_oid->hash);
++	commit = lookup_commit_reference(new_rev_oid);
+ 	if (!commit || parse_commit(commit)) {
+ 		cgit_print_error_page(404, "Not found",
+ 			"Bad commit: %s", oid_to_hex(new_rev_oid));
+ 		return;
+ 	}
+-	new_tree_sha1 = commit->tree->object.oid.hash;
++	new_tree_oid = &commit->tree->object.oid;
+ 
+ 	if (old_rev) {
+ 		if (get_oid(old_rev, old_rev_oid)) {
+@@ -428,15 +428,15 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
+ 	}
+ 
+ 	if (!is_null_oid(old_rev_oid)) {
+-		commit2 = lookup_commit_reference(old_rev_oid->hash);
++		commit2 = lookup_commit_reference(old_rev_oid);
+ 		if (!commit2 || parse_commit(commit2)) {
+ 			cgit_print_error_page(404, "Not found",
+ 				"Bad commit: %s", oid_to_hex(old_rev_oid));
+ 			return;
+ 		}
+-		old_tree_sha1 = commit2->tree->object.oid.hash;
++		old_tree_oid = &commit2->tree->object.oid;
+ 	} else {
+-		old_tree_sha1 = NULL;
++		old_tree_oid = NULL;
+ 	}
+ 
+ 	if (raw) {
+@@ -449,11 +449,11 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
+ 
+ 		ctx.page.mimetype = "text/plain";
+ 		cgit_print_http_headers();
+-		if (old_tree_sha1) {
+-			diff_tree_sha1(old_tree_sha1, new_tree_sha1, "",
++		if (old_tree_oid) {
++			diff_tree_oid(old_tree_oid, new_tree_oid, "",
+ 				       &diffopt);
+ 		} else {
+-			diff_root_tree_sha1(new_tree_sha1, "", &diffopt);
++			diff_root_tree_oid(new_tree_oid, "", &diffopt);
+ 		}
+ 		diffcore_std(&diffopt);
+ 		diff_flush(&diffopt);
+diff --git a/ui-log.c b/ui-log.c
+index 3220fd9..2d2bb31 100644
+--- ui-log.c
++++ ui-log.c
+@@ -150,9 +150,9 @@ static int show_commit(struct commit *commit, struct rev_info *revs)
+ 	rem_lines = 0;
+ 
+ 	DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
+-	diff_tree_sha1(parent->tree->object.oid.hash,
+-		       commit->tree->object.oid.hash,
+-		       "", &revs->diffopt);
++	diff_tree_oid(&parent->tree->object.oid,
++		      &commit->tree->object.oid,
++		      "", &revs->diffopt);
+ 	diffcore_std(&revs->diffopt);
+ 
+ 	found = !diff_queue_is_empty();
+@@ -273,7 +273,7 @@ static void print_commit(struct commit *commit, struct rev_info *revs)
+ 				strbuf_addstr(&msgbuf, info->msg);
+ 				strbuf_addch(&msgbuf, '\n');
+ 			}
+-			format_display_notes(commit->object.oid.hash,
++			format_display_notes(&commit->object.oid,
+ 					     &msgbuf, PAGE_ENCODING, 0);
+ 			strbuf_addch(&msgbuf, '\n');
+ 			strbuf_ltrim(&msgbuf);
+@@ -436,7 +436,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
+ 	setup_revisions(rev_argv.argc, rev_argv.argv, &rev, NULL);
+ 	load_ref_decorations(DECORATE_FULL_REFS);
+ 	rev.show_decorations = 1;
+-	rev.grep_filter.regflags |= REG_ICASE;
++	rev.grep_filter.ignore_case = 1;
+ 
+ 	rev.diffopt.detect_rename = 1;
+ 	rev.diffopt.rename_limit = ctx.cfg.renamelimit;
+diff --git a/ui-patch.c b/ui-patch.c
+index 047e2f9..69aa4a8 100644
+--- ui-patch.c
++++ ui-patch.c
+@@ -33,7 +33,7 @@ void cgit_print_patch(const char *new_rev, const char *old_rev,
+ 				"Bad object id: %s", new_rev);
+ 		return;
+ 	}
+-	commit = lookup_commit_reference(new_rev_oid.hash);
++	commit = lookup_commit_reference(&new_rev_oid);
+ 	if (!commit) {
+ 		cgit_print_error_page(404, "Not found",
+ 				"Bad commit reference: %s", new_rev);
+@@ -46,7 +46,7 @@ void cgit_print_patch(const char *new_rev, const char *old_rev,
+ 					"Bad object id: %s", old_rev);
+ 			return;
+ 		}
+-		if (!lookup_commit_reference(old_rev_oid.hash)) {
++		if (!lookup_commit_reference(&old_rev_oid)) {
+ 			cgit_print_error_page(404, "Not found",
+ 					"Bad commit reference: %s", old_rev);
+ 			return;
+diff --git a/ui-plain.c b/ui-plain.c
+index 8d541e3..e45d553 100644
+--- ui-plain.c
++++ ui-plain.c
+@@ -185,7 +185,7 @@ void cgit_print_plain(void)
+ 		cgit_print_error_page(404, "Not found", "Not found");
+ 		return;
+ 	}
+-	commit = lookup_commit_reference(oid.hash);
++	commit = lookup_commit_reference(&oid);
+ 	if (!commit || parse_commit(commit)) {
+ 		cgit_print_error_page(404, "Not found", "Not found");
+ 		return;
+diff --git a/ui-snapshot.c b/ui-snapshot.c
+index 9b8cddd..b2d95f7 100644
+--- ui-snapshot.c
++++ ui-snapshot.c
+@@ -116,7 +116,7 @@ static int make_snapshot(const struct cgit_snapshot_format *format,
+ 				"Bad object id: %s", hex);
+ 		return 1;
+ 	}
+-	if (!lookup_commit_reference(oid.hash)) {
++	if (!lookup_commit_reference(&oid)) {
+ 		cgit_print_error_page(400, "Bad request",
+ 				"Not a commit reference: %s", hex);
+ 		return 1;
+diff --git a/ui-tag.c b/ui-tag.c
+index afd7d61..909cde0 100644
+--- ui-tag.c
++++ ui-tag.c
+@@ -54,7 +54,7 @@ void cgit_print_tag(char *revname)
+ 			"Bad tag reference: %s", revname);
+ 		goto cleanup;
+ 	}
+-	obj = parse_object(oid.hash);
++	obj = parse_object(&oid);
+ 	if (!obj) {
+ 		cgit_print_error_page(500, "Internal server error",
+ 			"Bad object id: %s", oid_to_hex(&oid));
+@@ -64,7 +64,7 @@ void cgit_print_tag(char *revname)
+ 		struct tag *tag;
+ 		struct taginfo *info;
+ 
+-		tag = lookup_tag(oid.hash);
++		tag = lookup_tag(&oid);
+ 		if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) {
+ 			cgit_print_error_page(500, "Internal server error",
+ 				"Bad tag object: %s", revname);
+diff --git a/ui-tree.c b/ui-tree.c
+index b310242..ca24a03 100644
+--- ui-tree.c
++++ ui-tree.c
+@@ -157,7 +157,7 @@ static void print_object(const unsigned char *sha1, char *path, const char *base
+ 
+ struct single_tree_ctx {
+ 	struct strbuf *path;
+-	unsigned char sha1[GIT_SHA1_RAWSZ];
++	struct object_id oid;
+ 	char *name;
+ 	size_t count;
+ };
+@@ -177,7 +177,7 @@ static int single_tree_cb(const unsigned char *sha1, struct strbuf *base,
+ 	}
+ 
+ 	ctx->name = xstrdup(pathname);
+-	hashcpy(ctx->sha1, sha1);
++	hashcpy(ctx->oid.hash, sha1);
+ 	strbuf_addf(ctx->path, "/%s", pathname);
+ 	return 0;
+ }
+@@ -195,13 +195,13 @@ static void write_tree_link(const unsigned char *sha1, char *name,
+ 		.nr = 0
+ 	};
+ 
+-	hashcpy(tree_ctx.sha1, sha1);
++	hashcpy(tree_ctx.oid.hash, sha1);
+ 
+ 	while (tree_ctx.count == 1) {
+ 		cgit_tree_link(name, NULL, "ls-dir", ctx.qry.head, rev,
+ 			       fullpath->buf);
+ 
+-		tree = lookup_tree(tree_ctx.sha1);
++		tree = lookup_tree(&tree_ctx.oid);
+ 		if (!tree)
+ 			return;
+ 
+@@ -300,17 +300,17 @@ static void ls_tail(void)
+ 	cgit_print_layout_end();
+ }
+ 
+-static void ls_tree(const unsigned char *sha1, char *path, struct walk_tree_context *walk_tree_ctx)
++static void ls_tree(const struct object_id *oid, char *path, struct walk_tree_context *walk_tree_ctx)
+ {
+ 	struct tree *tree;
+ 	struct pathspec paths = {
+ 		.nr = 0
+ 	};
+ 
+-	tree = parse_tree_indirect(sha1);
++	tree = parse_tree_indirect(oid);
+ 	if (!tree) {
+ 		cgit_print_error_page(404, "Not found",
+-			"Not a tree object: %s", sha1_to_hex(sha1));
++			"Not a tree object: %s", sha1_to_hex(oid->hash));
+ 		return;
+ 	}
+ 
+@@ -380,7 +380,7 @@ void cgit_print_tree(const char *rev, char *path)
+ 			"Invalid revision name: %s", rev);
+ 		return;
+ 	}
+-	commit = lookup_commit_reference(oid.hash);
++	commit = lookup_commit_reference(&oid);
+ 	if (!commit || parse_commit(commit)) {
+ 		cgit_print_error_page(404, "Not found",
+ 			"Invalid commit reference: %s", rev);
+@@ -390,7 +390,7 @@ void cgit_print_tree(const char *rev, char *path)
+ 	walk_tree_ctx.curr_rev = xstrdup(rev);
+ 
+ 	if (path == NULL) {
+-		ls_tree(commit->tree->object.oid.hash, NULL, &walk_tree_ctx);
++		ls_tree(&commit->tree->object.oid, NULL, &walk_tree_ctx);
+ 		goto cleanup;
+ 	}
+ 
+-- 
+cgit v1.1-9-ge9c1d
+
diff --git a/devel/e2fsprogs-libss/Makefile b/devel/e2fsprogs-libss/Makefile
index 062ab0235da..0252efa1abe 100644
--- a/devel/e2fsprogs-libss/Makefile
+++ b/devel/e2fsprogs-libss/Makefile
@@ -8,6 +8,9 @@ PKGNAMESUFFIX=	-libss
 MAINTAINER=	kaduk-fbsd@mit.edu
 COMMENT=	Command-line interface parsing library from e2fsprogs
 
+LICENSE=	MIT
+LICENSE_FILE=	${INSTALL_WRKSRC}/ss.h
+
 CONFLICTS=	heimdal-[0-9]*
 CONFLICTS+=	krb4-[0-9]*
 
diff --git a/devel/elixir-calendar/Makefile b/devel/elixir-calendar/Makefile
index d709a5b8f50..ea1fa2bd4cd 100644
--- a/devel/elixir-calendar/Makefile
+++ b/devel/elixir-calendar/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	calendar
-PORTVERSION=	0.17.3
+PORTVERSION=	0.17.4
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 PKGNAMEPREFIX=	elixir-
diff --git a/devel/elixir-calendar/distinfo b/devel/elixir-calendar/distinfo
index 3eeb510f90a..6ae5b9079b5 100644
--- a/devel/elixir-calendar/distinfo
+++ b/devel/elixir-calendar/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499936945
-SHA256 (lau-calendar-v0.17.3_GH0.tar.gz) = 90cf5d571eee295cfbeecbe2c83798ab8184b6b1976b756ac2ceff4344a897d8
-SIZE (lau-calendar-v0.17.3_GH0.tar.gz) = 42962
+TIMESTAMP = 1502615753
+SHA256 (lau-calendar-v0.17.4_GH0.tar.gz) = 2cced60b69eb1e66cc37e8e9e58a3352e1eaa621c182d322606567080130f5b0
+SIZE (lau-calendar-v0.17.4_GH0.tar.gz) = 43048
diff --git a/devel/grpc/Makefile b/devel/grpc/Makefile
index 756e668b815..221292dac43 100644
--- a/devel/grpc/Makefile
+++ b/devel/grpc/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	grpc
-PORTVERSION=	1.4.3
+PORTVERSION=	1.4.5
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
diff --git a/devel/grpc/distinfo b/devel/grpc/distinfo
index e85c6da962d..1d7d8306920 100644
--- a/devel/grpc/distinfo
+++ b/devel/grpc/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1502184884
-SHA256 (grpc-grpc-v1.4.3_GH0.tar.gz) = d377edf3e37901ef7c11a0506ed6069dba9fc49ba477fe4fec45f9b9158952cd
-SIZE (grpc-grpc-v1.4.3_GH0.tar.gz) = 4829049
+TIMESTAMP = 1502460528
+SHA256 (grpc-grpc-v1.4.5_GH0.tar.gz) = 39545c6e3d5a41c6cdd42ef7ff8288bc58bacf47b791ed324268cdfa999db9df
+SIZE (grpc-grpc-v1.4.5_GH0.tar.gz) = 4834127
 SHA256 (google-boringssl-ba2d3df_GH0.tar.gz) = 2dca8694f422c90a083493c1cbfd43e8f70f77a79f9ffda1131998af14d59ff4
 SIZE (google-boringssl-ba2d3df_GH0.tar.gz) = 13152379
 SHA256 (google-benchmark-v1.2.0_GH0.tar.gz) = 3dcc90c158838e2ac4a7ad06af9e28eb5877cf28252a81e55eb3c836757d3070
diff --git a/devel/lfcbase/Makefile b/devel/lfcbase/Makefile
index 6147fa656fe..61f91bedbff 100644
--- a/devel/lfcbase/Makefile
+++ b/devel/lfcbase/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	lfcbase
-PORTVERSION=	1.9.7
+PORTVERSION=	1.10.0
 CATEGORIES=	devel
 MASTER_SITES=	http://www.lemke-it.com/
 
diff --git a/devel/lfcbase/distinfo b/devel/lfcbase/distinfo
index 0227b59a6d4..b1391139014 100644
--- a/devel/lfcbase/distinfo
+++ b/devel/lfcbase/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1498713532
-SHA256 (lfcbase-1.9.7.tar.gz) = 0abd030d20f199fdd554366b55f3176bce732eba4fcf670ad58ea885eea9c64d
-SIZE (lfcbase-1.9.7.tar.gz) = 615245
+TIMESTAMP = 1502538856
+SHA256 (lfcbase-1.10.0.tar.gz) = f513aed43078e542013c74009dba5316aa57bb69a46b327eaaf28256f0736ff1
+SIZE (lfcbase-1.10.0.tar.gz) = 615555
diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile
index 45727bf694b..99cec1daa03 100644
--- a/devel/mercurial/Makefile
+++ b/devel/mercurial/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mercurial
-PORTVERSION=	4.2.2
+PORTVERSION=	4.3.1
 CATEGORIES=	devel python
 MASTER_SITES=	https://www.mercurial-scm.org/release/
 
@@ -52,14 +52,12 @@ CONTRIB_FILES=	bash_completion \
 		vim/hgtest.vim \
 		vim/patchreview.txt \
 		vim/patchreview.vim
-DOCS=		CONTRIBUTORS README
+PORTDOCS=	CONTRIBUTORS README
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${STAGEDIR}${PREFIX}/man/man1/
 	${INSTALL_MAN} ${WRKSRC}/doc/*.5 ${STAGEDIR}${PREFIX}/man/man5/
-	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/*.so
-	${STRIP_CMD} \
-		${STAGEDIR}${PYTHON_SITELIBDIR}/hgext/fsmonitor/pywatchman/*.so
+	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/ -name '*.so' -exec ${STRIP_CMD} {} +
 
 post-install-DATA-on:
 .for d in hgsh vim
@@ -74,6 +72,6 @@ post-install-DATA-on:
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/mercurial/distinfo b/devel/mercurial/distinfo
index 9be00fe6a75..108022fc7b3 100644
--- a/devel/mercurial/distinfo
+++ b/devel/mercurial/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499364310
-SHA256 (mercurial-4.2.2.tar.gz) = b20132dec5ae6d27ee43a133144069895befe09f7e454bfa9e39950a185f0afe
-SIZE (mercurial-4.2.2.tar.gz) = 5319282
+TIMESTAMP = 1502528542
+SHA256 (mercurial-4.3.1.tar.gz) = 2b12f02e3a452adff4ec9cf007017bab0cadb3f37eaf12f4b25a662df73618a2
+SIZE (mercurial-4.3.1.tar.gz) = 5475042
diff --git a/devel/mercurial/pkg-plist b/devel/mercurial/pkg-plist
index 206d5f5a8a1..1d25673f588 100644
--- a/devel/mercurial/pkg-plist
+++ b/devel/mercurial/pkg-plist
@@ -1,10 +1,22 @@
 bin/hg
+%%PYTHON_SITELIBDIR%%/hgdemandimport/__init__.py
+%%PYTHON_SITELIBDIR%%/hgdemandimport/__init__.pyc
+%%PYTHON_SITELIBDIR%%/hgdemandimport/__init__.pyo
+%%PYTHON_SITELIBDIR%%/hgdemandimport/demandimportpy2.py
+%%PYTHON_SITELIBDIR%%/hgdemandimport/demandimportpy2.pyc
+%%PYTHON_SITELIBDIR%%/hgdemandimport/demandimportpy2.pyo
+%%PYTHON_SITELIBDIR%%/hgdemandimport/demandimportpy3.py
+%%PYTHON_SITELIBDIR%%/hgdemandimport/demandimportpy3.pyc
+%%PYTHON_SITELIBDIR%%/hgdemandimport/demandimportpy3.pyo
 %%PYTHON_SITELIBDIR%%/hgext/__init__.py
 %%PYTHON_SITELIBDIR%%/hgext/__init__.pyc
 %%PYTHON_SITELIBDIR%%/hgext/__init__.pyo
 %%PYTHON_SITELIBDIR%%/hgext/acl.py
 %%PYTHON_SITELIBDIR%%/hgext/acl.pyc
 %%PYTHON_SITELIBDIR%%/hgext/acl.pyo
+%%PYTHON_SITELIBDIR%%/hgext/amend.py
+%%PYTHON_SITELIBDIR%%/hgext/amend.pyc
+%%PYTHON_SITELIBDIR%%/hgext/amend.pyo
 %%PYTHON_SITELIBDIR%%/hgext/automv.py
 %%PYTHON_SITELIBDIR%%/hgext/automv.pyc
 %%PYTHON_SITELIBDIR%%/hgext/automv.pyo
@@ -26,9 +38,9 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/hgext/clonebundles.py
 %%PYTHON_SITELIBDIR%%/hgext/clonebundles.pyc
 %%PYTHON_SITELIBDIR%%/hgext/clonebundles.pyo
-%%PYTHON_SITELIBDIR%%/hgext/color.py
-%%PYTHON_SITELIBDIR%%/hgext/color.pyc
-%%PYTHON_SITELIBDIR%%/hgext/color.pyo
+%%PYTHON_SITELIBDIR%%/hgext/commitextras.py
+%%PYTHON_SITELIBDIR%%/hgext/commitextras.pyc
+%%PYTHON_SITELIBDIR%%/hgext/commitextras.pyo
 %%PYTHON_SITELIBDIR%%/hgext/convert/__init__.py
 %%PYTHON_SITELIBDIR%%/hgext/convert/__init__.pyc
 %%PYTHON_SITELIBDIR%%/hgext/convert/__init__.pyo
@@ -198,6 +210,9 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/hgext/record.py
 %%PYTHON_SITELIBDIR%%/hgext/record.pyc
 %%PYTHON_SITELIBDIR%%/hgext/record.pyo
+%%PYTHON_SITELIBDIR%%/hgext/releasenotes.py
+%%PYTHON_SITELIBDIR%%/hgext/releasenotes.pyc
+%%PYTHON_SITELIBDIR%%/hgext/releasenotes.pyo
 %%PYTHON_SITELIBDIR%%/hgext/relink.py
 %%PYTHON_SITELIBDIR%%/hgext/relink.pyc
 %%PYTHON_SITELIBDIR%%/hgext/relink.pyo
@@ -213,6 +228,9 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/hgext/show.py
 %%PYTHON_SITELIBDIR%%/hgext/show.pyc
 %%PYTHON_SITELIBDIR%%/hgext/show.pyo
+%%PYTHON_SITELIBDIR%%/hgext/sparse.py
+%%PYTHON_SITELIBDIR%%/hgext/sparse.pyc
+%%PYTHON_SITELIBDIR%%/hgext/sparse.pyo
 %%PYTHON_SITELIBDIR%%/hgext/strip.py
 %%PYTHON_SITELIBDIR%%/hgext/strip.pyc
 %%PYTHON_SITELIBDIR%%/hgext/strip.pyo
@@ -249,8 +267,6 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/archival.py
 %%PYTHON_SITELIBDIR%%/mercurial/archival.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/archival.pyo
-%%PYTHON_SITELIBDIR%%/mercurial/base85.so
-%%PYTHON_SITELIBDIR%%/mercurial/bdiff.so
 %%PYTHON_SITELIBDIR%%/mercurial/bookmarks.py
 %%PYTHON_SITELIBDIR%%/mercurial/bookmarks.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/bookmarks.pyo
@@ -266,6 +282,45 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/byterange.py
 %%PYTHON_SITELIBDIR%%/mercurial/byterange.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/byterange.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/cext/__init__.py
+%%PYTHON_SITELIBDIR%%/mercurial/cext/__init__.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/cext/__init__.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/cext/base85.so
+%%PYTHON_SITELIBDIR%%/mercurial/cext/bdiff.so
+%%PYTHON_SITELIBDIR%%/mercurial/cext/diffhelpers.so
+%%PYTHON_SITELIBDIR%%/mercurial/cext/mpatch.so
+%%PYTHON_SITELIBDIR%%/mercurial/cext/osutil.so
+%%PYTHON_SITELIBDIR%%/mercurial/cext/parsers.so
+%%PYTHON_SITELIBDIR%%/mercurial/cffi/__init__.py
+%%PYTHON_SITELIBDIR%%/mercurial/cffi/__init__.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/cffi/__init__.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/cffi/base85.py
+%%PYTHON_SITELIBDIR%%/mercurial/cffi/base85.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/cffi/base85.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/cffi/bdiff.py
+%%PYTHON_SITELIBDIR%%/mercurial/cffi/bdiff.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/cffi/bdiff.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/cffi/bdiffbuild.py
+%%PYTHON_SITELIBDIR%%/mercurial/cffi/bdiffbuild.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/cffi/bdiffbuild.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/cffi/diffhelpers.py
+%%PYTHON_SITELIBDIR%%/mercurial/cffi/diffhelpers.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/cffi/diffhelpers.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/cffi/mpatch.py
+%%PYTHON_SITELIBDIR%%/mercurial/cffi/mpatch.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/cffi/mpatch.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/cffi/mpatchbuild.py
+%%PYTHON_SITELIBDIR%%/mercurial/cffi/mpatchbuild.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/cffi/mpatchbuild.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/cffi/osutil.py
+%%PYTHON_SITELIBDIR%%/mercurial/cffi/osutil.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/cffi/osutil.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/cffi/osutilbuild.py
+%%PYTHON_SITELIBDIR%%/mercurial/cffi/osutilbuild.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/cffi/osutilbuild.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/cffi/parsers.py
+%%PYTHON_SITELIBDIR%%/mercurial/cffi/parsers.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/cffi/parsers.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/changegroup.py
 %%PYTHON_SITELIBDIR%%/mercurial/changegroup.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/changegroup.pyo
@@ -290,6 +345,9 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/config.py
 %%PYTHON_SITELIBDIR%%/mercurial/config.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/config.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/configitems.py
+%%PYTHON_SITELIBDIR%%/mercurial/configitems.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/configitems.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/context.py
 %%PYTHON_SITELIBDIR%%/mercurial/context.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/context.pyo
@@ -299,6 +357,9 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/crecord.py
 %%PYTHON_SITELIBDIR%%/mercurial/crecord.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/crecord.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/dagop.py
+%%PYTHON_SITELIBDIR%%/mercurial/dagop.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/dagop.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/dagparser.py
 %%PYTHON_SITELIBDIR%%/mercurial/dagparser.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/dagparser.pyo
@@ -309,13 +370,9 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/debugcommands.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/debugcommands.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/default.d/mergetools.rc
-%%PYTHON_SITELIBDIR%%/mercurial/demandimport.py
-%%PYTHON_SITELIBDIR%%/mercurial/demandimport.pyc
-%%PYTHON_SITELIBDIR%%/mercurial/demandimport.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/destutil.py
 %%PYTHON_SITELIBDIR%%/mercurial/destutil.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/destutil.pyo
-%%PYTHON_SITELIBDIR%%/mercurial/diffhelpers.so
 %%PYTHON_SITELIBDIR%%/mercurial/dirstate.py
 %%PYTHON_SITELIBDIR%%/mercurial/dirstate.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/dirstate.pyo
@@ -495,7 +552,6 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/minirst.py
 %%PYTHON_SITELIBDIR%%/mercurial/minirst.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/minirst.pyo
-%%PYTHON_SITELIBDIR%%/mercurial/mpatch.so
 %%PYTHON_SITELIBDIR%%/mercurial/namespaces.py
 %%PYTHON_SITELIBDIR%%/mercurial/namespaces.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/namespaces.pyo
@@ -505,11 +561,12 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/obsolete.py
 %%PYTHON_SITELIBDIR%%/mercurial/obsolete.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/obsolete.pyo
-%%PYTHON_SITELIBDIR%%/mercurial/osutil.so
+%%PYTHON_SITELIBDIR%%/mercurial/obsutil.py
+%%PYTHON_SITELIBDIR%%/mercurial/obsutil.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/obsutil.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/parser.py
 %%PYTHON_SITELIBDIR%%/mercurial/parser.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/parser.pyo
-%%PYTHON_SITELIBDIR%%/mercurial/parsers.so
 %%PYTHON_SITELIBDIR%%/mercurial/patch.py
 %%PYTHON_SITELIBDIR%%/mercurial/patch.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/patch.pyo
@@ -594,6 +651,9 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/scmwindows.py
 %%PYTHON_SITELIBDIR%%/mercurial/scmwindows.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/scmwindows.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/selectors2.py
+%%PYTHON_SITELIBDIR%%/mercurial/selectors2.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/selectors2.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/server.py
 %%PYTHON_SITELIBDIR%%/mercurial/server.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/server.pyo
@@ -609,6 +669,9 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/smartset.py
 %%PYTHON_SITELIBDIR%%/mercurial/smartset.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/smartset.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/sparse.py
+%%PYTHON_SITELIBDIR%%/mercurial/sparse.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/sparse.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/sshpeer.py
 %%PYTHON_SITELIBDIR%%/mercurial/sshpeer.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/sshpeer.pyo
@@ -852,8 +915,6 @@ bin/hg
 man/man1/hg.1.gz
 man/man5/hgignore.5.gz
 man/man5/hgrc.5.gz
-%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTORS
-%%PORTDOCS%%%%DOCSDIR%%/README
 %%DATA%%%%DATADIR%%/contrib/bash_completion
 %%DATA%%%%DATADIR%%/contrib/casesmash.py
 %%DATA%%%%DATADIR%%/contrib/check-code.py
diff --git a/devel/p5-Data-Alias/Makefile b/devel/p5-Data-Alias/Makefile
index ab43f657844..9e05520f4bc 100644
--- a/devel/p5-Data-Alias/Makefile
+++ b/devel/p5-Data-Alias/Makefile
@@ -19,4 +19,10 @@ USE_PERL5=	configure
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Data/Alias/Alias.so
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} >= 502501
+BROKEN=		Does not build, op_sibling usage. https://rt.cpan.org/Public/Bug/Display.html?id=114544
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/p5-Devel-BeginLift/Makefile b/devel/p5-Devel-BeginLift/Makefile
index f0f6fb2834e..a949883dce0 100644
--- a/devel/p5-Devel-BeginLift/Makefile
+++ b/devel/p5-Devel-BeginLift/Makefile
@@ -18,4 +18,10 @@ BUILD_DEPENDS:=	${RUN_DEPENDS} \
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} >= 502501
+BROKEN=		Does not build, op_sibling usage. https://rt.cpan.org/Public/Bug/Display.html?id=115272
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/p5-Module-Starter/Makefile b/devel/p5-Module-Starter/Makefile
index 7186d97647a..792a21b4ca0 100644
--- a/devel/p5-Module-Starter/Makefile
+++ b/devel/p5-Module-Starter/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Module-Starter
-PORTVERSION=	1.72
+PORTVERSION=	1.73
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -12,6 +12,10 @@ COMMENT=	Simple starter kit for any Perl module
 
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BUILD_DEPENDS=	p5-Module-Runtime>=0:devel/p5-Module-Runtime
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PORTSCOUT=	skipv:1.470
 
diff --git a/devel/p5-Module-Starter/distinfo b/devel/p5-Module-Starter/distinfo
index 4d04196d463..c5c95594c29 100644
--- a/devel/p5-Module-Starter/distinfo
+++ b/devel/p5-Module-Starter/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1490609371
-SHA256 (Module-Starter-1.72.tar.gz) = dd924c521538d96c0e4b5a5c911945aba42ed28f9b194c9ffe04f6f8aaf61e10
-SIZE (Module-Starter-1.72.tar.gz) = 54725
+TIMESTAMP = 1502473904
+SHA256 (Module-Starter-1.73.tar.gz) = 80299e53b7e4db4840dd7174740ea60a679cbb38a5e17d256a0f82fd9b3b8ae5
+SIZE (Module-Starter-1.73.tar.gz) = 61368
diff --git a/devel/p5-MooseX-NonMoose/Makefile b/devel/p5-MooseX-NonMoose/Makefile
index d1b7c4e49fa..9bb470ba1e6 100644
--- a/devel/p5-MooseX-NonMoose/Makefile
+++ b/devel/p5-MooseX-NonMoose/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	MooseX-NonMoose
 PORTVERSION=	0.26
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -13,14 +13,17 @@ COMMENT=	Easy subclassing of non-Moose classes
 
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Module-Runtime>=0:devel/p5-Module-Runtime \
+BUILD_DEPENDS=	p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Module-Runtime>=0:devel/p5-Module-Runtime \
 		p5-Moose>=2:devel/p5-Moose \
 		p5-Try-Tiny>=0:lang/p5-Try-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-MooseX-InsideOut>=0:devel/p5-MooseX-InsideOut \
 		p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
+NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure
 
diff --git a/devel/p5-Regexp-Compare/Makefile b/devel/p5-Regexp-Compare/Makefile
index c48b1ff0781..ced4094cad4 100644
--- a/devel/p5-Regexp-Compare/Makefile
+++ b/devel/p5-Regexp-Compare/Makefile
@@ -19,4 +19,10 @@ USES=		perl5
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Regexp/Compare/Compare.so
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} >= 502700
+BROKEN=		Does not support 5.27+
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/p5-TAP-Formatter-JUnit/Makefile b/devel/p5-TAP-Formatter-JUnit/Makefile
index 0c5da907298..252269a820d 100644
--- a/devel/p5-TAP-Formatter-JUnit/Makefile
+++ b/devel/p5-TAP-Formatter-JUnit/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	TAP-Formatter-JUnit
 PORTVERSION=	0.11
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -18,7 +18,6 @@ RUN_DEPENDS=	\
 	p5-MooseX-NonMoose>0:devel/p5-MooseX-NonMoose \
 	p5-File-Slurp>0:devel/p5-File-Slurp \
 	p5-XML-Generator>0:textproc/p5-XML-Generator \
-	p5-Test-Harness>3.12:devel/p5-Test-Harness \
 	p5-List-MoreUtils>0:lang/p5-List-MoreUtils
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 TEST_DEPENDS=	p5-IO-stringy>=0:devel/p5-IO-stringy
diff --git a/devel/p5-TAP-Formatter-JUnit/pkg-plist b/devel/p5-TAP-Formatter-JUnit/pkg-plist
index e12aae72b13..f093a612ee1 100644
--- a/devel/p5-TAP-Formatter-JUnit/pkg-plist
+++ b/devel/p5-TAP-Formatter-JUnit/pkg-plist
@@ -1,8 +1,8 @@
 bin/tap2junit
-%%PERL5_MAN1%%/tap2junit.1.gz
 %%SITE_PERL%%/TAP/Formatter/JUnit.pm
 %%SITE_PERL%%/TAP/Formatter/JUnit/Result.pm
 %%SITE_PERL%%/TAP/Formatter/JUnit/Session.pm
+%%PERL5_MAN1%%/tap2junit.1.gz
 %%PERL5_MAN3%%/TAP::Formatter::JUnit.3.gz
 %%PERL5_MAN3%%/TAP::Formatter::JUnit::Result.3.gz
 %%PERL5_MAN3%%/TAP::Formatter::JUnit::Session.3.gz
diff --git a/devel/p5-UNIVERSAL-ref/Makefile b/devel/p5-UNIVERSAL-ref/Makefile
index 07d0b17866d..5f8e1553817 100644
--- a/devel/p5-UNIVERSAL-ref/Makefile
+++ b/devel/p5-UNIVERSAL-ref/Makefile
@@ -17,4 +17,10 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} >= 502501
+BROKEN=		Does not build, op_sibling usage. https://rt.cpan.org/Public/Bug/Display.html?id=118008
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/p5-rpm-build-perl/Makefile b/devel/p5-rpm-build-perl/Makefile
index 1867728ccb1..f3c29bae743 100644
--- a/devel/p5-rpm-build-perl/Makefile
+++ b/devel/p5-rpm-build-perl/Makefile
@@ -19,4 +19,10 @@ USE_PERL5=	configure
 post-patch:
 	@${REINPLACE_CMD} -e 's| perl.clean||' ${WRKSRC}/Makefile.PL
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} >= 502501
+BROKEN=		Does not build, op_sibling usage. https://rt.cpan.org/Public/Bug/Display.html?id=117350
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/p5-subversion/Makefile b/devel/p5-subversion/Makefile
index f40d28154d4..ecbca0b10b3 100644
--- a/devel/p5-subversion/Makefile
+++ b/devel/p5-subversion/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PKGNAMEPREFIX=	p5-
-PORTREVISION=	2
+PORTREVISION=	0
 
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	Perl bindings for Version control system
diff --git a/devel/py-jcc/Makefile b/devel/py-jcc/Makefile
index 62d377366db..db6020a55c6 100644
--- a/devel/py-jcc/Makefile
+++ b/devel/py-jcc/Makefile
@@ -2,21 +2,22 @@
 # $FreeBSD$
 
 PORTNAME=	jcc
-PORTVERSION=	2.23
+PORTVERSION=	3.0
 CATEGORIES=	devel java python
 MASTER_SITES=	CHEESESHOP/source/J/JCC
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	JCC-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	dbaio@FreeBSD.org
 COMMENT=	C++ code generator for calling Java from C++/Python
 
 LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_armv6=		fails to link: /nxb-bin/usr/bin/ld: cannot find -ljava
 
 USES=		python
-USE_PYTHON=	distutils
+USE_PYTHON=	distutils autoplist
 PYDISTUTILS_PKGNAME=	JCC
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
@@ -35,6 +36,6 @@ MAKE_ENV+=	JCC_INCLUDES=${JCC_INCLUDES} JCC_CFLAGS=${JCC_CFLAGS} \
 		JCC_JAVAC=javac JCC_ARGSEP=";"
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/jcc/_jcc.so
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/jcc/_jcc${PYTHON_MAJOR_VER}.so
 
 .include <bsd.port.mk>
diff --git a/devel/py-jcc/distinfo b/devel/py-jcc/distinfo
index e9eed40995f..3fb29d4e897 100644
--- a/devel/py-jcc/distinfo
+++ b/devel/py-jcc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1487559424
-SHA256 (JCC-2.23.tar.gz) = d463c8592f79ac0b8e67208c504899a6c2a9d410586a769e2a670f55c7487c5f
-SIZE (JCC-2.23.tar.gz) = 97242
+TIMESTAMP = 1502582487
+SHA256 (JCC-3.0.tar.gz) = 52dc7ae13a8e81d78afbc0f13e88ecbdf969673923425a4d65021ae241d99b91
+SIZE (JCC-3.0.tar.gz) = 176276
diff --git a/devel/py-jcc/files/patch-jcc_sources_JArray.cpp b/devel/py-jcc/files/patch-jcc2_sources_JArray.cpp
similarity index 70%
rename from devel/py-jcc/files/patch-jcc_sources_JArray.cpp
rename to devel/py-jcc/files/patch-jcc2_sources_JArray.cpp
index 3624488e62c..0edf266f2d3 100644
--- a/devel/py-jcc/files/patch-jcc_sources_JArray.cpp
+++ b/devel/py-jcc/files/patch-jcc2_sources_JArray.cpp
@@ -1,6 +1,6 @@
---- jcc/sources/JArray.cpp.orig	2014-02-05 23:36:44 UTC
-+++ jcc/sources/JArray.cpp
-@@ -312,7 +312,7 @@ static PyObject *seq_concat(U *self, PyO
+--- jcc2/sources/JArray.cpp.orig	2017-08-13 00:37:59 UTC
++++ jcc2/sources/JArray.cpp
+@@ -312,7 +312,7 @@ static PyObject *seq_concat(U *self, PyObject *arg)
      PyObject *list = toSequence<U>(self);
  
      if (list != NULL &&
@@ -9,7 +9,7 @@
      {
          Py_DECREF(list);
          return NULL;
-@@ -327,7 +327,7 @@ static PyObject *seq_repeat(U *self, Py_
+@@ -327,7 +327,7 @@ static PyObject *seq_repeat(U *self, Py_ssize_t n)
      PyObject *list = toSequence<U>(self);
  
      if (list != NULL &&
diff --git a/devel/py-jcc/files/patch-jcc3_sources_JArray.cpp b/devel/py-jcc/files/patch-jcc3_sources_JArray.cpp
new file mode 100644
index 00000000000..e2c0a2ca289
--- /dev/null
+++ b/devel/py-jcc/files/patch-jcc3_sources_JArray.cpp
@@ -0,0 +1,20 @@
+--- jcc3/sources/JArray.cpp.orig	2017-08-13 00:38:32 UTC
++++ jcc3/sources/JArray.cpp
+@@ -312,7 +312,7 @@ static PyObject *seq_concat(U *self, PyObject *arg)
+     PyObject *list = toSequence<U>(self);
+ 
+     if (list != NULL &&
+-        PyList_Type.tp_as_sequence->sq_inplace_concat(list, arg) < 0)
++        PyList_Type.tp_as_sequence->sq_inplace_concat(list, arg) == NULL)
+     {
+         Py_DECREF(list);
+         return NULL;
+@@ -327,7 +327,7 @@ static PyObject *seq_repeat(U *self, Py_ssize_t n)
+     PyObject *list = toSequence<U>(self);
+ 
+     if (list != NULL &&
+-        PyList_Type.tp_as_sequence->sq_inplace_repeat(list, n) < 0)
++        PyList_Type.tp_as_sequence->sq_inplace_repeat(list, n) == NULL)
+     {
+         Py_DECREF(list);
+         return NULL;
diff --git a/devel/py-jcc/pkg-plist b/devel/py-jcc/pkg-plist
deleted file mode 100644
index a7423ad5177..00000000000
--- a/devel/py-jcc/pkg-plist
+++ /dev/null
@@ -1,34 +0,0 @@
-%%PYTHON_SITELIBDIR%%/jcc/__init__.py
-%%PYTHON_SITELIBDIR%%/jcc/__init__.pyc
-%%PYTHON_SITELIBDIR%%/jcc/__init__.pyo
-%%PYTHON_SITELIBDIR%%/jcc/__main__.py
-%%PYTHON_SITELIBDIR%%/jcc/__main__.pyc
-%%PYTHON_SITELIBDIR%%/jcc/__main__.pyo
-%%PYTHON_SITELIBDIR%%/jcc/_jcc.so
-%%PYTHON_SITELIBDIR%%/jcc/config.py
-%%PYTHON_SITELIBDIR%%/jcc/config.pyc
-%%PYTHON_SITELIBDIR%%/jcc/config.pyo
-%%PYTHON_SITELIBDIR%%/jcc/cpp.py
-%%PYTHON_SITELIBDIR%%/jcc/cpp.pyc
-%%PYTHON_SITELIBDIR%%/jcc/cpp.pyo
-%%PYTHON_SITELIBDIR%%/jcc/patches/patch.4195
-%%PYTHON_SITELIBDIR%%/jcc/patches/patch.43.0.6c11
-%%PYTHON_SITELIBDIR%%/jcc/patches/patch.43.0.6c7
-%%PYTHON_SITELIBDIR%%/jcc/python.py
-%%PYTHON_SITELIBDIR%%/jcc/python.pyc
-%%PYTHON_SITELIBDIR%%/jcc/python.pyo
-%%PYTHON_SITELIBDIR%%/jcc/sources/JArray.cpp
-%%PYTHON_SITELIBDIR%%/jcc/sources/JArray.h
-%%PYTHON_SITELIBDIR%%/jcc/sources/JCCEnv.cpp
-%%PYTHON_SITELIBDIR%%/jcc/sources/JCCEnv.h
-%%PYTHON_SITELIBDIR%%/jcc/sources/JObject.cpp
-%%PYTHON_SITELIBDIR%%/jcc/sources/JObject.h
-%%PYTHON_SITELIBDIR%%/jcc/sources/functions.cpp
-%%PYTHON_SITELIBDIR%%/jcc/sources/functions.h
-%%PYTHON_SITELIBDIR%%/jcc/sources/jcc.cpp
-%%PYTHON_SITELIBDIR%%/jcc/sources/jccfuncs.h
-%%PYTHON_SITELIBDIR%%/jcc/sources/macros.h
-%%PYTHON_SITELIBDIR%%/jcc/sources/types.cpp
-%%PYTHON_SITELIBDIR%%/jcc/windows.py
-%%PYTHON_SITELIBDIR%%/jcc/windows.pyc
-%%PYTHON_SITELIBDIR%%/jcc/windows.pyo
diff --git a/devel/py-jep/Makefile b/devel/py-jep/Makefile
index b2025fc0fff..679eff35ddd 100644
--- a/devel/py-jep/Makefile
+++ b/devel/py-jep/Makefile
@@ -2,24 +2,25 @@
 # $FreeBSD$
 
 PORTNAME=	jep
-PORTVERSION=	3.6.4
+PORTVERSION=	3.7.0
 CATEGORIES=	devel java python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	dbaio@FreeBSD.org
 COMMENT=	Java Embedded Python
 
 LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+USES=		python
+USE_PYTHON=	distutils
+
 CONFIGURE_ENV=	JAVA_HOME=${JAVA_HOME}
 MAKE_ENV=	JAVA_HOME=${JAVA_HOME}
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
+JAVA_VERSION=	1.7+
 USE_LDCONFIG=	yes
-USES=		python
-USE_PYTHON=	distutils
 PLIST_SUB+=	VERSION=${PORTVERSION}
 
 # Necessary, since the configure script does the LIBS and
diff --git a/devel/py-jep/distinfo b/devel/py-jep/distinfo
index d577cc80b71..70b04d165cc 100644
--- a/devel/py-jep/distinfo
+++ b/devel/py-jep/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1497361453
-SHA256 (jep-3.6.4.tar.gz) = 80396c14db98108ddab15ff159ae1db63021730cb868b7f8d463814cdc397a45
-SIZE (jep-3.6.4.tar.gz) = 259229
+TIMESTAMP = 1502584229
+SHA256 (jep-3.7.0.tar.gz) = 0e326a1ff300aefd4a8271d3efbe0aa8a63427cbf030e84394725685052443fd
+SIZE (jep-3.7.0.tar.gz) = 275560
diff --git a/devel/py-jira/Makefile b/devel/py-jira/Makefile
index 18e64f3300a..9d36ac0e006 100644
--- a/devel/py-jira/Makefile
+++ b/devel/py-jira/Makefile
@@ -2,27 +2,30 @@
 # $FreeBSD$
 
 PORTNAME=	jira
-PORTVERSION=	0.32
+PORTVERSION=	1.0.10
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	akosiaris+ports@gmail.com
+MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Library to ease use of the JIRA 5 REST APIs
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner \
+		${PYTHON_PKGNAMEPREFIX}pbr>=1.9:devel/py-pbr
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=1.2.3:www/py-requests \
 		${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.3.3:www/py-requests-oauthlib \
 		${PYTHON_PKGNAMEPREFIX}tlslite>=0.4.4:security/py-tlslite \
 		${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto
+		${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto \
+		${PYTHON_PKGNAMEPREFIX}pbr>=1.9:devel/py-pbr
 TEST_DEPENDS:=	${RUN_DEPENDS} \
 		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
 
 OPTIONS_DEFINE=		MAGIC PARALLEL SHELL TESTS
-OPTIONS_DEFAULT=	MAGIC PARALLEL
+OPTIONS_DEFAULT=	MAGIC PARALLEL SHELL
 
 MAGIC_DESC=	Enable Content-Type Auto-detection
 PARALLEL_DESC=	Enable asynchronous requests
diff --git a/devel/py-jira/distinfo b/devel/py-jira/distinfo
index aefc482480e..16946952834 100644
--- a/devel/py-jira/distinfo
+++ b/devel/py-jira/distinfo
@@ -1,2 +1,3 @@
-SHA256 (jira-0.32.tar.gz) = 11d832d72d09b3d37800cba7a7b2529cc39c73465d0523c4f97abe74e072e096
-SIZE (jira-0.32.tar.gz) = 33015
+TIMESTAMP = 1500324567
+SHA256 (jira-1.0.10.tar.gz) = 409a0a94800f05a1e8e078540eb5610e243586bd5ee9bc8cae8899cbbd061898
+SIZE (jira-1.0.10.tar.gz) = 98406
diff --git a/devel/py-jsonrpclib/Makefile b/devel/py-jsonrpclib/Makefile
index f488c1ff996..ae5f8bc88b4 100644
--- a/devel/py-jsonrpclib/Makefile
+++ b/devel/py-jsonrpclib/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	jsonrpclib
-PORTVERSION=	0.1.3
-PORTREVISION=	2
+PORTVERSION=	0.1.7
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-jsonrpclib/distinfo b/devel/py-jsonrpclib/distinfo
index 45858d391e0..7b424bad697 100644
--- a/devel/py-jsonrpclib/distinfo
+++ b/devel/py-jsonrpclib/distinfo
@@ -1,2 +1,3 @@
-SHA256 (jsonrpclib-0.1.3.tar.gz) = a594e702c35408ae5540086ab5bdea284fb27d09520898c381c5bbdbfceffbba
-SIZE (jsonrpclib-0.1.3.tar.gz) = 12468
+TIMESTAMP = 1494435006
+SHA256 (jsonrpclib-0.1.7.tar.gz) = 7f50239d53b5e95b94455d5e1adae70592b5b71f0e960d3bbbfbb125788e6f0b
+SIZE (jsonrpclib-0.1.7.tar.gz) = 13979
diff --git a/devel/py-pudb/Makefile b/devel/py-pudb/Makefile
index 2d9826b3109..9255f01ebb9 100644
--- a/devel/py-pudb/Makefile
+++ b/devel/py-pudb/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pudb
-PORTVERSION=	2017.1.2
+PORTVERSION=	2017.1.3
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-pudb/distinfo b/devel/py-pudb/distinfo
index 819240d332b..9cf647c831f 100644
--- a/devel/py-pudb/distinfo
+++ b/devel/py-pudb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1491494521
-SHA256 (pudb-2017.1.2.tar.gz) = 29d82ed05030146e5f2f9431926cc24f6c6c284cb451a4a850625fc0303e46e7
-SIZE (pudb-2017.1.2.tar.gz) = 53507
+TIMESTAMP = 1502640026
+SHA256 (pudb-2017.1.3.tar.gz) = 2ba6e91835ce3eccfb957addce3d1d0751aa16536b9864c8fd262d9863167a0b
+SIZE (pudb-2017.1.3.tar.gz) = 55283
diff --git a/devel/py-robotframework-pabot/Makefile b/devel/py-robotframework-pabot/Makefile
index be144cfe801..772f9fd5469 100644
--- a/devel/py-robotframework-pabot/Makefile
+++ b/devel/py-robotframework-pabot/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	robotframework-pabot
-PORTVERSION=	0.36
+PORTVERSION=	0.37
 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 a632988f673..db33b3c73ce 100644
--- a/devel/py-robotframework-pabot/distinfo
+++ b/devel/py-robotframework-pabot/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1491639298
-SHA256 (robotframework-pabot-0.36.tar.gz) = f13594a618a2513a9795410b8c30ab8b0e70cda341382e97b9056a9918812165
-SIZE (robotframework-pabot-0.36.tar.gz) = 10948
+TIMESTAMP = 1502406789
+SHA256 (robotframework-pabot-0.37.tar.gz) = 3665055fc59a4df64d7044ebb390191269117033b19133ee0ba36527c1aa4034
+SIZE (robotframework-pabot-0.37.tar.gz) = 11282
diff --git a/devel/py-twilio/Makefile b/devel/py-twilio/Makefile
index 90d7b47b1af..016c8263cf2 100644
--- a/devel/py-twilio/Makefile
+++ b/devel/py-twilio/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	twilio
-PORTVERSION=	6.5.0
+PORTVERSION=	6.5.1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-twilio/distinfo b/devel/py-twilio/distinfo
index afad3990b2a..e1a5fe2ffe1 100644
--- a/devel/py-twilio/distinfo
+++ b/devel/py-twilio/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501231603
-SHA256 (twilio-6.5.0.tar.gz) = 4734b35eb02c20fecb573c53efe70c22d2cf5aa7f40b52e3c074ae4927d8242c
-SIZE (twilio-6.5.0.tar.gz) = 331686
+TIMESTAMP = 1502396038
+SHA256 (twilio-6.5.1.tar.gz) = b57120aa8566c360059015121bdccdbcfe101fcba4b51e47714294c2c453d4ff
+SIZE (twilio-6.5.1.tar.gz) = 332528
diff --git a/devel/py-wrapt/Makefile b/devel/py-wrapt/Makefile
index bdcd77fe30d..46c9c42e710 100644
--- a/devel/py-wrapt/Makefile
+++ b/devel/py-wrapt/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	wrapt
-PORTVERSION=	1.10.10
+PORTVERSION=	1.10.11
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-wrapt/distinfo b/devel/py-wrapt/distinfo
index b757bf53a76..c6af506fd49 100644
--- a/devel/py-wrapt/distinfo
+++ b/devel/py-wrapt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1491416518
-SHA256 (wrapt-1.10.10.tar.gz) = 42160c91b77f1bc64a955890038e02f2f72986c01d462d53cb6cb039b995cdd9
-SIZE (wrapt-1.10.10.tar.gz) = 27257
+TIMESTAMP = 1502528522
+SHA256 (wrapt-1.10.11.tar.gz) = d4d560d479f2c21e1b5443bbd15fe7ec4b37fe7e53d335d3b9b0a7b1226fe3c6
+SIZE (wrapt-1.10.11.tar.gz) = 27402
diff --git a/devel/riscv64-binutils/Makefile b/devel/riscv64-binutils/Makefile
index a1d672fe7c6..7c41060f329 100644
--- a/devel/riscv64-binutils/Makefile
+++ b/devel/riscv64-binutils/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	binutils
-PORTVERSION=	2.27.51.20161101
+PORTVERSION=	2.29.51.20170726
 CATEGORIES=	devel
 PKGNAMEPREFIX=	riscv64-
 
@@ -15,12 +15,12 @@ LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libmpc.so:math/mpc
 
+USES=	bison gmake libtool makeinfo
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd-riscv
 GH_PROJECT=	riscv-binutils-gdb
-GH_TAGNAME=	6da6b8c
-
-USES=	bison gmake libtool makeinfo
+GH_TAGNAME=	ba0b7ff
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--target=${PKGNAMEPREFIX}${OPSYS:tl} \
@@ -30,6 +30,7 @@ CONFIGURE_ARGS=	--target=${PKGNAMEPREFIX}${OPSYS:tl} \
 		--enable-tls \
 		--disable-werror \
 		--disable-nls \
+		--disable-intl \
 		--disable-shared \
 		--with-system-zlib \
 		--with-gmp=${LOCALBASE} \
diff --git a/devel/riscv64-binutils/distinfo b/devel/riscv64-binutils/distinfo
index 668c271b3bd..dfb11e395bf 100644
--- a/devel/riscv64-binutils/distinfo
+++ b/devel/riscv64-binutils/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1483168463
-SHA256 (freebsd-riscv-riscv-binutils-gdb-2.27.51.20161101-6da6b8c_GH0.tar.gz) = 953f48e6ad49a80a43e11aae9ee321eed8d71c92a7af4af90fd234faac1d4fe1
-SIZE (freebsd-riscv-riscv-binutils-gdb-2.27.51.20161101-6da6b8c_GH0.tar.gz) = 52868361
+TIMESTAMP = 1502302734
+SHA256 (freebsd-riscv-riscv-binutils-gdb-2.29.51.20170726-ba0b7ff_GH0.tar.gz) = 6f4a80fa8107a883ceb66df2867fe9487d08e58737f94acdbcb63fea93e96b3b
+SIZE (freebsd-riscv-riscv-binutils-gdb-2.29.51.20170726-ba0b7ff_GH0.tar.gz) = 54348986
diff --git a/devel/riscv64-gcc/Makefile b/devel/riscv64-gcc/Makefile
index b990359463c..ed108a845a4 100644
--- a/devel/riscv64-gcc/Makefile
+++ b/devel/riscv64-gcc/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gcc
-PORTVERSION=	6.1.0
+PORTVERSION=	7.1.1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	riscv64-
 
@@ -17,12 +17,14 @@ LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libmpc.so:math/mpc
 
+USES=	iconv gmake libtool makeinfo
+
+USE_LDCONFIG=	yes
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd-riscv
 GH_PROJECT=	riscv-gcc
-GH_TAGNAME=	095b1d6
-
-USES=	iconv gmake libtool makeinfo
+GH_TAGNAME=	b2cdb72
 
 NOPIE_PORTS=	yes
 NORELRO_PORTS=	yes
diff --git a/devel/riscv64-gcc/distinfo b/devel/riscv64-gcc/distinfo
index cf98065ee41..7989ca9105f 100644
--- a/devel/riscv64-gcc/distinfo
+++ b/devel/riscv64-gcc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1483183890
-SHA256 (freebsd-riscv-riscv-gcc-6.1.0-095b1d6_GH0.tar.gz) = 6fec73670cf15d5a61a9bd7d602d08cb4154a9dc67001d4ac257aff063e209e8
-SIZE (freebsd-riscv-riscv-gcc-6.1.0-095b1d6_GH0.tar.gz) = 117643726
+TIMESTAMP = 1502306294
+SHA256 (freebsd-riscv-riscv-gcc-7.1.1-b2cdb72_GH0.tar.gz) = e4be22d446a163f8cdf30ebdd9c4cb91a2846793205c89521a84abb8a9d6b6d3
+SIZE (freebsd-riscv-riscv-gcc-7.1.1-b2cdb72_GH0.tar.gz) = 97690613
diff --git a/devel/riscv64-gcc/pkg-plist b/devel/riscv64-gcc/pkg-plist
index b0efe2cd51f..8bd0907a860 100644
--- a/devel/riscv64-gcc/pkg-plist
+++ b/devel/riscv64-gcc/pkg-plist
@@ -7,6 +7,7 @@ bin/%%GCC_TARGET%%-gcc-ar
 bin/%%GCC_TARGET%%-gcc-nm
 bin/%%GCC_TARGET%%-gcc-ranlib
 bin/%%GCC_TARGET%%-gcov
+bin/%%GCC_TARGET%%-gcov-dump
 bin/%%GCC_TARGET%%-gcov-tool
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include-fixed/README
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include-fixed/limits.h
@@ -58,6 +59,7 @@ lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/backend.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/basic-block.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/bb-reorder.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/bitmap.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/brig-builtins.def
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/builtin-attrs.def
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/builtin-types.def
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/builtins.def
@@ -138,6 +140,7 @@ lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/double-int.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/dumpfile.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/dwarf2asm.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/dwarf2out.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/edit-context.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/emit-rtl.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/errors.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/et-forest.h
@@ -205,7 +208,8 @@ lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/hooks.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/hosthooks-def.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/hosthooks.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/hsa-brig-format.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/hsa.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/hsa-builtins.def
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/hsa-common.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/hw-doloop.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/hwint.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/ifcvt.h
@@ -232,7 +236,6 @@ lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/ipa-utils.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/ira-int.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/ira.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/is-a.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/java/java-tree.def
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/langhooks-def.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/langhooks.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/lcm.h
@@ -253,12 +256,17 @@ lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/machmode.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/md5.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/mem-stats-traits.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/mem-stats.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/memmodel.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/memory-block.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/mode-classes.def
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/objc/objc-tree.def
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/obstack.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/omp-builtins.def
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/omp-expand.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/omp-general.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/omp-grid.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/omp-low.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/omp-offload.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/optabs-libfuncs.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/optabs-query.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/optabs-tree.h
@@ -270,6 +278,7 @@ lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/opts.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/output.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/params-enum.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/params-list.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/params-options.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/params.def
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/params.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/params.list
@@ -288,6 +297,7 @@ lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/print-rtl.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/print-tree.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/profile.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/read-md.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/read-rtl-function.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/real.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/realmpfr.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/recog.h
@@ -305,6 +315,7 @@ lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/rtl.def
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/rtl.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/rtlhash.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/rtlhooks-def.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/run-rtl-passes.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/safe-ctype.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/sanitizer.def
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/sbitmap.h
@@ -313,10 +324,13 @@ lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/sdbout.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/sel-sched-dump.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/sel-sched-ir.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/sel-sched.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/selftest-rtl.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/selftest.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/sese.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/shrink-wrap.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/signop.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/sparseset.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/spellcheck-tree.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/spellcheck.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/splay-tree.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/sreal.h
@@ -328,6 +342,7 @@ lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/stmt.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/stor-layout.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/streamer-hooks.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/stringpool.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/substring-locations.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/symbol-summary.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/symtab.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/sync-builtins.def
@@ -361,6 +376,7 @@ lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-dump.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-eh.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-hash-traits.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-hasher.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-if-conv.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-inline.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-into-ssa.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-iterator.h
@@ -374,6 +390,7 @@ lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-pretty-print.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-scalar-evolution.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-ssa-address.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-ssa-alias.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-ssa-ccp.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-ssa-coalesce.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-ssa-dom.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-ssa-live.h
@@ -394,6 +411,7 @@ lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-ssanames.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-stdarg.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-streamer.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-vectorizer.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-vrp.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree.def
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/treestruct.def
@@ -429,4 +447,6 @@ libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/gengtype
 man/man1/%%GCC_TARGET%%-cpp.1.gz
 man/man1/%%GCC_TARGET%%-g++.1.gz
 man/man1/%%GCC_TARGET%%-gcc.1.gz
+man/man1/%%GCC_TARGET%%-gcov-dump.1.gz
+man/man1/%%GCC_TARGET%%-gcov-tool.1.gz
 man/man1/%%GCC_TARGET%%-gcov.1.gz
diff --git a/devel/rubygem-aws-sdk-core/Makefile b/devel/rubygem-aws-sdk-core/Makefile
index fab4632884d..d45b7620f13 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.17
+PORTVERSION=	2.10.25
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
@@ -14,8 +14,8 @@ RUN_DEPENDS=	rubygem-aws-sigv4>=1.0:devel/rubygem-aws-sigv4 \
 		rubygem-jmespath>=1.0:devel/rubygem-jmespath
 
 NO_ARCH=	yes
-USE_RUBY=	yes
 USES=		gem
+USE_RUBY=	yes
 
 PLIST_FILES=	bin/aws.rb
 
diff --git a/devel/rubygem-aws-sdk-core/distinfo b/devel/rubygem-aws-sdk-core/distinfo
index 4d6d8ce361b..de7aa19adf4 100644
--- a/devel/rubygem-aws-sdk-core/distinfo
+++ b/devel/rubygem-aws-sdk-core/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501085795
-SHA256 (rubygem/aws-sdk-core-2.10.17.gem) = cc20a4a261c22f557f4e91d8de506b7a05dbd3f77f0407f0760271cf5fc53108
-SIZE (rubygem/aws-sdk-core-2.10.17.gem) = 1042944
+TIMESTAMP = 1502528550
+SHA256 (rubygem/aws-sdk-core-2.10.25.gem) = 27906cbe8d2a8b5ab8bfbf797228074356723e4d819310d323412456230c664e
+SIZE (rubygem/aws-sdk-core-2.10.25.gem) = 1045504
diff --git a/devel/rubygem-aws-sdk-resources/Makefile b/devel/rubygem-aws-sdk-resources/Makefile
index 5870a85a25f..98fbf8c3a16 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.17
+PORTVERSION=	2.10.25
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
@@ -13,7 +13,7 @@ LICENSE=	APACHE20
 RUN_DEPENDS=	rubygem-aws-sdk-core>=${PORTVERSION}:devel/rubygem-aws-sdk-core
 
 NO_ARCH=	yes
-USE_RUBY=	yes
 USES=		gem
+USE_RUBY=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/rubygem-aws-sdk-resources/distinfo b/devel/rubygem-aws-sdk-resources/distinfo
index 12733bc609d..fae4d1fb77d 100644
--- a/devel/rubygem-aws-sdk-resources/distinfo
+++ b/devel/rubygem-aws-sdk-resources/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501085801
-SHA256 (rubygem/aws-sdk-resources-2.10.17.gem) = 2167f90d45c3048d49ed8db02feab404b24ecfe7fe8a00c6d5da175def931388
-SIZE (rubygem/aws-sdk-resources-2.10.17.gem) = 48640
+TIMESTAMP = 1502528556
+SHA256 (rubygem/aws-sdk-resources-2.10.25.gem) = 058b886ccc0910e750d3437d94c8527025a3161c91a5d2b397bb96ba0cbeef59
+SIZE (rubygem/aws-sdk-resources-2.10.25.gem) = 48640
diff --git a/devel/rubygem-aws-sdk/Makefile b/devel/rubygem-aws-sdk/Makefile
index 0ca0355775f..fe5f0eae546 100644
--- a/devel/rubygem-aws-sdk/Makefile
+++ b/devel/rubygem-aws-sdk/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	aws-sdk
-PORTVERSION=	2.10.17
+PORTVERSION=	2.10.25
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
@@ -13,7 +13,7 @@ LICENSE=	APACHE20
 RUN_DEPENDS=	rubygem-aws-sdk-resources>=${PORTVERSION}:devel/rubygem-aws-sdk-resources
 
 NO_ARCH=	yes
-USE_RUBY=	yes
 USES=		gem
+USE_RUBY=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/rubygem-aws-sdk/distinfo b/devel/rubygem-aws-sdk/distinfo
index b395154978f..f6fabb6a09b 100644
--- a/devel/rubygem-aws-sdk/distinfo
+++ b/devel/rubygem-aws-sdk/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501085806
-SHA256 (rubygem/aws-sdk-2.10.17.gem) = d61441ff315604d507c224a7c5f49c18df3484b400bf9073dfaaabbc7cdbb67d
-SIZE (rubygem/aws-sdk-2.10.17.gem) = 4608
+TIMESTAMP = 1502528562
+SHA256 (rubygem/aws-sdk-2.10.25.gem) = d950d1110341b43c5e0f2eaa043bb8201030f4f4af557c07b86432768f8df737
+SIZE (rubygem/aws-sdk-2.10.25.gem) = 4608
diff --git a/devel/rubygem-hocon/Makefile b/devel/rubygem-hocon/Makefile
new file mode 100644
index 00000000000..d2edc60839d
--- /dev/null
+++ b/devel/rubygem-hocon/Makefile
@@ -0,0 +1,19 @@
+# $FreeBSD$
+
+PORTNAME=	hocon
+PORTVERSION=	1.2.5
+CATEGORIES=	devel rubygems
+MASTER_SITES=	RG
+
+MAINTAINER=	puppet@FreeBSD.org
+COMMENT=	Ruby port of the Typesafe Config library
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		gem
+USE_RUBY=	yes
+
+PLIST_FILES=	bin/hocon
+
+.include <bsd.port.mk>
diff --git a/devel/rubygem-hocon/distinfo b/devel/rubygem-hocon/distinfo
new file mode 100644
index 00000000000..1981be1084f
--- /dev/null
+++ b/devel/rubygem-hocon/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499441345
+SHA256 (rubygem/hocon-1.2.5.gem) = 33b04b2e4e75a644c170b128df298367ce7278a7444e31382317f148717abe88
+SIZE (rubygem/hocon-1.2.5.gem) = 147968
diff --git a/devel/rubygem-hocon/pkg-descr b/devel/rubygem-hocon/pkg-descr
new file mode 100644
index 00000000000..75c8207a07a
--- /dev/null
+++ b/devel/rubygem-hocon/pkg-descr
@@ -0,0 +1,5 @@
+This is a port of the Typesafe Config library to Ruby.
+
+The library provides Ruby support for the HOCON configuration file format.
+
+WWW: https://github.com/puppetlabs/ruby-hocon
diff --git a/devel/rubygem-oj/Makefile b/devel/rubygem-oj/Makefile
index 599f4573e95..d284f7a92cc 100644
--- a/devel/rubygem-oj/Makefile
+++ b/devel/rubygem-oj/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	oj
-PORTVERSION=	3.3.4
+PORTVERSION=	3.3.5
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-oj/distinfo b/devel/rubygem-oj/distinfo
index 7d71fc67082..148d89e1342 100644
--- a/devel/rubygem-oj/distinfo
+++ b/devel/rubygem-oj/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501862798
-SHA256 (rubygem/oj-3.3.4.gem) = 261eebc23dfbc224b45a724630099e40146185c5bfde28a8b5320dec95d37cfd
-SIZE (rubygem/oj-3.3.4.gem) = 186368
+TIMESTAMP = 1502528569
+SHA256 (rubygem/oj-3.3.5.gem) = dccb1a27a0def29f1192fe2a9c2f9025b8af973830ca0d6b54d10a677e69abb4
+SIZE (rubygem/oj-3.3.5.gem) = 187392
diff --git a/devel/rubygem-pkg-config/Makefile b/devel/rubygem-pkg-config/Makefile
index 243d1741e0e..2a6f3dd9fcb 100644
--- a/devel/rubygem-pkg-config/Makefile
+++ b/devel/rubygem-pkg-config/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pkg-config
-PORTVERSION=	1.2.4
+PORTVERSION=	1.2.5
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-pkg-config/distinfo b/devel/rubygem-pkg-config/distinfo
index 4ce66e46d11..70a6f227010 100644
--- a/devel/rubygem-pkg-config/distinfo
+++ b/devel/rubygem-pkg-config/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502125673
-SHA256 (rubygem/pkg-config-1.2.4.gem) = cf3f95210991dd3e4c54b5e41ac7b7dfaeddb5a0564e437b63a7516c01e75802
-SIZE (rubygem/pkg-config-1.2.4.gem) = 19968
+TIMESTAMP = 1502473975
+SHA256 (rubygem/pkg-config-1.2.5.gem) = 59a13066e983a690be2256c00f69df44387370ec203a339eb65f7a021bfed514
+SIZE (rubygem/pkg-config-1.2.5.gem) = 20480
diff --git a/devel/rubygem-rspec-rails/Makefile b/devel/rubygem-rspec-rails/Makefile
index 3d726be30c4..8b929e649f2 100644
--- a/devel/rubygem-rspec-rails/Makefile
+++ b/devel/rubygem-rspec-rails/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	rspec-rails
-PORTVERSION=	3.6.0
+PORTVERSION=	3.6.1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-rspec-rails/distinfo b/devel/rubygem-rspec-rails/distinfo
index 4e36b557591..8d9c365d766 100644
--- a/devel/rubygem-rspec-rails/distinfo
+++ b/devel/rubygem-rspec-rails/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1493987279
-SHA256 (rubygem/rspec-rails-3.6.0.gem) = d2ef9fa0cdd52a6ba13e46bf97724a01166dbdd21388e568f5994c90ecaa7433
-SIZE (rubygem/rspec-rails-3.6.0.gem) = 57856
+TIMESTAMP = 1502528533
+SHA256 (rubygem/rspec-rails-3.6.1.gem) = 17a6374bde3a31827c5e6e99a69827d8a36a57c32ab0f9a7a38317067e620677
+SIZE (rubygem/rspec-rails-3.6.1.gem) = 57856
diff --git a/devel/rubygem-slack-notifier/Makefile b/devel/rubygem-slack-notifier/Makefile
index 77f68b6e438..14cb7344699 100644
--- a/devel/rubygem-slack-notifier/Makefile
+++ b/devel/rubygem-slack-notifier/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	slack-notifier
-PORTVERSION=	2.3.0
+PORTVERSION=	2.3.1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-slack-notifier/distinfo b/devel/rubygem-slack-notifier/distinfo
index 247fcd1d157..2547fabd16a 100644
--- a/devel/rubygem-slack-notifier/distinfo
+++ b/devel/rubygem-slack-notifier/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501694503
-SHA256 (rubygem/slack-notifier-2.3.0.gem) = d3c4921178d4b7172323d65fcae3301b941c98edd1a77b4cca0b7ec34a8831cf
-SIZE (rubygem/slack-notifier-2.3.0.gem) = 12800
+TIMESTAMP = 1502640033
+SHA256 (rubygem/slack-notifier-2.3.1.gem) = 479a7ea2cc79a9b7e8a1ba1e450e93a8513ddf7cba779d28f38bc60b0b0a7405
+SIZE (rubygem/slack-notifier-2.3.1.gem) = 12800
diff --git a/devel/slibtool/Makefile b/devel/slibtool/Makefile
index 4d40984454a..47595019186 100644
--- a/devel/slibtool/Makefile
+++ b/devel/slibtool/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	slibtool
-PORTVERSION=	0.5.14
+PORTVERSION=	0.5.17
 CATEGORIES=	devel
 MASTER_SITES=	http://dl.midipix.org/${PORTNAME}/
 
diff --git a/devel/slibtool/distinfo b/devel/slibtool/distinfo
index 9b4f84c527d..6f05f631a51 100644
--- a/devel/slibtool/distinfo
+++ b/devel/slibtool/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502178775
-SHA256 (slibtool-0.5.14.tar.xz) = 51c4af2e41300a8dea5a91d28fc953311229434210230c4e587eef70bee24ad5
-SIZE (slibtool-0.5.14.tar.xz) = 51080
+TIMESTAMP = 1502440954
+SHA256 (slibtool-0.5.17.tar.xz) = de24fb363978531efac0d14392983c6600d180bc6bb2c33143fc42c99cd0b5a4
+SIZE (slibtool-0.5.17.tar.xz) = 51884
diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common
index 38dbed3a749..908b7747025 100644
--- a/devel/subversion/Makefile.common
+++ b/devel/subversion/Makefile.common
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME?=	subversion
-PORTVERSION=	1.9.6
+PORTVERSION=	1.9.7
 PORTREVISION?=	0
 CATEGORIES+=	devel
 MASTER_SITES=	APACHE/subversion
diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo
index 0ab4c3031d8..4b0bfc9b11a 100644
--- a/devel/subversion/distinfo
+++ b/devel/subversion/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499352634
-SHA256 (subversion19/subversion-1.9.6.tar.bz2) = dbcbc51fb634082f009121f2cb64350ce32146612787ffb0f7ced351aacaae19
-SIZE (subversion19/subversion-1.9.6.tar.bz2) = 7882084
+TIMESTAMP = 1502460058
+SHA256 (subversion19/subversion-1.9.7.tar.bz2) = c3b118333ce12e501d509e66bb0a47bcc34d053990acab45559431ac3e491623
+SIZE (subversion19/subversion-1.9.7.tar.bz2) = 7881909
diff --git a/devel/subversion18/Makefile b/devel/subversion18/Makefile
index 1e9d4d30cbf..943abba477d 100644
--- a/devel/subversion18/Makefile
+++ b/devel/subversion18/Makefile
@@ -45,6 +45,11 @@ P4_STYLE_MARKERS_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-3way-conflict-markers
 FREEBSD_TEMPLATE_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-fbsd-template
 SVNSERVE_WRAPPER_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-svnserve-wrapper
 
+USES+=			shebangfix
+python_CMD=		${LOCALBASE}/bin/python2
+python_OLD_CMD+=	"/bin/env python"
+SHEBANG_REGEX=		./tools/.*
+
 .include "Makefile.common"
 
 SVNREPOS?=	/home/svn/repos
diff --git a/devel/subversion18/Makefile.common b/devel/subversion18/Makefile.common
index 30c699c345b..91b11623cd7 100644
--- a/devel/subversion18/Makefile.common
+++ b/devel/subversion18/Makefile.common
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME?=	subversion
-PORTVERSION=	1.8.17
+PORTVERSION=	1.8.19
 PORTREVISION?=	0
 CATEGORIES+=	devel
 MASTER_SITES=	APACHE/subversion
@@ -57,6 +57,8 @@ SERF_LIB_DEPENDS=		libserf-1.so:www/serf
 
 STATIC_CONFIGURE_ON=		--enable-all-static PKG_CONFIG="${LOCALBASE}/bin/pkg-config --static"
 
+LD_FLAGS+=			-lm
+
 # ===============================================================
 .include <bsd.port.options.mk>
 
diff --git a/devel/subversion18/distinfo b/devel/subversion18/distinfo
index 697910489e5..ec8f684532f 100644
--- a/devel/subversion18/distinfo
+++ b/devel/subversion18/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480510093
-SHA256 (subversion18/subversion-1.8.17.tar.bz2) = de119538d29a5f2c028984cb54a55a4af3e9c32fa9316331bcbe5719e474a090
-SIZE (subversion18/subversion-1.8.17.tar.bz2) = 6924354
+TIMESTAMP = 1502460184
+SHA256 (subversion18/subversion-1.8.19.tar.bz2) = 56e869b0db59519867f7077849c9c0962c599974f1412ea235eab7f98c20e6be
+SIZE (subversion18/subversion-1.8.19.tar.bz2) = 6856860
diff --git a/devel/subversion18/files/patch-Makefile.in b/devel/subversion18/files/patch-Makefile.in
index ac484ac2d08..860cc8f9c6e 100644
--- a/devel/subversion18/files/patch-Makefile.in
+++ b/devel/subversion18/files/patch-Makefile.in
@@ -1,10 +1,22 @@
-========================================================================
-This patch is required to build SVN Apache modules with staging support
-========================================================================
---- ./Makefile.in.orig	2013-10-21 21:12:04.000000000 +0200
-+++ ./Makefile.in	2013-10-21 21:13:30.000000000 +0200
-@@ -85,7 +85,7 @@
- swig_pydir_extra = @libdir@/svn-python/svn
+--- Makefile.in.orig	2017-08-11 17:19:41.952532000 +0300
++++ Makefile.in	2017-08-11 17:24:02.745960000 +0300
+@@ -50,7 +50,7 @@
+ SVN_MAGIC_LIBS = @SVN_MAGIC_LIBS@
+ SVN_SASL_LIBS = @SVN_SASL_LIBS@
+ SVN_SERF_LIBS = @SVN_SERF_LIBS@
+-SVN_SQLITE_LIBS = @SVN_SQLITE_LIBS@
++SVN_SQLITE_LIBS = @SVN_SQLITE_LIBS@ -lm
+ SVN_XML_LIBS = @SVN_XML_LIBS@
+ SVN_ZLIB_LIBS = @SVN_ZLIB_LIBS@
+ 
+@@ -81,11 +81,11 @@
+ swig_rb_libdir = @libdir@
+ 
+ ### these possibly need further discussion
+-swig_pydir = @libdir@/svn-python/libsvn
+-swig_pydir_extra = @libdir@/svn-python/svn
++swig_pydir = /libsvn
++swig_pydir_extra = /svn
  swig_pldir = @libdir@/svn-perl
  swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/svn/ext
 -toolsdir = @bindir@/svn-tools
diff --git a/dns/knot-resolver/Makefile b/dns/knot-resolver/Makefile
index 2072ece66b2..00dde3bf230 100644
--- a/dns/knot-resolver/Makefile
+++ b/dns/knot-resolver/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	knot-resolver
-PORTVERSION=	1.3.1
+PORTVERSION=	1.3.3
 CATEGORIES=	dns ipv6
 MASTER_SITES=	https://secure.nic.cz/files/knot-resolver/ \
 		https://dns.company/downloads/knot-resolver/
@@ -30,46 +30,77 @@ USES=		gmake libedit libtool pkgconfig tar:xz
 USE_CSTD=	c99
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	COOKIES DNSTAP DOXYGEN GO MEMCACHED REDIS STATS
+OPTIONS_DEFINE=	COOKIES DNSTAP DOXYGEN GO MEMCACHED REDIS TRUSTANCHOR
 
 COOKIES_DESC=			cookies
 COOKIES_LIB_DEPENDS=		libnettle.so:security/nettle
+COOKIES_MAKE_ARGS_ON=		HAS_nettle=yes
+COOKIES_MAKE_ARGS_OFF=		HAS_nettle=no
+COOKIES_PLIST_FILES=		lib/kdns_modules/cookies.so      \
+				include/libkres/alg_containers.h \
+				include/libkres/alg_sha.h        \
+				include/libkres/control.h        \
+				include/libkres/helper.h         \
+				include/libkres/lru_cache.h      \
+				include/libkres/nonce.h
 
 DNSTAP_DESC=			dnstap support
 DNSTAP_LIB_DEPENDS=		libprotobuf.so:devel/protobuf \
 				libprotobuf-c.so:devel/protobuf-c \
 				libfstrm.so:devel/fstrm
+DNSTAP_MAKE_ARGS_ON=		HAS_libprotobuf-c=yes HAS_libfstrm=yes
+DNSTAP_MAKE_ARGS_OFF=		HAS_libprotobuf-c=no  HAS_libfstrm=no
+DNSTAP_PLIST_FILES=		lib/kdns_modules/dnstap.so
 
 DOXYGEN_BUILD_DEPENDS=		doxygen:devel/doxygen
-DOXYGEN_MAKE_ARGS=		HAS_doxygen=yes
+DOXYGEN_MAKE_ARGS_ON=		HAS_doxygen=yes
 DOXYGEN_MAKE_ARGS_OFF=		HAS_doxygen=no
 
 GO_DESC=			go
 GO_BUILD_DEPENDS=		go>=1.5:lang/go
+GO_MAKE_ARGS_ON=		HAS_go=yes
+GO_MAKE_ARGS_OFF=		HAS_go=no
 
 MEMCACHED_DESC=			memcached in-memory data-backend
 MEMCACHED_LIB_DEPENDS=		libmemcached.so:databases/libmemcached
-MEMCACHED_MAKE_ARGS=		HAS_libmemcached=yes
+MEMCACHED_MAKE_ARGS_ON=		HAS_libmemcached=yes
 MEMCACHED_MAKE_ARGS_OFF=	HAS_libmemcached=no
 MEMCACHED_PLIST_FILES=		lib/kdns_modules/kmemcached.so
 
 REDIS_DESC=			redis in-memory data-backend
 REDIS_LIB_DEPENDS=		libhiredis.so:databases/hiredis
-REDIS_MAKE_ARGS=		HAS_hiredis=yes
+REDIS_MAKE_ARGS_ON=		HAS_hiredis=yes
 REDIS_MAKE_ARGS_OFF=		HAS_hiredis=no
 REDIS_PLIST_FILES=		lib/kdns_modules/redis.so
 
-STATS_DESC=			stats
-STATS_BUILD_DEPENDS=		luasocket:net/luasocket \
-				luasec:security/luasec
+TRUSTANCHOR_DESC=		Trust anchor bootstrapping and stats 
+TRUSTANCHOR_USES=		lua
+TRUSTANCHOR_MAKE_ARGS_ON=	HAS_ltn12=yes HAS_ssl.https=yes
+TRUSTANCHOR_MAKE_ARGS_OFF=	HAS_ltn12=no  HAS_ssl.https=no
+TRUSTANCHOR_BUILD_DEPENDS=	${LUA_PKGNAMEPREFIX}luasocket>=0:net/luasocket \
+				${LUA_PKGNAMEPREFIX}luasec>=0:security/luasec
 
 USERS=		kresd
 GROUPS=		kresd
 
 PORTDOCS=	AUTHORS COPYING CodingStyle README.md
 
+STRIP_TARGETS=	sbin/kresd			\
+		sbin/kresc			\
+		lib/libkres.so.3		\
+		lib/kdns_modules/cookies.so	\
+		lib/kdns_modules/dnstap.so	\
+		lib/kdns_modules/hints.so	\
+		lib/kdns_modules/kmemcached.so	\
+		lib/kdns_modules/stats.so
+
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
+.for STRIP_TGT in ${STRIP_TARGETS}
+	if [ -f ${STAGEDIR}${PREFIX}/${STRIP_TGT} ]; then \
+	    ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${STRIP_TGT}; \
+	fi
+.endfor
 
 .include <bsd.port.mk>
diff --git a/dns/knot-resolver/distinfo b/dns/knot-resolver/distinfo
index 4676dfcdc15..a8dfc4749e2 100644
--- a/dns/knot-resolver/distinfo
+++ b/dns/knot-resolver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1498699706
-SHA256 (knot-resolver-1.3.1.tar.xz) = cc9631fe1a92628e81e74b324a7f70c0b29840d426de05d7d045fdf85ab01117
-SIZE (knot-resolver-1.3.1.tar.xz) = 1074804
+TIMESTAMP = 1502352801
+SHA256 (knot-resolver-1.3.3.tar.xz) = c679238bea5744de8a99f4402a61e9e58502bc42b40ecfa370e53679ed5d5b80
+SIZE (knot-resolver-1.3.3.tar.xz) = 1082408
diff --git a/dns/knot-resolver/pkg-plist b/dns/knot-resolver/pkg-plist
index 40ba03983c2..f7628dbfcf8 100644
--- a/dns/knot-resolver/pkg-plist
+++ b/dns/knot-resolver/pkg-plist
@@ -3,21 +3,15 @@ etc/kresd/config.isp
 etc/kresd/config.personal
 etc/kresd/config.splitview
 etc/kresd/icann-ca.pem
-include/libkres/alg_containers.h
-include/libkres/alg_sha.h
 include/libkres/array.h
 include/libkres/cache.h
 include/libkres/cdb.h
 include/libkres/cdb_lmdb.h
-include/libkres/control.h
 include/libkres/dnssec.h
-include/libkres/helper.h
 include/libkres/layer.h
 include/libkres/lru.h
-include/libkres/lru_cache.h
 include/libkres/map.h
 include/libkres/module.h
-include/libkres/nonce.h
 include/libkres/nsec.h
 include/libkres/nsec3.h
 include/libkres/nsrep.h
@@ -29,7 +23,6 @@ include/libkres/ta.h
 include/libkres/utils.h
 include/libkres/zonecut.h
 lib/kdns_modules/aho-corasick.lua
-lib/kdns_modules/cookies.so
 lib/kdns_modules/daf.lua
 lib/kdns_modules/daf/daf.js
 lib/kdns_modules/dns64.lua
diff --git a/dns/rubygem-dnsruby/Makefile b/dns/rubygem-dnsruby/Makefile
index deedc46b5c1..a9a0ae81d7d 100644
--- a/dns/rubygem-dnsruby/Makefile
+++ b/dns/rubygem-dnsruby/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dnsruby
-PORTVERSION=	1.60.1
+PORTVERSION=	1.60.2
 CATEGORIES=	dns rubygems
 MASTER_SITES=	RG
 
diff --git a/dns/rubygem-dnsruby/distinfo b/dns/rubygem-dnsruby/distinfo
index 897f96fda0c..8301605c5b1 100644
--- a/dns/rubygem-dnsruby/distinfo
+++ b/dns/rubygem-dnsruby/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1493122889
-SHA256 (rubygem/dnsruby-1.60.1.gem) = 7cc4a46e980e183a436194dc7f3fc93711f7ffc597458abcb9462cbf35baed72
-SIZE (rubygem/dnsruby-1.60.1.gem) = 254464
+TIMESTAMP = 1502473981
+SHA256 (rubygem/dnsruby-1.60.2.gem) = 2d68a90f334d8ed7357ba0affaf83dee4a474a9ef00fd5aaddc825a3e6bcdb61
+SIZE (rubygem/dnsruby-1.60.2.gem) = 254976
diff --git a/emulators/fuse-roms/Makefile b/emulators/fuse-roms/Makefile
index 36622cb33de..930a4b35269 100644
--- a/emulators/fuse-roms/Makefile
+++ b/emulators/fuse-roms/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	emulators
 MASTER_SITES=	ftp://mirror.switch.ch/pool/4/mirror/rpmfusion/${FC_SUBDIR}/:1 \
 		ftp://ftp.ntua.gr/pub/linux/rpmfusion/${FC_SUBDIR}/:1 \
 		ftp://ftp.pbone.net/mirror/rpmfusion.org/${FC_SUBDIR}/:1 \
-		ftp://ftp.icm.edu.pl/vol/rzm5/linux-rpmfusion/${FC_SUBDIR}/:1 \
+		ftp://ftp.icm.edu.pl/vol/rzm6/linux-rpmfusion/${FC_SUBDIR}/:1 \
 		http://zxspectrum.it.omegahg.com/rom/:2 \
 		https://rene-ladan.nl/distfiles/
 DISTFILES=	fuse-emulator-roms-0.9.0-6.fc${FCVER}.noarch.rpm:1,DEFAULT \
@@ -20,7 +20,7 @@ COMMENT=	Spectrum ROM files, for use with the Fuse emulator
 
 LICENSE=	NONE
 
-FCVER=		25
+FCVER=		26
 FC_SUBDIR=	nonfree/fedora/releases/${FCVER}/Everything/x86_64/os/Packages/f
 NO_ARCH=	yes
 NO_BUILD=	yes
diff --git a/emulators/fuse-roms/distinfo b/emulators/fuse-roms/distinfo
index 004b725623e..f1d6aaea448 100644
--- a/emulators/fuse-roms/distinfo
+++ b/emulators/fuse-roms/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1480880081
-SHA256 (fuse-emulator-roms-0.9.0-6.fc25.noarch.rpm) = 371627ee8b3b2f97351ca463694e317c9a000f66fc0c2f0c5ea3ec7b857c957c
-SIZE (fuse-emulator-roms-0.9.0-6.fc25.noarch.rpm) = 130778
+TIMESTAMP = 1502640763
+SHA256 (fuse-emulator-roms-0.9.0-6.fc26.noarch.rpm) = 7c5965ced82fb2ad41459fface30707339cedb03568eac0081fd21aebbc2924d
+SIZE (fuse-emulator-roms-0.9.0-6.fc26.noarch.rpm) = 130570
 SHA256 (Opus-22.rom) = 0a658b83257db99370f086f8ec57a5c9108ffc846e6fe567f262b63befc85dc9
 SIZE (Opus-22.rom) = 8192
diff --git a/emulators/i386-wine-devel/Makefile.inc b/emulators/i386-wine-devel/Makefile.inc
index cd79aba47cc..caa0c492685 100644
--- a/emulators/i386-wine-devel/Makefile.inc
+++ b/emulators/i386-wine-devel/Makefile.inc
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	wine
-PORTVERSION=	2.13
+PORTVERSION=	2.14
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	LOCAL/dbn/repos/wine/${DIST_SUBDIR}/
@@ -43,7 +43,7 @@ USES=		tar:xz desktop-file-utils
 BUNDLE_LIBS=	yes
 
 GECKO_RUN_DEPENDS=	${DATADIR}/gecko/wine_gecko-2.47-x86.msi:emulators/wine-gecko-devel
-MONO_RUN_DEPENDS=	${DATADIR}/mono/wine-mono-4.7.0.msi:emulators/wine-mono-devel
+MONO_RUN_DEPENDS=	${DATADIR}/mono/wine-mono-4.7.1.msi:emulators/wine-mono-devel
 
 # Included for OPSYS and OSVERSION
 .include <bsd.port.pre.mk>
diff --git a/emulators/i386-wine-devel/distinfo b/emulators/i386-wine-devel/distinfo
index cc1564b8cf2..75b99abe426 100644
--- a/emulators/i386-wine-devel/distinfo
+++ b/emulators/i386-wine-devel/distinfo
@@ -1,13 +1,13 @@
-TIMESTAMP = 1501469364
-SHA256 (freebsd:10:x86:64/i386-wine-devel-2.13,1.txz) = 2fe39034ed31cdf6ab2642a6b966baa1e73d05e3dcc483f99389143995eb26fe
-SIZE (freebsd:10:x86:64/i386-wine-devel-2.13,1.txz) = 53471592
-SHA256 (freebsd:10:x86:64/i386-wine-staging-2.13,1.txz) = 32ef22c4b3650452ff99015f68c2365a93ac5ecdc698fef1d3fa834cf95c9ada
-SIZE (freebsd:10:x86:64/i386-wine-staging-2.13,1.txz) = 56055328
-SHA256 (freebsd:11:x86:64/i386-wine-devel-2.13,1.txz) = 7b25958648394c5f0387d6c25b99b35ae6f6ee44b2bde999800b48de6eda7b0b
-SIZE (freebsd:11:x86:64/i386-wine-devel-2.13,1.txz) = 53092596
-SHA256 (freebsd:11:x86:64/i386-wine-staging-2.13,1.txz) = 597e4115a93e1c664778f5d6fd1f895cb94fce8b32af9230c68eaa082ec0cb89
-SIZE (freebsd:11:x86:64/i386-wine-staging-2.13,1.txz) = 55664172
-SHA256 (freebsd:12:x86:64/i386-wine-devel-2.13,1.txz) = 32c12afc6d3f8b93aa0a34cb0f1d51122432b91313079fa69c00a694f960938b
-SIZE (freebsd:12:x86:64/i386-wine-devel-2.13,1.txz) = 52607548
-SHA256 (freebsd:12:x86:64/i386-wine-staging-2.13,1.txz) = 8957eb5a10d75915fe8c57389eb2e1d2f786bc377d012040280e2a7843ce1072
-SIZE (freebsd:12:x86:64/i386-wine-staging-2.13,1.txz) = 55187628
+TIMESTAMP = 1502513658
+SHA256 (freebsd:10:x86:64/i386-wine-devel-2.14,1.txz) = 39f1773a73caa311f3ad49075f58ce34d654139007007285e20fefa10d23e647
+SIZE (freebsd:10:x86:64/i386-wine-devel-2.14,1.txz) = 53488160
+SHA256 (freebsd:10:x86:64/i386-wine-staging-2.14,1.txz) = 2583a639f815e5a04dd82bb070e068e8b1612c89f256269ede28c321803a4cda
+SIZE (freebsd:10:x86:64/i386-wine-staging-2.14,1.txz) = 56105428
+SHA256 (freebsd:11:x86:64/i386-wine-devel-2.14,1.txz) = 30c342de2af9f6203310121302d7bd96aa6e10fb1aa3064e4e5a6a45b23ee707
+SIZE (freebsd:11:x86:64/i386-wine-devel-2.14,1.txz) = 53103992
+SHA256 (freebsd:11:x86:64/i386-wine-staging-2.14,1.txz) = 4c9c78d0473ae029c43e5b3c221b44ee1c48b8d2a1881fb175c8044d4f994946
+SIZE (freebsd:11:x86:64/i386-wine-staging-2.14,1.txz) = 55691320
+SHA256 (freebsd:12:x86:64/i386-wine-devel-2.14,1.txz) = 2f6ecc8382b623c04560959583c2ef377c1d2651bfab7d1543bc07ee3b54fd56
+SIZE (freebsd:12:x86:64/i386-wine-devel-2.14,1.txz) = 52651328
+SHA256 (freebsd:12:x86:64/i386-wine-staging-2.14,1.txz) = a4b0e3a1a5dffb080d9a3e6a794d1d0a2636d0cc7d43ac9b408216ff756929dd
+SIZE (freebsd:12:x86:64/i386-wine-staging-2.14,1.txz) = 55252596
diff --git a/emulators/i386-wine-devel/pkg-plist b/emulators/i386-wine-devel/pkg-plist
index dfbbdf6568b..140a0ce30d5 100644
--- a/emulators/i386-wine-devel/pkg-plist
+++ b/emulators/i386-wine-devel/pkg-plist
@@ -168,6 +168,8 @@ include/wine/windows/cierror.h
 include/wine/windows/clusapi.h
 include/wine/windows/cmdbas.idl
 include/wine/windows/cmdtxt.idl
+include/wine/windows/cmnquery.h
+include/wine/windows/cmnquery.idl
 include/wine/windows/colinf.idl
 include/wine/windows/comcat.h
 include/wine/windows/comcat.idl
@@ -786,6 +788,8 @@ include/wine/windows/uiautomationclient.idl
 include/wine/windows/uiautomationcore.h
 include/wine/windows/uiautomationcore.idl
 include/wine/windows/uiautomationcoreapi.h
+include/wine/windows/uiribbon.h
+include/wine/windows/uiribbon.idl
 include/wine/windows/unknwn.h
 include/wine/windows/unknwn.idl
 include/wine/windows/urlhist.h
@@ -1334,6 +1338,7 @@ lib32/wine/dpvoice.dll.so
 lib32/wine/dpwsockx.dll.so
 lib32/wine/drmclien.dll.so
 lib32/wine/dsound.dll.so
+lib32/wine/dsquery.dll.so
 lib32/wine/dssenh.dll.so
 lib32/wine/dswave.dll.so
 lib32/wine/dwmapi.dll.so
@@ -1717,6 +1722,7 @@ lib32/wine/fakedlls/dpvoice.dll
 lib32/wine/fakedlls/dpwsockx.dll
 lib32/wine/fakedlls/drmclien.dll
 lib32/wine/fakedlls/dsound.dll
+lib32/wine/fakedlls/dsquery.dll
 lib32/wine/fakedlls/dssenh.dll
 lib32/wine/fakedlls/dswave.dll
 lib32/wine/fakedlls/dwmapi.dll
@@ -2011,6 +2017,7 @@ lib32/wine/fakedlls/rsabase.dll
 lib32/wine/fakedlls/rsaenh.dll
 lib32/wine/fakedlls/rstrtmgr.dll
 lib32/wine/fakedlls/rtutils.dll
+%%STAGING%%lib32/wine/fakedlls/runas.exe
 lib32/wine/fakedlls/rundll.exe16
 lib32/wine/fakedlls/rundll32.exe
 lib32/wine/fakedlls/samlib.dll
@@ -2080,6 +2087,7 @@ lib32/wine/fakedlls/twain_32.dll
 lib32/wine/fakedlls/typelib.dll16
 lib32/wine/fakedlls/ucrtbase.dll
 lib32/wine/fakedlls/uiautomationcore.dll
+lib32/wine/fakedlls/uiribbon.dll
 lib32/wine/fakedlls/unicows.dll
 lib32/wine/fakedlls/uninstaller.exe
 lib32/wine/fakedlls/unlodctr.exe
@@ -2639,6 +2647,7 @@ lib32/wine/rsabase.dll.so
 lib32/wine/rsaenh.dll.so
 lib32/wine/rstrtmgr.dll.so
 lib32/wine/rtutils.dll.so
+%%STAGING%%lib32/wine/runas.exe.so
 lib32/wine/rundll.exe16.so
 lib32/wine/rundll32.exe.so
 lib32/wine/samlib.dll.so
@@ -2708,6 +2717,7 @@ lib32/wine/twain_32.dll.so
 lib32/wine/typelib.dll16.so
 lib32/wine/ucrtbase.dll.so
 lib32/wine/uiautomationcore.dll.so
+lib32/wine/uiribbon.dll.so
 lib32/wine/unicows.dll.so
 lib32/wine/uninstaller.exe.so
 lib32/wine/unlodctr.exe.so
diff --git a/emulators/riscv-fesvr/Makefile b/emulators/riscv-fesvr/Makefile
index 8e907a4b00d..818b27b49bd 100644
--- a/emulators/riscv-fesvr/Makefile
+++ b/emulators/riscv-fesvr/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	riscv-fesvr
 DISTVERSION=	git
-PORTREVISION=	20170206
+PORTREVISION=	20170711
 CATEGORIES=	emulators
 
 MAINTAINER=	lwhsu@FreeBSD.org
@@ -13,7 +13,7 @@ LICENSE=	BSD3CLAUSE
 ONLY_FOR_ARCHS=	amd64
 
 GH_ACCOUNT=	freebsd-riscv
-GH_TAGNAME=	10a0333
+GH_TAGNAME=	5813492
 
 USES=	gmake
 
diff --git a/emulators/riscv-fesvr/distinfo b/emulators/riscv-fesvr/distinfo
index 64a8523d809..a59d2d2f4f5 100644
--- a/emulators/riscv-fesvr/distinfo
+++ b/emulators/riscv-fesvr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1486479769
-SHA256 (freebsd-riscv-riscv-fesvr-git-10a0333_GH0.tar.gz) = a1fc984b3ea49f77c11f876288853c2072ac449515e81e32983d179b9c79d52d
-SIZE (freebsd-riscv-riscv-fesvr-git-10a0333_GH0.tar.gz) = 104214
+TIMESTAMP = 1502218901
+SHA256 (freebsd-riscv-riscv-fesvr-git-5813492_GH0.tar.gz) = ba79b72678de9e473904e23fb0dd494f35b116afe3683e5acd00e2fd0600e4d6
+SIZE (freebsd-riscv-riscv-fesvr-git-5813492_GH0.tar.gz) = 118436
diff --git a/emulators/riscv-fesvr/pkg-plist b/emulators/riscv-fesvr/pkg-plist
index a5ffc63017f..66983dce3c7 100644
--- a/emulators/riscv-fesvr/pkg-plist
+++ b/emulators/riscv-fesvr/pkg-plist
@@ -1,5 +1,4 @@
 bin/elf2hex
-include/fesvr/configstring.h
 include/fesvr/context.h
 include/fesvr/device.h
 include/fesvr/dtm.h
diff --git a/emulators/riscv-isa-sim/Makefile b/emulators/riscv-isa-sim/Makefile
index d83a7252f28..a4f28cc4370 100644
--- a/emulators/riscv-isa-sim/Makefile
+++ b/emulators/riscv-isa-sim/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	riscv-isa-sim
 DISTVERSION=	git
-PORTREVISION=	20170207
+PORTREVISION=	20170809
 CATEGORIES=	emulators
 
 MAINTAINER=	lwhsu@FreeBSD.org
@@ -15,7 +15,7 @@ LIB_DEPENDS=	libfesvr.so:emulators/riscv-fesvr
 ONLY_FOR_ARCHS=	amd64
 
 GH_ACCOUNT=	freebsd-riscv
-GH_TAGNAME=	11ec3a3
+GH_TAGNAME=	54ae820
 
 USES=	compiler:c++11-lang gmake shebangfix
 
@@ -25,7 +25,8 @@ USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 
 LDFLAGS+=	-L${LOCALBASE}/lib
-CFLAGS+=	-I${LOCALBASE}/include
+CFLAGS+=	-I${LOCALBASE}/include \
+		-DRISCV_ENABLE_DIRTY=1
 
 STRIP_FILES=	bin/spike \
 		bin/spike-dasm \
diff --git a/emulators/riscv-isa-sim/distinfo b/emulators/riscv-isa-sim/distinfo
index d97f4b0e68c..45032c9107d 100644
--- a/emulators/riscv-isa-sim/distinfo
+++ b/emulators/riscv-isa-sim/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1486479711
-SHA256 (freebsd-riscv-riscv-isa-sim-git-11ec3a3_GH0.tar.gz) = fc2e48c69477c8b25994cf540f508d0beaec578d972d83c1683ec32eb49d1d85
-SIZE (freebsd-riscv-riscv-isa-sim-git-11ec3a3_GH0.tar.gz) = 187995
+TIMESTAMP = 1502283838
+SHA256 (freebsd-riscv-riscv-isa-sim-git-54ae820_GH0.tar.gz) = 0e201f99f1a808e09f52859374198cdcf050c52f1e7900ca4f9c5a7ef9eb0ac6
+SIZE (freebsd-riscv-riscv-isa-sim-git-54ae820_GH0.tar.gz) = 199179
diff --git a/emulators/riscv-isa-sim/files/patch-Makefile.in b/emulators/riscv-isa-sim/files/patch-Makefile.in
index 47b2e8ad21d..8e36466eb10 100644
--- a/emulators/riscv-isa-sim/files/patch-Makefile.in
+++ b/emulators/riscv-isa-sim/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2016-08-01 15:40:47 UTC
-+++ Makefile.in
-@@ -188,13 +188,13 @@ _$(1).cc :
+--- Makefile.in.orig	2017-08-08 20:00:25.889361000 +0100
++++ Makefile.in	2017-08-08 20:06:41.633896000 +0100
+@@ -187,13 +187,13 @@
  
  # Build the object files for this subproject
  
@@ -14,6 +14,6 @@
 -$$($(2)_pch) : %.h.gch : %.h
 +$(2)_deps += $$(patsubst %.hpp, %.h.d, $$($(2)_precompiled_hdrs))
 +$$($(2)_pch) : %.h.gch : %.hpp
- 	$(COMPILE) $$< -o $$@
+ 	$(COMPILE) -x c++-header $$< -o $$@
  # If using clang, don't depend (and thus don't build) precompiled headers
  $$($(2)_objs) : %.o : %.cc $$($(2)_gen_hdrs) $(if $(filter-out clang,$(CC)),$$($(2)_pch))
diff --git a/emulators/riscv-isa-sim/files/patch-riscv_riscv.mk.in b/emulators/riscv-isa-sim/files/patch-riscv_riscv.mk.in
index 1010ac5e72c..70a43a88b59 100644
--- a/emulators/riscv-isa-sim/files/patch-riscv_riscv.mk.in
+++ b/emulators/riscv-isa-sim/files/patch-riscv_riscv.mk.in
@@ -1,14 +1,15 @@
---- riscv/riscv.mk.in.orig	2016-08-01 15:40:47 UTC
-+++ riscv/riscv.mk.in
-@@ -21,13 +21,13 @@ riscv_hdrs = \
+--- riscv/riscv.mk.in.orig	2017-07-11 13:58:22.000000000 +0100
++++ riscv/riscv.mk.in	2017-08-08 20:08:06.247906000 +0100
+@@ -21,14 +21,14 @@
  	tracer.h \
  	extension.h \
  	rocc.h \
 -	insn_template.h \
 +	insn_template.hpp \
  	mulhi.h \
- 	gdbserver.h \
  	debug_module.h \
+ 	remote_bitbang.h \
+ 	jtag_dtm.h \
  
  riscv_precompiled_hdrs = \
 -	insn_template.h \
diff --git a/emulators/riscv-isa-sim/pkg-plist b/emulators/riscv-isa-sim/pkg-plist
index 27e028a459b..d6f1d660816 100644
--- a/emulators/riscv-isa-sim/pkg-plist
+++ b/emulators/riscv-isa-sim/pkg-plist
@@ -11,21 +11,22 @@ include/spike/devices.h
 include/spike/disasm.h
 include/spike/encoding.h
 include/spike/extension.h
-include/spike/gdbserver.h
 include/spike/icache.h
 include/spike/insn_list.h
 include/spike/insn_template.hpp
 include/spike/internals.h
+include/spike/jtag_dtm.h
 include/spike/memtracer.h
 include/spike/mmu.h
 include/spike/mulhi.h
-include/spike/primitives.h
 include/spike/primitiveTypes.h
+include/spike/primitives.h
 include/spike/processor.h
+include/spike/remote_bitbang.h
 include/spike/rocc.h
 include/spike/sim.h
-include/spike/softfloat_types.h
 include/spike/softfloat.h
+include/spike/softfloat_types.h
 include/spike/specialize.h
 include/spike/tracer.h
 include/spike/trap.h
diff --git a/games/OpenTomb/Makefile b/games/OpenTomb/Makefile
index 22d8a451016..5afa9834cf5 100644
--- a/games/OpenTomb/Makefile
+++ b/games/OpenTomb/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	OpenTomb
 DISTVERSIONPREFIX=	win32-
-DISTVERSION=	2017-04-24_alpha
+DISTVERSION=	2017-08-05_alpha
 CATEGORIES=	games
 
 MAINTAINER=	pkubaj@anongoth.pl
diff --git a/games/OpenTomb/distinfo b/games/OpenTomb/distinfo
index ab3b6225da6..b0c3d995a43 100644
--- a/games/OpenTomb/distinfo
+++ b/games/OpenTomb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1493300613
-SHA256 (OpenTomb-OpenTomb-win32-2017-04-24_alpha_GH0.tar.gz) = 48627b18f7d6f7a6675e66b12e26f6a4edbd1dbf4a0152eeca28eac86c9fd18d
-SIZE (OpenTomb-OpenTomb-win32-2017-04-24_alpha_GH0.tar.gz) = 9268426
+TIMESTAMP = 1502468625
+SHA256 (OpenTomb-OpenTomb-win32-2017-08-05_alpha_GH0.tar.gz) = 1bb6ded291d35eb0f15a98df9a466780f2ea6848e020156d5cc0062dc13aa656
+SIZE (OpenTomb-OpenTomb-win32-2017-08-05_alpha_GH0.tar.gz) = 9274258
diff --git a/games/critterding/Makefile b/games/critterding/Makefile
index b6b92fb0c16..b4800b4bc64 100644
--- a/games/critterding/Makefile
+++ b/games/critterding/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	critterding
 DISTVERSION=	beta12
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/sources
 
diff --git a/games/critterding/files/patch-src_brainz_brainz.cpp b/games/critterding/files/patch-src_brainz_brainz.cpp
new file mode 100644
index 00000000000..d2d525d43f5
--- /dev/null
+++ b/games/critterding/files/patch-src_brainz_brainz.cpp
@@ -0,0 +1,14 @@
+brainz.cpp: In member function 'void Brainz::processTillAnswer()':
+brainz.cpp:140:24: error: cannot convert 'bool' to 'bool*' in assignment
+    Outputs[i].output = false;
+--- src/brainz/brainz.cpp.orig	2017-07-28 12:12:16 UTC
++++ src/brainz/brainz.cpp
+@@ -137,7 +137,7 @@ Brainz::Brainz()
+ 	
+ 		// clear Motor Outputs
+ 		for ( unsigned int i=0; i < numberOfOutputs; i++ )
+-			Outputs[i].output = false;
++			*Outputs[i].output = false;
+ 	
+ 		// clear Neurons
+ 		for ( unsigned int i=0; i < totalNeurons; i++ )
diff --git a/games/openlierox/Makefile b/games/openlierox/Makefile
index 7519736c5fb..7fb2a643897 100644
--- a/games/openlierox/Makefile
+++ b/games/openlierox/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	openlierox
 DISTVERSION=	0.58_rc3
-PORTREVISION=	11
+PORTREVISION=	12
 PORTEPOCH=	1
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/OpenLieroX%20${DISTVERSION:C/_/%20/}
@@ -19,7 +19,6 @@ LIB_DEPENDS=	libgd.so:graphics/gd \
 USES=		tar:bzip2 cmake openal:al,alut pkgconfig
 USE_SDL=	sdl image
 USE_GNOME=	libxml2
-USE_GCC=	any # too many gcc'isms
 
 CFLAGS+=	-I${LOCALBASE}/include
 CXXFLAGS+=	-I${LOCALBASE}/include
@@ -60,6 +59,9 @@ post-patch:
 		s|/usr/local|${LOCALBASE}|' ${WRKSRC}/CMakeOlxCommon.cmake
 	@${FIND} ${WRKSRC} \( -name "*.cpp" -o -name "*.h" -o -name "*.cc" \) -print0 | ${XARGS} -0 -n1 \
 		${REINPLACE_CMD} -e '/include.*curl\/types.h/ d'
+# Convert the static_assert calls to regular, C++ ones.
+	@${FIND} ${WRKSRC} \( -name "*.cpp" -o -name "*.h" -o -name "*.cc" \) -print0 | ${XARGS} -0 -n1 \
+		${REINPLACE_CMD} -E -e 's/static_assert\((.+), (.+)\)/static_assert\(\1, "\2"\)/g'
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/openlierox ${STAGEDIR}${PREFIX}/bin/
diff --git a/games/openlierox/files/patch-include_GfxPrimitives.h b/games/openlierox/files/patch-include_GfxPrimitives.h
new file mode 100644
index 00000000000..006298774f1
--- /dev/null
+++ b/games/openlierox/files/patch-include_GfxPrimitives.h
@@ -0,0 +1,32 @@
+Provide missing constructor.
+
+./include/CMap.h:423:18: error: no matching constructor for initialization of 'SDLRect' (aka 'OLXRect<SDLRectBasic>')
+                if(!r.clipWith(SDLRect(0, 0, Width, Height)))
+                               ^       ~~~~~~~~~~~~~~~~~~~
+./include/GfxPrimitives.h:161:2: note: candidate constructor not viable: requires single argument 'r', but 4 arguments were provided
+        OLXRect(const _RectBasic & r): _RectBasic(r) {}
+        ^
+--- include/GfxPrimitives.h.orig	2017-07-26 12:33:41 UTC
++++ include/GfxPrimitives.h
+@@ -106,6 +106,12 @@ class SDLRectBasic : public SDL_Rect { (public)
+ 	typedef Uint16 TypeS;
+ 	
+ 	SDLRectBasic() { this->SDL_Rect::x = this->SDL_Rect::y = this->SDL_Rect::w = this->SDL_Rect::h = 0; }
++	SDLRectBasic(Type x_, Type y_, TypeS w_, TypeS h_) {
++		this->SDL_Rect::x = x_;
++		this->SDL_Rect::y = y_;
++		this->SDL_Rect::w = w_;
++		this->SDL_Rect::h = h_;
++	}
+ 	SDLRectBasic(const SDL_Rect & r): SDL_Rect(r) {}
+ 	Type& x() { return this->SDL_Rect::x; }
+ 	Type& y() { return this->SDL_Rect::y; }
+@@ -158,6 +164,8 @@ template<typename _RectBasic>
+ class OLXRect : public _RectBasic {
+ public:
+ 
++	OLXRect(typename _RectBasic::Type x_, typename _RectBasic::Type y_,
++		typename _RectBasic::TypeS w_, typename _RectBasic::TypeS h_): _RectBasic(x_, y_, w_, h_) {}
+ 	OLXRect(const _RectBasic & r): _RectBasic(r) {}
+ 
+ 	class GetX2 {
diff --git a/games/openlierox/files/patch-include_StaticAssert.h b/games/openlierox/files/patch-include_StaticAssert.h
new file mode 100644
index 00000000000..83a727c95ab
--- /dev/null
+++ b/games/openlierox/files/patch-include_StaticAssert.h
@@ -0,0 +1,16 @@
+Use static_assert provided by the compiler to avoid redefining it and breaking
+headers which use the official version.
+--- include/StaticAssert.h.orig	2009-10-11 20:53:01 UTC
++++ include/StaticAssert.h
+@@ -10,11 +10,5 @@
+ #ifndef __OLX__STATICASSERT_H__
+ #define __OLX__STATICASSERT_H__
+ 
+-template <bool b> class static_assert_failure;
+-template <> class static_assert_failure<true>  { char foo; };
+-template <int s> class static_assert_test{};
+-
+-#define static_assert(X, desc)  \
+-	typedef static_assert_test< (int)sizeof(static_assert_failure< (bool)(X) >) > static_assert_typedef_##desc;
+ 
+ #endif
diff --git a/games/openlierox/files/patch-libs_pstreams_pstream.h b/games/openlierox/files/patch-libs_pstreams_pstream.h
new file mode 100644
index 00000000000..62bb7fdb03c
--- /dev/null
+++ b/games/openlierox/files/patch-libs_pstreams_pstream.h
@@ -0,0 +1,49 @@
+Use the type basic_pstreambuf::fd_type is a typedef of.
+
+./libs/pstreams/pstream.h:1742:28: error: return type of out-of-line definition of 'redi::basic_pstreambuf::wpipe' differs from that in the declaration
+    basic_pstreambuf<C,T>::wpipe()
+                           ^
+./libs/pstreams/pstream.h:221:7: note: previous declaration is here
+      wpipe();
+      ^
+./libs/pstreams/pstream.h:1750:28: error: return type of out-of-line definition of 'redi::basic_pstreambuf::rpipe' differs from that in the declaration
+    basic_pstreambuf<C,T>::rpipe()
+                           ^
+./libs/pstreams/pstream.h:225:7: note: previous declaration is here
+      rpipe();
+      ^
+./libs/pstreams/pstream.h:1758:28: error: return type of out-of-line definition of 'redi::basic_pstreambuf::rpipe' differs from that in the declaration
+    basic_pstreambuf<C,T>::rpipe(buf_read_src which)
+                           ^
+./libs/pstreams/pstream.h:229:7: note: previous declaration is here
+      rpipe(buf_read_src which);
+      ^
+--- libs/pstreams/pstream.h.orig	2017-07-26 12:51:55 UTC
++++ libs/pstreams/pstream.h
+@@ -1738,7 +1738,7 @@ namespace redi
+ 
+   /** @return a reference to the output file descriptor */
+   template <typename C, typename T>
+-    inline typename basic_pstreambuf<C,T>::fd_type&
++    inline typename pstreams::fd_type&
+     basic_pstreambuf<C,T>::wpipe()
+     {
+       return wpipe_;
+@@ -1746,7 +1746,7 @@ namespace redi
+ 
+   /** @return a reference to the active input file descriptor */
+   template <typename C, typename T>
+-    inline typename basic_pstreambuf<C,T>::fd_type&
++    inline typename pstreams::fd_type&
+     basic_pstreambuf<C,T>::rpipe()
+     {
+       return rpipe_[rsrc_];
+@@ -1754,7 +1754,7 @@ namespace redi
+ 
+   /** @return a reference to the specified input file descriptor */
+   template <typename C, typename T>
+-    inline typename basic_pstreambuf<C,T>::fd_type&
++    inline typename pstreams::fd_type&
+     basic_pstreambuf<C,T>::rpipe(buf_read_src which)
+     {
+       return rpipe_[which];
diff --git a/games/p5-Games-Bingo-Print/Makefile b/games/p5-Games-Bingo-Print/Makefile
index a7c3deb4a9d..a4901218401 100644
--- a/games/p5-Games-Bingo-Print/Makefile
+++ b/games/p5-Games-Bingo-Print/Makefile
@@ -16,9 +16,8 @@ LICENSE=	ART10
 BUILD_DEPENDS=	p5-Games-Bingo>=0:games/p5-Games-Bingo \
 		p5-PDFLib>=0:print/p5-PDFLib
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Harness>=0:devel/p5-Test-Harness \
+TEST_DEPENDS=	p5-Test-Perl-Critic>=0:textproc/p5-Test-Perl-Critic \
 		p5-Test-Pod>=0:devel/p5-Test-Pod \
-		p5-Test-Perl-Critic>=0:textproc/p5-Test-Perl-Critic \
 		p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage
 
 NO_ARCH=	yes
diff --git a/games/wtf/Makefile b/games/wtf/Makefile
index 4c90be94857..1c90f8fefcb 100644
--- a/games/wtf/Makefile
+++ b/games/wtf/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	wtf
-PORTVERSION=	20170614
+PORTVERSION=	20170811
 CATEGORIES=	games
 MASTER_SITES=	SF/bsdwtf
 
diff --git a/games/wtf/distinfo b/games/wtf/distinfo
index 690e9bade59..5b81f77cf11 100644
--- a/games/wtf/distinfo
+++ b/games/wtf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1497539912
-SHA256 (wtf-20170614.tar.gz) = 9311760d5126867f17eca0ff2191c464cfdf1d1995a4bf6d26117e49ca867cda
-SIZE (wtf-20170614.tar.gz) = 25321
+TIMESTAMP = 1502550490
+SHA256 (wtf-20170811.tar.gz) = a7a7577dec32d6eb8e6b9f4ef85845484c330abf706de1c8f820549b24a71430
+SIZE (wtf-20170811.tar.gz) = 25322
diff --git a/graphics/Makefile b/graphics/Makefile
index a7819e2ef81..6b4c9467d41 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -938,7 +938,6 @@
     SUBDIR += raster3d
     SUBDIR += rawstudio
     SUBDIR += rawtherapee
-    SUBDIR += rawtherapee-devel
     SUBDIR += rayshade
     SUBDIR += reallyslick
     SUBDIR += recoverjpeg
diff --git a/graphics/p5-Gimp/Makefile b/graphics/p5-Gimp/Makefile
index 05701c1382c..5136ea06b12 100644
--- a/graphics/p5-Gimp/Makefile
+++ b/graphics/p5-Gimp/Makefile
@@ -28,4 +28,6 @@ BUILD_DEPENDS+=	p5-Alien-Gimp>=0.01:graphics/p5-Alien-Gimp
 USES=		perl5
 USE_PERL5=	configure
 
+MAKE_JOBS_UNSAFE=	yes
+
 .include <bsd.port.mk>
diff --git a/graphics/rawtherapee-devel/Makefile b/graphics/rawtherapee-devel/Makefile
deleted file mode 100644
index 37cec0c8e48..00000000000
--- a/graphics/rawtherapee-devel/Makefile
+++ /dev/null
@@ -1,138 +0,0 @@
-# Created by: stas
-# $FreeBSD$
-
-PORTNAME=	rawtherapee
-PORTVERSION=	5.0.1
-PORTREVISION=	1
-DISTVERSIONSUFFIX=	-gtk3
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}-r${PORTVERSION:E}${DISTVERSIONSUFFIX}
-CATEGORIES=	graphics
-MASTER_SITES=	http://rawtherapee.com/shared/source/
-PKGNAMESUFFIX=	-devel
-
-MAINTAINER=	mandree@FreeBSD.org
-COMMENT=	Powerful RAW image processing application
-
-LICENSE=	GPLv3
-
-LIB_DEPENDS=	libcanberra-gtk.so:audio/libcanberra \
-		libcanberra-gtk3.so:audio/libcanberra-gtk3 \
-		libexpat.so:textproc/expat2 \
-		libfftw3.so:math/fftw3 \
-		libfftw3f.so:math/fftw3-float \
-		libfontconfig.so:x11-fonts/fontconfig \
-		libfreetype.so:print/freetype2 \
-		libiptcdata.so:graphics/libiptcdata \
-		liblcms2.so:graphics/lcms2 \
-		libpng.so:graphics/png \
-		libsigc-2.0.so:devel/libsigc++20 \
-		libtiff.so:graphics/tiff
-
-USES=		cmake:outsource desktop-file-utils dos2unix \
-		jpeg localbase:ldflags pkgconfig tar:xz
-DOS2UNIX_REGEX=	.*\.(cc|h)
-LDFLAGS+=	-Wl,--as-needed # fontconfig, freetype, gettext, libX11
-USE_GNOME=	gtkmm30
-USE_LDCONFIG=	yes
-# The -D_GLIBCXX_USE_C99 works around stoi not being defined
-# by default because the GCC headers believe FreeBSD insufficiently C99
-# compliant.
-CFLAGS+=	-I${LOCALBASE}/include -fPIC -D_GLIBCXX_USE_C99 -Wno-deprecated-declarations -Wno-unused-result
-LDFLAGS+=	-lpthread
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS}"
-CMAKE_ARGS+=	-DDOCDIR="${DOCSDIR}" \
-		-DCREDITSDIR="${DOCSDIR}" \
-		-DLICENCEDIR="${DOCSDIR}" \
-		-DDESKTOPDIR="${DESKTOPDIR}" \
-		-DDATADIR="${DATADIR}" \
-		-DCACHE_NAME_SUFFIX="" \
-		-Wno-dev \
-		-DCMAKE_POLICY_DEFAULT_CMP0056:STRING=NEW
-# 3.4.x: CMAKE_EXE_LINKER_FLAGS is not passed to TRY_COMPILE by default
-# any more. The CMP0056 policy must be explicitly set to NEW to ensure
-# linker flags are passed. Else -lomp is not found with clang.
-# See: https://cmake.org/cmake/help/v3.4/policy/CMP0056.html
-
-INSTALLS_ICONS=	yes
-
-.if defined(PACKAGE_BUILDING) && empty(CFLAGS:M-march*)
-CMAKE_ARGS+=	-DPROC_TARGET_NUMBER="1"
-.endif
-
-RTDIR=		${PREFIX}/libdata/${PORTNAME}
-
-OPTIONS_DEFINE=		OPTIMIZED_CFLAGS OPENMP NATIVE
-OPTIONS_DEFAULT=	OPTIMIZED_CFLAGS OPENMP
-OPENMP_DESC=		Enable multicore processing using OpenMP (amd64)
-OPTIMIZED_CFLAGS_DESC=	Use extra compiler optimizations (requires SSE2 support)
-NATIVE_DESC=		Use -march=native for compilation (do not use for generic packages!)
-
-OPENMP_CMAKE_BOOL=	OPTION_OMP
-
-OPTIMIZED_CFLAGS_CFLAGS=	-O3 -funroll-loops -msse2
-# GCC 5.4 includes -fexpensive-optimizations in -O2 already
-
-.include <bsd.port.options.mk>
-
-# -------------------------------------------------------------------
-#
-
-BROKEN_aarch64=		fails to build: gcc5: error: unrecognized command line option -msse2
-
-.if ${OPSYS} == FreeBSD
-.if ${OSVERSION} >= 1200000
-# don't waste everybody's time with Tier-2 and moving targets.
-# might add ARM64 or SPARC64 later on if they are established by the
-# time FreeBSD 12 is out.
-ONLY_FOR_ARCHS=	amd64
-ONLY_FOR_ARCHS_REASON=Only amd64 is supported on non-released FreeBSD versions.
-.endif
-.endif
-
-.if ${PORT_OPTIONS:MNATIVE}
-CMAKE_ARGS+=	-DPROC_TARGET_NUMBER="2"
-.endif
-
-.if !empty(PORT_OPTIONS:MOPENMP) && ${ARCH} == "amd64"
-LIB_DEPENDS+=	libomp.so.0:devel/openmp
-OPENMP_FLAGS=	-lm -lomp
-LDFLAGS+=	${OPENMP_FLAGS}
-.endif
-
-.if defined(WITH_DEBUG)
-STRIP=
-.endif
-
-.if ${ARCH} == i386
-USES+=		compiler:c++11-lib
-# FIXME: if we were to use GCC on i386, we'd need to use -mstackrealign
-# or similar options, else we get SIGBUS when SSE2 is enabled due to
-# improper alignment. Base clang is good enough though, i386 does not
-# support OpenMP, and those seeking ultimate performance need to use
-# amd64.
-.else
-USES+=		compiler:gcc-c++11-lib
-.endif
-
-# -------------------------------------------------------------------
-
-.include <bsd.port.pre.mk>
-
-.if ${CHOSEN_COMPILER_TYPE} == gcc
-# work around compiler faults
-.if ${ARCH} == i386
-CFLAGS+=	-mstackrealign
-.endif
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's#DESTINATION "$${CMAKE_INSTALL_PREFIX}/share/man/man1"#DESTINATION "${MANPREFIX}/man/man1/"#' \
-		${WRKSRC}/CMakeLists.txt
-
-# paranoia: run rawtherapee --help to be sure it finds all its
-# shared libraries (this hinges on proper RPATH setting and propagation)
-post-install:
-	${SETENV} LANG= LC_ALL=C LANGUAGE= DISPLAY= HOME=/dev/null ${STAGEDIR}${PREFIX}/bin/rawtherapee --help 2>&1 \
-	    | ${EGREP} -q "RawTherapee, version ${PKGVERSION:C/_.*//:C/,.*//}|cannot open display:"
-
-.include <bsd.port.post.mk>
diff --git a/graphics/rawtherapee-devel/distinfo b/graphics/rawtherapee-devel/distinfo
deleted file mode 100644
index f8a60288436..00000000000
--- a/graphics/rawtherapee-devel/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1486072535
-SHA256 (rawtherapee-5.0-r1-gtk3.tar.xz) = fa6d69dd25de14c9b1798955beae2f957a998ab08cbb2c3744d8dd55924bea51
-SIZE (rawtherapee-5.0-r1-gtk3.tar.xz) = 10392408
diff --git a/graphics/rawtherapee-devel/files/patch-rtengine_imagedata.cc b/graphics/rawtherapee-devel/files/patch-rtengine_imagedata.cc
deleted file mode 100644
index 7190bb595dc..00000000000
--- a/graphics/rawtherapee-devel/files/patch-rtengine_imagedata.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- rtengine/imagedata.cc.orig	2017-01-26 22:12:23 UTC
-+++ rtengine/imagedata.cc
-@@ -444,7 +444,7 @@ void ImageData::extractInfo ()
-                         if (baseIsoTag) {
-                             std::string isoData = baseIsoTag->valueToString();
-                             if (isoData.size() > 1) {
--                                iso_speed = stoi(isoData);
-+                                iso_speed = std::stoi(isoData);
-                             }
-                         }
-                     }
diff --git a/graphics/rawtherapee-devel/files/patch-rtengine_opthelper.h b/graphics/rawtherapee-devel/files/patch-rtengine_opthelper.h
deleted file mode 100644
index c52f76d4629..00000000000
--- a/graphics/rawtherapee-devel/files/patch-rtengine_opthelper.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- rtengine/opthelper.h.orig	2017-01-26 22:12:23 UTC
-+++ rtengine/opthelper.h
-@@ -69,7 +69,7 @@
-         #define ALIGNED64
-         #define ALIGNED16
-     #endif
--    #if !defined(__clang__) && defined _OPENMP
-+    #if defined(_OPENMP)
-         #define _RT_NESTED_OPENMP
-     #endif
- #endif
diff --git a/graphics/rawtherapee-devel/files/patch-rtgui_cachemanager.cc b/graphics/rawtherapee-devel/files/patch-rtgui_cachemanager.cc
deleted file mode 100644
index 6c3af1cc09e..00000000000
--- a/graphics/rawtherapee-devel/files/patch-rtgui_cachemanager.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- rtgui/cachemanager.cc.orig	2017-01-26 22:12:22 UTC
-+++ rtgui/cachemanager.cc
-@@ -36,7 +36,7 @@ namespace
- {
- 
- constexpr auto cacheDirMode = 511;
--constexpr auto cacheDirs = { "profiles", "images", "aehistograms", "embprofiles", "data" };
-+constexpr const char *cacheDirs[] = { "profiles", "images", "aehistograms", "embprofiles", "data" };
- 
- }
- 
diff --git a/graphics/rawtherapee-devel/files/patch-rtgui_soundman.cc b/graphics/rawtherapee-devel/files/patch-rtgui_soundman.cc
deleted file mode 100644
index 43207b8d4f2..00000000000
--- a/graphics/rawtherapee-devel/files/patch-rtgui_soundman.cc
+++ /dev/null
@@ -1,22 +0,0 @@
---- rtgui/soundman.cc.orig	2017-01-26 22:12:22 UTC
-+++ rtgui/soundman.cc
-@@ -24,9 +24,7 @@
- #ifdef WIN32
- #include <windows.h>
- #include <mmsystem.h>
--#endif
--
--#ifdef __linux__
-+#elif !defined(__APPLE__)
- #include <canberra-gtk.h>
- #endif
- 
-@@ -67,7 +65,7 @@ void SoundManager::playSoundAsync(const 
-     wchar_t *wfilename = (wchar_t*)g_utf8_to_utf16 (sound.c_str(), -1, NULL, NULL, NULL);
-     PlaySoundW(wfilename, NULL, sndParam);
-     g_free( wfilename );
--#elif defined(__linux__)
-+#elif !defined(__APPLE__)
-     ca_context_play(ca_gtk_context_get(), 0, CA_PROP_EVENT_ID, sound.c_str(), CA_PROP_MEDIA_FILENAME, sound.c_str(), NULL);
- #endif
- }
diff --git a/graphics/rawtherapee-devel/pkg-descr b/graphics/rawtherapee-devel/pkg-descr
deleted file mode 100644
index e7bbec05070..00000000000
--- a/graphics/rawtherapee-devel/pkg-descr
+++ /dev/null
@@ -1,23 +0,0 @@
-RawTherapee is a powerful RAW image processing appliction. It features:
-
-High Image Quality
-- Various demosaicing algorithms: AMaZE, DCB, fast, AHD, EAHD, HPHD & VNG4.
-- Advanced color handling, including color management.
-- Enhanced exposure and tonality tools
-- Multiple denoising methods and several tools to enhance details.
-
-Efficiency
-- Multi-threaded algorithms for high performance
-- Batch processing: convert all the developed images at once without not
-  loading the processor while you work.
-- Basic tools immediately at your hands.
-- Parallel editing of multiple images.
-- An optional secondary display can be used.
-
-Versatility
-- Wide variety of supported cameras
-- Advanced control over the algorithms with many fine-tuning parameters.
-- Command line usage besides the normal graphical interface.
-- Various layouts: single/multiple/vertical tab, with/without filmstrip.
-
-WWW: http://www.rawtherapee.com/
diff --git a/graphics/rawtherapee-devel/pkg-message b/graphics/rawtherapee-devel/pkg-message
deleted file mode 100644
index ac0e1ed156a..00000000000
--- a/graphics/rawtherapee-devel/pkg-message
+++ /dev/null
@@ -1,12 +0,0 @@
-
-======================================================================
-DISK SPACE WARNING:
-
-Note that RawTherapee uses version-dependent cache and configuration
-directories.  Please be advised that cache directories can grow large,
-so be sure to check all users' $HOME/.cache/RawTherapee* and have them
-remove older cache directories.
-
-Also, after configurations have been moved to the new version's
-directory, older $HOME/.config/RawTherapee* directories may be removed.
-======================================================================
diff --git a/graphics/rawtherapee-devel/pkg-plist b/graphics/rawtherapee-devel/pkg-plist
deleted file mode 100644
index 12702b65911..00000000000
--- a/graphics/rawtherapee-devel/pkg-plist
+++ /dev/null
@@ -1,904 +0,0 @@
-bin/rawtherapee
-man/man1/rawtherapee.1.gz
-share/appdata/rawtherapee.appdata.xml
-share/applications/rawtherapee.desktop
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS.txt
-%%PORTDOCS%%%%DOCSDIR%%/AboutThisBuild.txt
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES.txt
-share/icons/hicolor/128x128/apps/rawtherapee.png
-share/icons/hicolor/16x16/apps/rawtherapee.png
-share/icons/hicolor/24x24/apps/rawtherapee.png
-share/icons/hicolor/256x256/apps/rawtherapee.png
-share/icons/hicolor/32x32/apps/rawtherapee.png
-share/icons/hicolor/48x48/apps/rawtherapee.png
-%%DATADIR%%/camconst.json
-%%DATADIR%%/dcpprofiles/Canon EOS 100D.dcp
-%%DATADIR%%/dcpprofiles/Canon EOS 20D.dcp
-%%DATADIR%%/dcpprofiles/Canon EOS 400D.dcp
-%%DATADIR%%/dcpprofiles/Canon EOS 40D.dcp
-%%DATADIR%%/dcpprofiles/Canon EOS 450D.dcp
-%%DATADIR%%/dcpprofiles/Canon EOS 50D.dcp
-%%DATADIR%%/dcpprofiles/Canon EOS 550D.dcp
-%%DATADIR%%/dcpprofiles/Canon EOS 5D Mark III.dcp
-%%DATADIR%%/dcpprofiles/Canon EOS 5D.dcp
-%%DATADIR%%/dcpprofiles/Canon EOS 6D.dcp
-%%DATADIR%%/dcpprofiles/Canon EOS 7D Mark II.dcp
-%%DATADIR%%/dcpprofiles/Canon EOS 7D.dcp
-%%DATADIR%%/dcpprofiles/Canon EOS D60.dcp
-%%DATADIR%%/dcpprofiles/Canon EOS Digital Rebel XSi.dcp
-%%DATADIR%%/dcpprofiles/Canon EOS Digital Rebel XTi.dcp
-%%DATADIR%%/dcpprofiles/Canon EOS Kiss X7.dcp
-%%DATADIR%%/dcpprofiles/Canon EOS Rebel SL1.dcp
-%%DATADIR%%/dcpprofiles/Canon EOS Rebel T2i.dcp
-%%DATADIR%%/dcpprofiles/Canon EOS-1D Mark III.dcp
-%%DATADIR%%/dcpprofiles/Canon PowerShot G10.dcp
-%%DATADIR%%/dcpprofiles/Canon PowerShot G12.dcp
-%%DATADIR%%/dcpprofiles/Canon PowerShot G7 X.dcp
-%%DATADIR%%/dcpprofiles/Canon PowerShot S110.dcp
-%%DATADIR%%/dcpprofiles/Fujifilm FinePix S9500.dcp
-%%DATADIR%%/dcpprofiles/Fujifilm X-E1.dcp
-%%DATADIR%%/dcpprofiles/Fujifilm X-E2.dcp
-%%DATADIR%%/dcpprofiles/FUJIFILM X-Pro2.dcp
-%%DATADIR%%/dcpprofiles/FUJIFILM X-T1.dcp
-%%DATADIR%%/dcpprofiles/Fujifilm X-T10.dcp
-%%DATADIR%%/dcpprofiles/FUJIFILM X100T.dcp
-%%DATADIR%%/dcpprofiles/Leaf Aptus 75.dcp
-%%DATADIR%%/dcpprofiles/Nikon D200.dcp
-%%DATADIR%%/dcpprofiles/Nikon D300.dcp
-%%DATADIR%%/dcpprofiles/Nikon D3000.dcp
-%%DATADIR%%/dcpprofiles/Nikon D3100.dcp
-%%DATADIR%%/dcpprofiles/Nikon D3S.dcp
-%%DATADIR%%/dcpprofiles/Nikon D50.dcp
-%%DATADIR%%/dcpprofiles/Nikon D5100.dcp
-%%DATADIR%%/dcpprofiles/NIKON D600.dcp
-%%DATADIR%%/dcpprofiles/Nikon D700.dcp
-%%DATADIR%%/dcpprofiles/Nikon D7000.dcp
-%%DATADIR%%/dcpprofiles/NIKON D7200.dcp
-%%DATADIR%%/dcpprofiles/NIKON D750.dcp
-%%DATADIR%%/dcpprofiles/Nikon D800.dcp
-%%DATADIR%%/dcpprofiles/NIKON D810.dcp
-%%DATADIR%%/dcpprofiles/Olympus E-1.dcp
-%%DATADIR%%/dcpprofiles/Olympus E-510.dcp
-%%DATADIR%%/dcpprofiles/Olympus E-520.dcp
-%%DATADIR%%/dcpprofiles/OLYMPUS E-M10.dcp
-%%DATADIR%%/dcpprofiles/Olympus E-M5.dcp
-%%DATADIR%%/dcpprofiles/Olympus E-P2.dcp
-%%DATADIR%%/dcpprofiles/Olympus XZ-1.dcp
-%%DATADIR%%/dcpprofiles/Panasonic DMC-FZ150.dcp
-%%DATADIR%%/dcpprofiles/Panasonic DMC-FZ35.dcp
-%%DATADIR%%/dcpprofiles/Panasonic DMC-FZ38.dcp
-%%DATADIR%%/dcpprofiles/Panasonic DMC-G1.dcp
-%%DATADIR%%/dcpprofiles/Panasonic DMC-G3.dcp
-%%DATADIR%%/dcpprofiles/Panasonic DMC-G5.dcp
-%%DATADIR%%/dcpprofiles/Panasonic DMC-GH1.dcp
-%%DATADIR%%/dcpprofiles/Panasonic DMC-GH2.dcp
-%%DATADIR%%/dcpprofiles/PENTAX K-5 II.dcp
-%%DATADIR%%/dcpprofiles/PENTAX K-5.dcp
-%%DATADIR%%/dcpprofiles/Pentax K-r.dcp
-%%DATADIR%%/dcpprofiles/PENTAX K10D.dcp
-%%DATADIR%%/dcpprofiles/Pentax K200D.dcp
-%%DATADIR%%/dcpprofiles/RICOH PENTAX K-1.dcp
-%%DATADIR%%/dcpprofiles/RICOH PENTAX K-3.dcp
-%%DATADIR%%/dcpprofiles/Sony DSLR-A700.dcp
-%%DATADIR%%/dcpprofiles/Sony DSLR-A900.dcp
-%%DATADIR%%/dcpprofiles/SONY ILCE-6000.dcp
-%%DATADIR%%/dcpprofiles/SONY ILCE-7M2.dcp
-%%DATADIR%%/dcpprofiles/Sony NEX-5N.dcp
-%%DATADIR%%/dcpprofiles/Sony SLT-A55V.dcp
-%%DATADIR%%/dcpprofiles/SONY SLT-A99V.dcp
-%%DATADIR%%/dcpprofiles/YI TECHNOLOGY M1.dcp
-%%DATADIR%%/iccprofiles/input/Canon EOS 20D.icc
-%%DATADIR%%/iccprofiles/input/Canon EOS 40D.icc
-%%DATADIR%%/iccprofiles/input/Canon EOS 450D.icc
-%%DATADIR%%/iccprofiles/input/Canon EOS 550D.icc
-%%DATADIR%%/iccprofiles/input/Canon EOS 5D.icc
-%%DATADIR%%/iccprofiles/input/Canon EOS Digital Rebel XSi.icc
-%%DATADIR%%/iccprofiles/input/Canon EOS Rebel T2i.icc
-%%DATADIR%%/iccprofiles/input/Canon EOS-1D Mark III.icc
-%%DATADIR%%/iccprofiles/input/Canon PowerShot G10.icc
-%%DATADIR%%/iccprofiles/input/Canon PowerShot G12.icc
-%%DATADIR%%/iccprofiles/input/Nikon D200.icc
-%%DATADIR%%/iccprofiles/input/Nikon D3000.icc
-%%DATADIR%%/iccprofiles/input/Nikon D3100.icc
-%%DATADIR%%/iccprofiles/input/Nikon D3S.icc
-%%DATADIR%%/iccprofiles/input/Nikon D700.icc
-%%DATADIR%%/iccprofiles/input/Nikon D7000.icc
-%%DATADIR%%/iccprofiles/input/Olympus E-P2.icc
-%%DATADIR%%/iccprofiles/input/Panasonic DMC-FZ150.icc
-%%DATADIR%%/iccprofiles/input/Panasonic DMC-FZ35.icc
-%%DATADIR%%/iccprofiles/input/Panasonic DMC-FZ38.icc
-%%DATADIR%%/iccprofiles/input/Panasonic DMC-G1.icc
-%%DATADIR%%/iccprofiles/input/Panasonic DMC-G3.icc
-%%DATADIR%%/iccprofiles/input/Panasonic DMC-GH1.icc
-%%DATADIR%%/iccprofiles/input/Panasonic DMC-GH2.icc
-%%DATADIR%%/iccprofiles/input/Pentax K200D.icc
-%%DATADIR%%/iccprofiles/input/Sony DSLR-A700.icc
-%%DATADIR%%/iccprofiles/input/Sony DSLR-A900.icc
-%%DATADIR%%/iccprofiles/input/Sony SLT-A55V.icc
-%%DATADIR%%/iccprofiles/input/sd14-bl15-crop-matrix-gamma-wp10.icm
-%%DATADIR%%/iccprofiles/input/sd14-bl15-crop-matrix-gamma-wp11.icm
-%%DATADIR%%/iccprofiles/input/sd14-bl15-crop-matrix-gamma-wp12.icm
-%%DATADIR%%/iccprofiles/input/sd1_merrill_cloudy8140-CROP-WP10.icm
-%%DATADIR%%/iccprofiles/input/sd1_merrill_cloudy8140-CROP-WP11.icm
-%%DATADIR%%/iccprofiles/input/sd1_merrill_sunny8161-crop-wp10.icm
-%%DATADIR%%/iccprofiles/input/sd1_merrill_sunny8161-crop-wp11.icm
-%%DATADIR%%/iccprofiles/input/sd1_merrill_tungsten8130-CROP-WP10.icm
-%%DATADIR%%/iccprofiles/input/sd1_merrill_tungsten8130-CROP-WP11.icm
-%%DATADIR%%/iccprofiles/output/RT_Large_g10.icc
-%%DATADIR%%/iccprofiles/output/RT_Large_gBT709.icc
-%%DATADIR%%/iccprofiles/output/RT_Large_gsRGB.icc
-%%DATADIR%%/iccprofiles/output/RT_Medium_gsRGB.icc
-%%DATADIR%%/iccprofiles/output/RT_sRGB.icm
-%%DATADIR%%/iccprofiles/output/RT_sRGB_g10.icm
-%%DATADIR%%/iccprofiles/output/RT_sRGB_gBT709.icm
-%%DATADIR%%/iccprofiles/output/Rec2020.icm
-%%DATADIR%%/images/Chanmixer-B.png
-%%DATADIR%%/images/Chanmixer-BB.png
-%%DATADIR%%/images/Chanmixer-BG.png
-%%DATADIR%%/images/Chanmixer-BR.png
-%%DATADIR%%/images/Chanmixer-BY.png
-%%DATADIR%%/images/Chanmixer-C.png
-%%DATADIR%%/images/Chanmixer-G.png
-%%DATADIR%%/images/Chanmixer-GB.png
-%%DATADIR%%/images/Chanmixer-GG.png
-%%DATADIR%%/images/Chanmixer-GR.png
-%%DATADIR%%/images/Chanmixer-M.png
-%%DATADIR%%/images/Chanmixer-O.png
-%%DATADIR%%/images/Chanmixer-P.png
-%%DATADIR%%/images/Chanmixer-R.png
-%%DATADIR%%/images/Chanmixer-RB.png
-%%DATADIR%%/images/Chanmixer-RG.png
-%%DATADIR%%/images/Chanmixer-RR.png
-%%DATADIR%%/images/Chanmixer-Y.png
-%%DATADIR%%/images/Dark/actions/Chanmixer-Bgamma.png
-%%DATADIR%%/images/Dark/actions/Chanmixer-Ggamma.png
-%%DATADIR%%/images/Dark/actions/Chanmixer-Rgamma.png
-%%DATADIR%%/images/Dark/actions/PanelEnding.png
-%%DATADIR%%/images/Dark/actions/ajd-ca-blue1.png
-%%DATADIR%%/images/Dark/actions/ajd-ca-blue2.png
-%%DATADIR%%/images/Dark/actions/ajd-ca-red1.png
-%%DATADIR%%/images/Dark/actions/ajd-ca-red2.png
-%%DATADIR%%/images/Dark/actions/ajd-wb-bluered1.png
-%%DATADIR%%/images/Dark/actions/ajd-wb-bluered2.png
-%%DATADIR%%/images/Dark/actions/ajd-wb-green1.png
-%%DATADIR%%/images/Dark/actions/ajd-wb-green2.png
-%%DATADIR%%/images/Dark/actions/ajd-wb-temp1.png
-%%DATADIR%%/images/Dark/actions/ajd-wb-temp2.png
-%%DATADIR%%/images/Dark/actions/arrow-down-small.png
-%%DATADIR%%/images/Dark/actions/arrow-down.png
-%%DATADIR%%/images/Dark/actions/arrow-left-small.png
-%%DATADIR%%/images/Dark/actions/arrow-left.png
-%%DATADIR%%/images/Dark/actions/arrow-right-small.png
-%%DATADIR%%/images/Dark/actions/arrow-right.png
-%%DATADIR%%/images/Dark/actions/arrow-up-small.png
-%%DATADIR%%/images/Dark/actions/arrow-up.png
-%%DATADIR%%/images/Dark/actions/beforeafter.png
-%%DATADIR%%/images/Dark/actions/cglabel0.png
-%%DATADIR%%/images/Dark/actions/cglabel1.png
-%%DATADIR%%/images/Dark/actions/cglabel2.png
-%%DATADIR%%/images/Dark/actions/cglabel3.png
-%%DATADIR%%/images/Dark/actions/cglabel4.png
-%%DATADIR%%/images/Dark/actions/cglabel5.png
-%%DATADIR%%/images/Dark/actions/clabel0.png
-%%DATADIR%%/images/Dark/actions/clabel1.png
-%%DATADIR%%/images/Dark/actions/clabel2.png
-%%DATADIR%%/images/Dark/actions/clabel3.png
-%%DATADIR%%/images/Dark/actions/clabel4.png
-%%DATADIR%%/images/Dark/actions/clabel5.png
-%%DATADIR%%/images/Dark/actions/closedhand.png
-%%DATADIR%%/images/Dark/actions/colorPickers-hide.png
-%%DATADIR%%/images/Dark/actions/colorPickers-show.png
-%%DATADIR%%/images/Dark/actions/colour.png
-%%DATADIR%%/images/Dark/actions/crop-auto.png
-%%DATADIR%%/images/Dark/actions/crop.png
-%%DATADIR%%/images/Dark/actions/crossed-arrows-in.png
-%%DATADIR%%/images/Dark/actions/crossed-arrows-out.png
-%%DATADIR%%/images/Dark/actions/curveType-NURBS.png
-%%DATADIR%%/images/Dark/actions/curveType-controlPoints.png
-%%DATADIR%%/images/Dark/actions/curveType-flatLinear.png
-%%DATADIR%%/images/Dark/actions/curveType-linear.png
-%%DATADIR%%/images/Dark/actions/curveType-parametric.png
-%%DATADIR%%/images/Dark/actions/curveType-spline.png
-%%DATADIR%%/images/Dark/actions/detail.png
-%%DATADIR%%/images/Dark/actions/distorsion.png
-%%DATADIR%%/images/Dark/actions/distortion-auto.png
-%%DATADIR%%/images/Dark/actions/distortion-barrel.png
-%%DATADIR%%/images/Dark/actions/distortion-pincushion.png
-%%DATADIR%%/images/Dark/actions/document-open-recent.png
-%%DATADIR%%/images/Dark/actions/document-open.png
-%%DATADIR%%/images/Dark/actions/edit-copy.png
-%%DATADIR%%/images/Dark/actions/edit-find.png
-%%DATADIR%%/images/Dark/actions/edit-paste.png
-%%DATADIR%%/images/Dark/actions/edited-small.png
-%%DATADIR%%/images/Dark/actions/edited.png
-%%DATADIR%%/images/Dark/actions/editedg-small.png
-%%DATADIR%%/images/Dark/actions/editednot-small.png
-%%DATADIR%%/images/Dark/actions/editednotg-small.png
-%%DATADIR%%/images/Dark/actions/editmodehand.png
-%%DATADIR%%/images/Dark/actions/expanderClosed.png
-%%DATADIR%%/images/Dark/actions/expanderDisabled.png
-%%DATADIR%%/images/Dark/actions/expanderEnabled.png
-%%DATADIR%%/images/Dark/actions/expanderInconsistent.png
-%%DATADIR%%/images/Dark/actions/expanderOpened.png
-%%DATADIR%%/images/Dark/actions/exposure.png
-%%DATADIR%%/images/Dark/actions/filter-original-1.png
-%%DATADIR%%/images/Dark/actions/filter-original-2.png
-%%DATADIR%%/images/Dark/actions/filter.png
-%%DATADIR%%/images/Dark/actions/filterclear.png
-%%DATADIR%%/images/Dark/actions/fullscreen-exit.png
-%%DATADIR%%/images/Dark/actions/fullscreen.png
-%%DATADIR%%/images/Dark/actions/grayrated.png
-%%DATADIR%%/images/Dark/actions/gtk-add.png
-%%DATADIR%%/images/Dark/actions/gtk-apply.png
-%%DATADIR%%/images/Dark/actions/gtk-cancel.png
-%%DATADIR%%/images/Dark/actions/gtk-close-small.png
-%%DATADIR%%/images/Dark/actions/gtk-close.png
-%%DATADIR%%/images/Dark/actions/gtk-color-picker-add.png
-%%DATADIR%%/images/Dark/actions/gtk-color-picker-small.png
-%%DATADIR%%/images/Dark/actions/gtk-color-picker.png
-%%DATADIR%%/images/Dark/actions/gtk-copy.png
-%%DATADIR%%/images/Dark/actions/gtk-edit.png
-%%DATADIR%%/images/Dark/actions/gtk-find.png
-%%DATADIR%%/images/Dark/actions/gtk-media-play.png
-%%DATADIR%%/images/Dark/actions/gtk-media-stop.png
-%%DATADIR%%/images/Dark/actions/gtk-ok.png
-%%DATADIR%%/images/Dark/actions/gtk-open.png
-%%DATADIR%%/images/Dark/actions/gtk-paste.png
-%%DATADIR%%/images/Dark/actions/gtk-preferences.png
-%%DATADIR%%/images/Dark/actions/gtk-remove.png
-%%DATADIR%%/images/Dark/actions/gtk-save-large.png
-%%DATADIR%%/images/Dark/actions/gtk-save.png
-%%DATADIR%%/images/Dark/actions/gtk-undo-ltr-small.png
-%%DATADIR%%/images/Dark/actions/gtk-undo-ltr.png
-%%DATADIR%%/images/Dark/actions/gtk-undo-rtl-small.png
-%%DATADIR%%/images/Dark/actions/gtk-undo-rtl.png
-%%DATADIR%%/images/Dark/actions/gtk-undoall-ltr.png
-%%DATADIR%%/images/Dark/actions/gtk-undoall-rtl.png
-%%DATADIR%%/images/Dark/actions/gtk-zoom-100-small.png
-%%DATADIR%%/images/Dark/actions/gtk-zoom-100.png
-%%DATADIR%%/images/Dark/actions/gtk-zoom-crop.png
-%%DATADIR%%/images/Dark/actions/gtk-zoom-fit.png
-%%DATADIR%%/images/Dark/actions/gtk-zoom-in-small.png
-%%DATADIR%%/images/Dark/actions/gtk-zoom-in.png
-%%DATADIR%%/images/Dark/actions/gtk-zoom-out-small.png
-%%DATADIR%%/images/Dark/actions/gtk-zoom-out.png
-%%DATADIR%%/images/Dark/actions/histBar.png
-%%DATADIR%%/images/Dark/actions/histBarg.png
-%%DATADIR%%/images/Dark/actions/histBlue.png
-%%DATADIR%%/images/Dark/actions/histBlueg.png
-%%DATADIR%%/images/Dark/actions/histChro.png
-%%DATADIR%%/images/Dark/actions/histChrog.png
-%%DATADIR%%/images/Dark/actions/histFull.png
-%%DATADIR%%/images/Dark/actions/histFullg.png
-%%DATADIR%%/images/Dark/actions/histGreen.png
-%%DATADIR%%/images/Dark/actions/histGreeng.png
-%%DATADIR%%/images/Dark/actions/histRaw.png
-%%DATADIR%%/images/Dark/actions/histRawg.png
-%%DATADIR%%/images/Dark/actions/histRed.png
-%%DATADIR%%/images/Dark/actions/histRedg.png
-%%DATADIR%%/images/Dark/actions/histValue.png
-%%DATADIR%%/images/Dark/actions/histValueg.png
-%%DATADIR%%/images/Dark/actions/image-editor.png
-%%DATADIR%%/images/Dark/actions/info.png
-%%DATADIR%%/images/Dark/actions/intent-absolute.png
-%%DATADIR%%/images/Dark/actions/intent-perceptual.png
-%%DATADIR%%/images/Dark/actions/intent-relative.png
-%%DATADIR%%/images/Dark/actions/intent-saturation.png
-%%DATADIR%%/images/Dark/actions/list-add-small.png
-%%DATADIR%%/images/Dark/actions/list-add.png
-%%DATADIR%%/images/Dark/actions/list-remove-red-small.png
-%%DATADIR%%/images/Dark/actions/list-remove.png
-%%DATADIR%%/images/Dark/actions/lock-off.png
-%%DATADIR%%/images/Dark/actions/lock-on.png
-%%DATADIR%%/images/Dark/actions/media-usb.png
-%%DATADIR%%/images/Dark/actions/meta.png
-%%DATADIR%%/images/Dark/actions/nav-next.png
-%%DATADIR%%/images/Dark/actions/nav-prev.png
-%%DATADIR%%/images/Dark/actions/nav-sync.png
-%%DATADIR%%/images/Dark/actions/new-detail-window.png
-%%DATADIR%%/images/Dark/actions/openhand.png
-%%DATADIR%%/images/Dark/actions/panel-to-bottom.png
-%%DATADIR%%/images/Dark/actions/panel-to-left.png
-%%DATADIR%%/images/Dark/actions/panel-to-right.png
-%%DATADIR%%/images/Dark/actions/panel-to-top.png
-%%DATADIR%%/images/Dark/actions/perspective-h1.png
-%%DATADIR%%/images/Dark/actions/perspective-h2.png
-%%DATADIR%%/images/Dark/actions/perspective-v1.png
-%%DATADIR%%/images/Dark/actions/perspective-v2.png
-%%DATADIR%%/images/Dark/actions/popuparrow.png
-%%DATADIR%%/images/Dark/actions/previewmodeB-off.png
-%%DATADIR%%/images/Dark/actions/previewmodeB-on.png
-%%DATADIR%%/images/Dark/actions/previewmodeBC0-off.png
-%%DATADIR%%/images/Dark/actions/previewmodeBC0-on.png
-%%DATADIR%%/images/Dark/actions/previewmodeBC1-off.png
-%%DATADIR%%/images/Dark/actions/previewmodeBC1-on.png
-%%DATADIR%%/images/Dark/actions/previewmodeBC2-off.png
-%%DATADIR%%/images/Dark/actions/previewmodeBC2-on.png
-%%DATADIR%%/images/Dark/actions/previewmodeF-off.png
-%%DATADIR%%/images/Dark/actions/previewmodeF-on.png
-%%DATADIR%%/images/Dark/actions/previewmodeG-off.png
-%%DATADIR%%/images/Dark/actions/previewmodeG-on.png
-%%DATADIR%%/images/Dark/actions/previewmodeL-off.png
-%%DATADIR%%/images/Dark/actions/previewmodeL-on.png
-%%DATADIR%%/images/Dark/actions/previewmodeR-off.png
-%%DATADIR%%/images/Dark/actions/previewmodeR-on.png
-%%DATADIR%%/images/Dark/actions/processing-pause.png
-%%DATADIR%%/images/Dark/actions/processing-play.png
-%%DATADIR%%/images/Dark/actions/processing-thumbnail.png
-%%DATADIR%%/images/Dark/actions/processing.png
-%%DATADIR%%/images/Dark/actions/profile-filled.png
-%%DATADIR%%/images/Dark/actions/profile-partial.png
-%%DATADIR%%/images/Dark/actions/rated.png
-%%DATADIR%%/images/Dark/actions/ratednot.png
-%%DATADIR%%/images/Dark/actions/ratednotg.png
-%%DATADIR%%/images/Dark/actions/raw.png
-%%DATADIR%%/images/Dark/actions/refresh-red.png
-%%DATADIR%%/images/Dark/actions/refresh-white.png
-%%DATADIR%%/images/Dark/actions/rotate-left-1.png
-%%DATADIR%%/images/Dark/actions/rotate-left-2.png
-%%DATADIR%%/images/Dark/actions/rotate-left-3.png
-%%DATADIR%%/images/Dark/actions/rotate-left.png
-%%DATADIR%%/images/Dark/actions/rotate-right-1.png
-%%DATADIR%%/images/Dark/actions/rotate-right-2.png
-%%DATADIR%%/images/Dark/actions/rotate-right-3.png
-%%DATADIR%%/images/Dark/actions/rotate-right.png
-%%DATADIR%%/images/Dark/actions/rtwindow.png
-%%DATADIR%%/images/Dark/actions/softProof.png
-%%DATADIR%%/images/Dark/actions/spGamutCheck.png
-%%DATADIR%%/images/Dark/actions/stock-flip-horizontal.png
-%%DATADIR%%/images/Dark/actions/stock-flip-vertical.png
-%%DATADIR%%/images/Dark/actions/stock-rotate-270.png
-%%DATADIR%%/images/Dark/actions/stock-rotate-90.png
-%%DATADIR%%/images/Dark/actions/straighten-small.png
-%%DATADIR%%/images/Dark/actions/straighten.png
-%%DATADIR%%/images/Dark/actions/toleftend.png
-%%DATADIR%%/images/Dark/actions/torightend.png
-%%DATADIR%%/images/Dark/actions/transform.png
-%%DATADIR%%/images/Dark/actions/trash-hide-deleted.png
-%%DATADIR%%/images/Dark/actions/trash-show-empty.png
-%%DATADIR%%/images/Dark/actions/trash-show-full.png
-%%DATADIR%%/images/Dark/actions/trash-thumbnail.png
-%%DATADIR%%/images/Dark/actions/trash.png
-%%DATADIR%%/images/Dark/actions/unchanged-18.png
-%%DATADIR%%/images/Dark/actions/unchanged-22.png
-%%DATADIR%%/images/Dark/actions/undelete-rtl.png
-%%DATADIR%%/images/Dark/actions/undelete-thumbnail-rtl.png
-%%DATADIR%%/images/Dark/actions/undelete-thumbnail.png
-%%DATADIR%%/images/Dark/actions/undelete.png
-%%DATADIR%%/images/Dark/actions/warnhl.png
-%%DATADIR%%/images/Dark/actions/warnsh.png
-%%DATADIR%%/images/Dark/actions/wavelet.png
-%%DATADIR%%/images/Dark/actions/wb-auto.png
-%%DATADIR%%/images/Dark/actions/wb-camera.png
-%%DATADIR%%/images/Dark/actions/wb-cloudy.png
-%%DATADIR%%/images/Dark/actions/wb-custom.png
-%%DATADIR%%/images/Dark/actions/wb-flash.png
-%%DATADIR%%/images/Dark/actions/wb-fluorescent.png
-%%DATADIR%%/images/Dark/actions/wb-lamp.png
-%%DATADIR%%/images/Dark/actions/wb-led.png
-%%DATADIR%%/images/Dark/actions/wb-shade.png
-%%DATADIR%%/images/Dark/actions/wb-sun.png
-%%DATADIR%%/images/Dark/actions/wb-tungsten.png
-%%DATADIR%%/images/Dark/actions/wb-water.png
-%%DATADIR%%/images/Dark/actions/zoom-100-identifier.png
-%%DATADIR%%/images/Dark/devices/computer.png
-%%DATADIR%%/images/Dark/devices/drive-harddisk.png
-%%DATADIR%%/images/Dark/devices/drive-optical.png
-%%DATADIR%%/images/Dark/devices/drive-removable-media.png
-%%DATADIR%%/images/Dark/devices/gtk-cdrom.png
-%%DATADIR%%/images/Dark/devices/media-flash.png
-%%DATADIR%%/images/Dark/devices/media-floppy.png
-%%DATADIR%%/images/Dark/devices/media-optical-bd.png
-%%DATADIR%%/images/Dark/devices/media-optical-dvd.png
-%%DATADIR%%/images/Dark/devices/media-optical.png
-%%DATADIR%%/images/Dark/devices/media-tape.png
-%%DATADIR%%/images/Dark/index.theme
-%%DATADIR%%/images/Dark/places/folder.png
-%%DATADIR%%/images/Dark/places/gtk-directory.png
-%%DATADIR%%/images/Dark/places/user-desktop.png
-%%DATADIR%%/images/Dark/places/user-home.png
-%%DATADIR%%/images/Light/actions/Chanmixer-Bgamma.png
-%%DATADIR%%/images/Light/actions/Chanmixer-Ggamma.png
-%%DATADIR%%/images/Light/actions/Chanmixer-Rgamma.png
-%%DATADIR%%/images/Light/actions/PanelEnding.png
-%%DATADIR%%/images/Light/actions/ajd-ca-blue1.png
-%%DATADIR%%/images/Light/actions/ajd-ca-blue2.png
-%%DATADIR%%/images/Light/actions/ajd-ca-red1.png
-%%DATADIR%%/images/Light/actions/ajd-ca-red2.png
-%%DATADIR%%/images/Light/actions/ajd-wb-bluered1.png
-%%DATADIR%%/images/Light/actions/ajd-wb-bluered2.png
-%%DATADIR%%/images/Light/actions/ajd-wb-green1.png
-%%DATADIR%%/images/Light/actions/ajd-wb-green2.png
-%%DATADIR%%/images/Light/actions/ajd-wb-temp1.png
-%%DATADIR%%/images/Light/actions/ajd-wb-temp2.png
-%%DATADIR%%/images/Light/actions/arrow-down-small.png
-%%DATADIR%%/images/Light/actions/arrow-down.png
-%%DATADIR%%/images/Light/actions/arrow-left-small.png
-%%DATADIR%%/images/Light/actions/arrow-left.png
-%%DATADIR%%/images/Light/actions/arrow-right-small.png
-%%DATADIR%%/images/Light/actions/arrow-right.png
-%%DATADIR%%/images/Light/actions/arrow-up-small.png
-%%DATADIR%%/images/Light/actions/arrow-up.png
-%%DATADIR%%/images/Light/actions/beforeafter.png
-%%DATADIR%%/images/Light/actions/cglabel0.png
-%%DATADIR%%/images/Light/actions/cglabel1.png
-%%DATADIR%%/images/Light/actions/cglabel2.png
-%%DATADIR%%/images/Light/actions/cglabel3.png
-%%DATADIR%%/images/Light/actions/cglabel4.png
-%%DATADIR%%/images/Light/actions/cglabel5.png
-%%DATADIR%%/images/Light/actions/clabel0.png
-%%DATADIR%%/images/Light/actions/clabel1.png
-%%DATADIR%%/images/Light/actions/clabel2.png
-%%DATADIR%%/images/Light/actions/clabel3.png
-%%DATADIR%%/images/Light/actions/clabel4.png
-%%DATADIR%%/images/Light/actions/clabel5.png
-%%DATADIR%%/images/Light/actions/closedhand.png
-%%DATADIR%%/images/Light/actions/colorPickers-hide.png
-%%DATADIR%%/images/Light/actions/colorPickers-show.png
-%%DATADIR%%/images/Light/actions/colour.png
-%%DATADIR%%/images/Light/actions/crop-auto.png
-%%DATADIR%%/images/Light/actions/crop.png
-%%DATADIR%%/images/Light/actions/crossed-arrows-in.png
-%%DATADIR%%/images/Light/actions/crossed-arrows-out.png
-%%DATADIR%%/images/Light/actions/curveType-NURBS.png
-%%DATADIR%%/images/Light/actions/curveType-controlPoints.png
-%%DATADIR%%/images/Light/actions/curveType-flatLinear.png
-%%DATADIR%%/images/Light/actions/curveType-linear.png
-%%DATADIR%%/images/Light/actions/curveType-parametric.png
-%%DATADIR%%/images/Light/actions/curveType-spline.png
-%%DATADIR%%/images/Light/actions/detail.png
-%%DATADIR%%/images/Light/actions/distorsion.png
-%%DATADIR%%/images/Light/actions/distortion-auto.png
-%%DATADIR%%/images/Light/actions/distortion-barrel.png
-%%DATADIR%%/images/Light/actions/distortion-pincushion.png
-%%DATADIR%%/images/Light/actions/document-open-recent.png
-%%DATADIR%%/images/Light/actions/document-open.png
-%%DATADIR%%/images/Light/actions/edit-copy.png
-%%DATADIR%%/images/Light/actions/edit-find.png
-%%DATADIR%%/images/Light/actions/edit-paste.png
-%%DATADIR%%/images/Light/actions/edited-small.png
-%%DATADIR%%/images/Light/actions/edited.png
-%%DATADIR%%/images/Light/actions/editedg-small.png
-%%DATADIR%%/images/Light/actions/editednot-small.png
-%%DATADIR%%/images/Light/actions/editednotg-small.png
-%%DATADIR%%/images/Light/actions/editmodehand.png
-%%DATADIR%%/images/Light/actions/expanderClosed.png
-%%DATADIR%%/images/Light/actions/expanderDisabled.png
-%%DATADIR%%/images/Light/actions/expanderEnabled.png
-%%DATADIR%%/images/Light/actions/expanderInconsistent.png
-%%DATADIR%%/images/Light/actions/expanderOpened.png
-%%DATADIR%%/images/Light/actions/exposure.png
-%%DATADIR%%/images/Light/actions/filter-original-1.png
-%%DATADIR%%/images/Light/actions/filter-original-2.png
-%%DATADIR%%/images/Light/actions/filter.png
-%%DATADIR%%/images/Light/actions/filterclear.png
-%%DATADIR%%/images/Light/actions/fullscreen-exit.png
-%%DATADIR%%/images/Light/actions/fullscreen.png
-%%DATADIR%%/images/Light/actions/grayrated.png
-%%DATADIR%%/images/Light/actions/gtk-add.png
-%%DATADIR%%/images/Light/actions/gtk-apply.png
-%%DATADIR%%/images/Light/actions/gtk-cancel.png
-%%DATADIR%%/images/Light/actions/gtk-close-small.png
-%%DATADIR%%/images/Light/actions/gtk-close.png
-%%DATADIR%%/images/Light/actions/gtk-color-picker-add.png
-%%DATADIR%%/images/Light/actions/gtk-color-picker-small.png
-%%DATADIR%%/images/Light/actions/gtk-color-picker.png
-%%DATADIR%%/images/Light/actions/gtk-copy.png
-%%DATADIR%%/images/Light/actions/gtk-edit.png
-%%DATADIR%%/images/Light/actions/gtk-find.png
-%%DATADIR%%/images/Light/actions/gtk-media-play.png
-%%DATADIR%%/images/Light/actions/gtk-media-stop.png
-%%DATADIR%%/images/Light/actions/gtk-ok.png
-%%DATADIR%%/images/Light/actions/gtk-open.png
-%%DATADIR%%/images/Light/actions/gtk-paste.png
-%%DATADIR%%/images/Light/actions/gtk-preferences.png
-%%DATADIR%%/images/Light/actions/gtk-remove.png
-%%DATADIR%%/images/Light/actions/gtk-save-large.png
-%%DATADIR%%/images/Light/actions/gtk-save.png
-%%DATADIR%%/images/Light/actions/gtk-undo-ltr-small.png
-%%DATADIR%%/images/Light/actions/gtk-undo-ltr.png
-%%DATADIR%%/images/Light/actions/gtk-undo-rtl-small.png
-%%DATADIR%%/images/Light/actions/gtk-undo-rtl.png
-%%DATADIR%%/images/Light/actions/gtk-undoall-ltr.png
-%%DATADIR%%/images/Light/actions/gtk-undoall-rtl.png
-%%DATADIR%%/images/Light/actions/gtk-zoom-100-small.png
-%%DATADIR%%/images/Light/actions/gtk-zoom-100.png
-%%DATADIR%%/images/Light/actions/gtk-zoom-crop.png
-%%DATADIR%%/images/Light/actions/gtk-zoom-fit.png
-%%DATADIR%%/images/Light/actions/gtk-zoom-in-small.png
-%%DATADIR%%/images/Light/actions/gtk-zoom-in.png
-%%DATADIR%%/images/Light/actions/gtk-zoom-out-small.png
-%%DATADIR%%/images/Light/actions/gtk-zoom-out.png
-%%DATADIR%%/images/Light/actions/histBar.png
-%%DATADIR%%/images/Light/actions/histBarg.png
-%%DATADIR%%/images/Light/actions/histBlue.png
-%%DATADIR%%/images/Light/actions/histBlueg.png
-%%DATADIR%%/images/Light/actions/histChro.png
-%%DATADIR%%/images/Light/actions/histChrog.png
-%%DATADIR%%/images/Light/actions/histFull.png
-%%DATADIR%%/images/Light/actions/histFullg.png
-%%DATADIR%%/images/Light/actions/histGreen.png
-%%DATADIR%%/images/Light/actions/histGreeng.png
-%%DATADIR%%/images/Light/actions/histRaw.png
-%%DATADIR%%/images/Light/actions/histRawg.png
-%%DATADIR%%/images/Light/actions/histRed.png
-%%DATADIR%%/images/Light/actions/histRedg.png
-%%DATADIR%%/images/Light/actions/histValue.png
-%%DATADIR%%/images/Light/actions/histValueg.png
-%%DATADIR%%/images/Light/actions/image-editor.png
-%%DATADIR%%/images/Light/actions/info.png
-%%DATADIR%%/images/Light/actions/intent-absolute.png
-%%DATADIR%%/images/Light/actions/intent-perceptual.png
-%%DATADIR%%/images/Light/actions/intent-relative.png
-%%DATADIR%%/images/Light/actions/intent-saturation.png
-%%DATADIR%%/images/Light/actions/list-add-small.png
-%%DATADIR%%/images/Light/actions/list-add.png
-%%DATADIR%%/images/Light/actions/list-remove-red-small.png
-%%DATADIR%%/images/Light/actions/list-remove.png
-%%DATADIR%%/images/Light/actions/lock-off.png
-%%DATADIR%%/images/Light/actions/lock-on.png
-%%DATADIR%%/images/Light/actions/media-usb.png
-%%DATADIR%%/images/Light/actions/meta.png
-%%DATADIR%%/images/Light/actions/nav-next.png
-%%DATADIR%%/images/Light/actions/nav-prev.png
-%%DATADIR%%/images/Light/actions/nav-sync.png
-%%DATADIR%%/images/Light/actions/new-detail-window.png
-%%DATADIR%%/images/Light/actions/openhand.png
-%%DATADIR%%/images/Light/actions/panel-to-bottom.png
-%%DATADIR%%/images/Light/actions/panel-to-left.png
-%%DATADIR%%/images/Light/actions/panel-to-right.png
-%%DATADIR%%/images/Light/actions/panel-to-top.png
-%%DATADIR%%/images/Light/actions/perspective-h1.png
-%%DATADIR%%/images/Light/actions/perspective-h2.png
-%%DATADIR%%/images/Light/actions/perspective-v1.png
-%%DATADIR%%/images/Light/actions/perspective-v2.png
-%%DATADIR%%/images/Light/actions/popuparrow.png
-%%DATADIR%%/images/Light/actions/previewmodeB-off.png
-%%DATADIR%%/images/Light/actions/previewmodeB-on.png
-%%DATADIR%%/images/Light/actions/previewmodeBC0-off.png
-%%DATADIR%%/images/Light/actions/previewmodeBC0-on.png
-%%DATADIR%%/images/Light/actions/previewmodeBC1-off.png
-%%DATADIR%%/images/Light/actions/previewmodeBC1-on.png
-%%DATADIR%%/images/Light/actions/previewmodeBC2-off.png
-%%DATADIR%%/images/Light/actions/previewmodeBC2-on.png
-%%DATADIR%%/images/Light/actions/previewmodeF-off.png
-%%DATADIR%%/images/Light/actions/previewmodeF-on.png
-%%DATADIR%%/images/Light/actions/previewmodeG-off.png
-%%DATADIR%%/images/Light/actions/previewmodeG-on.png
-%%DATADIR%%/images/Light/actions/previewmodeL-off.png
-%%DATADIR%%/images/Light/actions/previewmodeL-on.png
-%%DATADIR%%/images/Light/actions/previewmodeR-off.png
-%%DATADIR%%/images/Light/actions/previewmodeR-on.png
-%%DATADIR%%/images/Light/actions/processing-pause.png
-%%DATADIR%%/images/Light/actions/processing-play.png
-%%DATADIR%%/images/Light/actions/processing-thumbnail.png
-%%DATADIR%%/images/Light/actions/processing.png
-%%DATADIR%%/images/Light/actions/profile-filled.png
-%%DATADIR%%/images/Light/actions/profile-partial.png
-%%DATADIR%%/images/Light/actions/rated.png
-%%DATADIR%%/images/Light/actions/ratednot.png
-%%DATADIR%%/images/Light/actions/ratednotg.png
-%%DATADIR%%/images/Light/actions/raw.png
-%%DATADIR%%/images/Light/actions/refresh-red.png
-%%DATADIR%%/images/Light/actions/refresh-white.png
-%%DATADIR%%/images/Light/actions/rotate-left-1.png
-%%DATADIR%%/images/Light/actions/rotate-left-2.png
-%%DATADIR%%/images/Light/actions/rotate-left-3.png
-%%DATADIR%%/images/Light/actions/rotate-left.png
-%%DATADIR%%/images/Light/actions/rotate-right-1.png
-%%DATADIR%%/images/Light/actions/rotate-right-2.png
-%%DATADIR%%/images/Light/actions/rotate-right-3.png
-%%DATADIR%%/images/Light/actions/rotate-right.png
-%%DATADIR%%/images/Light/actions/rtwindow.png
-%%DATADIR%%/images/Light/actions/softProof.png
-%%DATADIR%%/images/Light/actions/spGamutCheck.png
-%%DATADIR%%/images/Light/actions/stock-flip-horizontal.png
-%%DATADIR%%/images/Light/actions/stock-flip-vertical.png
-%%DATADIR%%/images/Light/actions/stock-rotate-270.png
-%%DATADIR%%/images/Light/actions/stock-rotate-90.png
-%%DATADIR%%/images/Light/actions/straighten-small.png
-%%DATADIR%%/images/Light/actions/straighten.png
-%%DATADIR%%/images/Light/actions/toleftend.png
-%%DATADIR%%/images/Light/actions/torightend.png
-%%DATADIR%%/images/Light/actions/transform.png
-%%DATADIR%%/images/Light/actions/trash-hide-deleted.png
-%%DATADIR%%/images/Light/actions/trash-show-empty.png
-%%DATADIR%%/images/Light/actions/trash-show-full.png
-%%DATADIR%%/images/Light/actions/trash-thumbnail.png
-%%DATADIR%%/images/Light/actions/trash.png
-%%DATADIR%%/images/Light/actions/unchanged-18.png
-%%DATADIR%%/images/Light/actions/unchanged-22.png
-%%DATADIR%%/images/Light/actions/undelete-rtl.png
-%%DATADIR%%/images/Light/actions/undelete-thumbnail-rtl.png
-%%DATADIR%%/images/Light/actions/undelete-thumbnail.png
-%%DATADIR%%/images/Light/actions/undelete.png
-%%DATADIR%%/images/Light/actions/warnhl.png
-%%DATADIR%%/images/Light/actions/warnsh.png
-%%DATADIR%%/images/Light/actions/wavelet.png
-%%DATADIR%%/images/Light/actions/wb-auto.png
-%%DATADIR%%/images/Light/actions/wb-camera.png
-%%DATADIR%%/images/Light/actions/wb-cloudy.png
-%%DATADIR%%/images/Light/actions/wb-custom.png
-%%DATADIR%%/images/Light/actions/wb-flash.png
-%%DATADIR%%/images/Light/actions/wb-fluorescent.png
-%%DATADIR%%/images/Light/actions/wb-lamp.png
-%%DATADIR%%/images/Light/actions/wb-led.png
-%%DATADIR%%/images/Light/actions/wb-shade.png
-%%DATADIR%%/images/Light/actions/wb-sun.png
-%%DATADIR%%/images/Light/actions/wb-tungsten.png
-%%DATADIR%%/images/Light/actions/wb-water.png
-%%DATADIR%%/images/Light/actions/zoom-100-identifier.png
-%%DATADIR%%/images/Light/devices/computer.png
-%%DATADIR%%/images/Light/devices/drive-harddisk.png
-%%DATADIR%%/images/Light/devices/drive-optical.png
-%%DATADIR%%/images/Light/devices/drive-removable-media.png
-%%DATADIR%%/images/Light/devices/gtk-cdrom.png
-%%DATADIR%%/images/Light/devices/media-flash.png
-%%DATADIR%%/images/Light/devices/media-floppy.png
-%%DATADIR%%/images/Light/devices/media-optical-bd.png
-%%DATADIR%%/images/Light/devices/media-optical-dvd.png
-%%DATADIR%%/images/Light/devices/media-optical.png
-%%DATADIR%%/images/Light/devices/media-tape.png
-%%DATADIR%%/images/Light/index.theme
-%%DATADIR%%/images/Light/places/folder.png
-%%DATADIR%%/images/Light/places/gtk-directory.png
-%%DATADIR%%/images/Light/places/user-desktop.png
-%%DATADIR%%/images/Light/places/user-home.png
-%%DATADIR%%/images/PanelEnding.png
-%%DATADIR%%/images/beforeafter.png
-%%DATADIR%%/images/cglabel0.png
-%%DATADIR%%/images/cglabel1.png
-%%DATADIR%%/images/cglabel2.png
-%%DATADIR%%/images/cglabel3.png
-%%DATADIR%%/images/cglabel4.png
-%%DATADIR%%/images/cglabel5.png
-%%DATADIR%%/images/clabel0.png
-%%DATADIR%%/images/clabel1.png
-%%DATADIR%%/images/clabel2.png
-%%DATADIR%%/images/clabel3.png
-%%DATADIR%%/images/clabel4.png
-%%DATADIR%%/images/clabel5.png
-%%DATADIR%%/images/closedhand.png
-%%DATADIR%%/images/colour.png
-%%DATADIR%%/images/crop-auto.png
-%%DATADIR%%/images/crop.png
-%%DATADIR%%/images/cross.png
-%%DATADIR%%/images/crossed-arrows-out.png
-%%DATADIR%%/images/curveType-NURBS.png
-%%DATADIR%%/images/curveType-controlPoints.png
-%%DATADIR%%/images/curveType-flatLinear.png
-%%DATADIR%%/images/curveType-linear.png
-%%DATADIR%%/images/curveType-parametric.png
-%%DATADIR%%/images/curveType-spline.png
-%%DATADIR%%/images/curveType-unchanged.png
-%%DATADIR%%/images/default-settings-ltr.png
-%%DATADIR%%/images/default-settings-rtl.png
-%%DATADIR%%/images/detail.png
-%%DATADIR%%/images/distortion-auto.png
-%%DATADIR%%/images/distortion.png
-%%DATADIR%%/images/edited-small.png
-%%DATADIR%%/images/edited.png
-%%DATADIR%%/images/editedg-small.png
-%%DATADIR%%/images/editednot-small.png
-%%DATADIR%%/images/editednotg-small.png
-%%DATADIR%%/images/empty.png
-%%DATADIR%%/images/exposure.png
-%%DATADIR%%/images/filter.png
-%%DATADIR%%/images/filterclear.png
-%%DATADIR%%/images/folder.png
-%%DATADIR%%/images/fullscreen-exit.png
-%%DATADIR%%/images/fullscreen.png
-%%DATADIR%%/images/grayrated.png
-%%DATADIR%%/images/gtk-add.png
-%%DATADIR%%/images/gtk-apply.png
-%%DATADIR%%/images/gtk-close-small.png
-%%DATADIR%%/images/gtk-close.png
-%%DATADIR%%/images/gtk-color-picker-small.png
-%%DATADIR%%/images/gtk-color-picker.png
-%%DATADIR%%/images/gtk-open.png
-%%DATADIR%%/images/gtk-save-large.png
-%%DATADIR%%/images/gtk-undo-ltr.png
-%%DATADIR%%/images/gtk-undo-rtl.png
-%%DATADIR%%/images/gtk-undoall-ltr.png
-%%DATADIR%%/images/gtk-undoall-rtl.png
-%%DATADIR%%/images/gtk-zoom-100.png
-%%DATADIR%%/images/gtk-zoom-fit.png
-%%DATADIR%%/images/gtk-zoom-in.png
-%%DATADIR%%/images/gtk-zoom-out.png
-%%DATADIR%%/images/histBar.png
-%%DATADIR%%/images/histBlue.png
-%%DATADIR%%/images/histGreen.png
-%%DATADIR%%/images/histRaw.png
-%%DATADIR%%/images/histRed.png
-%%DATADIR%%/images/histValue.png
-%%DATADIR%%/images/image-editor.png
-%%DATADIR%%/images/info.png
-%%DATADIR%%/images/list-add-small.png
-%%DATADIR%%/images/list-remove-red-small.png
-%%DATADIR%%/images/list-remove.png
-%%DATADIR%%/images/lock-off.png
-%%DATADIR%%/images/lock-on.png
-%%DATADIR%%/images/logoicon-wind.png
-%%DATADIR%%/images/media-usb.png
-%%DATADIR%%/images/meta.png
-%%DATADIR%%/images/move-1D-h.png
-%%DATADIR%%/images/move-1D-v.png
-%%DATADIR%%/images/move-2D.png
-%%DATADIR%%/images/move-rotate.png
-%%DATADIR%%/images/network.png
-%%DATADIR%%/images/nocolorlabel.png
-%%DATADIR%%/images/notrated.png
-%%DATADIR%%/images/openhand.png
-%%DATADIR%%/images/panel-to-bottom.png
-%%DATADIR%%/images/panel-to-left.png
-%%DATADIR%%/images/panel-to-right.png
-%%DATADIR%%/images/panel-to-top.png
-%%DATADIR%%/images/popuparrow.png
-%%DATADIR%%/images/processing-pause.png
-%%DATADIR%%/images/processing-play.png
-%%DATADIR%%/images/processing.png
-%%DATADIR%%/images/rated.png
-%%DATADIR%%/images/ratednot.png
-%%DATADIR%%/images/ratednotg.png
-%%DATADIR%%/images/raw.png
-%%DATADIR%%/images/recent-save.png
-%%DATADIR%%/images/refresh-red.png
-%%DATADIR%%/images/refresh-white.png
-%%DATADIR%%/images/resize.png
-%%DATADIR%%/images/rt-logo-large.png
-%%DATADIR%%/images/rt-logo-medium.png
-%%DATADIR%%/images/rt-logo-small.png
-%%DATADIR%%/images/rt-logo-tiny.png
-%%DATADIR%%/images/saved.png
-%%DATADIR%%/images/savedg.png
-%%DATADIR%%/images/savednot.png
-%%DATADIR%%/images/savednotg.png
-%%DATADIR%%/images/splash.png
-%%DATADIR%%/images/stock-flip-horizontal.png
-%%DATADIR%%/images/stock-flip-vertical.png
-%%DATADIR%%/images/stock-rotate-270.png
-%%DATADIR%%/images/stock-rotate-90.png
-%%DATADIR%%/images/straighten-small.png
-%%DATADIR%%/images/straighten.png
-%%DATADIR%%/images/toleftend.png
-%%DATADIR%%/images/torightend.png
-%%DATADIR%%/images/transform.png
-%%DATADIR%%/images/trash-show-empty.png
-%%DATADIR%%/images/trash-show-full.png
-%%DATADIR%%/images/trash.png
-%%DATADIR%%/images/uncolorlabel.png
-%%DATADIR%%/images/undelete.png
-%%DATADIR%%/images/unrated.png
-%%DATADIR%%/images/warnhl.png
-%%DATADIR%%/images/warnsh.png
-%%DATADIR%%/languages/Catala
-%%DATADIR%%/languages/Chinese (Simplified)
-%%DATADIR%%/languages/Chinese (Traditional)
-%%DATADIR%%/languages/Czech
-%%DATADIR%%/languages/Dansk
-%%DATADIR%%/languages/Deutsch
-%%DATADIR%%/languages/English (UK)
-%%DATADIR%%/languages/English (US)
-%%DATADIR%%/languages/Espanol
-%%DATADIR%%/languages/Euskara
-%%DATADIR%%/languages/Francais
-%%DATADIR%%/languages/Greek
-%%DATADIR%%/languages/Hebrew
-%%DATADIR%%/languages/Italiano
-%%DATADIR%%/languages/Japanese
-%%DATADIR%%/languages/LICENSE
-%%DATADIR%%/languages/Latvian
-%%DATADIR%%/languages/Magyar
-%%DATADIR%%/languages/Nederlands
-%%DATADIR%%/languages/Norsk BM
-%%DATADIR%%/languages/Polish
-%%DATADIR%%/languages/Polish (Latin Characters)
-%%DATADIR%%/languages/Portugues (Brasil)
-%%DATADIR%%/languages/README
-%%DATADIR%%/languages/Russian
-%%DATADIR%%/languages/Serbian (Cyrilic Characters)
-%%DATADIR%%/languages/Serbian (Latin Characters)
-%%DATADIR%%/languages/Slovak
-%%DATADIR%%/languages/Suomi
-%%DATADIR%%/languages/Swedish
-%%DATADIR%%/languages/Turkish
-%%DATADIR%%/languages/default
-%%DATADIR%%/options
-%%DATADIR%%/profiles/BW/BW 1.pp3
-%%DATADIR%%/profiles/BW/BW 2.pp3
-%%DATADIR%%/profiles/BW/BW 3.pp3
-%%DATADIR%%/profiles/BW/BW 4.pp3
-%%DATADIR%%/profiles/Default ISO High.pp3
-%%DATADIR%%/profiles/Default ISO Medium.pp3
-%%DATADIR%%/profiles/Default.pp3
-%%DATADIR%%/profiles/Faded/Faded Amber 1 TM Bright.pp3
-%%DATADIR%%/profiles/Faded/Faded Amber 1 TM.pp3
-%%DATADIR%%/profiles/Faded/Faded Amber 1.pp3
-%%DATADIR%%/profiles/Faded/Faded Blue 1 TM Bright.pp3
-%%DATADIR%%/profiles/Faded/Faded Blue 1 TM.pp3
-%%DATADIR%%/profiles/Faded/Faded Blue 1.pp3
-%%DATADIR%%/profiles/Faded/Faded Blue Pink TM.pp3
-%%DATADIR%%/profiles/Faded/Faded Blue Pink.pp3
-%%DATADIR%%/profiles/Faded/Faded Chocolate 1 TM Bright.pp3
-%%DATADIR%%/profiles/Faded/Faded Chocolate 2 TM Bright.pp3
-%%DATADIR%%/profiles/Faded/Faded Golden 1.pp3
-%%DATADIR%%/profiles/Faded/Faded Golden 2.pp3
-%%DATADIR%%/profiles/Faded/Faded Green 1 TM Bright.pp3
-%%DATADIR%%/profiles/Faded/Faded Green 1 TM.pp3
-%%DATADIR%%/profiles/Faded/Faded Green 1.pp3
-%%DATADIR%%/profiles/Faded/Faded Green 2.pp3
-%%DATADIR%%/profiles/Faded/Faded Green 3.pp3
-%%DATADIR%%/profiles/Faded/Faded Neutral TM.pp3
-%%DATADIR%%/profiles/Faded/Faded Neutral.pp3
-%%DATADIR%%/profiles/Faded/Faded Purple 1 TM Bright.pp3
-%%DATADIR%%/profiles/Faded/Faded Purple 1 TM.pp3
-%%DATADIR%%/profiles/Faded/Faded Purple 1.pp3
-%%DATADIR%%/profiles/Faded/Faded Purple 2 TM.pp3
-%%DATADIR%%/profiles/Faded/Faded Purple 2.pp3
-%%DATADIR%%/profiles/Faded/Faded Teal Orange TM Bright.pp3
-%%DATADIR%%/profiles/Faded/Faded Teal Orange TM.pp3
-%%DATADIR%%/profiles/Faded/Faded Teal Orange.pp3
-%%DATADIR%%/profiles/Faded/Faded Warm 1 TM Bright.pp3
-%%DATADIR%%/profiles/Faded/Faded Warm 1 TM.pp3
-%%DATADIR%%/profiles/Faded/Faded Warm 1.pp3
-%%DATADIR%%/profiles/Faded/Faded Warm 2.pp3
-%%DATADIR%%/profiles/Faded/Faded Warm 3.pp3
-%%DATADIR%%/profiles/Generic/Deep Shadows.pp3
-%%DATADIR%%/profiles/Generic/Equilibrated.pp3
-%%DATADIR%%/profiles/Generic/High-Key.pp3
-%%DATADIR%%/profiles/Generic/Natural 1.pp3
-%%DATADIR%%/profiles/Generic/Natural 2.pp3
-%%DATADIR%%/profiles/Generic/Punchy 1.pp3
-%%DATADIR%%/profiles/Generic/Punchy 2.pp3
-%%DATADIR%%/profiles/Non-raw/Brighten.pp3
-%%DATADIR%%/profiles/Pop/Pop 1.pp3
-%%DATADIR%%/profiles/Pop/Pop 2 L.pp3
-%%DATADIR%%/profiles/Pop/Pop 3 Skin.pp3
-%%DATADIR%%/profiles/Pop/Pop 4 BW.pp3
-%%DATADIR%%/profiles/Portrait/Portrait Lejto.pp3
-%%DATADIR%%/profiles/Portrait/Portrait Smooth.pp3
-%%DATADIR%%/profiles/Skintones/Skintones - Natural TM.pp3
-%%DATADIR%%/profiles/Skintones/Skintones - Natural.pp3
-%%DATADIR%%/profiles/Skintones/Skintones - Pale TM Bright.pp3
-%%DATADIR%%/profiles/Skintones/Skintones - Pale TM.pp3
-%%DATADIR%%/profiles/Skintones/Skintones - Pale.pp3
-%%DATADIR%%/profiles/Skintones/Skintones - Soft Texture.pp3
-%%DATADIR%%/profiles/Skintones/Skintones - Strong Texture.pp3
-%%DATADIR%%/profiles/Skintones/Skintones - Studio TM.pp3
-%%DATADIR%%/profiles/Skintones/Skintones - Studio.pp3
-%%DATADIR%%/profiles/Skintones/Skintones - StudioBase 1 TM.pp3
-%%DATADIR%%/profiles/Skintones/Skintones - StudioBase 1.pp3
-%%DATADIR%%/sounds/BatchComplete.wav
-%%DATADIR%%/sounds/Empty.wav
-%%DATADIR%%/sounds/ProcessComplete.wav
-%%DATADIR%%/themes/RawTherapee-GTK3-20_.css
-%%DATADIR%%/themes/RawTherapee-GTK3-_19.css
-%%DATADIR%%/themes/TooWaBlue-Dark-GTK3-20_.css
-%%DATADIR%%/themes/TooWaBlue-GTK3-20_.css
-%%DATADIR%%/themes/TooWaBlue-GTK3-_19.css
-%%DATADIR%%/themes/images/svg/twb/checkbox-checked-disabled.svg
-%%DATADIR%%/themes/images/svg/twb/checkbox-checked.svg
-%%DATADIR%%/themes/images/svg/twb/checkbox-inconsistent-disabled.svg
-%%DATADIR%%/themes/images/svg/twb/checkbox-inconsistent.svg
-%%DATADIR%%/themes/images/svg/twb/checkbox-unchecked-disabled.svg
-%%DATADIR%%/themes/images/svg/twb/checkbox-unchecked.svg
-%%DATADIR%%/themes/images/svg/twb/radio-checked-disabled.svg
-%%DATADIR%%/themes/images/svg/twb/radio-checked.svg
-%%DATADIR%%/themes/images/svg/twb/radio-inconsistent-disabled.svg
-%%DATADIR%%/themes/images/svg/twb/radio-inconsistent.svg
-%%DATADIR%%/themes/images/svg/twb/radio-unchecked-disabled.svg
-%%DATADIR%%/themes/images/svg/twb/radio-unchecked.svg
-%%DATADIR%%/themes/images/twb/checkbox-checked-disabled.png
-%%DATADIR%%/themes/images/twb/checkbox-checked.png
-%%DATADIR%%/themes/images/twb/checkbox-inconsistent-disabled.png
-%%DATADIR%%/themes/images/twb/checkbox-inconsistent.png
-%%DATADIR%%/themes/images/twb/checkbox-unchecked-disabled.png
-%%DATADIR%%/themes/images/twb/checkbox-unchecked.png
-%%DATADIR%%/themes/images/twb/radio-checked-disabled.png
-%%DATADIR%%/themes/images/twb/radio-checked.png
-%%DATADIR%%/themes/images/twb/radio-inconsistent-disabled.png
-%%DATADIR%%/themes/images/twb/radio-inconsistent.png
-%%DATADIR%%/themes/images/twb/radio-unchecked-disabled.png
-%%DATADIR%%/themes/images/twb/radio-unchecked.png
-%%DATADIR%%/themes/system.iconset
diff --git a/graphics/rawtherapee/Makefile b/graphics/rawtherapee/Makefile
index 4cdcd0227e4..66c636f8703 100644
--- a/graphics/rawtherapee/Makefile
+++ b/graphics/rawtherapee/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	rawtherapee
-PORTVERSION=	5.1
+PORTVERSION=	5.2
 #DISTNAME=	${PORTNAME}-${PORTVERSION:R}-r${PORTVERSION:E}${DISTVERSIONSUFFIX}
 CATEGORIES=	graphics
 MASTER_SITES=	http://rawtherapee.com/shared/source/
diff --git a/graphics/rawtherapee/distinfo b/graphics/rawtherapee/distinfo
index ae58496d4ae..edd7c129801 100644
--- a/graphics/rawtherapee/distinfo
+++ b/graphics/rawtherapee/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495050595
-SHA256 (rawtherapee-5.1.tar.xz) = fb742065a6b2e1b89df67c70395e52ee1ebd537c86dfc473b41e7af171655b67
-SIZE (rawtherapee-5.1.tar.xz) = 10785516
+TIMESTAMP = 1502445498
+SHA256 (rawtherapee-5.2.tar.xz) = 5c32679bfb77eca36c26288483be75696086459b7a59bd4437e371ea1bf827b6
+SIZE (rawtherapee-5.2.tar.xz) = 10819936
diff --git a/graphics/rawtherapee/pkg-plist b/graphics/rawtherapee/pkg-plist
index 60036ed7481..737fed6b8ae 100644
--- a/graphics/rawtherapee/pkg-plist
+++ b/graphics/rawtherapee/pkg-plist
@@ -44,6 +44,7 @@ share/icons/hicolor/48x48/apps/rawtherapee.png
 %%DATADIR%%/dcpprofiles/FUJIFILM X-Pro2.dcp
 %%DATADIR%%/dcpprofiles/FUJIFILM X-T1.dcp
 %%DATADIR%%/dcpprofiles/Fujifilm X-T10.dcp
+%%DATADIR%%/dcpprofiles/FUJIFILM X-T20.dcp
 %%DATADIR%%/dcpprofiles/FUJIFILM X100S.dcp
 %%DATADIR%%/dcpprofiles/FUJIFILM X100T.dcp
 %%DATADIR%%/dcpprofiles/Leaf Aptus 75.dcp
diff --git a/hardenedbsd/Makefile b/hardenedbsd/Makefile
index 4d2ba276e95..e13090d48db 100644
--- a/hardenedbsd/Makefile
+++ b/hardenedbsd/Makefile
@@ -2,7 +2,6 @@
 
 SUBDIR += rowhammer
 SUBDIR += secadm
-SUBDIR += secadm-devel
 SUBDIR += secadm-kmod
 SUBDIR += testpie
 SUBDIR += testmprotect
diff --git a/java/intellij-pycharm/Makefile b/java/intellij-pycharm/Makefile
index a124c01d5d4..5733872d7bd 100644
--- a/java/intellij-pycharm/Makefile
+++ b/java/intellij-pycharm/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pycharm
-PORTVERSION=	2017.2
+PORTVERSION=	2017.2.1
 CATEGORIES=	java devel python
 MASTER_SITES=	https://download.jetbrains.com/python/ \
 		http://download.jetbrains.com/python/
diff --git a/java/intellij-pycharm/distinfo b/java/intellij-pycharm/distinfo
index 5f814daecab..e036e65f677 100644
--- a/java/intellij-pycharm/distinfo
+++ b/java/intellij-pycharm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501253414
-SHA256 (pycharm-community-2017.2.tar.gz) = 375efef320eaa5be3b8dc280dfe48b70adfab1fa2f418fc03f5983d09bcdb4d8
-SIZE (pycharm-community-2017.2.tar.gz) = 200381343
+TIMESTAMP = 1502575841
+SHA256 (pycharm-community-2017.2.1.tar.gz) = 4a7e5ab8c89be6ac3b6da649003260d1ed86b1dd41b7e9aa1d3873cacd7d6bd1
+SIZE (pycharm-community-2017.2.1.tar.gz) = 200410040
diff --git a/java/linux-oracle-jdk18/Makefile b/java/linux-oracle-jdk18/Makefile
index ed6e173e8b7..6aba2f25b7d 100644
--- a/java/linux-oracle-jdk18/Makefile
+++ b/java/linux-oracle-jdk18/Makefile
@@ -29,7 +29,7 @@ ONLY_FOR_ARCHS=	i386 amd64
 JDK_VENDOR=		oracle
 JDK_VERSION=		8
 JDK_INTERNAL_VERSION=	1.${JDK_VERSION}.0
-JDK_UPDATE_VERSION=	131
+JDK_UPDATE_VERSION=	144
 .if ${JDK_UPDATE_VERSION} == 0
 DL_JDK_VERSION=		${JDK_INTERNAL_VERSION}
 .elif ${JDK_UPDATE_VERSION} <= 9
diff --git a/java/linux-oracle-jdk18/distinfo b/java/linux-oracle-jdk18/distinfo
index 90455bf58c3..4e0b7c045e1 100644
--- a/java/linux-oracle-jdk18/distinfo
+++ b/java/linux-oracle-jdk18/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1492576712
-SHA256 (jdk-8u131-linux-i586.tar.gz) = 0069a2b1b1cddbefa45f1ff12933fca3b114b6544d536ec0e2d4861a830d7154
-SIZE (jdk-8u131-linux-i586.tar.gz) = 188105480
-SHA256 (jdk-8u131-linux-i586-demos.tar.gz) = e75eff66cc8f0fbec43bc18c3392eac39b8f7fc3db19367fa214091f61c00ad2
-SIZE (jdk-8u131-linux-i586-demos.tar.gz) = 55065450
+TIMESTAMP = 1502382949
+SHA256 (jdk-8u144-linux-i586.tar.gz) = 624c090647629394ef0ee08d9d8ac5d3d5a9a60fa245fefb2eb417c36c7cb7c4
+SIZE (jdk-8u144-linux-i586.tar.gz) = 188157665
+SHA256 (jdk-8u144-linux-i586-demos.tar.gz) = 3e8f02f32b129d681f5f2a0178373d750f4c2352acf55785fdca70c8f9aaf595
+SIZE (jdk-8u144-linux-i586-demos.tar.gz) = 55071167
diff --git a/java/linux-oracle-jre18/Makefile b/java/linux-oracle-jre18/Makefile
index 815f19afead..c3498a99e31 100644
--- a/java/linux-oracle-jre18/Makefile
+++ b/java/linux-oracle-jre18/Makefile
@@ -27,7 +27,7 @@ ONLY_FOR_ARCHS=	i386 amd64
 JRE_VENDOR=		oracle
 JRE_VERSION=		8
 JRE_INTERNAL_VERSION=	1.${JRE_VERSION}.0
-JRE_UPDATE_VERSION=	131
+JRE_UPDATE_VERSION=	144
 .if ${JRE_UPDATE_VERSION} == 0
 DL_JRE_VERSION=		${JRE_INTERNAL_VERSION}
 .elif ${JRE_UPDATE_VERSION} <= 9
diff --git a/java/linux-oracle-jre18/distinfo b/java/linux-oracle-jre18/distinfo
index 85f69b66e64..fea8d92d049 100644
--- a/java/linux-oracle-jre18/distinfo
+++ b/java/linux-oracle-jre18/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1492577191
-SHA256 (jre-8u131-linux-i586.tar.gz) = a773f2fe17061ef637ed2094b06313a99c0b45ba3d3cb7f8f1ebf18448495aeb
-SIZE (jre-8u131-linux-i586.tar.gz) = 78620957
+TIMESTAMP = 1502383119
+SHA256 (jre-8u144-linux-i586.tar.gz) = 9ac5b0d6cda9279a4959a6eb635d849d745a37dafc24666539d1c8f7d76ab77a
+SIZE (jre-8u144-linux-i586.tar.gz) = 78658631
diff --git a/lang/cint/Makefile b/lang/cint/Makefile
index 1ecbc98dc6b..f8aa8676e57 100644
--- a/lang/cint/Makefile
+++ b/lang/cint/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cint
 PORTVERSION=	5.18.00
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	lang
 MASTER_SITES=	http://root.cern.ch/drupal/sites/default/files/
 
@@ -15,12 +15,17 @@ BROKEN_powerpc64=	does not build: cint/include/iosenum.h: segmentation fault (co
 BUILD_DEPENDS=	bash:shells/bash
 
 HAS_CONFIGURE=	yes
-CONFIGURE_ENV=	CC="${CC}" CXX="${CXX}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV=	CC="${CC}" CXX="${CXX}" LDFLAGS="${LDFLAGS}" \
+		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
 USE_GCC=	yes
 USES=		gmake readline tar:tgz
 USE_LDCONFIG=	${PREFIX}/lib/cint
 ALL_TARGET=
 
+# The port does not build with C++11/C++14, so explicitly use an older
+# standard.
+USE_CXXSTD=	gnu++03
+
 INSTALL_ARGS=	--bindir=${STAGEDIR}${PREFIX}/bin\
 		--libdir=${STAGEDIR}${PREFIX}/lib/cint\
 		--mandir=${STAGEDIR}${PREFIX}/man\
diff --git a/lang/gcc6-devel/Makefile b/lang/gcc6-devel/Makefile
index f560c01e14a..d67fccbc475 100644
--- a/lang/gcc6-devel/Makefile
+++ b/lang/gcc6-devel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gcc
-PORTVERSION=	6.4.1.s20170802
+PORTVERSION=	6.4.1.s20170809
 CATEGORIES=	lang java
 MASTER_SITES=	GCC/snapshots/${DIST_VERSION}
 PKGNAMESUFFIX=	${SUFFIX}-devel
diff --git a/lang/gcc6-devel/distinfo b/lang/gcc6-devel/distinfo
index 4d89eba849e..5a76dc1c7fb 100644
--- a/lang/gcc6-devel/distinfo
+++ b/lang/gcc6-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501892301
-SHA256 (gcc-6-20170802.tar.xz) = 6da53170cb1fd50fc49cae567e741a0e6334babcc1d23e7302221b18adcce34c
-SIZE (gcc-6-20170802.tar.xz) = 72581920
+TIMESTAMP = 1502376026
+SHA256 (gcc-6-20170809.tar.xz) = cb44a7c3a9c42ae527a0b14cb7af43c1a7adc1d730cc505a52edb365c73206dd
+SIZE (gcc-6-20170809.tar.xz) = 72584212
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 5b46f4f1817..71e9d9a75fa 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ghc
 PORTVERSION=	${GHC_VERSION}
+PORTREVISION=	1
 CATEGORIES=	lang haskell
 MASTER_SITES=	http://www.haskell.org/ghc/dist/${PORTVERSION}/:source \
 		LOCAL/pgj/:boot
@@ -192,7 +193,7 @@ post-install-script:
 .endif
 
 post-patch:
-	${REINPLACE_CMD} -e 's|%%CC%%|${CC}|; \
+	@${REINPLACE_CMD} -e 's|%%CC%%|${CC}|; \
 		s|%%AR%%|${AR}|; \
 		s|%%LD%%|${LD}|' \
 		${WRKSRC}/libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs
diff --git a/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs b/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs
index daf5ea981ba..18f93733593 100644
--- a/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs
+++ b/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs
@@ -15,13 +15,13 @@
  gccProgram = (simpleProgram "gcc") {
 -    programFindVersion = findProgramVersion "-dumpversion" id
 -  }
-+     programFindLocation = \v p -> findProgramOnSearchPath v p "cc"
++     programFindLocation = \v p -> findProgramOnSearchPath v p "%%CC%%"
 +}
  
  arProgram :: Program
 -arProgram = simpleProgram "ar"
 +arProgram = (simpleProgram "ar") {
-+     programFindLocation = \v p -> findProgramOnSearchPath v p "ar"
++     programFindLocation = \v p -> findProgramOnSearchPath v p "%%AR%%"
 +}
  
  stripProgram :: Program
@@ -32,7 +32,7 @@
  ldProgram :: Program
 -ldProgram = simpleProgram "ld"
 +ldProgram = (simpleProgram "ld") {
-+    programFindLocation = \v p -> findProgramOnSearchPath v p "ld"
++    programFindLocation = \v p -> findProgramOnSearchPath v p "%%LD%%"
 +  }
  
  tarProgram :: Program
diff --git a/lang/jimtcl/Makefile b/lang/jimtcl/Makefile
index 7e97cf45ce2..341b259c534 100644
--- a/lang/jimtcl/Makefile
+++ b/lang/jimtcl/Makefile
@@ -4,23 +4,32 @@ PORTNAME=	jimtcl
 PORTVERSION=	0.77
 CATEGORIES=	lang tcl
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	Small footprint implementation of the Tcl programming language
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+USES=		ssl
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	msteveb
 
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--full \
+CONFIGURE_ARGS=	--prefix=${PREFIX} \
+		--full \
 		--enable-utf8 \
-		--enable-shared \
-		--disable-docs
+		--enable-shared
+
+OPTIONS_DEFINE=		DOCS
+DOCS_CONFIGURE_ENABLE=	docs
+DOCS_CONFIGURE_ON=	--docdir=${DOCSDIR}
+DOCS_BUILD_DEPENDS=	asciidoc:textproc/asciidoc
+PORTDOCS=		*
+
+TEST_TARGET=		test
 
 post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/jimsh \
-		${STAGEDIR}${PREFIX}/lib/libjim.so.*
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/jimsh
 
 .include <bsd.port.mk>
diff --git a/lang/opencoarrays/Makefile b/lang/opencoarrays/Makefile
index 02d2aae2522..d868556d1d0 100644
--- a/lang/opencoarrays/Makefile
+++ b/lang/opencoarrays/Makefile
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	opencoarrays
-PORTVERSION=	1.9.0
+PORTVERSION=	1.9.1
 CATEGORIES=	lang parallel
 
-MAINTAINER=	mexas@bris.ac.uk
+MAINTAINER=	as@cmplx.uk
 COMMENT=	Transport layer for coarray Fortran compilers
 
 LICENSE=	BSD3CLAUSE
diff --git a/lang/opencoarrays/distinfo b/lang/opencoarrays/distinfo
index 74b67536a09..0ec3e9e465b 100644
--- a/lang/opencoarrays/distinfo
+++ b/lang/opencoarrays/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1496141206
-SHA256 (sourceryinstitute-OpenCoarrays-1.9.0_GH0.tar.gz) = 5686194b325f8769dd86d691343f3abf859676fd88fb97c4e88ab0e6066a66f6
-SIZE (sourceryinstitute-OpenCoarrays-1.9.0_GH0.tar.gz) = 252524
+TIMESTAMP = 1502444969
+SHA256 (sourceryinstitute-OpenCoarrays-1.9.1_GH0.tar.gz) = 084a365ea90c0f88c652b259b494349641cf3c75f1bb7b65b78e74755fc5d041
+SIZE (sourceryinstitute-OpenCoarrays-1.9.1_GH0.tar.gz) = 247200
diff --git a/lang/x10/Makefile b/lang/x10/Makefile
index 4dcc81b6682..8416ea25ffd 100644
--- a/lang/x10/Makefile
+++ b/lang/x10/Makefile
@@ -25,6 +25,8 @@ COMMENT=	Object-oriented parallel programming language
 
 LICENSE=	EPL
 
+BROKEN=		Fails to build with modern compilers (cf. PR 219282)
+
 USES=	tar:bzip2
 USE_JAVA=	yes
 JAVA_VERSION=	1.6 1.7
diff --git a/mail/cyrus-imapd30/Makefile b/mail/cyrus-imapd30/Makefile
index bd98d908384..2702eb3ef98 100644
--- a/mail/cyrus-imapd30/Makefile
+++ b/mail/cyrus-imapd30/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cyrus-imapd
-PORTVERSION=	3.0.2
+PORTVERSION=	3.0.3
 #PORTREVISION=	0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-imapd/ \
diff --git a/mail/cyrus-imapd30/distinfo b/mail/cyrus-imapd30/distinfo
index 7d09b952957..89cd9b2c547 100644
--- a/mail/cyrus-imapd30/distinfo
+++ b/mail/cyrus-imapd30/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1498150554
-SHA256 (cyrus-imapd-3.0.2.tar.gz) = 5612f3cfa0504eb50bc3e49a77bf04a31c1aff3096fa1bbddb26cd7dbb69d94d
-SIZE (cyrus-imapd-3.0.2.tar.gz) = 10706654
+TIMESTAMP = 1502436537
+SHA256 (cyrus-imapd-3.0.3.tar.gz) = 6a76d8d00b26a2c9d03c65197724a28ab6d044527d7e230e6331f8de79af889a
+SIZE (cyrus-imapd-3.0.3.tar.gz) = 10819454
diff --git a/mail/isync/Makefile b/mail/isync/Makefile
index fefc78fd966..3c123515435 100644
--- a/mail/isync/Makefile
+++ b/mail/isync/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	isync
-PORTVERSION=	1.2.1
-PORTREVISION=	1
+PORTVERSION=	1.2.2
 CATEGORIES=	mail
 MASTER_SITES=	SF
 
diff --git a/mail/isync/distinfo b/mail/isync/distinfo
index 3b55038ec90..8ba433c3bd4 100644
--- a/mail/isync/distinfo
+++ b/mail/isync/distinfo
@@ -1,2 +1,3 @@
-SHA256 (isync-1.2.1.tar.gz) = e716de28c9a08e624a035caae3902fcf3b511553be5d61517a133e03aa3532ae
-SIZE (isync-1.2.1.tar.gz) = 281990
+TIMESTAMP = 1502654615
+SHA256 (isync-1.2.2.tar.gz) = d9197e27bfe77e3d8971f4fcb25ec37b2506827c4bc9439b72376caa091ce877
+SIZE (isync-1.2.2.tar.gz) = 285745
diff --git a/mail/isync/files/patch-src_socket.c b/mail/isync/files/patch-src_socket.c
new file mode 100644
index 00000000000..4dbed8220aa
--- /dev/null
+++ b/mail/isync/files/patch-src_socket.c
@@ -0,0 +1,11 @@
+--- src/socket.c.orig	2017-08-13 23:04:40 UTC
++++ src/socket.c
+@@ -40,7 +40,7 @@
+ # include <openssl/ssl.h>
+ # include <openssl/err.h>
+ # include <openssl/x509v3.h>
+-# if OPENSSL_VERSION_NUMBER < 0x10100000L
++# if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ #  define X509_OBJECT_get0_X509(o) ((o)->data.x509)
+ #  define X509_STORE_get0_objects(o) ((o)->objs)
+ # endif
diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index 34fbe7a95e4..0f7f05bf740 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mailman
-DISTVERSION=	2.1.23
-PORTREVISION=	1
+DISTVERSION=	2.1.24
 CATEGORIES=	mail
 MASTER_SITES=	GNU \
 		SF/${PORTNAME}/Mailman%202.1%20%28stable%29/${PORTVERSION} \
@@ -115,11 +114,12 @@ MAIL_GID?=	_smtpd
 .if ${PORT_OPTIONS:MHTDIG}
 PKGNAMESUFFIX+=	-with-htdig
 # how to create PATCHFILES:
-#X fetch http://bazaar.launchpad.net/~msapiro/mailman/htdig/tarball/1668
+#X identify what is the version of msapiro's patches corresponding to the release.
+#X fetch http://bazaar.launchpad.net/~msapiro/mailman/htdig/tarball/1702
 #X unpack this tarball, and the original distfile
-#X diff -NEur original-unpack bazaar-unpack | xz --best -c >msapiro-htdig-1668.patch.xz
+#X diff -NEur original-unpack bazaar-unpack | xz --best -c >msapiro-htdig-1702.patch.xz
 #X upload the latter with mode 0644 or similar to freefall's public_distfiles/ directory
-PATCHFILES+=	msapiro-htdig-1668.patch.xz
+PATCHFILES+=	msapiro-htdig-1702.patch.xz
 RUN_DEPENDS+=	htdig:textproc/htdig
 PLIST_SUB+=	SUB_HTDIG=""
 .else
diff --git a/mail/mailman/distinfo b/mail/mailman/distinfo
index 13bba8f2e9f..4207b65173c 100644
--- a/mail/mailman/distinfo
+++ b/mail/mailman/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1472497873
-SHA256 (mailman/mailman-2.1.23.tgz) = b022ca6f8534621c9dbe50c983948688bc4623214773b580c2c78e4a7ae43e69
-SIZE (mailman/mailman-2.1.23.tgz) = 9290881
-SHA256 (mailman/msapiro-htdig-1668.patch.xz) = 8376e56788ea9561e74261bbf1deff1417cc265bc87b0a25e963af693f57b34d
-SIZE (mailman/msapiro-htdig-1668.patch.xz) = 50768
+TIMESTAMP = 1502457748
+SHA256 (mailman/mailman-2.1.24.tgz) = e723cbc9093f1e3e83aae09004fe8cc4f5e09112eccb157b215bad2aaf92dae4
+SIZE (mailman/mailman-2.1.24.tgz) = 9251020
+SHA256 (mailman/msapiro-htdig-1702.patch.xz) = 770b43d44b48e9d730ac842fe6eaefa2def669e497aaa1a78043b83b26573909
+SIZE (mailman/msapiro-htdig-1702.patch.xz) = 50864
diff --git a/mail/mailman/pkg-plist b/mail/mailman/pkg-plist
index a2f3b18466e..10bf0889c44 100644
--- a/mail/mailman/pkg-plist
+++ b/mail/mailman/pkg-plist
@@ -2220,6 +2220,7 @@
 %%MMDIR%%/tests/bounces/simple_38.txt
 %%MMDIR%%/tests/bounces/simple_39.txt
 %%MMDIR%%/tests/bounces/simple_40.txt
+%%MMDIR%%/tests/bounces/simple_41.txt
 %%MMDIR%%/tests/bounces/sina_01.txt
 %%MMDIR%%/tests/bounces/smtp32_01.txt
 %%MMDIR%%/tests/bounces/smtp32_02.txt
diff --git a/mail/notmuch/Makefile b/mail/notmuch/Makefile
index c47a17ef948..4e1928ed4ef 100644
--- a/mail/notmuch/Makefile
+++ b/mail/notmuch/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	notmuch
-PORTVERSION=	0.24.2
+PORTVERSION=	0.25
 CATEGORIES=	mail
 MASTER_SITES=	http://notmuchmail.org/releases/
 
@@ -21,31 +21,35 @@ TEST_DEPENDS=	bash:shells/bash \
 		dtach:misc/dtach \
 		gdate:sysutils/coreutils \
 		gbase64:sysutils/coreutils \
-		gwc:sysutils/coreutils \
-		gsed:sysutils/coreutils \
+		gsed:textproc/gsed \
 		gsha256sum:sysutils/coreutils \
 		gpg:security/gnupg \
+		gwc:sysutils/coreutils \
 		${LOCALBASE}/bin/gdb:devel/gdb
 
 BROKEN_powerpc64=	Does not build
 
 HAS_CONFIGURE=	yes
-USES=		gmake pkgconfig python:build
+USES=		gmake pkgconfig python:build,test
 USE_GNOME=	glib20
 CONFIGURE_ARGS=	--prefix=${PREFIX} --mandir=${MANPREFIX}/man
 USE_LDCONFIG=	yes
 
 MAKE_ENV+=	PYTHONCMD=${PYTHON_CMD}
 
-TEST_ENV+=	NOTMUCH_SKIP_TESTS="basic count insert smime atomicity \
-		message-property new regexp-query tagging" \
+TEST_ENV+=	NOTMUCH_SKIP_TESTS="address basic count crypto db-features \
+		database-modified dump-restore emacs emacs-large-search-buffer \
+		from-guessing insert json lib-error new parse-time-string \
+		python search search-output sexp smime symbol-hiding tagging \
+		thread-order thread-search" \
 		V=1 \
 		TEST_CFLAGS="-g -O0 -I${LOCALBASE}/include -L${LOCALBASE}/lib" \
 		BSD_GDB=${LOCALBASE}/bin/gdb
 
 TEST_TARGET=	test
 
-OPTIONS_DEFINE=	BASH DOXYGEN EMACS MANPAGES MUTT RUBY ZSH
+OPTIONS_DEFINE=	BASH DESKTOP DOXYGEN EMACS MANPAGES MUTT RUBY ZSH
+DESKTOP_DESC=	Install desktop file
 EMACS_DESC=	Install EMACS lisp files (requires emacs)
 MUTT_DESC=	Install notmuch-mutt script
 OPTIONS_SUB=	yes
@@ -53,6 +57,8 @@ OPTIONS_SUB=	yes
 BASH_BUILD_DEPENDS=	bash-completion>=1.90:shells/bash-completion
 BASH_RUN_DEPENDS=	${BASH_BUILD_DEPENDS}
 BASH_CONFIGURE_WITH=	bash-completion
+DESKTOP_CONFIGURE_WITH=	desktop
+DESKTOP_USES=		desktop-file-utils
 DOXYGEN_CONFIGURE_WITH=	api-docs
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 EMACS_CONFIGURE_WITH=	emacs
@@ -64,7 +70,7 @@ MUTT_RUN_DEPENDS=	p5-Term-ReadLine-Gnu>0:devel/p5-Term-ReadLine-Gnu \
 			p5-Mail-Tools>0:mail/p5-Mail-Tools \
 			p5-Mail-Box>0:mail/p5-Mail-Box \
 			p5-String-ShellQuote>0:textproc/p5-String-ShellQuote
-MUTT_USE=	PERL=yes
+MUTT_USES=	perl5
 RUBY_USE=	RUBY=yes
 ZSH_CONFIGURE_WITH=	zsh-completion
 
@@ -78,6 +84,6 @@ do-install-MUTT-on:
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/notmuch
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnotmuch.so.4.4.0
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnotmuch.so.5.0.0
 
 .include <bsd.port.mk>
diff --git a/mail/notmuch/distinfo b/mail/notmuch/distinfo
index c70f9577774..d46a7f1f924 100644
--- a/mail/notmuch/distinfo
+++ b/mail/notmuch/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500399569
-SHA256 (notmuch-0.24.2.tar.gz) = aa76a96684d5c5918d940182b6fe40f7d6745f144476fdda57388479d586cc51
-SIZE (notmuch-0.24.2.tar.gz) = 709272
+TIMESTAMP = 1501171431
+SHA256 (notmuch-0.25.tar.gz) = 65d28d1f783d02629039f7d15d9a2bada147a7d3809f86fe8d13861b0f6ae60b
+SIZE (notmuch-0.25.tar.gz) = 882093
diff --git a/mail/notmuch/pkg-plist b/mail/notmuch/pkg-plist
index a6b9475c14b..b97227ec73f 100644
--- a/mail/notmuch/pkg-plist
+++ b/mail/notmuch/pkg-plist
@@ -3,8 +3,8 @@ bin/notmuch
 %%MUTT%%bin/notmuch-mutt
 include/notmuch.h
 lib/libnotmuch.so
-lib/libnotmuch.so.4
-lib/libnotmuch.so.4.4.0
+lib/libnotmuch.so.5
+lib/libnotmuch.so.5.0.0
 %%MANPAGES%%man/man1/notmuch-address.1.gz
 %%MANPAGES%%man/man1/notmuch-compact.1.gz
 %%MANPAGES%%man/man1/notmuch-config.1.gz
@@ -24,7 +24,7 @@ lib/libnotmuch.so.4.4.0
 %%DOXYGEN%%man/man3/notmuch.3.gz
 %%MANPAGES%%man/man5/notmuch-hooks.5.gz
 %%MANPAGES%%man/man7/notmuch-search-terms.7.gz
-%%BASH%%etc/bash_completion.d/notmuch
+%%BASH%%share/bash-completion/completions/notmuch
 %%EMACS%%%%EMACS_SITE_LISPDIR%%/coolj.el
 %%EMACS%%%%EMACS_SITE_LISPDIR%%/coolj.elc
 %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-address.el
@@ -68,5 +68,5 @@ lib/libnotmuch.so.4.4.0
 %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-company.elc
 %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-compat.el
 %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-compat.elc
-%%EMACS%%share/applications/notmuch-emacs-mua.desktop
+%%DESKTOP%%share/applications/notmuch-emacs-mua.desktop
 %%ZSH%%share/zsh/functions/Completion/Unix/_notmuch
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 2f8363fb2c7..7354f470ed5 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	postfix
-DISTVERSION=	3.3-20170613
+DISTVERSION=	3.3-20170730
 PORTREVISION?=	0
 PORTEPOCH=	5
 CATEGORIES=	mail ipv6
diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo
index f2d991531e0..90766c2f3cb 100644
--- a/mail/postfix-current/distinfo
+++ b/mail/postfix-current/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1497369791
-SHA256 (postfix/postfix-3.3-20170613.tar.gz) = 4c66e3188aa2ff8fdf4f9e9705261204e8128687bc3eb1dd07c7f10af0225cfc
-SIZE (postfix/postfix-3.3-20170613.tar.gz) = 4391163
+TIMESTAMP = 1501448854
+SHA256 (postfix/postfix-3.3-20170730.tar.gz) = 1818c409fdb5e1271bb684d4af7f49ea7cc33b2a13856633c95f30edd265aa54
+SIZE (postfix/postfix-3.3-20170730.tar.gz) = 4396415
diff --git a/mail/postfix211/Makefile b/mail/postfix211/Makefile
index 5387a167a36..3421f3bbf51 100644
--- a/mail/postfix211/Makefile
+++ b/mail/postfix211/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	postfix
-PORTVERSION=	2.11.8
+PORTVERSION=	2.11.10
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/ \
@@ -25,7 +25,6 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 PORTSCOUT=	limit:^2\.11\.
 
-VDAVERSION=	2.10.0
 CONFLICTS_INSTALL?=	courier-0.* opensmtpd-[0-9]* \
 		sendmail-8.* sendmail+*-8.* smail-3.* zmailer-2.* \
 		postfix2?-* postfix-3.* postfix-current-*
@@ -239,8 +238,7 @@ _REQUIRE+=		ypserv
 .endif
 
 .if ${PORT_OPTIONS:MVDA}
-PATCH_SITES+=		http://vda.sourceforge.net/VDA/:vda
-PATCHFILES+=		postfix-vda-v13-${VDAVERSION}.patch:-p1:vda
+EXTRA_PATCHES+=		${FILESDIR}/extra-patch-postfix-vda-v13-2.11.x
 .endif
 
 .if ${PORT_OPTIONS:MTEST}
@@ -319,6 +317,9 @@ do-configure:
 	AUXLIBS="${POSTFIX_AUXLIBS}" && \
 	${ECHO} "all: default" >> Makefile)
 
+post-stage-VDA-on:
+	${HEAD} -n 17 ${FILESDIR}/extra-patch-postfix-vda-v13-2.11.x >> ${WRKDIR}/pkg-message
+
 pre-install-INST_BASE-on:
 	${MKDIR} ${STAGEDIR}/etc/rc.d
 
diff --git a/mail/postfix211/distinfo b/mail/postfix211/distinfo
index 4785752b3ea..e82ea9fac28 100644
--- a/mail/postfix211/distinfo
+++ b/mail/postfix211/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1463402666
-SHA256 (postfix/postfix-2.11.8.tar.gz) = 3c4ece0846b519e2e800608f3009e929a3c2a1c7841bf07397ec9edc7463c923
-SIZE (postfix/postfix-2.11.8.tar.gz) = 4032263
+TIMESTAMP = 1383475619
+SHA256 (postfix/postfix-2.11.10.tar.gz) = 4d9dca8a6f08adcb70fc02a00bde0f8057f062bc16dfa32acd6bbec2b0ffb9dd
+SIZE (postfix/postfix-2.11.10.tar.gz) = 4033890
 SHA256 (postfix/postfix-2.8.0-libspf2-1.2.x-0.patch.gz) = e5c38e5bc226cab109c02a4e530ab1aefd3bb06f2169f3e052bdf83d2727aacc
 SIZE (postfix/postfix-2.8.0-libspf2-1.2.x-0.patch.gz) = 8191
 SHA256 (postfix/postfix-vda-v13-2.10.0.patch) = 6208021eb0b37ac6482e334e538ed5700cc22c4d4dd66ed9e975ae5f20bf935f
diff --git a/mail/postfix211/files/extra-patch-postfix-vda-v13-2.11.x b/mail/postfix211/files/extra-patch-postfix-vda-v13-2.11.x
new file mode 100644
index 00000000000..70cf4ccb550
--- /dev/null
+++ b/mail/postfix211/files/extra-patch-postfix-vda-v13-2.11.x
@@ -0,0 +1,1385 @@
+
+VDA patch against postfix-2.11.10+
+
+It seems the upstream VDA project is no longer maintained, the last
+changes against postfix-2.x could also be archived by using the -p1
+parameter.  This is an updated patch against 2.11.10 and it will be
+the last VDA patch for the postfix ports.
+
+Users using the VDA patch should adopt dovecot-lda which has also quota
+support.  As alternative users can jump on the wagon and try to become
+an active maintainer of the SF.net VDA project (or a fork)
+
+The 2.11 port will be deprecated at the time postfix-2.11.x is no longer
+supported by the postfix author (Wietse Venema), this will happen with
+the release of postfix-3.3.x.
+
+===========================================================================
+--- README_FILES/VDA_README.orig	1970-01-01 01:00:00.000000000 +0100
++++ README_FILES/VDA_README
+@@ -0,0 +1,10 @@
++Postfix VDA patch for maildir++ quota support by 
++    Anderson Nadal <andernadal@gmail.com>
++    Tomas Macek <maca02@atlas.cz>
++    Lucca Longinotti
++
++See VDA patch official website http://vda.sf.net for instructions
++howto patch the Postfix's sourcetree and configure the options 
++provided by this patch.
++
++
+--- src/global/mail_params.h.orig	2017-08-13 09:19:28 UTC
++++ src/global/mail_params.h
+@@ -2413,6 +2413,54 @@ extern char *var_virt_uid_maps;
+ #define DEF_VIRT_GID_MAPS		""
+ extern char *var_virt_gid_maps;
+ 
++#define VAR_VIRT_MAILBOX_LIMIT_MAPS     "virtual_mailbox_limit_maps"
++#define DEF_VIRT_MAILBOX_LIMIT_MAPS     ""
++extern char *var_virt_mailbox_limit_maps;
++
++#define VAR_VIRT_MAILBOX_LIMIT_INBOX    "virtual_mailbox_limit_inbox"
++#define DEF_VIRT_MAILBOX_LIMIT_INBOX    0
++extern bool var_virt_mailbox_limit_inbox;
++
++#define VAR_VIRT_MAILBOX_LIMIT_OVERRIDE "virtual_mailbox_limit_override"
++#define DEF_VIRT_MAILBOX_LIMIT_OVERRIDE 0
++extern bool var_virt_mailbox_limit_override;
++
++#define VAR_VIRT_MAILDIR_EXTENDED       "virtual_maildir_extended"
++#define DEF_VIRT_MAILDIR_EXTENDED       0
++extern bool var_virt_maildir_extended;
++
++#define VAR_VIRT_OVERQUOTA_BOUNCE       "virtual_overquota_bounce"
++#define DEF_VIRT_OVERQUOTA_BOUNCE       0
++extern bool var_virt_overquota_bounce;
++
++#define VAR_VIRT_MAILDIR_LIMIT_MESSAGE  "virtual_maildir_limit_message"
++#define DEF_VIRT_MAILDIR_LIMIT_MESSAGE  "Sorry, the user's maildir has overdrawn his diskspace quota, please try again later."
++extern char *var_virt_maildir_limit_message;
++
++#define VAR_VIRT_MAILDIR_LIMIT_MESSAGE_MAPS "virtual_maildir_limit_message_maps"
++#define DEF_VIRT_MAILDIR_LIMIT_MESSAGE_MAPS ""
++extern char *var_virt_maildir_limit_message_maps;
++
++#define VAR_VIRT_MAILDIR_SUFFIX         "virtual_maildir_suffix"
++#define DEF_VIRT_MAILDIR_SUFFIX         ""
++extern char *var_virt_maildir_suffix;
++
++#define VAR_VIRT_TRASH_COUNT            "virtual_trash_count"
++#define DEF_VIRT_TRASH_COUNT            0
++extern bool var_virt_trash_count;
++
++#define VAR_VIRT_TRASH_NAME             "virtual_trash_name"
++#define DEF_VIRT_TRASH_NAME             ".Trash"
++extern char *var_virt_trash_name;
++
++#define VAR_VIRT_MAILDIR_FILTER         "virtual_maildir_filter"
++#define DEF_VIRT_MAILDIR_FILTER         0
++extern bool var_virt_maildir_filter;
++
++#define VAR_VIRT_MAILDIR_FILTER_MAPS    "virtual_maildir_filter_maps"
++#define DEF_VIRT_MAILDIR_FILTER_MAPS    ""
++extern char *var_virt_maildir_filter_maps;
++
+ #define VAR_VIRT_MINUID			"virtual_minimum_uid"
+ #define DEF_VIRT_MINUID			100
+ extern int var_virt_minimum_uid;
+--- src/util/file_limit.c.orig	2003-10-22 18:48:36 UTC
++++ src/util/file_limit.c
+@@ -85,7 +85,11 @@ void    set_file_limit(off_t limit)
+ #else
+     struct rlimit rlim;
+ 
+-    rlim.rlim_cur = rlim.rlim_max = limit;
++    /* rlim_max can only be changed by root. */
++    if (getrlimit(RLIMIT_FSIZE, &rlim) < 0)
++        msg_fatal("getrlimit: %m");
++    rlim.rlim_cur = limit;
++
+     if (setrlimit(RLIMIT_FSIZE, &rlim) < 0)
+ 	msg_fatal("setrlimit: %m");
+ #ifdef SIGXFSZ
+--- src/virtual/mailbox.c.orig	2016-08-22 21:24:31 UTC
++++ src/virtual/mailbox.c
+@@ -52,6 +52,7 @@
+ #include <mymalloc.h>
+ #include <stringops.h>
+ #include <set_eugid.h>
++#include <iostuff.h>
+ 
+ /* Global library. */
+ 
+@@ -70,6 +71,70 @@
+ #define YES	1
+ #define NO	0
+ 
++/* change_mailbox_limit - change limit for mailbox file */
++static int change_mailbox_limit(LOCAL_STATE state, USER_ATTR usr_attr)
++{
++    char *myname = "change_mailbox_limit";
++    const char *limit_res;
++    long n = 0;
++    int status = NO;
++
++    /*
++     * Look up the virtual mailbox limit size for this user.
++     * Fall back to virtual_mailbox_limit in case lookup failed.
++     * If virtual mailbox limit size is negative, fall back to virtual_mailbox_limit.
++     * If it's 0, set the mailbox limit to 0, which means unlimited.
++     * If it's more than 0 (positive int), check if the value is smaller than the maximum message size,
++     * if it is and the virtual mailbox limit can't be overridden, fall back to virtual_mailbox_limit and
++     * warn the user, else use the value directly as the mailbox limit.
++     */
++    if (*var_virt_mailbox_limit_maps != 0 && (limit_res = mail_addr_find(virtual_mailbox_limit_maps, state.msg_attr.user, (char **) NULL)) != 0) {
++        n = atol(limit_res);
++        if (n > 0) {
++            if ((n < var_message_limit) && (!var_virt_mailbox_limit_override)) {
++                set_file_limit(var_virt_mailbox_limit);
++                status = NO;
++
++                msg_warn("%s: recipient %s - virtual mailbox limit is "
++                        "smaller than %s in %s - falling back to %s",
++                        myname,
++                        state.msg_attr.user,
++                        VAR_MESSAGE_LIMIT,
++                        virtual_mailbox_limit_maps->title,
++                        VAR_VIRT_MAILBOX_LIMIT);
++            }
++            else {
++                set_file_limit((off_t) n);
++                status = YES;
++
++                if (msg_verbose)
++                    msg_info("%s: set virtual mailbox limit size for %s to %ld",
++                            myname, usr_attr.mailbox, n);
++            }
++        }
++        else if (n == 0) {
++                set_file_limit(OFF_T_MAX);
++                status = YES;
++
++                if (msg_verbose)
++                    msg_info("%s: set virtual mailbox limit size for %s to %ld",
++                            myname, usr_attr.mailbox, OFF_T_MAX);
++        }
++        else {
++            /* Invalid limit size (negative). Use default virtual_mailbox_limit. */
++            set_file_limit(var_virt_mailbox_limit);
++            status = NO;
++        }
++    }
++    else {
++        /* There is no limit in the maps. Use default virtual_mailbox_limit. */
++        set_file_limit(var_virt_mailbox_limit);
++        status = NO;
++    }
++
++    return(status);
++}
++
+ /* deliver_mailbox_file - deliver to recipient mailbox */
+ 
+ static int deliver_mailbox_file(LOCAL_STATE state, USER_ATTR usr_attr)
+@@ -214,62 +279,72 @@ int     deliver_mailbox(LOCAL_STATE stat
+      * Look up the mailbox owner rights. Defer in case of trouble.
+      */
+     uid_res = mail_addr_find(virtual_uid_maps, state.msg_attr.user,
+-			     IGNORE_EXTENSION);
+-    if (uid_res == 0) {
+-	msg_warn("recipient %s: not found in %s",
+-		 state.msg_attr.user, virtual_uid_maps->title);
+-	dsb_simple(why, "4.3.5", "mail system configuration error");
+-	*statusp = defer_append(BOUNCE_FLAGS(state.request),
+-				BOUNCE_ATTR(state.msg_attr));
+-	RETURN(YES);
++                            IGNORE_EXTENSION);
++
++    if ((uid_res = mail_addr_find(virtual_uid_maps, state.msg_attr.user, (char **) 0)) == 0) {
++        if ((uid_res = maps_find(virtual_uid_maps, strchr(state.msg_attr.user, '@'), DICT_FLAG_FIXED)) == 0) {
++			msg_warn("recipient %s: not found in %s", state.msg_attr.user, virtual_uid_maps->title);
++			dsb_simple(why, "4.3.5", "mail system configuration error");
++			*statusp = defer_append(BOUNCE_FLAGS(state.request), BOUNCE_ATTR(state.msg_attr));
++			RETURN(YES);
++        }
+     }
++
+     if ((n = atol(uid_res)) < var_virt_minimum_uid) {
+-	msg_warn("recipient %s: bad uid %s in %s",
+-		 state.msg_attr.user, uid_res, virtual_uid_maps->title);
+-	dsb_simple(why, "4.3.5", "mail system configuration error");
+-	*statusp = defer_append(BOUNCE_FLAGS(state.request),
+-				BOUNCE_ATTR(state.msg_attr));
+-	RETURN(YES);
++		msg_warn("recipient %s: bad uid %s in %s", state.msg_attr.user, uid_res, virtual_uid_maps->title);
++		dsb_simple(why, "4.3.5", "mail system configuration error");
++		*statusp = defer_append(BOUNCE_FLAGS(state.request), BOUNCE_ATTR(state.msg_attr));
++		RETURN(YES);
+     }
++
+     usr_attr.uid = (uid_t) n;
+ 
+     /*
+      * Look up the mailbox group rights. Defer in case of trouble.
+      */
+     gid_res = mail_addr_find(virtual_gid_maps, state.msg_attr.user,
+-			     IGNORE_EXTENSION);
+-    if (gid_res == 0) {
+-	msg_warn("recipient %s: not found in %s",
+-		 state.msg_attr.user, virtual_gid_maps->title);
+-	dsb_simple(why, "4.3.5", "mail system configuration error");
+-	*statusp = defer_append(BOUNCE_FLAGS(state.request),
+-				BOUNCE_ATTR(state.msg_attr));
+-	RETURN(YES);
++                            IGNORE_EXTENSION);
++
++    if ((gid_res = mail_addr_find(virtual_gid_maps, state.msg_attr.user, (char **) 0)) == 0) {
++        if ((gid_res = maps_find(virtual_gid_maps, strchr(state.msg_attr.user, '@'), DICT_FLAG_FIXED)) == 0) {
++			msg_warn("recipient %s: not found in %s", state.msg_attr.user, virtual_gid_maps->title);
++			dsb_simple(why, "4.3.5", "mail system configuration error");
++			*statusp = defer_append(BOUNCE_FLAGS(state.request), BOUNCE_ATTR(state.msg_attr));
++			RETURN(YES);
++        }
+     }
++
+     if ((n = atol(gid_res)) <= 0) {
+-	msg_warn("recipient %s: bad gid %s in %s",
+-		 state.msg_attr.user, gid_res, virtual_gid_maps->title);
+-	dsb_simple(why, "4.3.5", "mail system configuration error");
+-	*statusp = defer_append(BOUNCE_FLAGS(state.request),
+-				BOUNCE_ATTR(state.msg_attr));
+-	RETURN(YES);
++		msg_warn("recipient %s: bad gid %s in %s", state.msg_attr.user, gid_res, virtual_gid_maps->title);
++		dsb_simple(why, "4.3.5", "mail system configuration error");
++		*statusp = defer_append(BOUNCE_FLAGS(state.request), BOUNCE_ATTR(state.msg_attr));
++		RETURN(YES);
+     }
++
+     usr_attr.gid = (gid_t) n;
+ 
+     if (msg_verbose)
+-	msg_info("%s[%d]: set user_attr: %s, uid = %u, gid = %u",
+-		 myname, state.level, usr_attr.mailbox,
+-		 (unsigned) usr_attr.uid, (unsigned) usr_attr.gid);
++        msg_info("%s[%d]: set user_attr: %s, uid = %u, gid = %u",
++                myname, state.level, usr_attr.mailbox,
++                (unsigned) usr_attr.uid, (unsigned) usr_attr.gid);
+ 
+     /*
+      * Deliver to mailbox or to maildir.
+      */
+ #define LAST_CHAR(s) (s[strlen(s) - 1])
+ 
+-    if (LAST_CHAR(usr_attr.mailbox) == '/')
+-	*statusp = deliver_maildir(state, usr_attr);
+-    else
+-	*statusp = deliver_mailbox_file(state, usr_attr);
++    if (LAST_CHAR(usr_attr.mailbox) == '/') {
++        *statusp = deliver_maildir(state, usr_attr);
++    }
++    else {
++        int changed_limit;
++
++        changed_limit = change_mailbox_limit(state, usr_attr);
++        *statusp = deliver_mailbox_file(state, usr_attr);
++
++        if (changed_limit)
++            set_file_limit(var_virt_mailbox_limit);
++    }
+ 
+     /*
+      * Cleanup.
+--- src/virtual/maildir.c.orig	2012-01-25 00:41:08 UTC
++++ src/virtual/maildir.c
+@@ -64,28 +64,420 @@
+ #include <mbox_open.h>
+ #include <dsn_util.h>
+ 
++/* Patch library. */
++
++#include <sys/types.h> /* opendir(3), stat(2) */
++#include <sys/stat.h>  /* stat(2) */
++#include <dirent.h>    /* opendir(3) */
++#include <unistd.h>    /* stat(2) */
++#include <stdlib.h>    /* atol(3) */
++#include <string.h>    /* strrchr(3) */
++#include <vstring_vstream.h>
++#include <dict.h>
++#include <dict_regexp.h>
++#include <ctype.h>
++#include <stdio.h>
++#include <sys_defs.h>
++#include <mail_addr_find.h>
++
+ /* Application-specific. */
+ 
+ #include "virtual.h"
+ 
+-/* deliver_maildir - delivery to maildir-style mailbox */
++/* Maildirsize maximal size. */
+ 
+-int     deliver_maildir(LOCAL_STATE state, USER_ATTR usr_attr)
++#define SIZEFILE_MAX 5120
++
++/*
++ * Chris Stratford <chriss@pipex.net>
++ * Read the maildirsize file to get quota info.
++ *
++ * Arguments:
++ *  dirname: the maildir
++ *  countptr: number of messages
++ *
++ * Returns the size of all mails as read from maildirsize,
++ * zero if it couldn't read the file.
++ */
++static long read_maildirsize(char *filename, long *sumptr, long *countptr)
++{
++    char *myname = "read_maildirsize";
++    struct stat statbuf;
++    VSTREAM *sizefile;
++    char *p;
++    int len, first;
++    long sum = 0, count = 0, ret_value = -1;
++
++    if (msg_verbose) 
++	msg_info("%s: we will use sizefile = '%s'", myname, filename);
++	
++    sizefile = vstream_fopen(filename, O_RDONLY, 0);
++    if (!sizefile) {
++	if (msg_verbose)
++	    msg_info("%s: cannot open %s: %m (maybe file does not exist)", myname, filename);
++	    
++	return -1;
++    } else if (stat(filename, &statbuf) < 0 || statbuf.st_size > SIZEFILE_MAX) {
++        if (sizefile) {
++            vstream_fclose(sizefile);
++            unlink(filename);
++        }
++        
++        if (msg_verbose) 
++	    msg_info("%s: stat() returned < 0 or filesize > SIZEFILE_MAX (filename = %s, filesize = %ld)", myname, filename, statbuf.st_size);
++        
++        return -1;
++    }
++    
++    VSTRING *sizebuf = vstring_alloc(SIZEFILE_MAX);
++    len = vstream_fread(sizefile, STR(sizebuf), SIZEFILE_MAX);
++
++    p = STR(sizebuf);
++    *(p + len) = '\0';
++    first = 1;
++
++    while (*p) {
++        long n = 0, c = 0;
++        char *q = p;
++
++        while (*p) {
++            if (*p++ == '\n') {
++                p[-1] = 0;
++                break;
++            }
++        }
++
++        if (first) {
++            first = 0;
++            continue;
++        }
++
++        if (sscanf(q, "%ld %ld", &n, &c) == 2) {
++            sum += n;
++            count += c;
++            /* if (msg_verbose)
++    		msg_info("%s: we read line '%s', totals: sum = %ld, count = %ld", myname, q, sum, count); */
++        }
++        else {
++            vstream_fclose(sizefile);
++            unlink(filename);
++            msg_warn("%s: invalid line '%s' found in %s, removing maildirsize file", myname, q, filename);
++            vstring_free(sizebuf);
++
++            return -1;
++        }
++    }
++
++    *countptr = count;
++    *sumptr = sum;
++        
++    if (sum < 0 || count < 0 || (sum == 0 && count != 0) || (sum != 0 && count == 0)) {
++	if (msg_verbose) {
++	    msg_info("%s: we will return -1 and unlink %s, because file count or sum is <= 0 (sum = %ld, count = %ld)", myname, filename, sum, count);
++	}
++	
++	unlink(filename);
++	ret_value = -1;
++    } else {
++	if (msg_verbose) 
++	    msg_info("%s: we will return Maildir size = %ld, count = %ld", myname, *sumptr, *countptr);
++
++	ret_value = sum;	
++    }
++
++    vstream_fclose(sizefile);
++    vstring_free(sizebuf);
++    
++    return ret_value;
++}
++
++/*
++ * Gives the size of the file according to the Maildir++ extension
++ * present in the filename (code taken from courier-imap).
++ *
++ * Arguments:
++ *  n: filename
++ *
++ * Returns the size given in ",S=<size>" in the filename,
++ * zero if it cannot find ",S=<size>" in the filename.
++ */
++static long maildir_parsequota(const char *n)
++{
++    const char *o;
++    int yes = 0;
++
++    if ((o = strrchr(n, '/')) == 0)
++        o = n;
++
++    for (; *o; o++) {
++        if (*o == ':')
++            break;
++    }
++
++    for (; o >= n; --o) {
++        if (*o == '/')
++            break;
++
++        if (*o == ',' && o[1] == 'S' && o[2] == '=') {
++            yes = 1;
++            o += 3;
++            break;
++        }
++    }
++
++    if (yes) {
++        long s = 0;
++
++        while (*o >= '0' && *o <= '9')
++            s = s*10 + (*o++ - '0');
++
++        return s;
++    }
++
++    return 0;
++}
++
++/*
++ * Computes quota usage for a directory (taken from exim).
++ *
++ * This function is called to determine the exact quota usage of a virtual
++ * maildir box. To achieve maximum possible speed while doing this, it takes
++ * advantage of the maildirsize file and the Maildir++ extensions to filenames,
++ * when applicable and configured to be used. In all other cases it simply
++ * stats all the files as needed to get the size information.
++ *
++ * Arguments:
++ *  dirname: the name of the directory
++ *  countptr: where to add the file count (because this function recurses)
++ *
++ * Returns the sum of the sizes of all measurable files,
++ * zero if the directory could not be opened.
++ */
++static long check_dir_size(char *dirname, long *countptr)
++{
++    char *myname = "check_dir_size";
++    DIR *dir;
++    long sum = 0;
++    struct dirent *ent;
++    struct stat statbuf;
++
++    dir = opendir(dirname);
++    if (dir == NULL) {
++        if (make_dirs(dirname, 0700) == 0) {    /* Try to create the dirs. */
++            dir = opendir(dirname);             /* Reopen the dir. */
++            if (dir == NULL) {
++                msg_warn("%s: cannot reopen directory: %s", myname, dirname);
++                return 0;
++            }
++        }
++        else {
++            msg_warn("%s: cannot open directory: %s", myname, dirname);
++            return 0;
++        }
++    }
++
++    while ((ent = readdir(dir)) != NULL) {
++        char *name = ent->d_name;
++        long tmpsum = 0;
++        VSTRING *buffer;
++
++	/* do not count dot a double-dot dirs */
++        if (strcmp(name, ".") == 0 || strcmp(name, "..") == 0)
++            continue;
++        /* do not count if this is the trash subdir and if we should NOT count it */
++	else if (var_virt_trash_count == 0 && strcmp(name, var_virt_trash_name) == 0)
++    	    continue;
++
++        /*
++         * Here comes the real logic behind this function.
++         * Optimized to be the most efficient possible,
++         * depending on the settings given.
++         * See above for a more detailed description.
++         */
++        if (var_virt_mailbox_limit_inbox) {
++            if (var_virt_maildir_extended && (tmpsum = maildir_parsequota(name))) {
++                sum += tmpsum;
++                (*countptr)++;
++            }
++            else {
++                buffer = vstring_alloc(1024);
++                vstring_sprintf(buffer, "%s/%s", dirname, name);
++
++                if (stat(STR(buffer), &statbuf) < 0) {
++                    vstring_free(buffer);
++                    continue;
++                }
++                if ((statbuf.st_mode & S_IFREG) != 0) {
++                    sum += (long) statbuf.st_size;
++                    (*countptr)++;
++                }
++
++                vstring_free(buffer);
++            }
++        }
++        else {
++            buffer = vstring_alloc(1024);
++            vstring_sprintf(buffer, "%s/%s", dirname, name);
++
++            if (stat(STR(buffer), &statbuf) < 0) {
++                vstring_free(buffer);
++                continue;
++            }
++            if ((statbuf.st_mode & S_IFREG) != 0) {
++                if (strcmp(dirname + strlen(dirname) - 3, "new") == 0 || strcmp(dirname + strlen(dirname) - 3, "cur") == 0 || strcmp(dirname + strlen(dirname) - 3, "tmp") == 0) {
++                    sum += (long) statbuf.st_size;
++                    (*countptr)++;
++                }
++            }
++            else if ((statbuf.st_mode & S_IFDIR) != 0) {
++                sum += check_dir_size(STR(buffer), countptr);
++            }
++
++            vstring_free(buffer);
++        }
++    }
++    closedir(dir);
++
++    if (msg_verbose)
++        msg_info("%s: full scan done: dir=%s sum=%ld count=%ld", myname, dirname, sum, *countptr);
++
++    return sum;
++}
++
++/* Cut all occurrences of pattern from string. */
++static char *strcut(char *str, const char *pat)
++{
++    char *ptr, *loc, *ret;
++    ret = str;
++    loc = str;
++
++    /* No match, return original string. */
++    if (!strstr(loc, pat))
++        return(str);
++
++    while (*loc && (ptr = strstr(loc, pat))) {
++        while (loc < ptr)
++            *str++ = *loc++;
++        loc += strlen(pat);
++    }
++
++    while (*loc)
++        *str++ = *loc++;
++
++    *str = 0;
++
++    return(ret);
++}
++
++/* Check if maildirfilter file is up-to-date compared to SQL, (re)write it if not. */
++static long sql2file(char *filename, char *user)
++{
++    char *myname = "sql2file";
++    char *filter_sqlres;
++    char filter_fileres[128];
++    long sqlmtime = 0, filemtime = 0, retval = 0;
++    int filterfile, size_sqlres, i;
++    struct stat statbuf;
++
++    if (*var_virt_maildir_filter_maps != 0) {
++        filter_sqlres = (char *) mymalloc(16000);
++        filter_sqlres = (char *) mail_addr_find(virtual_maildir_filter_maps, user, (char **) 0);
++
++        if (filter_sqlres) {
++            strcut(filter_sqlres, "\r");
++            if (filter_sqlres[0] == '#' && filter_sqlres[1] == ' ' && filter_sqlres[2] == 'M') {
++                size_sqlres = strlen(filter_sqlres);
++
++                for (i = 4; i <= size_sqlres; i++) {
++                    if(filter_sqlres[i] == '/' && filter_sqlres[i+1] == '^') {
++                        filter_sqlres[i-1] = '\n';
++                    }
++                }
++
++                filter_sqlres[(size_sqlres+1)] = '\0';
++
++                sqlmtime = atol(filter_sqlres+3);
++                retval = sqlmtime;
++
++                filterfile = open(filename, O_RDONLY, 0);
++                if (filterfile) {
++                    read(filterfile, (void *) filter_fileres, 127);
++                    close(filterfile);
++
++                    filemtime = atol(filter_fileres+3);
++                }
++
++                if (msg_verbose)
++                    msg_info("%s: filter data: sql_size=%li sql_mtime=%ld file_mtime=%ld", myname, strlen(filter_sqlres), sqlmtime, filemtime);
++            }
++            if (sqlmtime != filemtime && sqlmtime != 0) {
++                if ((filterfile = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0640))) {
++                    if (msg_verbose)
++                        msg_info("%s: updating filter file: %s", myname, filename);
++                    write(filterfile, filter_sqlres, strlen(filter_sqlres));
++                    close(filterfile);
++                }
++                else {
++                    msg_warn("%s: can't create filter file: %s", myname, filename);
++                    retval = 0;
++                }
++            }
++        }
++    }
++    else {
++        if (stat(filename, &statbuf) == 0)
++            retval = (long) statbuf.st_mtime;
++        if (msg_verbose)
++            msg_info("%s: processing filter file: file_mtime=%ld", myname, retval);
++    }
++
++    return retval;
++}
++
++/* deliver_maildir - delivery to maildir-style mailbox */
++int deliver_maildir(LOCAL_STATE state, USER_ATTR usr_attr)
+ {
+     const char *myname = "deliver_maildir";
+-    char   *newdir;
+-    char   *tmpdir;
+-    char   *curdir;
+-    char   *tmpfile;
+-    char   *newfile;
++    char    *newdir;
++    char    *tmpdir;
++    char    *curdir;
++    char    *newfile;
++    char    *tmpfile;
+     DSN_BUF *why = state.msg_attr.why;
+     VSTRING *buf;
+     VSTREAM *dst;
+-    int     mail_copy_status;
+-    int     deliver_status;
+-    int     copy_flags;
+-    struct stat st;
+-    struct timeval starttime;
++    int      mail_copy_status;
++    int      deliver_status;
++    int      copy_flags;
++    struct   stat st;
++    struct   timeval starttime;
++
++    /* Maildir Quota. */
++    const char *limit_res;              /* Limit from map. */
++    char    *sizefilename = (char *) 0; /* Maildirsize file name. */
++    VSTRING *filequota;                 /* Quota setting from the maildirsize file. */
++    VSTREAM *sizefile;                  /* Maildirsize file handle. */
++    long     n = 0;                     /* Limit in long integer format. */
++    long     saved_count = 0;           /* The total number of files. */
++    long     saved_size = 0;            /* The total quota of all files. */
++    struct   stat mail_stat;            /* To check the size of the mail to be written. */
++    struct   stat sizefile_stat;        /* To check the size of the maildirsize file. */
++    time_t   tm;                        /* To check the age of the maildirsize file. */
++
++    /* Maildir Filters. */
++    const char *value, *cmd_text;       /* Filter values. */
++    char    *filtername;
++    char    *header;
++    char    *bkpnewfile;
++    char    *mdffilename = (char *) 0;  /* Maildirfolder file name. */
++    VSTRING *fltstr;
++    VSTREAM *tmpfilter;
++    VSTREAM *mdffile;                   /* Maildirfolder file handle. */
++    DICT    *FILTERS;
++    long     sqlmtime;                  /* Latest modification time from sql2file(). */
++    int      cmd_len;
++    int	    read_mds = -1;		/* read_maildirsize() returned value */
++    struct   stat mdffile_stat;         /* To check if the maildirfolder file exists. */
+ 
+     GETTIMEOFDAY(&starttime);
+ 
+@@ -94,15 +486,14 @@ int     deliver_maildir(LOCAL_STATE stat
+      */
+     state.level++;
+     if (msg_verbose)
+-	MSG_LOG_STATE(myname, state);
++	    MSG_LOG_STATE(myname, state);
+ 
+     /*
+      * Don't deliver trace-only requests.
+      */
+     if (DEL_REQ_TRACE_ONLY(state.request->flags)) {
+-	dsb_simple(why, "2.0.0", "delivers to maildir");
+-	return (sent(BOUNCE_FLAGS(state.request),
+-		     SENT_ATTR(state.msg_attr)));
++        dsb_simple(why, "2.0.0", "delivers to maildir");
++        return (sent(BOUNCE_FLAGS(state.request), SENT_ATTR(state.msg_attr)));
+     }
+ 
+     /*
+@@ -110,18 +501,116 @@ int     deliver_maildir(LOCAL_STATE stat
+      * attribute to reflect the final recipient.
+      */
+     if (vstream_fseek(state.msg_attr.fp, state.msg_attr.offset, SEEK_SET) < 0)
+-	msg_fatal("seek message file %s: %m", VSTREAM_PATH(state.msg_attr.fp));
++        msg_fatal("seek message file %s: %m", VSTREAM_PATH(state.msg_attr.fp));
+     state.msg_attr.delivered = state.msg_attr.rcpt.address;
+     mail_copy_status = MAIL_COPY_STAT_WRITE;
+     buf = vstring_alloc(100);
+ 
+-    copy_flags = MAIL_COPY_TOFILE | MAIL_COPY_RETURN_PATH
+-	| MAIL_COPY_DELIVERED | MAIL_COPY_ORIG_RCPT;
++    copy_flags = MAIL_COPY_TOFILE | MAIL_COPY_RETURN_PATH | MAIL_COPY_DELIVERED | MAIL_COPY_ORIG_RCPT;
+ 
+-    newdir = concatenate(usr_attr.mailbox, "new/", (char *) 0);
+-    tmpdir = concatenate(usr_attr.mailbox, "tmp/", (char *) 0);
+-    curdir = concatenate(usr_attr.mailbox, "cur/", (char *) 0);
++    /*
++     * Concatenate the maildir suffix (if set).
++     */
++    if (*var_virt_maildir_suffix == 0) {
++        newdir = concatenate(usr_attr.mailbox, "new/", (char *) 0);
++        tmpdir = concatenate(usr_attr.mailbox, "tmp/", (char *) 0);
++        curdir = concatenate(usr_attr.mailbox, "cur/", (char *) 0);
++    }
++    else {
++        newdir = concatenate(usr_attr.mailbox, var_virt_maildir_suffix, (char *) 0);
++        tmpdir = concatenate(usr_attr.mailbox, var_virt_maildir_suffix, (char *) 0);
++        curdir = concatenate(usr_attr.mailbox, var_virt_maildir_suffix, (char *) 0);
++        newdir = concatenate(newdir, "new/", (char *) 0);
++        tmpdir = concatenate(tmpdir, "tmp/", (char *) 0);
++        curdir = concatenate(curdir, "cur/", (char *) 0);
++    }
++
++    /* get the sizefilename, no matter if we use var_virt_maildir_extended */
++    if (*var_virt_maildir_suffix == 0) {
++        sizefilename = concatenate(usr_attr.mailbox, "maildirsize", (char *) 0);
++    } else {
++        sizefilename = concatenate(usr_attr.mailbox, var_virt_maildir_suffix, (char *) 0);
++        sizefilename = concatenate(sizefilename, "maildirsize", (char *) 0);
++    }
++    
++    /*
++     * Look up the virtual maildir limit size for this user.
++     * Fall back to virtual_mailbox_limit in case lookup failed.
++     * If virtual maildir limit size is negative, fall back to virtual_mailbox_limit.
++     * If it's 0, set the mailbox limit to 0, which means unlimited.
++     * If it's more than 0 (positive int), check if the value is smaller than the maximum message size,
++     * if it is and the virtual maildir limit can't be overridden, fall back to virtual_mailbox_limit and
++     * warn the user, else use the value directly as the maildir limit.
++     */
++    if (*var_virt_mailbox_limit_maps != 0 && (limit_res = mail_addr_find(virtual_mailbox_limit_maps, state.msg_attr.user, (char **) NULL)) != 0) {
++        n = atol(limit_res);
++        if (n > 0) {
++            if ((n < var_message_limit) && (!var_virt_mailbox_limit_override)) {
++                n = var_virt_mailbox_limit;
++
++                msg_warn("%s: recipient %s - virtual maildir limit is smaller than %s in %s - falling back to %s",
++                        myname, state.msg_attr.user, VAR_MESSAGE_LIMIT, virtual_mailbox_limit_maps->title,
++                        VAR_VIRT_MAILBOX_LIMIT);
++            }
++            else {
++                if (msg_verbose)
++                    msg_info("%s: set virtual maildir limit size for %s to %ld",
++                            myname, usr_attr.mailbox, n);
++            }
++        }
++        else if (n == 0) {
++                if (msg_verbose)
++                    msg_info("%s: set virtual maildir limit size for %s to %ld",
++                            myname, usr_attr.mailbox, n);
++        }
++        else {
++	    if (msg_verbose)
++		msg_info("%s: quota is negative (%ld), using default virtual_mailbox_limit (%ld)", 
++			    myname, n, var_virt_mailbox_limit);
++            /* Invalid limit size (negative). Use default virtual_mailbox_limit. */
++            n = var_virt_mailbox_limit;
++        }
++    }
++    else {
++	if (msg_verbose)
++	    msg_info("%s: no limit found in the maps, using default virtual_mailbox_limit (%ld)", 
++			myname, var_virt_mailbox_limit);
++        /* There is no limit in the maps. Use default virtual_mailbox_limit. */
++        n = var_virt_mailbox_limit;
++    }
+ 
++    /* If there should is a quota on maildir generaly, check it before delivering the mail */
++    if (n != 0) {
++        set_eugid(usr_attr.uid, usr_attr.gid);
++	/* try to read the quota from maildirsize file. Returned values by read_maildirsize:
++	x < 0  = something failed
++	x >= 0 = reading successfully finished - sum si returned, so sum size of Maildir was 0 or more */
++        if (!var_virt_mailbox_limit_inbox && var_virt_maildir_extended && (read_mds = read_maildirsize(sizefilename, &saved_size, &saved_count)) >= 0) {
++    	    if (msg_verbose)
++        	msg_info("%s: maildirsize used=%s sum=%ld count=%ld", myname, sizefilename, saved_size, saved_count);
++	} else {
++	    if (msg_verbose) 
++		msg_info("%s: We will recount the quota (var_virt_mailbox_limit = %ld, var_virt_maildir_extended = %d, read_maildirsize = %d)", 
++			    myname, var_virt_mailbox_limit, var_virt_maildir_extended, read_mds);
++
++	    /* sanity */
++	    saved_size = 0; 
++	    saved_count = 0;
++	    
++    	    if (var_virt_mailbox_limit_inbox) {
++        	/* Check Inbox only (new, cur and tmp dirs). */
++        	saved_size = check_dir_size(newdir, &saved_count);
++        	saved_size += check_dir_size(curdir, &saved_count);
++        	saved_size += check_dir_size(tmpdir, &saved_count);
++    	    } else {
++        	/* Check all boxes. */
++        	saved_size = check_dir_size(usr_attr.mailbox, &saved_count);
++    	    }
++
++    	    set_eugid(var_owner_uid, var_owner_gid);
++    	}    	
++    }
++    
+     /*
+      * Create and write the file as the recipient, so that file quota work.
+      * Create any missing directories on the fly. The file name is chosen
+@@ -175,46 +664,288 @@ int     deliver_maildir(LOCAL_STATE stat
+      * [...]
+      */
+     set_eugid(usr_attr.uid, usr_attr.gid);
+-    vstring_sprintf(buf, "%lu.P%d.%s",
+-		 (unsigned long) starttime.tv_sec, var_pid, get_hostname());
++    vstring_sprintf(buf, "%lu.P%d.%s", (unsigned long) starttime.tv_sec, var_pid, get_hostname());
+     tmpfile = concatenate(tmpdir, STR(buf), (char *) 0);
+     newfile = 0;
++    bkpnewfile = 0;
+     if ((dst = vstream_fopen(tmpfile, O_WRONLY | O_CREAT | O_EXCL, 0600)) == 0
+-	&& (errno != ENOENT
+-	    || make_dirs(tmpdir, 0700) < 0
+-	    || (dst = vstream_fopen(tmpfile, O_WRONLY | O_CREAT | O_EXCL, 0600)) == 0)) {
+-	dsb_simple(why, mbox_dsn(errno, "4.2.0"),
+-		   "create maildir file %s: %m", tmpfile);
+-    } else if (fstat(vstream_fileno(dst), &st) < 0) {
++        && (errno != ENOENT
++            || make_dirs(tmpdir, 0700) < 0
++            || (dst = vstream_fopen(tmpfile, O_WRONLY | O_CREAT | O_EXCL, 0600)) == 0)) {
++        dsb_simple(why, mbox_dsn(errno, "4.2.0"), "create maildir file %s: %m", tmpfile);
++    }
++    else if (fstat(vstream_fileno(dst), &st) < 0) {
++        /*
++         * Coverity 200604: file descriptor leak in code that never executes.
++         * Code replaced by msg_fatal(), as it is not worthwhile to continue
++         * after an impossible error condition.
++         */
++        msg_fatal("fstat %s: %m", tmpfile);
++    }
++    else {
++        vstring_sprintf(buf, "%lu.V%lxI%lxM%lu.%s",
++                (unsigned long) starttime.tv_sec,
++                (unsigned long) st.st_dev,
++                (unsigned long) st.st_ino,
++                (unsigned long) starttime.tv_usec,
++                get_hostname());
++        newfile = concatenate(newdir, STR(buf), (char *) 0);
++        bkpnewfile = concatenate(STR(buf), (char *) 0); /* Will need it later, if we MOVE to other folders. */
+ 
+-	/*
+-	 * Coverity 200604: file descriptor leak in code that never executes.
+-	 * Code replaced by msg_fatal(), as it is not worthwhile to continue
+-	 * after an impossible error condition.
+-	 */
+-	msg_fatal("fstat %s: %m", tmpfile);
+-    } else {
+-	vstring_sprintf(buf, "%lu.V%lxI%lxM%lu.%s",
+-			(unsigned long) starttime.tv_sec,
+-			(unsigned long) st.st_dev,
+-			(unsigned long) st.st_ino,
+-			(unsigned long) starttime.tv_usec,
+-			get_hostname());
+-	newfile = concatenate(newdir, STR(buf), (char *) 0);
+-	if ((mail_copy_status = mail_copy(COPY_ATTR(state.msg_attr),
+-					  dst, copy_flags, "\n",
+-					  why)) == 0) {
+-	    if (sane_link(tmpfile, newfile) < 0
+-		&& (errno != ENOENT
+-		    || (make_dirs(curdir, 0700), make_dirs(newdir, 0700)) < 0
+-		    || sane_link(tmpfile, newfile) < 0)) {
+-		dsb_simple(why, mbox_dsn(errno, "4.2.0"),
+-			   "create maildir file %s: %m", newfile);
+-		mail_copy_status = MAIL_COPY_STAT_WRITE;
+-	    }
+-	}
+-	if (unlink(tmpfile) < 0)
+-	    msg_warn("remove %s: %m", tmpfile);
++        if ((mail_copy_status = mail_copy(COPY_ATTR(state.msg_attr), dst, copy_flags, "\n", why)) == 0) {
++            /*
++             * Add a ",S=<sizeoffile>" to the newly written file according to the
++             * Maildir++ specifications: http://www.inter7.com/courierimap/README.maildirquota.html
++             * This needs a stat(2) of the tempfile and modification of the
++             * name of the file.
++             */
++            if (stat(tmpfile, &mail_stat) == 0) {
++                if (n != 0) {
++                    saved_size += (long) mail_stat.st_size;
++                    saved_count++;
++                }
++                if (var_virt_maildir_extended) {
++                    /* Append the size of the file to newfile. */
++                    vstring_sprintf(buf, ",S=%ld", (long) mail_stat.st_size);
++                    newfile = concatenate(newfile, STR(buf), (char *) 0);
++                    bkpnewfile = concatenate(bkpnewfile, STR(buf), (char *) 0);
++                }
++            }
++
++            /*
++             * Now we have the maildir size in saved_size, compare it to the max
++             * quota value and eventually issue a message that we've overdrawn it.
++             */
++            if (saved_size > n) {
++                mail_copy_status = MAIL_COPY_STAT_WRITE;
++                if (((long) mail_stat.st_size > n) || (var_virt_overquota_bounce))
++                    errno = EFBIG;
++                else
++                    errno = EDQUOT;
++            }
++            else {
++                /* Maildirfilter code by rk@demiurg.net. */
++                if (var_virt_maildir_filter) {
++                    if (msg_verbose)
++                        msg_info("%s: loading DICT filters", myname);
++
++#define STREQUAL(x,y,l) (strncasecmp((x), (y), (l)) == 0 && (y)[l] == 0)
++#define MAIL_COPY_STAT_REJECT  (1<<3)
++#define MAIL_COPY_STAT_DISCARD (1<<4)
++
++                    /* Read filters. */
++                    filtername = concatenate("regexp:", usr_attr.mailbox, "maildirfilter", (char *) 0);
++                    sqlmtime = sql2file(strchr(filtername, '/'), state.msg_attr.user);
++
++                    /* Check if this filter is already registered as dictionary. */
++                    if (msg_verbose)
++                        msg_info("%s: checking DICT filters for %s", myname, filtername);
++
++                    if ((FILTERS = dict_handle(filtername))) {
++                        if (msg_verbose)
++                            msg_info("%s: DICT filter found", myname);
++
++                        /*
++                         * If we have mtime in our DICT structure, check it against sqlmtime
++                         * and reload the filters if they differ.
++                         */
++                        if (FILTERS->mtime > 0 && sqlmtime > 0 && FILTERS->mtime != sqlmtime) {
++                            if (msg_verbose)
++                                msg_info("%s: reloading DICT filters (dict_mtime=%ld != sql_mtime=%ld)",
++                                        myname, FILTERS->mtime, sqlmtime);
++
++                            dict_unregister(filtername);
++                            FILTERS = dict_open(filtername, O_RDONLY, DICT_FLAG_LOCK);
++                            dict_register(filtername, FILTERS);
++                            FILTERS->mtime = sqlmtime;
++                        }
++                    }
++                    else {
++                        if (sqlmtime > 0) {
++                            /* Registering filter as new dictionary. */
++                            if (msg_verbose)
++                                msg_info("%s: loading DICT filters from %s (mtime=%ld)",
++                                        myname, filtername, sqlmtime);
++
++                            FILTERS = dict_open(filtername, O_RDONLY, DICT_FLAG_LOCK);
++                            dict_register(filtername, FILTERS);
++                            FILTERS->mtime = sqlmtime;
++                        }
++                    }
++
++                    if (FILTERS && (tmpfilter = vstream_fopen(tmpfile, O_RDONLY, 0))) {
++                        fltstr = vstring_alloc(1024);
++                        header = (char *) malloc(8192); /* !!!INSECURE!!! See 7168-hack below. */
++                        header[0] = 0;
++                        vstring_get_nonl_bound(fltstr, tmpfilter, 1023);
++                        header = concatenate(header, STR(fltstr), (char *) 0);
++
++                        while(!vstream_feof(tmpfilter) && fltstr->vbuf.data[0] && strlen(header) < 7168 ) {
++                            vstring_get_nonl_bound(fltstr, tmpfilter, 1023);
++                            /* Glue multiline headers, replacing leading TAB with space. */
++                            if (msg_verbose)
++                                msg_info("%s: fltstr value: %s", myname, STR(fltstr));
++
++                            if (fltstr->vbuf.data[0] == ' ' || fltstr->vbuf.data[0] == '\t' ) {
++                                if (fltstr->vbuf.data[0] == '\t')
++                                    fltstr->vbuf.data[0] = ' ';
++                                header = concatenate(header, STR(fltstr), (char *) 0);
++                            }
++                            else {
++                                header = concatenate(header, "\n", STR(fltstr), (char *) 0);
++                            }
++                        }
++
++                        if (msg_verbose)
++                            msg_info("%s: checking filter CMD for %s", myname, filtername);
++
++                        /* Check whole header part with regexp maps. */
++                        if ((value = dict_get(FILTERS, lowercase(header))) != 0) {
++                            if (msg_verbose)
++                                msg_info("%s: preparing filter CMD", myname);
++
++                            cmd_text = value + strcspn(value, " \t");
++                            cmd_len = cmd_text - value;
++                            while (*cmd_text && ISSPACE(*cmd_text))
++                                cmd_text++;
++
++                            if (msg_verbose)
++                                msg_info("%s: executing filter CMD", myname);
++
++                            if (STREQUAL(value, "REJECT", cmd_len)) {
++                                if (msg_verbose)
++                                    msg_info("%s: executing filter CMD REJECT", myname);
++
++                                mail_copy_status = MAIL_COPY_STAT_REJECT;
++                                vstring_sprintf(why->reason, "%s", cmd_text);
++                                dsb_simple(why, "5.0.0", "User filter - REJECT");
++                            }
++
++                            if (STREQUAL(value, "DISCARD", cmd_len)) {
++                                if (msg_verbose)
++                                    msg_info("%s: executing filter CMD DISCARD", myname);
++
++                                mail_copy_status = MAIL_COPY_STAT_DISCARD;
++                                vstring_sprintf(why->reason, "%s", cmd_text);
++                                dsb_simple(why, "5.0.0", "User filter - DISCARD");
++                            }
++
++                            if (var_virt_maildir_extended) {
++                                if (STREQUAL(value, "MOVE", cmd_len)) {
++                                    if (msg_verbose)
++                                        msg_info("%s: executing filter CMD MOVE", myname);
++
++                                    strcut((char *) cmd_text, " ");
++                                    strcut((char *) cmd_text, "\t");
++                                    strcut((char *) cmd_text, "/");
++                                    strcut((char *) cmd_text, "..");
++
++                                    if (*var_virt_maildir_suffix == 0) {
++                                        newfile = concatenate(usr_attr.mailbox, (char *) 0);
++                                    }
++                                    else {
++                                        newfile = concatenate(usr_attr.mailbox, var_virt_maildir_suffix, (char *) 0);
++                                    }
++
++                                    if (cmd_text[0] != '.') {
++                                        newfile = concatenate(newfile, ".", (char *) 0);
++                                    }
++                                    newdir  = concatenate(newfile, cmd_text, "/", "new/", (char *) 0);
++                                    tmpdir  = concatenate(newfile, cmd_text, "/", "tmp/", (char *) 0);
++                                    curdir  = concatenate(newfile, cmd_text, "/", "cur/", (char *) 0);
++                                    mdffilename = concatenate(newfile, cmd_text, "/", "maildirfolder", (char *) 0);
++                                    newfile = concatenate(newfile, cmd_text, "/", "new/", bkpnewfile, (char *) 0);
++                                }
++                            }
++
++                            if (STREQUAL(value, "LOG", cmd_len) || STREQUAL(value, "WARN", cmd_len)) {
++                                msg_warn("%s: header check warning: %s", myname, cmd_text);
++                            }
++
++                            if (STREQUAL(value, "INFO", cmd_len)) {
++                                msg_info("%s: header check info: %s", myname, cmd_text);
++                            }
++
++                            if (msg_verbose)
++                                msg_info("%s: exiting filter CMD", myname);
++                        } /* End-Of-Check */
++
++                        myfree(header);
++                        vstring_free(fltstr);
++                        vstream_fclose(tmpfilter);
++                    }
++
++                    myfree(filtername);
++                } /* End-Of-Maildirfilter */
++
++                /* Deliver to curdir. */
++                if (mail_copy_status == 0) {
++                    if (sane_link(tmpfile, newfile) < 0
++                        && (errno != ENOENT
++                            || (make_dirs(curdir, 0700), make_dirs(newdir, 0700), make_dirs(tmpdir, 0700)) < 0
++                            || sane_link(tmpfile, newfile) < 0)) {
++                        dsb_simple(why, mbox_dsn(errno, "4.2.0"), "create maildir file %s: %m", newfile);
++                        mail_copy_status = MAIL_COPY_STAT_WRITE;
++                    }
++
++                    if (var_virt_maildir_extended) {
++                        time(&tm);
++
++                        /* Check if the quota in the file is the same as the current one, if not, delete the file. */
++                        sizefile = vstream_fopen(sizefilename, O_RDONLY, 0);
++                        if (sizefile) {
++                            filequota = vstring_alloc(128);
++                            vstring_get_null_bound(filequota, sizefile, 127);
++                            vstream_fclose(sizefile);
++                            if (atol(vstring_export(filequota)) != n)
++                                unlink(sizefilename);
++                        }
++
++                        /* Open maildirsize file to append this transaction. */
++                        sizefile = vstream_fopen(sizefilename, O_WRONLY | O_APPEND, 0640);
++
++                        /* If the open fails (maildirsize doesn't exist), or it's too large, or too old, overwrite it. */
++                        if(!sizefile || (stat(sizefilename, &sizefile_stat) < 0) || (sizefile_stat.st_size > SIZEFILE_MAX) || (sizefile_stat.st_mtime + 15*60 < tm)) {
++                            /* If the file exists, sizefile has been opened above, so close it first. */
++                            if (sizefile) {
++                                vstream_fclose(sizefile);
++                                sizefile = vstream_fopen(sizefilename, O_WRONLY | O_TRUNC, 0640);
++                            }
++                            else {
++                                sizefile = vstream_fopen(sizefilename, O_WRONLY | O_CREAT, 0640);
++                            }
++
++                            /* If the creation worked, write to the file, otherwise just give up. */
++                            if (sizefile) {
++                                vstream_fprintf(sizefile, "%ldS\n%ld %ld\n", n, saved_size, saved_count);
++                                vstream_fclose(sizefile);
++                            }
++                        }
++                        else {
++                            /* We opened maildirsize, so let's just append this transaction and close it. */
++                            vstream_fprintf(sizefile, "%ld 1\n", (long) mail_stat.st_size);
++                            vstream_fclose(sizefile);
++                        }
++
++                        /*
++                         * 1) mdffilename != 0, so the maildirfilter code went through the MOVE to subfolder rule.
++                         * 2) stat() failed, maybe the file does not exist? Try to create it.
++                         */
++                        if (mdffilename && (stat(mdffilename, &mdffile_stat) < 0)) {
++                            mdffile = vstream_fopen(mdffilename, O_WRONLY | O_CREAT, 0600);
++                            if (mdffile) {
++                                vstream_fclose(mdffile);
++                            }
++                            else {
++                                msg_warn("Cannot create maildirfolder file '%s': %s", mdffilename, strerror(errno));
++                            }
++                        }
++                    }
++                }
++            }
++        }
++        if (unlink(tmpfile) < 0)
++            msg_warn("remove %s: %m", tmpfile);
+     }
+     set_eugid(var_owner_uid, var_owner_gid);
+ 
+@@ -224,31 +955,64 @@ int     deliver_maildir(LOCAL_STATE stat
+      * location possibly under user control.
+      */
+     if (mail_copy_status & MAIL_COPY_STAT_CORRUPT) {
+-	deliver_status = DEL_STAT_DEFER;
+-    } else if (mail_copy_status != 0) {
+-	if (errno == EACCES) {
+-	    msg_warn("maildir access problem for UID/GID=%lu/%lu: %s",
+-		     (long) usr_attr.uid, (long) usr_attr.gid,
+-		     STR(why->reason));
+-	    msg_warn("perhaps you need to create the maildirs in advance");
+-	}
+-	vstring_sprintf_prepend(why->reason, "maildir delivery failed: ");
+-	deliver_status =
+-	    (STR(why->status)[0] == '4' ?
+-	     defer_append : bounce_append)
+-	    (BOUNCE_FLAGS(state.request),
+-	     BOUNCE_ATTR(state.msg_attr));
+-    } else {
+-	dsb_simple(why, "2.0.0", "delivered to maildir");
+-	deliver_status = sent(BOUNCE_FLAGS(state.request),
+-			      SENT_ATTR(state.msg_attr));
++        deliver_status = DEL_STAT_DEFER;
+     }
++    else if (mail_copy_status != 0) {
++        if (errno == EACCES) {
++            msg_warn("maildir access problem for UID/GID=%lu/%lu: %s",
++                    (long) usr_attr.uid, (long) usr_attr.gid, STR(why->reason));
++            msg_warn("perhaps you need to create the maildirs in advance");
++        }
++
++        /* Support per-recipient bounce messages. */
++        const char *limit_message;
++        int errnored = errno; /* Seems like mail_addr_find resets errno ... */
++
++        if (*var_virt_maildir_limit_message_maps != 0 && (limit_message = mail_addr_find(virtual_maildir_limit_message_maps, state.msg_attr.user, (char **) NULL)) != 0) {
++            errno = errnored;
++            if (errno == EFBIG) {
++                dsb_simple(why, "5.2.2", limit_message, NULL);
++            }
++            if (errno == EDQUOT) {
++                dsb_simple(why, "4.2.2", limit_message, NULL);
++            }
++        }
++        else {
++            errno = errnored;
++            if (errno == EFBIG) {
++                dsb_simple(why, "5.2.2", var_virt_maildir_limit_message, NULL);
++            }
++            if (errno == EDQUOT) {
++                dsb_simple(why, "4.2.2", var_virt_maildir_limit_message, NULL);
++            }
++        }
++
++        vstring_sprintf_prepend(why->reason, "maildir delivery failed: ");
++        deliver_status =
++                (STR(why->status)[0] == '4' ? defer_append : bounce_append)
++                (BOUNCE_FLAGS(state.request), BOUNCE_ATTR(state.msg_attr));
++    }
++    else {
++        dsb_simple(why, "2.0.0", "delivered to maildir");
++        deliver_status = sent(BOUNCE_FLAGS(state.request), SENT_ATTR(state.msg_attr));
++    }
++
+     vstring_free(buf);
++
+     myfree(newdir);
+     myfree(tmpdir);
+     myfree(curdir);
++
++    if (sizefilename)
++        myfree(sizefilename);
++    if (mdffilename)
++        myfree(mdffilename);
++
+     myfree(tmpfile);
+     if (newfile)
+-	myfree(newfile);
++        myfree(newfile);
++    if (bkpnewfile)
++        myfree(bkpnewfile);
++
+     return (deliver_status);
+ }
+--- src/virtual/virtual.c.orig	2011-02-19 00:46:06 UTC
++++ src/virtual/virtual.c
+@@ -335,12 +335,30 @@ long    var_virt_mailbox_limit;
+ char   *var_mail_spool_dir;		/* XXX dependency fix */
+ bool    var_strict_mbox_owner;
+ 
++char   *var_virt_mailbox_limit_maps;
++bool    var_virt_mailbox_limit_inbox;
++bool    var_virt_mailbox_limit_override;
++bool    var_virt_maildir_extended;
++bool    var_virt_overquota_bounce;
++char   *var_virt_maildir_limit_message;
++char   *var_virt_maildir_limit_message_maps;
++char   *var_virt_maildir_suffix;
++bool    var_virt_trash_count;
++char   *var_virt_trash_name;
++bool    var_virt_maildir_filter;
++char   *var_virt_maildir_filter_maps;
++
++
+  /*
+   * Mappings.
+   */
+ MAPS   *virtual_mailbox_maps;
+ MAPS   *virtual_uid_maps;
+ MAPS   *virtual_gid_maps;
++MAPS   *virtual_mailbox_limit_maps;
++MAPS   *virtual_maildir_limit_message_maps;
++MAPS   *virtual_maildir_filter_maps;
++
+ 
+  /*
+   * Bit masks.
+@@ -450,15 +468,28 @@ static void post_init(char *unused_name,
+      */
+     virtual_mailbox_maps =
+ 	maps_create(VAR_VIRT_MAILBOX_MAPS, var_virt_mailbox_maps,
+-		    DICT_FLAG_LOCK | DICT_FLAG_PARANOID);
++		    DICT_FLAG_LOCK);
+ 
+     virtual_uid_maps =
+ 	maps_create(VAR_VIRT_UID_MAPS, var_virt_uid_maps,
+-		    DICT_FLAG_LOCK | DICT_FLAG_PARANOID);
++		    DICT_FLAG_LOCK);
+ 
+     virtual_gid_maps =
+ 	maps_create(VAR_VIRT_GID_MAPS, var_virt_gid_maps,
+-		    DICT_FLAG_LOCK | DICT_FLAG_PARANOID);
++		    DICT_FLAG_LOCK);
++
++    virtual_mailbox_limit_maps =
++        maps_create(VAR_VIRT_MAILBOX_LIMIT_MAPS, var_virt_mailbox_limit_maps,
++                    DICT_FLAG_LOCK);
++
++    virtual_maildir_limit_message_maps =
++        maps_create(VAR_VIRT_MAILDIR_LIMIT_MESSAGE_MAPS, var_virt_maildir_limit_message_maps,
++                    DICT_FLAG_LOCK);
++
++    virtual_maildir_filter_maps =
++        maps_create(VAR_VIRT_MAILDIR_FILTER_MAPS, var_virt_maildir_filter_maps,
++                    DICT_FLAG_LOCK);
++
+ 
+     virtual_mbox_lock_mask = mbox_lock_mask(var_virt_mailbox_lock);
+ }
+@@ -510,10 +541,22 @@ int     main(int argc, char **argv)
+ 	VAR_VIRT_GID_MAPS, DEF_VIRT_GID_MAPS, &var_virt_gid_maps, 0, 0,
+ 	VAR_VIRT_MAILBOX_BASE, DEF_VIRT_MAILBOX_BASE, &var_virt_mailbox_base, 1, 0,
+ 	VAR_VIRT_MAILBOX_LOCK, DEF_VIRT_MAILBOX_LOCK, &var_virt_mailbox_lock, 1, 0,
++	VAR_VIRT_MAILBOX_LIMIT_MAPS, DEF_VIRT_MAILBOX_LIMIT_MAPS, &var_virt_mailbox_limit_maps, 0, 0,
++	VAR_VIRT_MAILDIR_LIMIT_MESSAGE, DEF_VIRT_MAILDIR_LIMIT_MESSAGE, &var_virt_maildir_limit_message, 1, 0,
++	VAR_VIRT_MAILDIR_LIMIT_MESSAGE_MAPS, DEF_VIRT_MAILDIR_LIMIT_MESSAGE_MAPS, &var_virt_maildir_limit_message_maps, 0, 0,
++	VAR_VIRT_MAILDIR_SUFFIX, DEF_VIRT_MAILDIR_SUFFIX, &var_virt_maildir_suffix, 0, 0,
++	VAR_VIRT_TRASH_NAME, DEF_VIRT_TRASH_NAME, &var_virt_trash_name, 0, 0,
++	VAR_VIRT_MAILDIR_FILTER_MAPS, DEF_VIRT_MAILDIR_FILTER_MAPS, &var_virt_maildir_filter_maps, 0, 0,
+ 	0,
+     };
+     static const CONFIG_BOOL_TABLE bool_table[] = {
+ 	VAR_STRICT_MBOX_OWNER, DEF_STRICT_MBOX_OWNER, &var_strict_mbox_owner,
++	VAR_VIRT_MAILBOX_LIMIT_INBOX, DEF_VIRT_MAILBOX_LIMIT_INBOX, &var_virt_mailbox_limit_inbox,
++	VAR_VIRT_MAILBOX_LIMIT_OVERRIDE, DEF_VIRT_MAILBOX_LIMIT_OVERRIDE, &var_virt_mailbox_limit_override,
++	VAR_VIRT_MAILDIR_EXTENDED, DEF_VIRT_MAILDIR_EXTENDED, &var_virt_maildir_extended,
++	VAR_VIRT_OVERQUOTA_BOUNCE, DEF_VIRT_OVERQUOTA_BOUNCE, &var_virt_overquota_bounce,
++	VAR_VIRT_TRASH_COUNT, DEF_VIRT_TRASH_COUNT, &var_virt_trash_count,
++	VAR_VIRT_MAILDIR_FILTER, DEF_VIRT_MAILDIR_FILTER, &var_virt_maildir_filter,
+ 	0,
+     };
+ 
+@@ -530,6 +573,7 @@ int     main(int argc, char **argv)
+ 		       MAIL_SERVER_PRE_INIT, pre_init,
+ 		       MAIL_SERVER_POST_INIT, post_init,
+ 		       MAIL_SERVER_PRE_ACCEPT, pre_accept,
++                       MAIL_SERVER_BOOL_TABLE, bool_table,
+ 		       MAIL_SERVER_PRIVILEGED,
+ 		       0);
+ }
+--- src/virtual/virtual.h.orig	2006-01-07 23:59:47 UTC
++++ src/virtual/virtual.h
+@@ -34,6 +34,9 @@
+ extern MAPS *virtual_mailbox_maps;
+ extern MAPS *virtual_uid_maps;
+ extern MAPS *virtual_gid_maps;
++extern MAPS *virtual_mailbox_limit_maps;
++extern MAPS *virtual_maildir_limit_message_maps;
++extern MAPS *virtual_maildir_filter_maps;
+ 
+  /*
+   * User attributes: these control the privileges for delivery to external
diff --git a/mail/rubygem-exception_notification/Makefile b/mail/rubygem-exception_notification/Makefile
index 1837948adb0..550688c7c5c 100644
--- a/mail/rubygem-exception_notification/Makefile
+++ b/mail/rubygem-exception_notification/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	exception_notification
-PORTVERSION=	4.2.1
+PORTVERSION=	4.2.2
 CATEGORIES=	mail rubygems
 MASTER_SITES=	RG
 
diff --git a/mail/rubygem-exception_notification/distinfo b/mail/rubygem-exception_notification/distinfo
index 8bdbcec60b7..e65564e122f 100644
--- a/mail/rubygem-exception_notification/distinfo
+++ b/mail/rubygem-exception_notification/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1482940874
-SHA256 (rubygem/exception_notification-4.2.1.gem) = 1cca58ad3d6658ae959f726f41cab2246ca0eea3c7488f379cc13b9941d694ed
-SIZE (rubygem/exception_notification-4.2.1.gem) = 117248
+TIMESTAMP = 1502640042
+SHA256 (rubygem/exception_notification-4.2.2.gem) = 9895c1b1bb12f18d035ecf7b0f1e7684bac9d9af90be6f92530c681b322e2ec4
+SIZE (rubygem/exception_notification-4.2.2.gem) = 121344
diff --git a/mail/rubygem-mini_mime/Makefile b/mail/rubygem-mini_mime/Makefile
index 17478a751b9..5293332ad78 100644
--- a/mail/rubygem-mini_mime/Makefile
+++ b/mail/rubygem-mini_mime/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	mini_mime
-PORTVERSION=	0.1.3
+PORTVERSION=	0.1.4
 CATEGORIES=	mail rubygems
 MASTER_SITES=	RG
 
@@ -9,9 +9,9 @@ MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Lightweight mime type lookup toy
 
 LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 NO_ARCH=	yes
-
 USES=		gem
 USE_RUBY=	yes
 
diff --git a/mail/rubygem-mini_mime/distinfo b/mail/rubygem-mini_mime/distinfo
index a1c7a5113b4..c845497269a 100644
--- a/mail/rubygem-mini_mime/distinfo
+++ b/mail/rubygem-mini_mime/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501901117
-SHA256 (rubygem/mini_mime-0.1.3.gem) = d2510acf3af92ac904036b19e711c986bdcb2c14704d9ff35f426dfb599602ea
-SIZE (rubygem/mini_mime-0.1.3.gem) = 32768
+TIMESTAMP = 1502528574
+SHA256 (rubygem/mini_mime-0.1.4.gem) = af99edd6fc6e18be29206917c17768b3fdbab004da56c31287126615fa17ee4f
+SIZE (rubygem/mini_mime-0.1.4.gem) = 32768
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index bd0b8e129ad..78e9f94e707 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -28,7 +28,6 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--enable-ipv6 \
 		--prefix=${PREFIX} \
-		--with-libintl-prefix=${LOCALBASE} \
 		--program-transform-name=''
 
 CONFLICTS=	sylpheed-1.[0-8]* sylpheed-2.[0-9]* sylpheed-gtk2-[0-9]*
@@ -75,7 +74,7 @@ JPILOT_CONFIGURE_ENABLE=	jpilot
 LDAP_CONFIGURE_ENABLE=		ldap
 LDAP_USE=			openldap=yes
 
-ONIGURUMA_LIB_DEPENDS=		libonig.so:devel/oniguruma5
+ONIGURUMA_LIB_DEPENDS=		libonig.so:devel/oniguruma6
 ONIGURUMA_CONFIGURE_ENABLE=	oniguruma
 
 SSL_CONFIGURE_ENABLE=		ssl
diff --git a/math/ceres-solver/Makefile b/math/ceres-solver/Makefile
index 381631bf895..c02fe49aa0a 100644
--- a/math/ceres-solver/Makefile
+++ b/math/ceres-solver/Makefile
@@ -1,10 +1,12 @@
 # $FreeBSD$
 
 PORTNAME=	ceres-solver
-DISTVERSION=	1.12.0
-PORTREVISION=	3
+DISTVERSION=	1.13.0
 CATEGORIES=	math
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES=	f58eacf082dd.patch:-p1
+
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Nonlinear least squares minimizer
 
diff --git a/math/ceres-solver/distinfo b/math/ceres-solver/distinfo
index ca57cdee294..b94e5b4a92c 100644
--- a/math/ceres-solver/distinfo
+++ b/math/ceres-solver/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1480952568
-SHA256 (ceres-solver-ceres-solver-1.12.0_GH0.tar.gz) = 7433c1e0518108bb3e4b9d8a2a481da43cd490e839f234feb828b4a6b2b07a23
-SIZE (ceres-solver-ceres-solver-1.12.0_GH0.tar.gz) = 3414903
+TIMESTAMP = 1501744176
+SHA256 (ceres-solver-ceres-solver-1.13.0_GH0.tar.gz) = 51ccb201b61ac71501fb6ccef158f078a750bc796ee6a271cd535cfe338202e5
+SIZE (ceres-solver-ceres-solver-1.13.0_GH0.tar.gz) = 3586772
+SHA256 (f58eacf082dd.patch) = c372934476fae4a11e3a62f0037feeb65d01c27f05b95257b05335f4dfe999a6
+SIZE (f58eacf082dd.patch) = 2495
diff --git a/math/drgeo/Makefile b/math/drgeo/Makefile
index 46b409abce7..d0381962c34 100644
--- a/math/drgeo/Makefile
+++ b/math/drgeo/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	drgeo
 PORTVERSION=	1.1.0
-PORTREVISION=	19
+PORTREVISION=	20
 CATEGORIES=	math
 MASTER_SITES=	SF/ofset/${PORTNAME}/${PORTVERSION}
 
@@ -17,7 +17,6 @@ USES=		gettext gmake pkgconfig pathfix
 USE_GNOME=	gnomeprefix intlhack libglade2
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-USE_GCC=	yes # segfaults when built with clang
 
 PORTDATA=	*
 
diff --git a/math/drgeo/files/patch-geo_drgeo__figure.cc b/math/drgeo/files/patch-geo_drgeo__figure.cc
new file mode 100644
index 00000000000..1f87f43cd58
--- /dev/null
+++ b/math/drgeo/files/patch-geo_drgeo__figure.cc
@@ -0,0 +1,17 @@
+Fix the build with GCC >= 6.
+
+drgeo_figure.cc: At global scope:
+drgeo_figure.cc:56:1: error: '<anonymous struct> drgeoDialogData', declared using anonymous type, is used but never defined [-fpermissive]
+ drgeoDialogData;
+  ^~~~~~~~~~~~~~~
+--- geo/drgeo_figure.cc.orig	2017-07-25 16:56:59 UTC
++++ geo/drgeo_figure.cc
+@@ -48,7 +48,7 @@
+ #include "drgeo_dialog.h"
+ #include "traite.h"
+ 
+-extern struct
++struct
+ {
+   drgeoPoint mouse;
+   drgeoFigure *figure;
diff --git a/math/dynare/Makefile b/math/dynare/Makefile
index 5ac7f63ec64..0bcc73ab415 100644
--- a/math/dynare/Makefile
+++ b/math/dynare/Makefile
@@ -2,22 +2,32 @@
 # $FreeBSD$
 
 PORTNAME=	dynare
-PORTVERSION=	4.4.3
-PORTREVISION=	9
+PORTVERSION=	4.5.1
 CATEGORIES=	math
 MASTER_SITES=	http://www.dynare.org/release/source/
 
 MAINTAINER=	fernando.apesteguia@gmail.com
 COMMENT=	Software platform for handling a wide class of economic models
 
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/unordered_set.hpp:devel/boost-libs \
 		ctangle:devel/cweb
 LIB_DEPENDS=	libumfpack.so:math/suitesparse \
-		libmatio.so:math/matio
+		libmatio.so:math/matio \
+		libhdf5.so:science/hdf5 \
+		libopenblas.so:math/openblas \
+		libopenblasp.so:math/openblas \
+		libfftw3_threads.so:math/fftw3 \
+		libfftw3.so:math/fftw3 \
+		libfftw3f_threads.so:math/fftw3-float \
+		libfftw3f.so:math/fftw3-float
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 GNU_CONFIGURE=	yes
-USES=		fortran gmake pkgconfig tar:xz
+USES=		fortran gmake pkgconfig tar:xz shebangfix
+SHEBANG_FILES=	matlab/modules/reporting/success.sh
 
 INFO=		dynare
 
@@ -33,11 +43,6 @@ OCTAVE_BUILD_DEPENDS=		octave:math/octave
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-pre-configure:
-# fix matio detection
-	${REINPLACE_CMD} 's,-lmatio .*$$LIBS,`pkgconf --libs matio`,' \
-		${WRKSRC}/configure ${WRKSRC}/mex/build/octave/configure
-
 post-configure:
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} ""
@@ -48,4 +53,11 @@ post-configure:
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} ""
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+post-install:
+.if ${ARCH} == "amd64"
+	${REINPLACE_CMD} -e 's|preprocessor32|preprocessor64|g' ${TMPPLIST}
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/math/dynare/distinfo b/math/dynare/distinfo
index 63597e1036b..4c4cc80602c 100644
--- a/math/dynare/distinfo
+++ b/math/dynare/distinfo
@@ -1,2 +1,3 @@
-SHA256 (dynare-4.4.3.tar.xz) = d00f97f72bcad7486ec1d18640d44b607d91ff9f585c9b4e01d08b6a3deeae21
-SIZE (dynare-4.4.3.tar.xz) = 14982128
+TIMESTAMP = 1500906695
+SHA256 (dynare-4.5.1.tar.xz) = ae6a7e9cc62fb25b18db3d4b5c34c27c7af17a46cb73586d051a049b7108db1f
+SIZE (dynare-4.5.1.tar.xz) = 16068492
diff --git a/math/dynare/files/patch-Makefile.in b/math/dynare/files/patch-Makefile.in
index 33045809044..b894472c46e 100644
--- a/math/dynare/files/patch-Makefile.in
+++ b/math/dynare/files/patch-Makefile.in
@@ -1,14 +1,11 @@
---- Makefile.in.orig	2014-07-31 12:30:46 UTC
+--- Makefile.in.orig	2017-07-24 14:31:29 UTC
 +++ Makefile.in
-@@ -827,9 +827,9 @@
- install-exec-local:
- 	$(MKDIR_P) $(DESTDIR)$(pkglibdir)/contrib/ms-sbvar/TZcode
- 	cp -r examples $(DESTDIR)$(pkglibdir)
--	cp -r matlab $(DESTDIR)$(pkglibdir)
- 	rm -f $(DESTDIR)$(pkglibdir)/matlab/dynare_m
--	cp preprocessor/dynare_m $(DESTDIR)$(pkglibdir)/matlab
-+	cp -r matlab $(DESTDIR)$(pkglibdir)
-+	$(INSTALL_PROGRAM) preprocessor/dynare_m $(DESTDIR)$(pkglibdir)/matlab
- 	cp -r contrib/ms-sbvar/TZcode/MatlabFiles $(DESTDIR)$(pkglibdir)/contrib/ms-sbvar/TZcode
+@@ -844,7 +844,7 @@ install-exec-local:
+ 	  ARCH="64"; \
+ 	fi; \
+ 	mkdir -p $(DESTDIR)$(pkglibdir)/matlab/preprocessor$$ARCH; \
+-	cp preprocessor/dynare_m $(DESTDIR)$(pkglibdir)/matlab/preprocessor$$ARCH; \
++	$(INSTALL_PROGRAM) preprocessor/dynare_m $(DESTDIR)$(pkglibdir)/matlab/preprocessor$$ARCH; \
+ 	}
  
  uninstall-local:
diff --git a/math/dynare/files/patch-journal.cweb b/math/dynare/files/patch-dynare++_kord_journal.cweb
similarity index 78%
rename from math/dynare/files/patch-journal.cweb
rename to math/dynare/files/patch-dynare++_kord_journal.cweb
index 33d7731cf2c..2d697d9ee90 100644
--- a/math/dynare/files/patch-journal.cweb
+++ b/math/dynare/files/patch-dynare++_kord_journal.cweb
@@ -1,5 +1,5 @@
---- dynare++/kord/journal.cweb.orig	2011-08-21 20:56:09.000000000 +0200
-+++ dynare++/kord/journal.cweb	2011-08-21 23:02:31.000000000 +0200
+--- dynare++/kord/journal.cweb.orig	2017-07-24 09:58:59 UTC
++++ dynare++/kord/journal.cweb
 @@ -5,6 +5,8 @@
  @c
  #include "journal.h"
@@ -9,7 +9,7 @@
  
  #if !defined(__MINGW32__)
  # include <sys/resource.h>
-@@ -72,7 +74,16 @@
+@@ -72,7 +74,16 @@ long int SystemResources::onlineProcesso
  @<|SystemResources::availableMemory| code@>=
  long int SystemResources::availableMemory()
  {
@@ -27,7 +27,7 @@
  }
  
  @ Here we read the current values of resource usage. For MinGW, we
-@@ -84,6 +95,10 @@
+@@ -84,6 +95,10 @@ void SystemResources::getRUS(double& loa
  							 long int& idrss, long int& majflt)
  {
  	struct timeval now;
@@ -38,7 +38,7 @@
  	gettimeofday(&now, NULL);
  	elapsed = now.tv_sec-start.tv_sec + (now.tv_usec-start.tv_usec)*1.0e-6;
  
-@@ -107,7 +122,11 @@
+@@ -111,7 +126,11 @@ void SystemResources::getRUS(double& loa
  	load_avg = -1.0;
  #endif
  
diff --git a/math/dynare/files/patch-dynare++_parser_cc_parser__exception.h b/math/dynare/files/patch-dynare++_parser_cc_parser__exception.h
new file mode 100644
index 00000000000..cf6d2b707e4
--- /dev/null
+++ b/math/dynare/files/patch-dynare++_parser_cc_parser__exception.h
@@ -0,0 +1,10 @@
+--- dynare++/parser/cc/parser_exception.h.orig	2017-07-24 09:58:59 UTC
++++ dynare++/parser/cc/parser_exception.h
+@@ -6,6 +6,7 @@
+ #define OG_FORMULA_PARSER_H
+ 
+ #include <string>
++#include <stdio.h>
+ 
+ namespace ogp
+ {
diff --git a/math/dynare/files/patch-configure b/math/dynare/files/patch-mex_build_octave_configure
similarity index 60%
rename from math/dynare/files/patch-configure
rename to math/dynare/files/patch-mex_build_octave_configure
index 92c99caf055..3b384d669e7 100644
--- a/math/dynare/files/patch-configure
+++ b/math/dynare/files/patch-mex_build_octave_configure
@@ -1,6 +1,6 @@
---- mex/build/octave/configure.orig	2014-01-10 20:33:42.000000000 +0100
-+++ mex/build/octave/configure	2014-01-10 20:34:24.000000000 +0100
-@@ -6769,7 +6769,7 @@
+--- mex/build/octave/configure.orig	2017-07-24 14:31:27 UTC
++++ mex/build/octave/configure
+@@ -7202,7 +7202,7 @@ if ${ac_cv_lib_umfpack_umfpack_dl_defaul
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
diff --git a/math/dynare/files/patch-parser-exception.h b/math/dynare/files/patch-parser-exception.h
deleted file mode 100644
index b7d5936c342..00000000000
--- a/math/dynare/files/patch-parser-exception.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- dynare++/parser/cc/parser_exception.h.orig	2011-08-21 19:10:51.000000000 +0200
-+++ dynare++/parser/cc/parser_exception.h	2011-08-21 19:31:06.000000000 +0200
-@@ -6,6 +6,7 @@
- #define OG_FORMULA_PARSER_H
- 
- #include <string>
-+#include <stdio.h>
- 
- namespace ogp {
- 	using std::string;
diff --git a/math/dynare/pkg-plist b/math/dynare/pkg-plist
index 3050fcb46bc..0ff4bed70c2 100644
--- a/math/dynare/pkg-plist
+++ b/math/dynare/pkg-plist
@@ -1,4 +1,5 @@
 bin/dynare++
+info/dir
 lib/dynare/contrib/ms-sbvar/TZcode/MatlabFiles/a0asfun.m
 lib/dynare/contrib/ms-sbvar/TZcode/MatlabFiles/a0asgrad.m
 lib/dynare/contrib/ms-sbvar/TZcode/MatlabFiles/a0freefun.m
@@ -243,7 +244,10 @@ lib/dynare/examples/NK_baseline.mod
 lib/dynare/examples/NK_baseline_steadystate.m
 lib/dynare/examples/agtrend.mod
 lib/dynare/examples/bkk.mod
+lib/dynare/examples/dynare++/README.txt
+lib/dynare/examples/dynare++/example1.mod
 lib/dynare/examples/example1.mod
+lib/dynare/examples/example1_reporting.mod
 lib/dynare/examples/example2.mod
 lib/dynare/examples/example3.mod
 lib/dynare/examples/example3_steady_state_helper.m
@@ -251,92 +255,6 @@ lib/dynare/examples/fs2000.mod
 lib/dynare/examples/fs2000_nonstationary.mod
 lib/dynare/examples/fsdat_simul.m
 lib/dynare/examples/ramst.mod
-lib/dynare/matlab/.dir-locals.el
-lib/dynare/matlab/@dates/append.m
-lib/dynare/matlab/@dates/colon.m
-lib/dynare/matlab/@dates/dates.m
-lib/dynare/matlab/@dates/disp.m
-lib/dynare/matlab/@dates/display.m
-lib/dynare/matlab/@dates/double.m
-lib/dynare/matlab/@dates/end.m
-lib/dynare/matlab/@dates/eq.m
-lib/dynare/matlab/@dates/ge.m
-lib/dynare/matlab/@dates/gt.m
-lib/dynare/matlab/@dates/horzcat.m
-lib/dynare/matlab/@dates/intersect.m
-lib/dynare/matlab/@dates/isempty.m
-lib/dynare/matlab/@dates/isequal.m
-lib/dynare/matlab/@dates/le.m
-lib/dynare/matlab/@dates/length.m
-lib/dynare/matlab/@dates/lt.m
-lib/dynare/matlab/@dates/max.m
-lib/dynare/matlab/@dates/min.m
-lib/dynare/matlab/@dates/minus.m
-lib/dynare/matlab/@dates/mtimes.m
-lib/dynare/matlab/@dates/ne.m
-lib/dynare/matlab/@dates/plus.m
-lib/dynare/matlab/@dates/pop.m
-lib/dynare/matlab/@dates/setdiff.m
-lib/dynare/matlab/@dates/size.m
-lib/dynare/matlab/@dates/sort.m
-lib/dynare/matlab/@dates/strings.m
-lib/dynare/matlab/@dates/subsasgn.m
-lib/dynare/matlab/@dates/subsref.m
-lib/dynare/matlab/@dates/uminus.m
-lib/dynare/matlab/@dates/union.m
-lib/dynare/matlab/@dates/unique.m
-lib/dynare/matlab/@dates/uplus.m
-lib/dynare/matlab/@dates/vertcat.m
-lib/dynare/matlab/@dseries/align.m
-lib/dynare/matlab/@dseries/baxter_king_filter.m
-lib/dynare/matlab/@dseries/check.m
-lib/dynare/matlab/@dseries/cumsum.m
-lib/dynare/matlab/@dseries/disp.m
-lib/dynare/matlab/@dseries/display.m
-lib/dynare/matlab/@dseries/dseries.m
-lib/dynare/matlab/@dseries/eq.m
-lib/dynare/matlab/@dseries/exp.m
-lib/dynare/matlab/@dseries/extract.m
-lib/dynare/matlab/@dseries/horzcat.m
-lib/dynare/matlab/@dseries/hpcycle.m
-lib/dynare/matlab/@dseries/hptrend.m
-lib/dynare/matlab/@dseries/insert.m
-lib/dynare/matlab/@dseries/isempty.m
-lib/dynare/matlab/@dseries/isequal.m
-lib/dynare/matlab/@dseries/lag.m
-lib/dynare/matlab/@dseries/lead.m
-lib/dynare/matlab/@dseries/log.m
-lib/dynare/matlab/@dseries/merge.m
-lib/dynare/matlab/@dseries/minus.m
-lib/dynare/matlab/@dseries/mpower.m
-lib/dynare/matlab/@dseries/mrdivide.m
-lib/dynare/matlab/@dseries/mtimes.m
-lib/dynare/matlab/@dseries/ne.m
-lib/dynare/matlab/@dseries/numel.m
-lib/dynare/matlab/@dseries/plot.m
-lib/dynare/matlab/@dseries/plus.m
-lib/dynare/matlab/@dseries/pop.m
-lib/dynare/matlab/@dseries/private/default_name.m
-lib/dynare/matlab/@dseries/qdiff.m
-lib/dynare/matlab/@dseries/qgrowth.m
-lib/dynare/matlab/@dseries/rename.m
-lib/dynare/matlab/@dseries/save.m
-lib/dynare/matlab/@dseries/set_names.m
-lib/dynare/matlab/@dseries/size.m
-lib/dynare/matlab/@dseries/subsasgn.m
-lib/dynare/matlab/@dseries/subsref.m
-lib/dynare/matlab/@dseries/tex_rename.m
-lib/dynare/matlab/@dseries/uminus.m
-lib/dynare/matlab/@dseries/vertcat.m
-lib/dynare/matlab/@dseries/ydiff.m
-lib/dynare/matlab/@dseries/ygrowth.m
-lib/dynare/matlab/@dynTimeIndex/display.m
-lib/dynare/matlab/@dynTimeIndex/dynTimeIndex.m
-lib/dynare/matlab/@dynTimeIndex/minus.m
-lib/dynare/matlab/@dynTimeIndex/mpower.m
-lib/dynare/matlab/@dynTimeIndex/plus.m
-lib/dynare/matlab/@dynTimeIndex/subsasgn.m
-lib/dynare/matlab/@dynTimeIndex/subsref.m
 lib/dynare/matlab/AHessian.m
 lib/dynare/matlab/AIM/README.txt
 lib/dynare/matlab/AIM/SPAimerr.m
@@ -352,7 +270,6 @@ lib/dynare/matlab/AIM/SPShiftright.m
 lib/dynare/matlab/AIM/dynAIMsolver1.m
 lib/dynare/matlab/AIM_first_order_solver.m
 lib/dynare/matlab/CheckPath.m
-lib/dynare/matlab/Contents.m
 lib/dynare/matlab/CutSample.m
 lib/dynare/matlab/DsgeSmoother.m
 lib/dynare/matlab/GetAllPosteriorDraws.m
@@ -360,21 +277,21 @@ lib/dynare/matlab/GetOneDraw.m
 lib/dynare/matlab/GetPosteriorMeanVariance.m
 lib/dynare/matlab/GetPosteriorParametersStatistics.m
 lib/dynare/matlab/MakeAllFigures.m
-lib/dynare/matlab/McMCDiagnostics.m
-lib/dynare/matlab/McMCDiagnostics_core.m
 lib/dynare/matlab/PlotPosteriorDistributions.m
-lib/dynare/matlab/PosteriorFilterSmootherAndForecast.m
 lib/dynare/matlab/PosteriorIRF.m
 lib/dynare/matlab/PosteriorIRF_core1.m
 lib/dynare/matlab/PosteriorIRF_core2.m
 lib/dynare/matlab/ReshapeMatFiles.m
+lib/dynare/matlab/TaRB_optimizer_wrapper.m
 lib/dynare/matlab/Tracing.m
 lib/dynare/matlab/UnivariateSpectralDensity.m
-lib/dynare/matlab/adaptive_metropolis_hastings.m
-lib/dynare/matlab/add_auxiliary_variables_to_steadystate.m
+lib/dynare/matlab/WriteShockDecomp2Excel.m
+lib/dynare/matlab/add_filter_subtitle.m
+lib/dynare/matlab/add_path_to_mex_files.m
+lib/dynare/matlab/annualized_shock_decomposition.m
 lib/dynare/matlab/autoregressive_process_specification.m
+lib/dynare/matlab/backward_model_inversion.m
 lib/dynare/matlab/basic_plan.m
-lib/dynare/matlab/bfgsi1.m
 lib/dynare/matlab/bicgstab_.m
 lib/dynare/matlab/bksup0.m
 lib/dynare/matlab/bksup1.m
@@ -388,39 +305,50 @@ lib/dynare/matlab/bvar_irf.m
 lib/dynare/matlab/bvar_toolbox.m
 lib/dynare/matlab/bytecode_steadystate.m
 lib/dynare/matlab/cartesian_product_of_sets.m
+lib/dynare/matlab/cellofchar2mfile.m
 lib/dynare/matlab/check.m
 lib/dynare/matlab/check_consistency_covariances.m
 lib/dynare/matlab/check_dsge_var_model.m
-lib/dynare/matlab/check_file_extension.m
 lib/dynare/matlab/check_for_calibrated_covariances.m
 lib/dynare/matlab/check_list_of_variables.m
+lib/dynare/matlab/check_matlab_path.m
 lib/dynare/matlab/check_model.m
 lib/dynare/matlab/check_name.m
 lib/dynare/matlab/check_posterior_analysis_data.m
+lib/dynare/matlab/check_posterior_sampler_options.m
 lib/dynare/matlab/check_prior_analysis_data.m
 lib/dynare/matlab/check_prior_bounds.m
-lib/dynare/matlab/cmaes.m
-lib/dynare/matlab/common_strings_in_cell_arrays.m
+lib/dynare/matlab/check_valid_ver.m
+lib/dynare/matlab/chol_SE.m
+lib/dynare/matlab/clear_persistent_variables.m
+lib/dynare/matlab/cli/prior.m
+lib/dynare/matlab/collect_latex_files.m
+lib/dynare/matlab/compute_Pinf_Pstar.m
 lib/dynare/matlab/compute_mh_covariance_matrix.m
 lib/dynare/matlab/compute_model_moments.m
 lib/dynare/matlab/compute_moments_varendo.m
 lib/dynare/matlab/compute_overall_acceptance_ratio.m
+lib/dynare/matlab/compute_trend_coefficients.m
 lib/dynare/matlab/conditional_variance_decomposition.m
 lib/dynare/matlab/conditional_variance_decomposition_mc_analysis.m
+lib/dynare/matlab/convergence_diagnostics/McMCDiagnostics.m
+lib/dynare/matlab/convergence_diagnostics/McMCDiagnostics_core.m
+lib/dynare/matlab/convergence_diagnostics/geweke_chi2_test.m
+lib/dynare/matlab/convergence_diagnostics/geweke_moments.m
+lib/dynare/matlab/convergence_diagnostics/mcmc_ifac.m
+lib/dynare/matlab/convergence_diagnostics/raftery_lewis.m
 lib/dynare/matlab/convertAimCodeToInfo.m
+lib/dynare/matlab/convert_dyn_45_to_44.m
+lib/dynare/matlab/convert_oo_.m
 lib/dynare/matlab/correlation_mc_analysis.m
 lib/dynare/matlab/cosn.m
 lib/dynare/matlab/covariance_mc_analysis.m
-lib/dynare/matlab/csminit1.m
-lib/dynare/matlab/csminwel1.m
 lib/dynare/matlab/csolve.m
 lib/dynare/matlab/cubature_with_gaussian_weight.m
 lib/dynare/matlab/cycle_reduction.m
 lib/dynare/matlab/datatomfile.m
 lib/dynare/matlab/dcompare.m
 lib/dynare/matlab/delete_mh_history_files.m
-lib/dynare/matlab/det_cond_forecast.m
-lib/dynare/matlab/det_forecast.m
 lib/dynare/matlab/discretionary_policy.m
 lib/dynare/matlab/discretionary_policy_1.m
 lib/dynare/matlab/discretionary_policy_engine.m
@@ -432,9 +360,13 @@ lib/dynare/matlab/disp_steady_state.m
 lib/dynare/matlab/disp_th_moments.m
 lib/dynare/matlab/display_conditional_variance_decomposition.m
 lib/dynare/matlab/display_estimation_results_table.m
+lib/dynare/matlab/display_problematic_vars_Jacobian.m
+lib/dynare/matlab/distributions/beta_specification.m
 lib/dynare/matlab/distributions/compute_prior_mode.m
+lib/dynare/matlab/distributions/gamma_specification.m
 lib/dynare/matlab/distributions/ig1fun.m
 lib/dynare/matlab/distributions/inverse_gamma_specification.m
+lib/dynare/matlab/distributions/lpdfgweibull.m
 lib/dynare/matlab/distributions/mode_and_variance_to_mean.m
 lib/dynare/matlab/distributions/multivariate_normal_pdf.m
 lib/dynare/matlab/distributions/multivariate_student_pdf.m
@@ -442,6 +374,7 @@ lib/dynare/matlab/distributions/rand_inverse_wishart.m
 lib/dynare/matlab/distributions/rand_matrix_normal.m
 lib/dynare/matlab/distributions/rand_multivariate_normal.m
 lib/dynare/matlab/distributions/rand_multivariate_student.m
+lib/dynare/matlab/distributions/weibull_specification.m
 lib/dynare/matlab/do_parameter_initialization.m
 lib/dynare/matlab/dr_block.m
 lib/dynare/matlab/draw_prior_density.m
@@ -452,13 +385,14 @@ lib/dynare/matlab/dsge_simulated_theoretical_correlation.m
 lib/dynare/matlab/dsge_simulated_theoretical_covariance.m
 lib/dynare/matlab/dsge_simulated_theoretical_variance_decomposition.m
 lib/dynare/matlab/dsge_var_likelihood.m
-lib/dynare/matlab/dsgevar_posterior_density.m
 lib/dynare/matlab/dy_date.m
 lib/dynare/matlab/dyn2vec.m
+lib/dynare/matlab/dyn_autocorr.m
 lib/dynare/matlab/dyn_diag_vech.m
 lib/dynare/matlab/dyn_figure.m
 lib/dynare/matlab/dyn_first_order_solver.m
 lib/dynare/matlab/dyn_forecast.m
+lib/dynare/matlab/dyn_latex_table.m
 lib/dynare/matlab/dyn_ramsey_static.m
 lib/dynare/matlab/dyn_risky_steadystate_solver.m
 lib/dynare/matlab/dyn_saveas.m
@@ -467,6 +401,8 @@ lib/dynare/matlab/dyn_unvech.m
 lib/dynare/matlab/dyn_vech.m
 lib/dynare/matlab/dyn_waitbar.m
 lib/dynare/matlab/dyn_waitbar_close.m
+lib/dynare/matlab/dynamic_backward_model_for_inversion.m
+lib/dynare/matlab/dynamic_backward_model_for_simulation.m
 lib/dynare/matlab/dynare.m
 lib/dynare/matlab/dynare_config.m
 lib/dynare/matlab/dynare_estimation.m
@@ -491,13 +427,26 @@ lib/dynare/matlab/dynsec2hms.m
 lib/dynare/matlab/dyntable.m
 lib/dynare/matlab/endogenous_prior.m
 lib/dynare/matlab/endogenous_prior_restrictions.m
+lib/dynare/matlab/ep/ep_accuracy_check.m
+lib/dynare/matlab/ep/ep_notes.org
+lib/dynare/matlab/ep/ep_problem_2.m
+lib/dynare/matlab/ep/euler_equation_error.m
 lib/dynare/matlab/ep/extended_path.m
-lib/dynare/matlab/ep/homotopic_steps.m
+lib/dynare/matlab/ep/extended_path_core.m
+lib/dynare/matlab/ep/extended_path_homotopy.m
+lib/dynare/matlab/ep/extended_path_initialization.m
+lib/dynare/matlab/ep/extended_path_mc.m
+lib/dynare/matlab/ep/extended_path_shocks.m
+lib/dynare/matlab/ep/get_block_world_nbr.m
+lib/dynare/matlab/ep/setup_integration_nodes.m
+lib/dynare/matlab/ep/setup_stochastic_perfect_foresight_model_solver.m
 lib/dynare/matlab/ep/solve_stochastic_perfect_foresight_model.m
 lib/dynare/matlab/ep/solve_stochastic_perfect_foresight_model_1.m
 lib/dynare/matlab/ep_residuals.m
 lib/dynare/matlab/erase_compiled_function.m
+lib/dynare/matlab/evaluate_dynamic_model.m
 lib/dynare/matlab/evaluate_likelihood.m
+lib/dynare/matlab/evaluate_max_dynamic_residual.m
 lib/dynare/matlab/evaluate_planner_objective.m
 lib/dynare/matlab/evaluate_posterior_kernel.m
 lib/dynare/matlab/evaluate_prior.m
@@ -505,6 +454,8 @@ lib/dynare/matlab/evaluate_smoother.m
 lib/dynare/matlab/evaluate_static_model.m
 lib/dynare/matlab/evaluate_steady_state.m
 lib/dynare/matlab/evaluate_steady_state_file.m
+lib/dynare/matlab/execute_prior_posterior_function.m
+lib/dynare/matlab/expand_group.m
 lib/dynare/matlab/f_var.m
 lib/dynare/matlab/fastgensylv.m
 lib/dynare/matlab/ff1_.m
@@ -514,13 +465,14 @@ lib/dynare/matlab/flip_plan.m
 lib/dynare/matlab/forcst.m
 lib/dynare/matlab/forcst2.m
 lib/dynare/matlab/forcst2a.m
-lib/dynare/matlab/forcst_unc.m
 lib/dynare/matlab/forecast_graphs.m
 lib/dynare/matlab/formdata.m
 lib/dynare/matlab/ftest.m
+lib/dynare/matlab/fwriten.m
 lib/dynare/matlab/gauss_hermite_weights_and_nodes.m
 lib/dynare/matlab/gauss_legendre_weights_and_nodes.m
 lib/dynare/matlab/gcompare.m
+lib/dynare/matlab/generate_trace_plots.m
 lib/dynare/matlab/gensylv/gensylv.m
 lib/dynare/matlab/gensylv/sylvester3.m
 lib/dynare/matlab/gensylv/sylvester3a.m
@@ -535,23 +487,20 @@ lib/dynare/matlab/get_cells_id.m
 lib/dynare/matlab/get_date_of_a_file.m
 lib/dynare/matlab/get_dynare_random_generator_state.m
 lib/dynare/matlab/get_existing_subsamples_indx.m
+lib/dynare/matlab/get_file_extension.m
 lib/dynare/matlab/get_moments_size.m
 lib/dynare/matlab/get_name_of_the_last_mh_file.m
 lib/dynare/matlab/get_new_or_existing_ei_index.m
 lib/dynare/matlab/get_optimal_policy_discount_factor.m
 lib/dynare/matlab/get_param_by_name.m
 lib/dynare/matlab/get_posterior_parameters.m
-lib/dynare/matlab/get_prior_info.m
-lib/dynare/matlab/get_random_string.m
 lib/dynare/matlab/get_subsamples_range_indx.m
 lib/dynare/matlab/get_the_name.m
 lib/dynare/matlab/get_variables_list.m
 lib/dynare/matlab/get_variance_of_endogenous_variables.m
-lib/dynare/matlab/geweke_chi2_test.m
-lib/dynare/matlab/geweke_moments.m
 lib/dynare/matlab/global_initialization.m
-lib/dynare/matlab/gmhmaxlik.m
 lib/dynare/matlab/graph_decomp.m
+lib/dynare/matlab/graph_decomp_detail.m
 lib/dynare/matlab/gsa/Morris_Measure_Groups.m
 lib/dynare/matlab/gsa/Sampling_Function_2.m
 lib/dynare/matlab/gsa/cumplot.m
@@ -561,15 +510,22 @@ lib/dynare/matlab/gsa/gsa_plotmatrix.m
 lib/dynare/matlab/gsa/gsa_skewness.m
 lib/dynare/matlab/gsa/gsa_speed.m
 lib/dynare/matlab/gsa/log_trans_.m
+lib/dynare/matlab/gsa/map_calibration.m
 lib/dynare/matlab/gsa/map_ident_.m
 lib/dynare/matlab/gsa/mc_moments.m
+lib/dynare/matlab/gsa/mcf_analysis.m
 lib/dynare/matlab/gsa/myboxplot.m
 lib/dynare/matlab/gsa/myprctilecol.m
+lib/dynare/matlab/gsa/pick.m
 lib/dynare/matlab/gsa/prior_draw_gsa.m
 lib/dynare/matlab/gsa/priorcdf.m
 lib/dynare/matlab/gsa/read_data.m
 lib/dynare/matlab/gsa/redform_map.m
 lib/dynare/matlab/gsa/redform_screen.m
+lib/dynare/matlab/gsa/scatter_analysis.m
+lib/dynare/matlab/gsa/scatter_callback.m
+lib/dynare/matlab/gsa/scatter_mcf.m
+lib/dynare/matlab/gsa/scatter_plots.m
 lib/dynare/matlab/gsa/set_shocks_param.m
 lib/dynare/matlab/gsa/smirnov.m
 lib/dynare/matlab/gsa/stab_map_.m
@@ -583,6 +539,7 @@ lib/dynare/matlab/gsa/trank.m
 lib/dynare/matlab/hess_element.m
 lib/dynare/matlab/hessian.m
 lib/dynare/matlab/hessian_sparse.m
+lib/dynare/matlab/histvalf.m
 lib/dynare/matlab/homotopy1.m
 lib/dynare/matlab/homotopy2.m
 lib/dynare/matlab/homotopy3.m
@@ -590,20 +547,20 @@ lib/dynare/matlab/ident_bruteforce.m
 lib/dynare/matlab/identification_analysis.m
 lib/dynare/matlab/identification_checks.m
 lib/dynare/matlab/imcforecast.m
-lib/dynare/matlab/independent_metropolis_hastings.m
-lib/dynare/matlab/independent_metropolis_hastings_core.m
 lib/dynare/matlab/indnv.m
 lib/dynare/matlab/init_plan.m
+lib/dynare/matlab/initial_condition_decomposition.m
 lib/dynare/matlab/initial_estimation_checks.m
 lib/dynare/matlab/initialize_from_mode.m
 lib/dynare/matlab/initvalf.m
-lib/dynare/matlab/insert_column_vector_in_a_matrix.m
-lib/dynare/matlab/insert_object_in_a_one_dimensional_cell_array.m
 lib/dynare/matlab/internals.m
+lib/dynare/matlab/interpret_resol_info.m
 lib/dynare/matlab/irf.m
+lib/dynare/matlab/isbayes.m
+lib/dynare/matlab/isoctave.m
+lib/dynare/matlab/isolder.m
 lib/dynare/matlab/jacob_element.m
 lib/dynare/matlab/k_order_pert.m
-lib/dynare/matlab/k_order_perturbation.m
 lib/dynare/matlab/kalman/build_selection_matrix.m
 lib/dynare/matlab/kalman/likelihood/computeDLIK.m
 lib/dynare/matlab/kalman/likelihood/kalman_filter.m
@@ -622,16 +579,20 @@ lib/dynare/matlab/kalman_transition_matrix.m
 lib/dynare/matlab/kernel_density_estimate.m
 lib/dynare/matlab/kronecker/A_times_B_kronecker_C.m
 lib/dynare/matlab/kronecker/sparse_hessian_times_B_kronecker_C.m
+lib/dynare/matlab/list_of_functions_to_be_cleared.m
 lib/dynare/matlab/list_of_parameters_calibrated_as_NaN.m
+lib/dynare/matlab/lmmcp/catstruct.m
+lib/dynare/matlab/lmmcp/dyn_lmmcp.m
+lib/dynare/matlab/lmmcp/dyn_lmmcp_func.m
+lib/dynare/matlab/lmmcp/get_complementarity_conditions.m
+lib/dynare/matlab/lmmcp/lmmcp.m
 lib/dynare/matlab/lnsrch1.m
 lib/dynare/matlab/lnsrch1_wrapper_one_boundary.m
 lib/dynare/matlab/lnsrch1_wrapper_two_boundaries.m
-lib/dynare/matlab/load_csv_file_data.m
 lib/dynare/matlab/load_first_mh_history_file.m
 lib/dynare/matlab/load_last_mh_history_file.m
-lib/dynare/matlab/load_m_file_data.m
-lib/dynare/matlab/load_mat_file_data.m
-lib/dynare/matlab/load_xls_file_data.m
+lib/dynare/matlab/load_m_file_data_legacy.m
+lib/dynare/matlab/load_mat_file_data_legacy.m
 lib/dynare/matlab/logarithmic_reduction.m
 lib/dynare/matlab/long_run_variance.m
 lib/dynare/matlab/lpdfgam.m
@@ -639,22 +600,28 @@ lib/dynare/matlab/lpdfgbeta.m
 lib/dynare/matlab/lpdfig1.m
 lib/dynare/matlab/lpdfig2.m
 lib/dynare/matlab/lpdfnorm.m
+lib/dynare/matlab/lyapunov_solver.m
 lib/dynare/matlab/lyapunov_symm.m
-lib/dynare/matlab/make_ex_.m
-lib/dynare/matlab/make_y_.m
 lib/dynare/matlab/marginal_density.m
 lib/dynare/matlab/matlab_ver_less_than.m
 lib/dynare/matlab/maximize_prior_density.m
 lib/dynare/matlab/mcforecast3.m
 lib/dynare/matlab/mcompare.m
+lib/dynare/matlab/mcp_func.m
+lib/dynare/matlab/mcpath_function.m
 lib/dynare/matlab/metropolis_draw.m
 lib/dynare/matlab/metropolis_hastings_initialization.m
 lib/dynare/matlab/metropolis_run_analysis.m
+lib/dynare/matlab/mex/k_order_perturbation.m
+lib/dynare/matlab/mex/qmc_sequence.m
 lib/dynare/matlab/mexErrCheck.m
 lib/dynare/matlab/mh_autocorrelation_function.m
 lib/dynare/matlab/mh_optimal_bandwidth.m
 lib/dynare/matlab/minus_logged_prior_density.m
-lib/dynare/matlab/missing/bsxfun/bsxfun.m
+lib/dynare/matlab/missing/corrcoef/corrcoef.m
+lib/dynare/matlab/missing/corrcoef/flag_implicit_skip_nan.m
+lib/dynare/matlab/missing/corrcoef/sumskipnan.m
+lib/dynare/matlab/missing/corrcoef/tcdf.m
 lib/dynare/matlab/missing/ilu/ilu.m
 lib/dynare/matlab/missing/issquare/issquare.m
 lib/dynare/matlab/missing/nanmean/nanmean.m
@@ -668,6 +635,7 @@ lib/dynare/matlab/missing/stats/betarnd.m
 lib/dynare/matlab/missing/stats/chi2cdf.m
 lib/dynare/matlab/missing/stats/chi2inv.m
 lib/dynare/matlab/missing/stats/common_size.m
+lib/dynare/matlab/missing/stats/corr.m
 lib/dynare/matlab/missing/stats/exprnd.m
 lib/dynare/matlab/missing/stats/gamcdf.m
 lib/dynare/matlab/missing/stats/gaminv.m
@@ -676,10 +644,14 @@ lib/dynare/matlab/missing/stats/gamrnd.m
 lib/dynare/matlab/missing/stats/normcdf.m
 lib/dynare/matlab/missing/stats/norminv.m
 lib/dynare/matlab/missing/stats/normpdf.m
+lib/dynare/matlab/missing/stats/quantile.m
 lib/dynare/matlab/missing/stats/stdnormal_cdf.m
 lib/dynare/matlab/missing/stats/stdnormal_inv.m
 lib/dynare/matlab/missing/stats/stdnormal_pdf.m
-lib/dynare/matlab/missing/strjoin/strjoin.m
+lib/dynare/matlab/missing/stats/wblcdf.m
+lib/dynare/matlab/missing/stats/wblinv.m
+lib/dynare/matlab/missing/stats/wblrnd.m
+lib/dynare/matlab/missing/struct2array/struct2array.m
 lib/dynare/matlab/missing/vec/vec.m
 lib/dynare/matlab/missing_DiffuseKalmanSmootherH1_Z.m
 lib/dynare/matlab/missing_DiffuseKalmanSmootherH3_Z.m
@@ -687,10 +659,251 @@ lib/dynare/matlab/mode_check.m
 lib/dynare/matlab/model_comparison.m
 lib/dynare/matlab/model_diagnostics.m
 lib/dynare/matlab/model_info.m
+lib/dynare/matlab/model_inversion.m
+lib/dynare/matlab/modules/dates/README.md
+lib/dynare/matlab/modules/dates/src/@dates/append.m
+lib/dynare/matlab/modules/dates/src/@dates/char.m
+lib/dynare/matlab/modules/dates/src/@dates/colon.m
+lib/dynare/matlab/modules/dates/src/@dates/dates.m
+lib/dynare/matlab/modules/dates/src/@dates/disp.m
+lib/dynare/matlab/modules/dates/src/@dates/display.m
+lib/dynare/matlab/modules/dates/src/@dates/double.m
+lib/dynare/matlab/modules/dates/src/@dates/end.m
+lib/dynare/matlab/modules/dates/src/@dates/eq.m
+lib/dynare/matlab/modules/dates/src/@dates/ge.m
+lib/dynare/matlab/modules/dates/src/@dates/gt.m
+lib/dynare/matlab/modules/dates/src/@dates/horzcat.m
+lib/dynare/matlab/modules/dates/src/@dates/intersect.m
+lib/dynare/matlab/modules/dates/src/@dates/isempty.m
+lib/dynare/matlab/modules/dates/src/@dates/isequal.m
+lib/dynare/matlab/modules/dates/src/@dates/le.m
+lib/dynare/matlab/modules/dates/src/@dates/length.m
+lib/dynare/matlab/modules/dates/src/@dates/lt.m
+lib/dynare/matlab/modules/dates/src/@dates/max.m
+lib/dynare/matlab/modules/dates/src/@dates/min.m
+lib/dynare/matlab/modules/dates/src/@dates/minus.m
+lib/dynare/matlab/modules/dates/src/@dates/mtimes.m
+lib/dynare/matlab/modules/dates/src/@dates/ne.m
+lib/dynare/matlab/modules/dates/src/@dates/plus.m
+lib/dynare/matlab/modules/dates/src/@dates/pop.m
+lib/dynare/matlab/modules/dates/src/@dates/setdiff.m
+lib/dynare/matlab/modules/dates/src/@dates/size.m
+lib/dynare/matlab/modules/dates/src/@dates/sort.m
+lib/dynare/matlab/modules/dates/src/@dates/strings.m
+lib/dynare/matlab/modules/dates/src/@dates/subsasgn.m
+lib/dynare/matlab/modules/dates/src/@dates/subsref.m
+lib/dynare/matlab/modules/dates/src/@dates/uminus.m
+lib/dynare/matlab/modules/dates/src/@dates/union.m
+lib/dynare/matlab/modules/dates/src/@dates/unique.m
+lib/dynare/matlab/modules/dates/src/@dates/uplus.m
+lib/dynare/matlab/modules/dates/src/@dates/vertcat.m
+lib/dynare/matlab/modules/dates/src/initialize_dates_toolbox.m
+lib/dynare/matlab/modules/dates/src/utilities/convert/date2string.m
+lib/dynare/matlab/modules/dates/src/utilities/convert/freq2string.m
+lib/dynare/matlab/modules/dates/src/utilities/convert/string2date.m
+lib/dynare/matlab/modules/dates/src/utilities/convert/string2freq.m
+lib/dynare/matlab/modules/dates/src/utilities/is/isdate.m
+lib/dynare/matlab/modules/dates/src/utilities/is/isdates.m
+lib/dynare/matlab/modules/dates/src/utilities/is/isfreq.m
+lib/dynare/matlab/modules/dates/src/utilities/is/ismonthly.m
+lib/dynare/matlab/modules/dates/src/utilities/is/isquaterly.m
+lib/dynare/matlab/modules/dates/src/utilities/is/isstringdate.m
+lib/dynare/matlab/modules/dates/src/utilities/is/issubperiod.m
+lib/dynare/matlab/modules/dates/src/utilities/is/isweekly.m
+lib/dynare/matlab/modules/dates/src/utilities/is/isyearly.m
+lib/dynare/matlab/modules/dates/src/utilities/missing/dims/columns.m
+lib/dynare/matlab/modules/dates/src/utilities/missing/dims/rows.m
+lib/dynare/matlab/modules/dates/src/utilities/missing/isint/isint.m
+lib/dynare/matlab/modules/dates/src/utilities/missing/isoctave/isoctave.m
+lib/dynare/matlab/modules/dates/src/utilities/missing/matlab_ver_less_than/matlab_ver_less_than.m
+lib/dynare/matlab/modules/dates/src/utilities/missing/shiftS/shiftS.m
+lib/dynare/matlab/modules/dates/src/utilities/op/add_periods_to_array_of_dates.m
+lib/dynare/matlab/modules/dates/src/utilities/op/add_periods_to_date.m
+lib/dynare/matlab/modules/dseries/README.md
+lib/dynare/matlab/modules/dseries/src/@dseries/abs.m
+lib/dynare/matlab/modules/dseries/src/@dseries/align.m
+lib/dynare/matlab/modules/dseries/src/@dseries/baxter_king_filter.m
+lib/dynare/matlab/modules/dseries/src/@dseries/center.m
+lib/dynare/matlab/modules/dseries/src/@dseries/chain.m
+lib/dynare/matlab/modules/dseries/src/@dseries/check.m
+lib/dynare/matlab/modules/dseries/src/@dseries/cumprod.m
+lib/dynare/matlab/modules/dseries/src/@dseries/cumsum.m
+lib/dynare/matlab/modules/dseries/src/@dseries/detrend.m
+lib/dynare/matlab/modules/dseries/src/@dseries/disp.m
+lib/dynare/matlab/modules/dseries/src/@dseries/display.m
+lib/dynare/matlab/modules/dseries/src/@dseries/dseries.m
+lib/dynare/matlab/modules/dseries/src/@dseries/end.m
+lib/dynare/matlab/modules/dseries/src/@dseries/eq.m
+lib/dynare/matlab/modules/dseries/src/@dseries/exist.m
+lib/dynare/matlab/modules/dseries/src/@dseries/exp.m
+lib/dynare/matlab/modules/dseries/src/@dseries/extract.m
+lib/dynare/matlab/modules/dseries/src/@dseries/firstdate.m
+lib/dynare/matlab/modules/dseries/src/@dseries/firstobservedperiod.m
+lib/dynare/matlab/modules/dseries/src/@dseries/frequency.m
+lib/dynare/matlab/modules/dseries/src/@dseries/horzcat.m
+lib/dynare/matlab/modules/dseries/src/@dseries/hpcycle.m
+lib/dynare/matlab/modules/dseries/src/@dseries/hptrend.m
+lib/dynare/matlab/modules/dseries/src/@dseries/insert.m
+lib/dynare/matlab/modules/dseries/src/@dseries/isempty.m
+lib/dynare/matlab/modules/dseries/src/@dseries/isequal.m
+lib/dynare/matlab/modules/dseries/src/@dseries/isnan.m
+lib/dynare/matlab/modules/dseries/src/@dseries/lag.m
+lib/dynare/matlab/modules/dseries/src/@dseries/lastdate.m
+lib/dynare/matlab/modules/dseries/src/@dseries/lastobservedperiod.m
+lib/dynare/matlab/modules/dseries/src/@dseries/lead.m
+lib/dynare/matlab/modules/dseries/src/@dseries/log.m
+lib/dynare/matlab/modules/dseries/src/@dseries/mean.m
+lib/dynare/matlab/modules/dseries/src/@dseries/merge.m
+lib/dynare/matlab/modules/dseries/src/@dseries/minus.m
+lib/dynare/matlab/modules/dseries/src/@dseries/mpower.m
+lib/dynare/matlab/modules/dseries/src/@dseries/mrdivide.m
+lib/dynare/matlab/modules/dseries/src/@dseries/mtimes.m
+lib/dynare/matlab/modules/dseries/src/@dseries/ne.m
+lib/dynare/matlab/modules/dseries/src/@dseries/nobs.m
+lib/dynare/matlab/modules/dseries/src/@dseries/numel.m
+lib/dynare/matlab/modules/dseries/src/@dseries/plot.m
+lib/dynare/matlab/modules/dseries/src/@dseries/plus.m
+lib/dynare/matlab/modules/dseries/src/@dseries/pop.m
+lib/dynare/matlab/modules/dseries/src/@dseries/private/default_name.m
+lib/dynare/matlab/modules/dseries/src/@dseries/qdiff.m
+lib/dynare/matlab/modules/dseries/src/@dseries/qgrowth.m
+lib/dynare/matlab/modules/dseries/src/@dseries/remove.m
+lib/dynare/matlab/modules/dseries/src/@dseries/rename.m
+lib/dynare/matlab/modules/dseries/src/@dseries/save.m
+lib/dynare/matlab/modules/dseries/src/@dseries/set_names.m
+lib/dynare/matlab/modules/dseries/src/@dseries/size.m
+lib/dynare/matlab/modules/dseries/src/@dseries/std.m
+lib/dynare/matlab/modules/dseries/src/@dseries/subsasgn.m
+lib/dynare/matlab/modules/dseries/src/@dseries/subsref.m
+lib/dynare/matlab/modules/dseries/src/@dseries/tex_rename.m
+lib/dynare/matlab/modules/dseries/src/@dseries/uminus.m
+lib/dynare/matlab/modules/dseries/src/@dseries/vertcat.m
+lib/dynare/matlab/modules/dseries/src/@dseries/vobs.m
+lib/dynare/matlab/modules/dseries/src/@dseries/ydiff.m
+lib/dynare/matlab/modules/dseries/src/@dseries/ygrowth.m
+lib/dynare/matlab/modules/dseries/src/initialize_dseries_toolbox.m
+lib/dynare/matlab/modules/dseries/src/read/load_csv_file_data.m
+lib/dynare/matlab/modules/dseries/src/read/load_m_file_data.m
+lib/dynare/matlab/modules/dseries/src/read/load_mat_file_data.m
+lib/dynare/matlab/modules/dseries/src/read/load_xls_file_data.m
+lib/dynare/matlab/modules/dseries/src/utilities/cumulate/cumprodnan.m
+lib/dynare/matlab/modules/dseries/src/utilities/cumulate/cumsumnan.m
+lib/dynare/matlab/modules/dseries/src/utilities/file/check_file_extension.m
+lib/dynare/matlab/modules/dseries/src/utilities/from/from.m
+lib/dynare/matlab/modules/dseries/src/utilities/insert/insert_column_vector_in_a_matrix.m
+lib/dynare/matlab/modules/dseries/src/utilities/insert/insert_object_in_a_one_dimensional_cell_array.m
+lib/dynare/matlab/modules/dseries/src/utilities/insert/replace_object_in_a_one_dimensional_cell_array.m
+lib/dynare/matlab/modules/dseries/src/utilities/is/iscellofchar.m
+lib/dynare/matlab/modules/dseries/src/utilities/is/isdseries.m
+lib/dynare/matlab/modules/dseries/src/utilities/is/isglobalinbase.m
+lib/dynare/matlab/modules/dseries/src/utilities/missing/demean/demean.m
+lib/dynare/matlab/modules/dseries/src/utilities/missing/get_cells_id/get_cells_id.m
+lib/dynare/matlab/modules/dseries/src/utilities/missing/ndim/ndim.m
+lib/dynare/matlab/modules/dseries/src/utilities/missing/sample_hp_filter/sample_hp_filter.m
+lib/dynare/matlab/modules/dseries/src/utilities/missing/user_has_octave_forge_package/user_has_octave_forge_package.m
+lib/dynare/matlab/modules/dseries/src/utilities/str/common_strings_in_cell_arrays.m
+lib/dynare/matlab/modules/dseries/src/utilities/str/get_random_string.m
+lib/dynare/matlab/modules/dseries/src/utilities/str/name2tex.m
+lib/dynare/matlab/modules/dseries/src/utilities/variables/build_list_of_variables_with_loops.m
+lib/dynare/matlab/modules/dseries/src/utilities/variables/build_list_of_variables_with_regexp.m
+lib/dynare/matlab/modules/dseries/tests/runalldseriestests.m
+lib/dynare/matlab/modules/reporting/.travis.yml
+lib/dynare/matlab/modules/reporting/Makefile
+lib/dynare/matlab/modules/reporting/README.md
+lib/dynare/matlab/modules/reporting/initialize_reporting_toolbox.m
+lib/dynare/matlab/modules/reporting/macros/make_report_irfs.m
+lib/dynare/matlab/modules/reporting/src/@graph/addSeries.m
+lib/dynare/matlab/modules/reporting/src/@graph/display.m
+lib/dynare/matlab/modules/reporting/src/@graph/end.m
+lib/dynare/matlab/modules/reporting/src/@graph/graph.m
+lib/dynare/matlab/modules/reporting/src/@graph/subsasgn.m
+lib/dynare/matlab/modules/reporting/src/@graph/subsref.m
+lib/dynare/matlab/modules/reporting/src/@graph/write.m
+lib/dynare/matlab/modules/reporting/src/@graph/writeGraphFile.m
+lib/dynare/matlab/modules/reporting/src/@page/addSection.m
+lib/dynare/matlab/modules/reporting/src/@page/display.m
+lib/dynare/matlab/modules/reporting/src/@page/end.m
+lib/dynare/matlab/modules/reporting/src/@page/numSections.m
+lib/dynare/matlab/modules/reporting/src/@page/page.m
+lib/dynare/matlab/modules/reporting/src/@page/subsasgn.m
+lib/dynare/matlab/modules/reporting/src/@page/subsref.m
+lib/dynare/matlab/modules/reporting/src/@page/write.m
+lib/dynare/matlab/modules/reporting/src/@paragraph/display.m
+lib/dynare/matlab/modules/reporting/src/@paragraph/paragraph.m
+lib/dynare/matlab/modules/reporting/src/@paragraph/subsasgn.m
+lib/dynare/matlab/modules/reporting/src/@paragraph/subsref.m
+lib/dynare/matlab/modules/reporting/src/@paragraph/write.m
+lib/dynare/matlab/modules/reporting/src/@report/addGraph.m
+lib/dynare/matlab/modules/reporting/src/@report/addPage.m
+lib/dynare/matlab/modules/reporting/src/@report/addParagraph.m
+lib/dynare/matlab/modules/reporting/src/@report/addSection.m
+lib/dynare/matlab/modules/reporting/src/@report/addSeries.m
+lib/dynare/matlab/modules/reporting/src/@report/addTable.m
+lib/dynare/matlab/modules/reporting/src/@report/addVspace.m
+lib/dynare/matlab/modules/reporting/src/@report/compile.m
+lib/dynare/matlab/modules/reporting/src/@report/display.m
+lib/dynare/matlab/modules/reporting/src/@report/numPages.m
+lib/dynare/matlab/modules/reporting/src/@report/report.m
+lib/dynare/matlab/modules/reporting/src/@report/subsasgn.m
+lib/dynare/matlab/modules/reporting/src/@report/subsref.m
+lib/dynare/matlab/modules/reporting/src/@report/write.m
+lib/dynare/matlab/modules/reporting/src/@report_series/display.m
+lib/dynare/matlab/modules/reporting/src/@report_series/getNameForLegend.m
+lib/dynare/matlab/modules/reporting/src/@report_series/getRange.m
+lib/dynare/matlab/modules/reporting/src/@report_series/getTexName.m
+lib/dynare/matlab/modules/reporting/src/@report_series/isZero.m
+lib/dynare/matlab/modules/reporting/src/@report_series/printSeries.m
+lib/dynare/matlab/modules/reporting/src/@report_series/report_series.m
+lib/dynare/matlab/modules/reporting/src/@report_series/setDataToZeroFromZeroTol.m
+lib/dynare/matlab/modules/reporting/src/@report_series/subsasgn.m
+lib/dynare/matlab/modules/reporting/src/@report_series/subsref.m
+lib/dynare/matlab/modules/reporting/src/@report_series/writeSeriesForGraph.m
+lib/dynare/matlab/modules/reporting/src/@report_series/writeSeriesForTable.m
+lib/dynare/matlab/modules/reporting/src/@report_series/ymax.m
+lib/dynare/matlab/modules/reporting/src/@report_series/ymin.m
+lib/dynare/matlab/modules/reporting/src/@report_table/addSeries.m
+lib/dynare/matlab/modules/reporting/src/@report_table/display.m
+lib/dynare/matlab/modules/reporting/src/@report_table/report_table.m
+lib/dynare/matlab/modules/reporting/src/@report_table/subsasgn.m
+lib/dynare/matlab/modules/reporting/src/@report_table/subsref.m
+lib/dynare/matlab/modules/reporting/src/@report_table/write.m
+lib/dynare/matlab/modules/reporting/src/@report_table/writeTableFile.m
+lib/dynare/matlab/modules/reporting/src/@section/addGraph.m
+lib/dynare/matlab/modules/reporting/src/@section/addParagraph.m
+lib/dynare/matlab/modules/reporting/src/@section/addTable.m
+lib/dynare/matlab/modules/reporting/src/@section/addVspace.m
+lib/dynare/matlab/modules/reporting/src/@section/display.m
+lib/dynare/matlab/modules/reporting/src/@section/end.m
+lib/dynare/matlab/modules/reporting/src/@section/numElements.m
+lib/dynare/matlab/modules/reporting/src/@section/section.m
+lib/dynare/matlab/modules/reporting/src/@section/subsasgn.m
+lib/dynare/matlab/modules/reporting/src/@section/subsref.m
+lib/dynare/matlab/modules/reporting/src/@section/write.m
+lib/dynare/matlab/modules/reporting/src/@vspace/display.m
+lib/dynare/matlab/modules/reporting/src/@vspace/subsasgn.m
+lib/dynare/matlab/modules/reporting/src/@vspace/subsref.m
+lib/dynare/matlab/modules/reporting/src/@vspace/vspace.m
+lib/dynare/matlab/modules/reporting/src/@vspace/write.m
+lib/dynare/matlab/modules/reporting/src/addCommasToCellStr.m
+lib/dynare/matlab/modules/reporting/src/allCellsAreDates.m
+lib/dynare/matlab/modules/reporting/src/allCellsAreDatesRange.m
+lib/dynare/matlab/modules/reporting/src/areParensNext.m
+lib/dynare/matlab/modules/reporting/src/display_reporting_object.m
+lib/dynare/matlab/modules/reporting/src/getMaxRange.m
+lib/dynare/matlab/modules/reporting/success.sh
+lib/dynare/matlab/modules/reporting/test/AnnualTable.m
+lib/dynare/matlab/modules/reporting/test/CommResidTablePage.m
+lib/dynare/matlab/modules/reporting/test/CountryGraphPage.m
+lib/dynare/matlab/modules/reporting/test/CountryTablePage.m
+lib/dynare/matlab/modules/reporting/test/ResidTablePage.m
+lib/dynare/matlab/modules/reporting/test/createReport.m
+lib/dynare/matlab/modules/reporting/test/db_a.csv
+lib/dynare/matlab/modules/reporting/test/db_q.csv
+lib/dynare/matlab/modules/reporting/test/dc_a.csv
+lib/dynare/matlab/modules/reporting/test/dc_q.csv
+lib/dynare/matlab/modules/reporting/test/runtest.m
 lib/dynare/matlab/moment_function.m
 lib/dynare/matlab/moments.m
-lib/dynare/matlab/mr_gstep.m
-lib/dynare/matlab/mr_hessian.m
 lib/dynare/matlab/ms-sbvar/check_datafile_years_assigned.m
 lib/dynare/matlab/ms-sbvar/clean_files_for_second_type_of_mex.m
 lib/dynare/matlab/ms-sbvar/clean_ms_estimation_files.m
@@ -736,20 +949,40 @@ lib/dynare/matlab/ms-sbvar/sbvar.m
 lib/dynare/matlab/ms-sbvar/set_file_tags.m
 lib/dynare/matlab/ms-sbvar/set_ms_estimation_file.m
 lib/dynare/matlab/ms-sbvar/set_ms_simulation_file.m
+lib/dynare/matlab/ms-sbvar/svar_global_identification_check.m
 lib/dynare/matlab/mult_elimination.m
 lib/dynare/matlab/multivariate_sample_autocovariance.m
 lib/dynare/matlab/my_subplot.m
 lib/dynare/matlab/myboxplot.m
 lib/dynare/matlab/mydelete.m
 lib/dynare/matlab/name2index.m
-lib/dynare/matlab/newrat.m
 lib/dynare/matlab/non_linear_dsge_likelihood.m
-lib/dynare/matlab/numgrad2.m
-lib/dynare/matlab/numgrad3.m
-lib/dynare/matlab/numgrad3_.m
-lib/dynare/matlab/numgrad5.m
-lib/dynare/matlab/numgrad5_.m
 lib/dynare/matlab/octave_ver_less_than.m
+lib/dynare/matlab/one_sided_hp_filter.m
+lib/dynare/matlab/optimization/apprgrdn.m
+lib/dynare/matlab/optimization/bfgsi1.m
+lib/dynare/matlab/optimization/cmaes.m
+lib/dynare/matlab/optimization/csminit1.m
+lib/dynare/matlab/optimization/csminwel1.m
+lib/dynare/matlab/optimization/dynare_minimize_objective.m
+lib/dynare/matlab/optimization/gmhmaxlik.m
+lib/dynare/matlab/optimization/gmhmaxlik_core.m
+lib/dynare/matlab/optimization/mr_gstep.m
+lib/dynare/matlab/optimization/mr_hessian.m
+lib/dynare/matlab/optimization/newrat.m
+lib/dynare/matlab/optimization/numgrad2.m
+lib/dynare/matlab/optimization/numgrad3.m
+lib/dynare/matlab/optimization/numgrad3_.m
+lib/dynare/matlab/optimization/numgrad5.m
+lib/dynare/matlab/optimization/numgrad5_.m
+lib/dynare/matlab/optimization/penalty_objective_function.m
+lib/dynare/matlab/optimization/simplex_optimization_routine.m
+lib/dynare/matlab/optimization/simpsa.m
+lib/dynare/matlab/optimization/simpsaget.m
+lib/dynare/matlab/optimization/simpsaset.m
+lib/dynare/matlab/optimization/simulated_annealing.m
+lib/dynare/matlab/optimization/solvopt.m
+lib/dynare/matlab/optimize_prior.m
 lib/dynare/matlab/options2cell.m
 lib/dynare/matlab/osr.m
 lib/dynare/matlab/osr1.m
@@ -782,50 +1015,86 @@ lib/dynare/matlab/partial_information/PCL_Part_info_moments.m
 lib/dynare/matlab/partial_information/PCL_resol.m
 lib/dynare/matlab/partial_information/PI_gensys.m
 lib/dynare/matlab/partial_information/PI_gensys_singularC.m
+lib/dynare/matlab/partial_information/add_auxiliary_variables_to_steadystate.m
 lib/dynare/matlab/partial_information/disc_riccati_fast.m
 lib/dynare/matlab/partial_information/disclyap_fast.m
 lib/dynare/matlab/partial_information/dr1_PI.m
-lib/dynare/matlab/particle/auxiliary_initialization.m
-lib/dynare/matlab/particle/auxiliary_particle_filter.m
-lib/dynare/matlab/particle/conditional_filter_proposal.m
-lib/dynare/matlab/particle/conditional_particle_filter.m
-lib/dynare/matlab/particle/fit_gaussian_mixture.m
-lib/dynare/matlab/particle/gaussian_densities.m
-lib/dynare/matlab/particle/gaussian_filter.m
-lib/dynare/matlab/particle/gaussian_filter_bank.m
-lib/dynare/matlab/particle/gaussian_mixture_densities.m
-lib/dynare/matlab/particle/gaussian_mixture_filter.m
-lib/dynare/matlab/particle/gaussian_mixture_filter_bank.m
-lib/dynare/matlab/particle/importance_sampling.m
-lib/dynare/matlab/particle/index_resample.m
-lib/dynare/matlab/particle/local_state_space_iteration/local_state_space_iteration_2.m
-lib/dynare/matlab/particle/measurement_equations.m
-lib/dynare/matlab/particle/multivariate_smooth_resampling.m
-lib/dynare/matlab/particle/mykmeans.m
-lib/dynare/matlab/particle/neff.m
-lib/dynare/matlab/particle/online_auxiliary_filter.m
-lib/dynare/matlab/particle/probability.m
-lib/dynare/matlab/particle/probability2.m
-lib/dynare/matlab/particle/resample.m
-lib/dynare/matlab/particle/residual_resampling.m
-lib/dynare/matlab/particle/sequential_importance_particle_filter.m
-lib/dynare/matlab/particle/solve_model_for_online_filter.m
-lib/dynare/matlab/particle/spherical_radial_sigma_points.m
-lib/dynare/matlab/particle/traditional_resampling.m
-lib/dynare/matlab/particle/univariate_smooth_resampling.m
-lib/dynare/matlab/particle/unscented_sigma_points.m
-lib/dynare/matlab/perfect_foresight_simulation.m
+lib/dynare/matlab/particles/README.md
+lib/dynare/matlab/particles/doc/Makefile
+lib/dynare/matlab/particles/doc/README.md
+lib/dynare/matlab/particles/doc/make.bat
+lib/dynare/matlab/particles/doc/source/conf.py
+lib/dynare/matlab/particles/doc/source/index.rst
+lib/dynare/matlab/particles/src/auxiliary_initialization.m
+lib/dynare/matlab/particles/src/auxiliary_particle_filter.m
+lib/dynare/matlab/particles/src/conditional_filter_proposal.m
+lib/dynare/matlab/particles/src/conditional_particle_filter.m
+lib/dynare/matlab/particles/src/fit_gaussian_mixture.m
+lib/dynare/matlab/particles/src/gaussian_densities.m
+lib/dynare/matlab/particles/src/gaussian_filter.m
+lib/dynare/matlab/particles/src/gaussian_filter_bank.m
+lib/dynare/matlab/particles/src/gaussian_mixture_densities.m
+lib/dynare/matlab/particles/src/gaussian_mixture_filter.m
+lib/dynare/matlab/particles/src/gaussian_mixture_filter_bank.m
+lib/dynare/matlab/particles/src/importance_sampling.m
+lib/dynare/matlab/particles/src/measurement_equations.m
+lib/dynare/matlab/particles/src/multivariate_smooth_resampling.m
+lib/dynare/matlab/particles/src/mykmeans.m
+lib/dynare/matlab/particles/src/neff.m
+lib/dynare/matlab/particles/src/nonlinear_kalman_filter.m
+lib/dynare/matlab/particles/src/online_auxiliary_filter.m
+lib/dynare/matlab/particles/src/probability.m
+lib/dynare/matlab/particles/src/probability2.m
+lib/dynare/matlab/particles/src/probability3.m
+lib/dynare/matlab/particles/src/resample.m
+lib/dynare/matlab/particles/src/residual_resampling.m
+lib/dynare/matlab/particles/src/sequential_importance_particle_filter.m
+lib/dynare/matlab/particles/src/solve_model_for_online_filter.m
+lib/dynare/matlab/particles/src/spherical_radial_sigma_points.m
+lib/dynare/matlab/particles/src/traditional_resampling.m
+lib/dynare/matlab/particles/src/univariate_smooth_resampling.m
+lib/dynare/matlab/particles/src/unscented_sigma_points.m
+lib/dynare/matlab/perfect-foresight-models/det_cond_forecast.m
+lib/dynare/matlab/perfect-foresight-models/linear_approximation_accuracy.m
+lib/dynare/matlab/perfect-foresight-models/linear_perfect_foresight_problem.m
+lib/dynare/matlab/perfect-foresight-models/make_ex_.m
+lib/dynare/matlab/perfect-foresight-models/make_y_.m
+lib/dynare/matlab/perfect-foresight-models/perfect_foresight_mcp_problem.m
+lib/dynare/matlab/perfect-foresight-models/perfect_foresight_problem.m
+lib/dynare/matlab/perfect-foresight-models/perfect_foresight_setup.m
+lib/dynare/matlab/perfect-foresight-models/perfect_foresight_simulation.m
+lib/dynare/matlab/perfect-foresight-models/perfect_foresight_solver.m
+lib/dynare/matlab/perfect-foresight-models/perfect_foresight_solver_core.m
+lib/dynare/matlab/perfect-foresight-models/private/check_input_arguments.m
+lib/dynare/matlab/perfect-foresight-models/private/initialize_stacked_problem.m
+lib/dynare/matlab/perfect-foresight-models/private/simulation_core.m
+lib/dynare/matlab/perfect-foresight-models/sim1.m
+lib/dynare/matlab/perfect-foresight-models/sim1_lbj.m
+lib/dynare/matlab/perfect-foresight-models/sim1_linear.m
+lib/dynare/matlab/perfect-foresight-models/sim1_purely_backward.m
+lib/dynare/matlab/perfect-foresight-models/sim1_purely_forward.m
+lib/dynare/matlab/perfect-foresight-models/solve_stacked_linear_problem.m
+lib/dynare/matlab/perfect-foresight-models/solve_stacked_problem.m
 lib/dynare/matlab/plot_icforecast.m
 lib/dynare/matlab/plot_identification.m
 lib/dynare/matlab/plot_priors.m
+lib/dynare/matlab/plot_shock_decomposition.m
 lib/dynare/matlab/pltorg.m
 lib/dynare/matlab/pm3.m
 lib/dynare/matlab/pm3_core.m
 lib/dynare/matlab/posterior_analysis.m
 lib/dynare/matlab/posterior_moments.m
+lib/dynare/matlab/posterior_sampler.m
+lib/dynare/matlab/posterior_sampler_core.m
+lib/dynare/matlab/posterior_sampler_initialization.m
+lib/dynare/matlab/posterior_sampler_iteration.m
+lib/dynare/matlab/preprocessor32/dynare_m
 lib/dynare/matlab/print_bytecode_dynamic_model.m
 lib/dynare/matlab/print_bytecode_static_model.m
 lib/dynare/matlab/print_info.m
+lib/dynare/matlab/print_moments_implied_prior.m
+lib/dynare/matlab/print_table_prior.m
+lib/dynare/matlab/printline.m
 lib/dynare/matlab/prior_analysis.m
 lib/dynare/matlab/prior_bounds.m
 lib/dynare/matlab/prior_draw.m
@@ -833,173 +1102,53 @@ lib/dynare/matlab/prior_posterior_statistics.m
 lib/dynare/matlab/prior_posterior_statistics_core.m
 lib/dynare/matlab/prior_sampler.m
 lib/dynare/matlab/priordens.m
-lib/dynare/matlab/qmc_sequence.m
 lib/dynare/matlab/qr2.m
 lib/dynare/matlab/quadratic_matrix_equation_solver.m
 lib/dynare/matlab/qz/mjdgges.m
 lib/dynare/matlab/qzdiv.m
 lib/dynare/matlab/qzswitch.m
 lib/dynare/matlab/ramsey_policy.m
-lib/dynare/matlab/random_walk_metropolis_hastings.m
-lib/dynare/matlab/random_walk_metropolis_hastings_core.m
 lib/dynare/matlab/read_data_.m
 lib/dynare/matlab/read_key_value_string.m
 lib/dynare/matlab/read_variables.m
+lib/dynare/matlab/realtime_shock_decomposition.m
 lib/dynare/matlab/recursive_moments.m
+lib/dynare/matlab/reduced_form_models/local_state_space_iteration_2/local_state_space_iteration_2.m
 lib/dynare/matlab/reduced_rank_cholesky.m
-lib/dynare/matlab/replace_object_in_a_one_dimensional_cell_array.m
-lib/dynare/matlab/reports/@elements/addGraph.m
-lib/dynare/matlab/reports/@elements/addTable.m
-lib/dynare/matlab/reports/@elements/addVspace.m
-lib/dynare/matlab/reports/@elements/display.m
-lib/dynare/matlab/reports/@elements/elements.m
-lib/dynare/matlab/reports/@elements/end.m
-lib/dynare/matlab/reports/@elements/getElements.m
-lib/dynare/matlab/reports/@elements/numElements.m
-lib/dynare/matlab/reports/@elements/numVspace.m
-lib/dynare/matlab/reports/@elements/subsasgn.m
-lib/dynare/matlab/reports/@elements/subsref.m
-lib/dynare/matlab/reports/@graph/addSeries.m
-lib/dynare/matlab/reports/@graph/createGraph.m
-lib/dynare/matlab/reports/@graph/display.m
-lib/dynare/matlab/reports/@graph/end.m
-lib/dynare/matlab/reports/@graph/graph.m
-lib/dynare/matlab/reports/@graph/subsasgn.m
-lib/dynare/matlab/reports/@graph/subsref.m
-lib/dynare/matlab/reports/@graph/write.m
-lib/dynare/matlab/reports/@objArray/addObj.m
-lib/dynare/matlab/reports/@objArray/display.m
-lib/dynare/matlab/reports/@objArray/getObjs.m
-lib/dynare/matlab/reports/@objArray/numObjArray.m
-lib/dynare/matlab/reports/@objArray/objArray.m
-lib/dynare/matlab/reports/@objArray/subsasgn.m
-lib/dynare/matlab/reports/@objArray/subsref.m
-lib/dynare/matlab/reports/@page/addSection.m
-lib/dynare/matlab/reports/@page/display.m
-lib/dynare/matlab/reports/@page/end.m
-lib/dynare/matlab/reports/@page/numSections.m
-lib/dynare/matlab/reports/@page/page.m
-lib/dynare/matlab/reports/@page/subsasgn.m
-lib/dynare/matlab/reports/@page/subsref.m
-lib/dynare/matlab/reports/@page/write.m
-lib/dynare/matlab/reports/@pages/addPage.m
-lib/dynare/matlab/reports/@pages/display.m
-lib/dynare/matlab/reports/@pages/end.m
-lib/dynare/matlab/reports/@pages/getPages.m
-lib/dynare/matlab/reports/@pages/numPages.m
-lib/dynare/matlab/reports/@pages/pages.m
-lib/dynare/matlab/reports/@pages/subsasgn.m
-lib/dynare/matlab/reports/@pages/subsref.m
-lib/dynare/matlab/reports/@pages/write.m
-lib/dynare/matlab/reports/@report/addGraph.m
-lib/dynare/matlab/reports/@report/addPage.m
-lib/dynare/matlab/reports/@report/addSection.m
-lib/dynare/matlab/reports/@report/addSeries.m
-lib/dynare/matlab/reports/@report/addTable.m
-lib/dynare/matlab/reports/@report/addVspace.m
-lib/dynare/matlab/reports/@report/compile.m
-lib/dynare/matlab/reports/@report/display.m
-lib/dynare/matlab/reports/@report/numPages.m
-lib/dynare/matlab/reports/@report/report.m
-lib/dynare/matlab/reports/@report/subsasgn.m
-lib/dynare/matlab/reports/@report/subsref.m
-lib/dynare/matlab/reports/@report/write.m
-lib/dynare/matlab/reports/@report_series/display.m
-lib/dynare/matlab/reports/@report_series/getData.m
-lib/dynare/matlab/reports/@report_series/getLine.m
-lib/dynare/matlab/reports/@report_series/getName.m
-lib/dynare/matlab/reports/@report_series/getRange.m
-lib/dynare/matlab/reports/@report_series/getTexName.m
-lib/dynare/matlab/reports/@report_series/printSeries.m
-lib/dynare/matlab/reports/@report_series/report_series.m
-lib/dynare/matlab/reports/@report_series/subsasgn.m
-lib/dynare/matlab/reports/@report_series/subsref.m
-lib/dynare/matlab/reports/@report_series/write.m
-lib/dynare/matlab/reports/@report_table/addSeries.m
-lib/dynare/matlab/reports/@report_table/display.m
-lib/dynare/matlab/reports/@report_table/report_table.m
-lib/dynare/matlab/reports/@report_table/subsasgn.m
-lib/dynare/matlab/reports/@report_table/subsref.m
-lib/dynare/matlab/reports/@report_table/write.m
-lib/dynare/matlab/reports/@section/addGraph.m
-lib/dynare/matlab/reports/@section/addTable.m
-lib/dynare/matlab/reports/@section/addVspace.m
-lib/dynare/matlab/reports/@section/display.m
-lib/dynare/matlab/reports/@section/element.m
-lib/dynare/matlab/reports/@section/end.m
-lib/dynare/matlab/reports/@section/numElements.m
-lib/dynare/matlab/reports/@section/numVspace.m
-lib/dynare/matlab/reports/@section/section.m
-lib/dynare/matlab/reports/@section/subsasgn.m
-lib/dynare/matlab/reports/@section/subsref.m
-lib/dynare/matlab/reports/@section/write.m
-lib/dynare/matlab/reports/@sections/addSection.m
-lib/dynare/matlab/reports/@sections/display.m
-lib/dynare/matlab/reports/@sections/end.m
-lib/dynare/matlab/reports/@sections/getSections.m
-lib/dynare/matlab/reports/@sections/numSections.m
-lib/dynare/matlab/reports/@sections/sections.m
-lib/dynare/matlab/reports/@sections/subsasgn.m
-lib/dynare/matlab/reports/@sections/subsref.m
-lib/dynare/matlab/reports/@sections/write.m
-lib/dynare/matlab/reports/@seriesElements/addSeries.m
-lib/dynare/matlab/reports/@seriesElements/display.m
-lib/dynare/matlab/reports/@seriesElements/getMaxRange.m
-lib/dynare/matlab/reports/@seriesElements/getNames.m
-lib/dynare/matlab/reports/@seriesElements/getSeriesElements.m
-lib/dynare/matlab/reports/@seriesElements/getTexNames.m
-lib/dynare/matlab/reports/@seriesElements/numSeriesElements.m
-lib/dynare/matlab/reports/@seriesElements/seriesElements.m
-lib/dynare/matlab/reports/@seriesElements/subsasgn.m
-lib/dynare/matlab/reports/@seriesElements/subsref.m
-lib/dynare/matlab/reports/@vspace/display.m
-lib/dynare/matlab/reports/@vspace/subsasgn.m
-lib/dynare/matlab/reports/@vspace/subsref.m
-lib/dynare/matlab/reports/@vspace/vspace.m
-lib/dynare/matlab/reports/@vspace/write.m
-lib/dynare/matlab/reports/allCellsAreDates.m
-lib/dynare/matlab/reports/allCellsAreDatesRange.m
-lib/dynare/matlab/reports/areParensNext.m
-lib/dynare/matlab/reports/reporting_object_display.m
 lib/dynare/matlab/resid.m
 lib/dynare/matlab/resol.m
 lib/dynare/matlab/restricted_steadystate.m
 lib/dynare/matlab/reversed_extended_path.m
-lib/dynare/matlab/rndprior.m
+lib/dynare/matlab/rotated_slice_sampler.m
 lib/dynare/matlab/row_header_width.m
 lib/dynare/matlab/rplot.m
 lib/dynare/matlab/sample_autocovariance.m
 lib/dynare/matlab/sample_hp_filter.m
 lib/dynare/matlab/save_params_and_steady_state.m
 lib/dynare/matlab/save_results.m
-lib/dynare/matlab/schur_statespace_transformation.m
 lib/dynare/matlab/score.m
 lib/dynare/matlab/selec_posterior_draws.m
 lib/dynare/matlab/select_from_table.m
+lib/dynare/matlab/select_qz_criterium_value.m
 lib/dynare/matlab/selif.m
 lib/dynare/matlab/send_endogenous_variables_to_workspace.m
 lib/dynare/matlab/set_all_parameters.m
+lib/dynare/matlab/set_default_initial_condition_decomposition_options.m
 lib/dynare/matlab/set_default_option.m
+lib/dynare/matlab/set_default_plot_shock_decomposition_options.m
 lib/dynare/matlab/set_dynare_random_generator_state.m
 lib/dynare/matlab/set_dynare_seed.m
 lib/dynare/matlab/set_dynare_threads.m
+lib/dynare/matlab/set_local_param_value.m
 lib/dynare/matlab/set_param_value.m
 lib/dynare/matlab/set_parameters.m
+lib/dynare/matlab/set_parameters_locally.m
 lib/dynare/matlab/set_prior.m
-lib/dynare/matlab/set_shocks.m
 lib/dynare/matlab/set_state_space.m
-lib/dynare/matlab/setup_stochastic_perfect_foresight_model_solver.m
 lib/dynare/matlab/shiftS.m
 lib/dynare/matlab/shock_decomposition.m
-lib/dynare/matlab/sim1.m
-lib/dynare/matlab/sim1_lbj.m
-lib/dynare/matlab/sim1_purely_backward.m
-lib/dynare/matlab/sim1_purely_forward.m
-lib/dynare/matlab/simplex_optimization_routine.m
-lib/dynare/matlab/simpsa.m
-lib/dynare/matlab/simpsaget.m
-lib/dynare/matlab/simpsaset.m
-lib/dynare/matlab/simul.m
+lib/dynare/matlab/simul_backward_linear_model.m
+lib/dynare/matlab/simul_backward_model.m
 lib/dynare/matlab/simul_backward_nonlinear_model.m
 lib/dynare/matlab/simulated_moment_uncertainty.m
 lib/dynare/matlab/simulated_moments_estimation.m
@@ -1008,7 +1157,9 @@ lib/dynare/matlab/simult_.m
 lib/dynare/matlab/simultxdet.m
 lib/dynare/matlab/size_of_the_reduced_form_model.m
 lib/dynare/matlab/skipline.m
+lib/dynare/matlab/slice_sampler.m
 lib/dynare/matlab/smm_objective.m
+lib/dynare/matlab/smoother2histval.m
 lib/dynare/matlab/solve1.m
 lib/dynare/matlab/solve_one_boundary.m
 lib/dynare/matlab/solve_perfect_foresight_model.m
@@ -1018,74 +1169,91 @@ lib/dynare/matlab/steady_.m
 lib/dynare/matlab/step_length_correction.m
 lib/dynare/matlab/stoch_simul.m
 lib/dynare/matlab/stochastic_solvers.m
+lib/dynare/matlab/store_smoother_results.m
 lib/dynare/matlab/subset.m
+lib/dynare/matlab/supported_octave_version.m
 lib/dynare/matlab/symmetric_matrix_index.m
 lib/dynare/matlab/test_for_deep_parameters_calibration.m
 lib/dynare/matlab/th_autocovariances.m
 lib/dynare/matlab/thet2tau.m
 lib/dynare/matlab/trace_plot.m
-lib/dynare/matlab/transition_matrix.m
+lib/dynare/matlab/trust_region.m
 lib/dynare/matlab/uniform_specification.m
 lib/dynare/matlab/update_last_mh_history_file.m
 lib/dynare/matlab/user_has_matlab_license.m
 lib/dynare/matlab/user_has_octave_forge_package.m
-lib/dynare/matlab/utilities/dataset/compute_acov.m
-lib/dynare/matlab/utilities/dataset/compute_corr.m
-lib/dynare/matlab/utilities/dataset/compute_cova.m
-lib/dynare/matlab/utilities/dataset/compute_stdv.m
 lib/dynare/matlab/utilities/dataset/describe_missing_data.m
 lib/dynare/matlab/utilities/dataset/descriptive_statistics.m
 lib/dynare/matlab/utilities/dataset/initialize_dataset.m
-lib/dynare/matlab/utilities/dates/add_periods_to_array_of_dates.m
-lib/dynare/matlab/utilities/dates/date2string.m
-lib/dynare/matlab/utilities/dates/freq2string.m
-lib/dynare/matlab/utilities/dates/isdate.m
-lib/dynare/matlab/utilities/dates/isdates.m
-lib/dynare/matlab/utilities/dates/isfreq.m
-lib/dynare/matlab/utilities/dates/ismonthly.m
-lib/dynare/matlab/utilities/dates/isquaterly.m
-lib/dynare/matlab/utilities/dates/issubperiod.m
-lib/dynare/matlab/utilities/dates/isweekly.m
-lib/dynare/matlab/utilities/dates/isyearly.m
-lib/dynare/matlab/utilities/dates/string2date.m
-lib/dynare/matlab/utilities/dates/string2freq.m
+lib/dynare/matlab/utilities/dataset/lagged.m
+lib/dynare/matlab/utilities/dataset/makedataset.m
+lib/dynare/matlab/utilities/dataset/nanautocovariance.m
+lib/dynare/matlab/utilities/dataset/nancovariance.m
+lib/dynare/matlab/utilities/dataset/nanmoments.m
+lib/dynare/matlab/utilities/dataset/nanvariance.m
+lib/dynare/matlab/utilities/dataset/quarterly2annual.m
 lib/dynare/matlab/utilities/doc/dynInfo.m
 lib/dynare/matlab/utilities/doc/get_internal_doc_block.m
-lib/dynare/matlab/utilities/dseries/isdseries.m
+lib/dynare/matlab/utilities/general/clean_current_folder.m
 lib/dynare/matlab/utilities/general/compare_vectors.m
+lib/dynare/matlab/utilities/general/delete_stale_file.m
 lib/dynare/matlab/utilities/general/demean.m
+lib/dynare/matlab/utilities/general/disp_verbose.m
+lib/dynare/matlab/utilities/general/dyn_mex.m
+lib/dynare/matlab/utilities/general/get_all_variables_but_lagged_leaded_exogenous.m
+lib/dynare/matlab/utilities/general/indices_lagged_leaded_exogenous_variables.m
 lib/dynare/matlab/utilities/general/isaletter.m
-lib/dynare/matlab/utilities/general/iscellofchar.m
+lib/dynare/matlab/utilities/general/isanynan.m
 lib/dynare/matlab/utilities/general/isconst.m
 lib/dynare/matlab/utilities/general/isdiagonal.m
+lib/dynare/matlab/utilities/general/isestimation.m
 lib/dynare/matlab/utilities/general/iseven.m
 lib/dynare/matlab/utilities/general/isfile.m
-lib/dynare/matlab/utilities/general/isglobalinbase.m
+lib/dynare/matlab/utilities/general/isinestimationobjective.m
 lib/dynare/matlab/utilities/general/isint.m
-lib/dynare/matlab/utilities/general/isoctave.m
 lib/dynare/matlab/utilities/general/isodd.m
 lib/dynare/matlab/utilities/general/ispd.m
 lib/dynare/matlab/utilities/general/isquare.m
-lib/dynare/matlab/utilities/general/name2tex.m
+lib/dynare/matlab/utilities/general/log_variable.m
 lib/dynare/matlab/utilities/general/nandemean.m
 lib/dynare/matlab/utilities/general/ndim.m
-lib/dynare/matlab/utilities/tests/build_report_summary.m
-lib/dynare/matlab/utilities/tests/dynTest.m
-lib/dynare/matlab/utilities/tests/dyn_assert.m
-lib/dynare/matlab/utilities/tests/get_directory_description.m
-lib/dynare/matlab/utilities/tests/is_unitary_test_available.m
-lib/dynare/matlab/utilities/tests/mtest.m
-lib/dynare/matlab/utilities/tests/run_unitary_tests.m
-lib/dynare/matlab/utilities/tests/run_unitary_tests_in_directory.m
+lib/dynare/matlab/utilities/general/remove_fractional_xticks.m
+lib/dynare/matlab/utilities/graphics/colorspace.m
+lib/dynare/matlab/utilities/graphics/distinguishable_colors.m
+lib/dynare/matlab/utilities/tests/README.md
+lib/dynare/matlab/utilities/tests/doc/Makefile
+lib/dynare/matlab/utilities/tests/doc/README.md
+lib/dynare/matlab/utilities/tests/doc/make.bat
+lib/dynare/matlab/utilities/tests/doc/source/conf.py
+lib/dynare/matlab/utilities/tests/doc/source/index.rst
+lib/dynare/matlab/utilities/tests/src/Contents.m
+lib/dynare/matlab/utilities/tests/src/build_report_summary.m
+lib/dynare/matlab/utilities/tests/src/dassert.m
+lib/dynare/matlab/utilities/tests/src/dtest.m
+lib/dynare/matlab/utilities/tests/src/get_directory_description.m
+lib/dynare/matlab/utilities/tests/src/initialize_unit_tests_toolbox.m
+lib/dynare/matlab/utilities/tests/src/is_unitary_test_available.m
+lib/dynare/matlab/utilities/tests/src/missing/isoctave/isoctave.m
+lib/dynare/matlab/utilities/tests/src/missing/skipline/skipline.m
+lib/dynare/matlab/utilities/tests/src/mtest.m
+lib/dynare/matlab/utilities/tests/src/run_unitary_tests.m
+lib/dynare/matlab/utilities/tests/src/run_unitary_tests_in_directory.m
 lib/dynare/matlab/var_sample_moments.m
 lib/dynare/matlab/variance_decomposition_mc_analysis.m
 lib/dynare/matlab/varlist_indices.m
+lib/dynare/matlab/ver_greater_than.m
+lib/dynare/matlab/ver_greater_than_equal.m
+lib/dynare/matlab/ver_less_than.m
 lib/dynare/matlab/vnorm.m
 lib/dynare/matlab/warning_config.m
 lib/dynare/matlab/write_latex_definitions.m
+lib/dynare/matlab/write_latex_parameter_table.m
+lib/dynare/matlab/write_latex_prior_table.m
 lib/dynare/matlab/write_mh_history_file.m
+lib/dynare/matlab/writecellofchar.m
 lib/dynare/matlab/writedata.m
 lib/dynare/matlab/writedata_text.m
+lib/dynare/matlab/writematrixofchar.m
 lib/dynare/mex/octave/A_times_B_kronecker_C.mex
 lib/dynare/mex/octave/block_kalman_filter.mex
 lib/dynare/mex/octave/bytecode.mex
@@ -1094,7 +1262,6 @@ lib/dynare/mex/octave/gensylv.mex
 lib/dynare/mex/octave/k_order_perturbation.mex
 lib/dynare/mex/octave/local_state_space_iteration_2.mex
 lib/dynare/mex/octave/mjdgges.mex
-lib/dynare/mex/octave/ordschur.oct
 lib/dynare/mex/octave/qmc_sequence.mex
 lib/dynare/mex/octave/qzcomplex.oct
 lib/dynare/mex/octave/sparse_hessian_times_B_kronecker_C.mex
diff --git a/math/math77/Makefile b/math/math77/Makefile
index 18a8493188e..f6389408cf9 100644
--- a/math/math77/Makefile
+++ b/math/math77/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	NL/math
 DISTNAME=	${PORTNAME}
 DIST_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	mexas@bris.ac.uk
+MAINTAINER=	as@cmplx.uk
 COMMENT=	CalTech mathematical subprogram libraries for Fortran 77
 
 LICENSE=	BSD3CLAUSE
diff --git a/math/p5-Math-Utils/Makefile b/math/p5-Math-Utils/Makefile
index e9ce9da93c0..36f9b8d42ca 100644
--- a/math/p5-Math-Utils/Makefile
+++ b/math/p5-Math-Utils/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Math-Utils
-PORTVERSION=	1.10
+PORTVERSION=	1.11
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/math/p5-Math-Utils/distinfo b/math/p5-Math-Utils/distinfo
index 69eb475c56f..27ed3deadc8 100644
--- a/math/p5-Math-Utils/distinfo
+++ b/math/p5-Math-Utils/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1494508624
-SHA256 (Math-Utils-1.10.tar.gz) = 0905aab8b65ed08f951756dd86803267877f88e45027af458bb3b83d218cb7c4
-SIZE (Math-Utils-1.10.tar.gz) = 24755
+TIMESTAMP = 1502528513
+SHA256 (Math-Utils-1.11.tar.gz) = 50aebae583d58eec5fec23acf1734088dab6c9646758bf3f560edc21c612a371
+SIZE (Math-Utils-1.11.tar.gz) = 24077
diff --git a/misc/e2fsprogs-libblkid/Makefile b/misc/e2fsprogs-libblkid/Makefile
index 2975b90917e..afb1dc00843 100644
--- a/misc/e2fsprogs-libblkid/Makefile
+++ b/misc/e2fsprogs-libblkid/Makefile
@@ -7,6 +7,9 @@ PKGNAMESUFFIX=	-libblkid
 
 COMMENT=	Blkid library from e2fsprogs package
 
+LICENSE=	LGPL20+
+_no_license_file=	sorry
+
 LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid
 
 CONFIGURE_ARGS=	--enable-elf-shlibs
diff --git a/multimedia/libmediainfo/Makefile b/multimedia/libmediainfo/Makefile
index c01637eeb6f..b5de46bf8aa 100644
--- a/multimedia/libmediainfo/Makefile
+++ b/multimedia/libmediainfo/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libmediainfo
-PORTVERSION=	0.7.97
+PORTVERSION=	0.7.98
 CATEGORIES=	multimedia
 MASTER_SITES=	http://mediaarea.net/download/binary/mediainfo/${PORTVERSION}/ \
 		LOCAL/sunpoet
diff --git a/multimedia/libmediainfo/distinfo b/multimedia/libmediainfo/distinfo
index 5ee1de8247f..1f8fa20f461 100644
--- a/multimedia/libmediainfo/distinfo
+++ b/multimedia/libmediainfo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499142268
-SHA256 (MediaInfo_CLI_0.7.97_GNU_FromSource.tar.xz) = 2f586cd9a26a7d6bdf39e21fcb3abfec3bb0f027dfc03dee7831fa8676e7dc05
-SIZE (MediaInfo_CLI_0.7.97_GNU_FromSource.tar.xz) = 2787996
+TIMESTAMP = 1502473867
+SHA256 (MediaInfo_CLI_0.7.98_GNU_FromSource.tar.xz) = 2b4fb7a485e8be5051165e551e86a6702f02c3f45fc8448fbb2e4776f75a7383
+SIZE (MediaInfo_CLI_0.7.98_GNU_FromSource.tar.xz) = 2790656
diff --git a/multimedia/libzen/Makefile b/multimedia/libzen/Makefile
index 66fabb15a86..6598ebcdc91 100644
--- a/multimedia/libzen/Makefile
+++ b/multimedia/libzen/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libzen
-PORTVERSION=	0.7.97
+PORTVERSION=	0.7.98
 CATEGORIES=	multimedia
 MASTER_SITES=	http://mediaarea.net/download/binary/mediainfo/${PORTVERSION}/ \
 		LOCAL/sunpoet
diff --git a/multimedia/libzen/distinfo b/multimedia/libzen/distinfo
index 092eefd8272..b0a4b1f41ac 100644
--- a/multimedia/libzen/distinfo
+++ b/multimedia/libzen/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499142262
-SHA256 (MediaInfo_CLI_0.7.97_GNU_FromSource.tar.xz) = 2f586cd9a26a7d6bdf39e21fcb3abfec3bb0f027dfc03dee7831fa8676e7dc05
-SIZE (MediaInfo_CLI_0.7.97_GNU_FromSource.tar.xz) = 2787996
+TIMESTAMP = 1502473871
+SHA256 (MediaInfo_CLI_0.7.98_GNU_FromSource.tar.xz) = 2b4fb7a485e8be5051165e551e86a6702f02c3f45fc8448fbb2e4776f75a7383
+SIZE (MediaInfo_CLI_0.7.98_GNU_FromSource.tar.xz) = 2790656
diff --git a/multimedia/mediainfo/Makefile b/multimedia/mediainfo/Makefile
index 10c95148674..4ad9e470b3b 100644
--- a/multimedia/mediainfo/Makefile
+++ b/multimedia/mediainfo/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mediainfo
-PORTVERSION=	0.7.97
+PORTVERSION=	0.7.98
 CATEGORIES=	multimedia
 MASTER_SITES=	http://mediaarea.net/download/binary/${PORTNAME}/${PORTVERSION}/ \
 		LOCAL/sunpoet
diff --git a/multimedia/mediainfo/distinfo b/multimedia/mediainfo/distinfo
index b8c16fd4f1f..4250fa854ef 100644
--- a/multimedia/mediainfo/distinfo
+++ b/multimedia/mediainfo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499142273
-SHA256 (MediaInfo_CLI_0.7.97_GNU_FromSource.tar.xz) = 2f586cd9a26a7d6bdf39e21fcb3abfec3bb0f027dfc03dee7831fa8676e7dc05
-SIZE (MediaInfo_CLI_0.7.97_GNU_FromSource.tar.xz) = 2787996
+TIMESTAMP = 1502473876
+SHA256 (MediaInfo_CLI_0.7.98_GNU_FromSource.tar.xz) = 2b4fb7a485e8be5051165e551e86a6702f02c3f45fc8448fbb2e4776f75a7383
+SIZE (MediaInfo_CLI_0.7.98_GNU_FromSource.tar.xz) = 2790656
diff --git a/multimedia/motion/Makefile b/multimedia/motion/Makefile
index cd7ee6bbf86..4985e4b3032 100644
--- a/multimedia/motion/Makefile
+++ b/multimedia/motion/Makefile
@@ -3,8 +3,8 @@
 
 PORTNAME=	motion
 PORTVERSION=	4.0.1
-PORTREVISION=	3
 DISTVERSIONPREFIX=	release-
+PORTREVISION=	4
 CATEGORIES=	multimedia
 
 MAINTAINER=	ports@FreeBSD.org
@@ -13,10 +13,11 @@ COMMENT=	Motion detection application
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+USES=		autoreconf gmake jpeg localbase pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	Motion-Project
+USE_RC_SUBR=	${PORTNAME}
 
-USES=		autoreconf gmake jpeg localbase pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-linuxthreads \
 		--without-jpeg-mmx
@@ -26,7 +27,6 @@ KMODDIR?=	/boot/modules
 KMODDIR=	/boot/modules
 .endif
 
-USE_RC_SUBR=	${PORTNAME}
 SUB_FILES=	pkg-message
 
 PLIST_FILES=	bin/motion \
diff --git a/multimedia/motion/files/patch-video2.c b/multimedia/motion/files/patch-video2.c
new file mode 100644
index 00000000000..a0e17aa9244
--- /dev/null
+++ b/multimedia/motion/files/patch-video2.c
@@ -0,0 +1,11 @@
+--- video2.c.orig	2017-08-11 20:05:27 UTC
++++ video2.c
+@@ -184,7 +184,7 @@ typedef struct {
+ /**
+  * xioctl
+  */
+-#ifdef __OpenBSD__
++#if defined (__OpenBSD__) || defined (__FreeBSD__)
+ static int xioctl(src_v4l2_t *vid_source, unsigned long request, void *arg)
+ #else
+ static int xioctl(src_v4l2_t *vid_source, int request, void *arg)
diff --git a/multimedia/mpc-qt/Makefile b/multimedia/mpc-qt/Makefile
index b1cff644def..84aedf4089b 100644
--- a/multimedia/mpc-qt/Makefile
+++ b/multimedia/mpc-qt/Makefile
@@ -2,16 +2,12 @@
 
 PORTNAME=	mpc-qt
 DISTVERSIONPREFIX=	v
-DISTVERSION=	17.07
-PORTREVISION=	1
+DISTVERSION=	17.08
 CATEGORIES=	multimedia audio
 MASTER_SITES=	https://aur.archlinux.org/cgit/aur.git/plain/${PORTNAME}.desktop?h=${PORTNAME}-git&id=b1a6b91&dummy=/:desktop
 DISTFILES=	${PORTNAME}.desktop:desktop
 EXTRACT_ONLY=	${DISTFILES:N*\:desktop:C/:.*//}
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES=	b1644dfe782b.patch:-p1
-
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Qt 5 clone of Media Player Classic based on libmpv
 
@@ -26,7 +22,7 @@ EXPLICIT_SAFESTACK=	yes
 
 USES=		compiler:c++11-lib desktop-file-utils pkgconfig qmake
 USE_QT5=	qmake_build buildtools_build linguisttools_build \
-		core dbus gui network widgets x11extras
+		core dbus gui network svg_run widgets x11extras
 USE_GL=		gl
 CXXFLAGS+=	-D_GLIBCXX_USE_C99 -D_GLIBCXX_USE_C99_MATH_TR1 \
 		-D_DECLARE_C99_LDBL_MATH # XXX ports/193528
diff --git a/multimedia/mpc-qt/distinfo b/multimedia/mpc-qt/distinfo
index 3a778f610f2..83fc605c28c 100644
--- a/multimedia/mpc-qt/distinfo
+++ b/multimedia/mpc-qt/distinfo
@@ -1,7 +1,5 @@
-TIMESTAMP = 1500495636
+TIMESTAMP = 1502557964
 SHA256 (mpc-qt.desktop) = 7694745aac0e52c050a6bc069a0686b025e509136919d985d3c4495eec0f1c9d
 SIZE (mpc-qt.desktop) = 1270
-SHA256 (cmdrkotori-mpc-qt-v17.07_GH0.tar.gz) = dd3515ecafa72b0722fe416963d84ce77e146ac67333948864e72b183af3ddae
-SIZE (cmdrkotori-mpc-qt-v17.07_GH0.tar.gz) = 156689
-SHA256 (b1644dfe782b.patch) = 80d99f4214140a41895c9e1dcce9054497a7a4dec6a63909cc60772bd04b6a82
-SIZE (b1644dfe782b.patch) = 704
+SHA256 (cmdrkotori-mpc-qt-v17.08_GH0.tar.gz) = 16a81194baaf10884764423a2bfc2f39860515dfb62e29cefcbe0d8f2d9dc27d
+SIZE (cmdrkotori-mpc-qt-v17.08_GH0.tar.gz) = 162691
diff --git a/multimedia/qmmp-plugin-pack-qt5/Makefile b/multimedia/qmmp-plugin-pack-qt5/Makefile
index 3197f2b0b2e..b8cb4a29e56 100644
--- a/multimedia/qmmp-plugin-pack-qt5/Makefile
+++ b/multimedia/qmmp-plugin-pack-qt5/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	qmmp-plugin-pack
-PORTVERSION=	1.1.3
+PORTVERSION=	1.1.4
 CATEGORIES=	multimedia
 MASTER_SITES=	http://qmmp.ylsoftware.com/files/plugins/ \
 	SF/qmmp-dev/${PORTNAME}/
@@ -11,9 +11,7 @@ MAINTAINER=	liangtai.s16@gmail.com
 COMMENT=	Additional plug-ins for QMMP (Qt5)
 
 LICENSE=	GPLv2
-
-CONFLICTS=	${PORTNAME}-0.*
-PORTSCOUT=	limit:^1\..*
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libqmmpui.so:multimedia/qmmp-qt5
 BUILD_DEPENDS=	qmmp-qt5>=1.1.0:multimedia/qmmp-qt5
@@ -23,19 +21,22 @@ USE_QT5=	core gui widgets \
 		buildtools_build linguisttools_build qmake_build
 USE_LDCONFIG=	yes
 
-OPTIONS_SUB=	yes
+CONFLICTS=	${PORTNAME}-0.*
+PORTSCOUT=	limit:^1\..*
 
+OPTIONS_DEFINE_amd64=	FFAPASM
+OPTIONS_DEFINE_i386=	FFAPASM
+OPTIONS_DEFAULT=	FFAP MPG123 XMP
+OPTIONS_DEFAULT_amd64=	FFAPASM
+OPTIONS_DEFAULT_i386=	FFAPASM
 OPTIONS_MULTI=	PLUGINS
 OPTIONS_MULTI_PLUGINS=	FFAP MPG123 SRCONV XMP
-OPTIONS_DEFAULT=	FFAP MPG123 XMP
+OPTIONS_SUB=	yes
 
 FFAP_DESC=		Support APE sound file
 FFAP_LIB_DEPENDS=	libtag.so:audio/taglib
 FFAP_CMAKE_BOOL=	USE_FFAP
-OPTIONS_DEFINE_i386=	FFAPASM
-OPTIONS_DEFAULT_i386=	FFAPASM
-OPTIONS_DEFINE_amd64=	FFAPASM
-OPTIONS_DEFAULT_amd64=	FFAPASM
+
 FFAPASM_DESC=	Optimize FFap decoder using devel/yasm
 FFAPASM_BUILD_DEPENDS=	yasm:devel/yasm
 FFAPASM_CMAKE_BOOL=	USE_ASM
diff --git a/multimedia/qmmp-plugin-pack-qt5/distinfo b/multimedia/qmmp-plugin-pack-qt5/distinfo
index 64ee4760f6b..79ed907a85f 100644
--- a/multimedia/qmmp-plugin-pack-qt5/distinfo
+++ b/multimedia/qmmp-plugin-pack-qt5/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1475654564
-SHA256 (qmmp-plugin-pack-1.1.3.tar.bz2) = e049920ec6cb7adf296b603c4268f615203e6c1cd0c9de2440b5b141e2e88377
-SIZE (qmmp-plugin-pack-1.1.3.tar.bz2) = 83314
+TIMESTAMP = 1501879746
+SHA256 (qmmp-plugin-pack-1.1.4.tar.bz2) = 029fba40353f6b883e0d662c65fdcbf9a23a8f081c1a9438f2ba6772b40d4ff5
+SIZE (qmmp-plugin-pack-1.1.4.tar.bz2) = 84240
diff --git a/multimedia/qmmp-plugin-pack/Makefile b/multimedia/qmmp-plugin-pack/Makefile
index 04bdaf6ab66..a0a425e7a98 100644
--- a/multimedia/qmmp-plugin-pack/Makefile
+++ b/multimedia/qmmp-plugin-pack/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	qmmp-plugin-pack
-PORTVERSION=	0.10.2
-PORTREVISION=	1
+PORTVERSION=	0.10.3
 CATEGORIES=	multimedia
 MASTER_SITES=	http://qmmp.ylsoftware.com/files/plugins/ \
 	SF/qmmp-dev/${PORTNAME}/
@@ -11,9 +10,7 @@ MAINTAINER=	liangtai.s16@gmail.com
 COMMENT=	Additional plug-ins for QMMP (Qt4)
 
 LICENSE=	GPLv2
-
-CONFLICTS=	${PORTNAME}-qt5-1.*
-PORTSCOUT=	limit:^0.*
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libqmmpui.so:multimedia/qmmp
 BUILD_DEPENDS=	qmmp>=0.10.0:multimedia/qmmp
@@ -22,11 +19,13 @@ USES=		cmake:outsource localbase pkgconfig tar:bzip2
 USE_QT4=	corelib gui linguisttools_build moc_build qmake_build rcc_build
 USE_LDCONFIG=	yes
 
-OPTIONS_SUB=	yes
+CONFLICTS=	${PORTNAME}-qt5-1.*
+PORTSCOUT=	limit:^0.*
 
+OPTIONS_DEFAULT=	FFAP MPG123 XMP
 OPTIONS_MULTI=	PLUGINS
 OPTIONS_MULTI_PLUGINS=	FFAP MPG123 SRCONV XMP
-OPTIONS_DEFAULT=	FFAP MPG123 XMP
+OPTIONS_SUB=	yes
 
 FFAP_DESC=		Support APE sound file
 FFAP_LIB_DEPENDS=	libtag.so:audio/taglib
diff --git a/multimedia/qmmp-plugin-pack/distinfo b/multimedia/qmmp-plugin-pack/distinfo
index 2d0ba9ca8f6..07d78e79731 100644
--- a/multimedia/qmmp-plugin-pack/distinfo
+++ b/multimedia/qmmp-plugin-pack/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1475654449
-SHA256 (qmmp-plugin-pack-0.10.2.tar.bz2) = 393ceebc10542af6aa437f1b1b2acbf02c3c141d700a79dbde7f2dae60f7a535
-SIZE (qmmp-plugin-pack-0.10.2.tar.bz2) = 83334
+TIMESTAMP = 1501879677
+SHA256 (qmmp-plugin-pack-0.10.3.tar.bz2) = 366f904c277dfe5e637b88be56fde6b46879dcb19d6f3eb6c363252f4e507b86
+SIZE (qmmp-plugin-pack-0.10.3.tar.bz2) = 84299
diff --git a/multimedia/qmmp-qt5/Makefile b/multimedia/qmmp-qt5/Makefile
index 2865f2c422c..29ccb293640 100644
--- a/multimedia/qmmp-qt5/Makefile
+++ b/multimedia/qmmp-qt5/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	qmmp
-PORTVERSION=	1.1.7
-PORTREVISION=	2
+PORTVERSION=	1.1.10
 CATEGORIES=	multimedia
 MASTER_SITES=	http://qmmp.ylsoftware.com/files/ \
 	SF/qmmp-dev/${PORTNAME}/
@@ -12,15 +11,30 @@ MAINTAINER=	liangtai.s16@gmail.com
 COMMENT=	Qt5-based multimedia player
 
 LICENSE=	GPLv2
-
-CONFLICTS=	${PORTNAME}-0.*
-PORTSCOUT=	limit:^1\..*
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		cmake:outsource pathfix pkgconfig tar:bzip2
 USE_QT5=	core gui network widgets xml \
 		buildtools_build linguisttools_build qmake_build
 USE_LDCONFIG=	yes
 
+CONFLICTS=	${PORTNAME}-0.*
+PORTSCOUT=	limit:^1\..*
+
+PLIST_SUB=	SHLIB_VER=${PORTVERSION:C/-.*//}
+
+PATHFIX_CMAKELISTSTXT=	\\"CMakeLists.txt -exec grep -l /pkgconfig {} +\\"
+PORTDOCS=	README README.RUS AUTHORS
+INSTALLS_ICONS=	yes
+
+OPTIONS_DEFAULT=	ALSA ANALYZER BS2B CDDA CONVERTER COPYPASTE COVER \
+		CROSSFADE CUE CURL DIR_ASSOC ENCA FAAD FFMPEG FILEOPS FLAC \
+		GNOMEHOTKEY GME HAL HOTKEY JACK KDENOTIFY LADSPA LYRICS MAD \
+		MMS MODPLUG MPRIS MPLAYER MUSEPACK NOTIFIER NULLOUT \
+		OPUS OSS4 PROJECTM PULSEAUDIO QMMP_DIALOG QSUI QTMULTIMEDIA \
+		RGSCAN SB SCROBBLER SID SKINNEDUI SNDFILE SOXR STATICON STEREO \
+		TRACKCHANGE TWOPANELDIALOG UDISKS2 VORBIS WAVPACK WILDMIDI
+
 OPTIONS_SUB=	yes
 OPTIONS_GROUP=	DOCUMENTS PLUGIN_APPLICATION PLUGIN_FORMATS \
 		PLUGIN_DSP_EFFECTS PLUGIN_VISUAL_EFFECTS PLUGIN_OUTPUT \
@@ -57,14 +71,6 @@ OPTIONS_GROUP_PLUGIN_NETWORKING=	COVER CURL LYRICS MMS SB SCROBBLER
 MISC_DESC=	Other features
 OPTIONS_GROUP_MISC=	CONVERTER CUE ENCA MPLAYER MPRIS RGSCAN SID
 
-OPTIONS_DEFAULT=	ALSA ANALYZER BS2B CDDA CONVERTER COPYPASTE COVER \
-		CROSSFADE CUE CURL DIR_ASSOC ENCA FAAD FFMPEG FILEOPS FLAC \
-		GNOMEHOTKEY GME HAL HOTKEY JACK KDENOTIFY LADSPA LYRICS MAD \
-		MMS MODPLUG MPRIS MPLAYER MUSEPACK NOTIFIER NULLOUT \
-		OPUS OSS4 PROJECTM PULSEAUDIO QMMP_DIALOG QSUI QTMULTIMEDIA \
-		RGSCAN SB SCROBBLER SID SKINNEDUI SNDFILE SOXR STATICON STEREO \
-		TRACKCHANGE TWOPANELDIALOG UDISKS2 VORBIS WAVPACK WILDMIDI
-
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 
 QSUI_DESC=	Simple UI based on standard widgets set
@@ -253,6 +259,7 @@ TRACKCHANGE_DESC=	Enable to run external command each track
 TRACKCHANGE_CMAKE_BOOL=	USE_TRACKCHANGE
 
 UDISKS2_DESC=	Support removable disc detection using UDisks
+UDISKS2_RUN_DEPENDS=	bsdisks:sysutils/bsdisks
 UDISKS2_USE=	QT5=dbus
 UDISKS2_CMAKE_BOOL=	USE_UDISKS2
 
@@ -262,12 +269,6 @@ QMMP_DIALOG_CMAKE_BOOL=	USE_QMMP_DIALOG
 TWOPANELDIALOG_DESC=	File dialog by two-panel selector
 TWOPANELDIALOG_CMAKE_BOOL=	USE_TWO_PANEL_DIALOG
 
-PLIST_SUB+=	SHLIB_VER=${PORTVERSION:C/-.*//}
-
-PATHFIX_CMAKELISTSTXT=	\\"CMakeLists.txt -exec grep -l /pkgconfig {} +\\"
-PORTDOCS=	README README.RUS AUTHORS
-INSTALLS_ICONS=	yes
-
 post-patch:
 	@${GREP} -L '${LOCALBASE}/lib/oss' \
 		${WRKSRC}/src/plugins/Output/oss4/CMakeLists.txt | ${XARGS} \
diff --git a/multimedia/qmmp-qt5/distinfo b/multimedia/qmmp-qt5/distinfo
index a2fe4e174b8..6745805a25f 100644
--- a/multimedia/qmmp-qt5/distinfo
+++ b/multimedia/qmmp-qt5/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1490441147
-SHA256 (qmmp-1.1.7.tar.bz2) = 464f79d9a54e6456c5abcb570d7f062e48d3eaa3d60ad2b09c58bc62af5b87a7
-SIZE (qmmp-1.1.7.tar.bz2) = 1135005
+TIMESTAMP = 1501879751
+SHA256 (qmmp-1.1.10.tar.bz2) = 1e5781bf65b3a27dd5e21349ac007464e67861dda99f8a0206984687881e0b9a
+SIZE (qmmp-1.1.10.tar.bz2) = 1142444
diff --git a/multimedia/qmmp/Makefile b/multimedia/qmmp/Makefile
index 45a950e67d5..3845a060132 100644
--- a/multimedia/qmmp/Makefile
+++ b/multimedia/qmmp/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	qmmp
-PORTVERSION=	0.10.7
-PORTREVISION=	2
+PORTVERSION=	0.10.10
 CATEGORIES=	multimedia
 MASTER_SITES=	http://qmmp.ylsoftware.com/files/ \
 	SF/qmmp-dev/${PORTNAME}/
@@ -11,15 +10,31 @@ MAINTAINER=	liangtai.s16@gmail.com
 COMMENT=	Qt4-based multimedia player
 
 LICENSE=	GPLv2
-
-CONFLICTS=	${PORTNAME}-qt5-1.*
-PORTSCOUT=	limit:^0.*
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		cmake:outsource localbase pathfix pkgconfig tar:bzip2
 USE_QT4=	corelib gui network xml \
 		linguisttools_build moc_build qmake_build rcc_build uic_build
 USE_LDCONFIG=	yes
 
+CONFLICTS=	${PORTNAME}-qt5-1.*
+PORTSCOUT=	limit:^0.*
+
+PLIST_SUB=	SHLIB_VER=${PORTVERSION:C/-.*//}
+
+PATHFIX_CMAKELISTSTXT=	\\"CMakeLists.txt -exec grep -l /pkgconfig {} +\\"
+PORTDOCS=	README README.RUS AUTHORS
+INSTALLS_ICONS=	yes
+
+CMAKE_ARGS=	-DUSE_FFMPEG_LEGACY:BOOL=FALSE
+
+OPTIONS_DEFAULT=	ALSA ANALYZER BS2B CDDA CONVERTER COPYPASTE COVER \
+		CROSSFADE CUE CURL DIR_ASSOC ENCA FAAD FFMPEG FILEOPS FLAC \
+		GNOMEHOTKEY GME HAL HOTKEY JACK KDENOTIFY LADSPA LYRICS MAD \
+		MMS MODPLUG MPRIS MPLAYER MUSEPACK NOTIFIER NULLOUT \
+		OPUS OSS4 PROJECTM PULSEAUDIO QMMP_DIALOG QSUI QTMULTIMEDIA \
+		RGSCAN SB SCROBBLER SID SKINNEDUI SNDFILE SOXR STATICON STEREO \
+		TRACKCHANGE TWOPANELDIALOG UDISKS2 VORBIS WAVPACK WILDMIDI
 OPTIONS_SUB=	yes
 OPTIONS_GROUP=	DOCUMENTS PLUGIN_APPLICATION PLUGIN_FORMATS \
 		PLUGIN_DSP_EFFECTS PLUGIN_VISUAL_EFFECTS PLUGIN_OUTPUT \
@@ -56,14 +71,6 @@ OPTIONS_GROUP_PLUGIN_NETWORKING=	COVER CURL LYRICS MMS SB SCROBBLER
 MISC_DESC=	Other features
 OPTIONS_GROUP_MISC=	CONVERTER CUE ENCA MPLAYER MPRIS RGSCAN SID
 
-OPTIONS_DEFAULT=	ALSA ANALYZER BS2B CDDA CONVERTER COPYPASTE COVER \
-		CROSSFADE CUE CURL DIR_ASSOC ENCA FAAD FFMPEG FILEOPS FLAC \
-		GNOMEHOTKEY GME HAL HOTKEY JACK KDENOTIFY LADSPA LYRICS MAD \
-		MMS MODPLUG MPRIS MPLAYER MUSEPACK NOTIFIER NULLOUT \
-		OPUS OSS4 PROJECTM PULSEAUDIO QMMP_DIALOG QSUI QTMULTIMEDIA \
-		RGSCAN SB SCROBBLER SID SKINNEDUI SNDFILE SOXR STATICON STEREO \
-		TRACKCHANGE TWOPANELDIALOG UDISKS2 VORBIS WAVPACK WILDMIDI
-
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 
 QSUI_DESC=	Simple UI based on standard widgets set
@@ -254,6 +261,7 @@ TRACKCHANGE_CMAKE_BOOL=	USE_TRACKCHANGE
 
 UDISKS_DESC=	Support removable disc detection (obsolete)
 UDISKS2_DESC=	Support removable disc detection using UDisks
+UDISKS2_RUN_DEPENDS=	bsdisks:sysutils/bsdisks
 UDISKS_USE=	QT4=dbus
 UDISKS2_USE=	QT4=dbus
 UDISKS_CMAKE_BOOL=	USE_UDISKS
@@ -265,14 +273,6 @@ QMMP_DIALOG_CMAKE_BOOL=	USE_QMMP_DIALOG
 TWOPANELDIALOG_DESC=	File dialog by two-panel selector
 TWOPANELDIALOG_CMAKE_BOOL=	USE_TWO_PANEL_DIALOG
 
-PLIST_SUB+=	SHLIB_VER=${PORTVERSION:C/-.*//}
-
-PATHFIX_CMAKELISTSTXT=	\\"CMakeLists.txt -exec grep -l /pkgconfig {} +\\"
-PORTDOCS=	README README.RUS AUTHORS
-INSTALLS_ICONS=	yes
-
-CMAKE_ARGS+=	-DUSE_FFMPEG_LEGACY:BOOL=FALSE
-
 post-patch:
 	@${GREP} -L '${LOCALBASE}/lib/oss' \
 		${WRKSRC}/src/plugins/Output/oss4/CMakeLists.txt | ${XARGS} \
diff --git a/multimedia/qmmp/distinfo b/multimedia/qmmp/distinfo
index 097689b6e6d..c25ff1325c4 100644
--- a/multimedia/qmmp/distinfo
+++ b/multimedia/qmmp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1490427682
-SHA256 (qmmp-0.10.7.tar.bz2) = 1f9e9198bb7bc2f71691653112704ce73ab10bf191b27b7836ccc7ceee155e4b
-SIZE (qmmp-0.10.7.tar.bz2) = 1342434
+TIMESTAMP = 1501879675
+SHA256 (qmmp-0.10.10.tar.bz2) = 7f8982a1a4bb216cd4c8d5d5599b24a16c3f2bc1faf22c1ab40bdaf6c6ea5cc0
+SIZE (qmmp-0.10.10.tar.bz2) = 1346679
diff --git a/net-im/oysttyer/Makefile b/net-im/oysttyer/Makefile
index 7969590f6d5..ce9e07ecd87 100644
--- a/net-im/oysttyer/Makefile
+++ b/net-im/oysttyer/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	oysttyer
-PORTVERSION=	2.9.0
+PORTVERSION=	2.9.1
 CATEGORIES=	net-im
 
 MAINTAINER=	pi@FreeBSD.org
diff --git a/net-im/oysttyer/distinfo b/net-im/oysttyer/distinfo
index d42c6e96c71..07ce7ec57e2 100644
--- a/net-im/oysttyer/distinfo
+++ b/net-im/oysttyer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500489191
-SHA256 (oysttyer-oysttyer-2.9.0_GH0.tar.gz) = 0d8ec6bd10674f805552c8d77fa26bf491613f318fa8481e3dc714660887e6e0
-SIZE (oysttyer-oysttyer-2.9.0_GH0.tar.gz) = 107245
+TIMESTAMP = 1502430376
+SHA256 (oysttyer-oysttyer-2.9.1_GH0.tar.gz) = 2539e993f72bc4c4547dc8c93ae385d06f285a136bc3e9192f4ce0182f6619e3
+SIZE (oysttyer-oysttyer-2.9.1_GH0.tar.gz) = 107271
diff --git a/net-mgmt/blackbox_exporter/Makefile b/net-mgmt/blackbox_exporter/Makefile
index e964b1b63f5..4d99cddc48e 100644
--- a/net-mgmt/blackbox_exporter/Makefile
+++ b/net-mgmt/blackbox_exporter/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	blackbox_exporter
-PORTVERSION=	0.7.0
+PORTVERSION=	0.8.1
 DISTVERSIONPREFIX=v
 CATEGORIES=	net-mgmt
 
diff --git a/net-mgmt/blackbox_exporter/distinfo b/net-mgmt/blackbox_exporter/distinfo
index 7b5f03b34d5..8ba8e90a98c 100644
--- a/net-mgmt/blackbox_exporter/distinfo
+++ b/net-mgmt/blackbox_exporter/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500372544
-SHA256 (prometheus-blackbox_exporter-v0.7.0_GH0.tar.gz) = 6d45133404fc962b5a76195e2e90c993a358debdc22264618c349a690db7bd44
-SIZE (prometheus-blackbox_exporter-v0.7.0_GH0.tar.gz) = 1279014
+TIMESTAMP = 1502274035
+SHA256 (prometheus-blackbox_exporter-v0.8.1_GH0.tar.gz) = 6a9abef7575fc666c0c456f95e9d0410600e0832e679f8bed8c2069345d60d7e
+SIZE (prometheus-blackbox_exporter-v0.8.1_GH0.tar.gz) = 1347185
diff --git a/net-mgmt/p5-FusionInventory-Agent/Makefile b/net-mgmt/p5-FusionInventory-Agent/Makefile
index 705159ac176..66b42cdb408 100644
--- a/net-mgmt/p5-FusionInventory-Agent/Makefile
+++ b/net-mgmt/p5-FusionInventory-Agent/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	FusionInventory-Agent
 PORTVERSION=	2.3.20
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:GBOUGARD/${PORTNAME}-2320targz
@@ -12,6 +13,7 @@ MAINTAINER=	vg@FreeBSD.org
 COMMENT=	Agent for OCS Inventory server and FusionInventory for GLPI servers
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	p5-File-Which>=0:sysutils/p5-File-Which \
 		p5-libwww>=0:www/p5-libwww \
@@ -73,11 +75,9 @@ DEPLOY_RUN_DEPENDS=	p5-Archive-Extract>=0:archivers/p5-Archive-Extract \
 DMIDECODE_RUN_DEPENDS=	dmidecode:sysutils/dmidecode
 NETDISC_RUN_DEPENDS=	nmap:security/nmap \
 			p5-Net-NBName>=0:net/p5-Net-NBName \
-			p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP \
-			p5-Thread-Queue>=0:devel/p5-Thread-Queue
+			p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP
 NETINV_RUN_DEPENDS=	p5-Crypt-DES>=0:security/p5-Crypt-DES \
-			p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP \
-			p5-Thread-Queue>=0:devel/p5-Thread-Queue
+			p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP
 PCIUTILS_RUN_DEPENDS+=	lspci:sysutils/pciutils
 SSL_RUN_DEPENDS=	p5-IO-Socket-SSL>=1.14:security/p5-IO-Socket-SSL \
 			p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https
diff --git a/net-mgmt/semaphore/Makefile b/net-mgmt/semaphore/Makefile
index c99f8b285b0..d19b616dba6 100644
--- a/net-mgmt/semaphore/Makefile
+++ b/net-mgmt/semaphore/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	semaphore
-PORTVERSION=	2.2.0
-PORTREVISION=	1
+PORTVERSION=	2.4.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net-mgmt
 
@@ -22,27 +21,34 @@ GH_TUPLE=	ansible-semaphore:semaphore-vendor:dcb3abe:vendor/public/vendor \
 		swills:semaphore-node_modules:v${PORTVERSION}:modules/public/node_modules \
 		swills:semaphore-rendered_files:v${PORTVERSION}:render/public.rendered \
 		bugsnag:bugsnag-go:70e1420:bugsnag/src/github.com/bugsnag/bugsnag-go \
-		bugsnag:panicwrap:aa7703c:panicwrap/src/github.com/bugsnag/panicwrap \
-		gin-gonic:gin:e2212d4:gonic/src/github.com/gin-gonic/gin \
-		go-sql-driver:mysql:9dee4ca:gomysql/src/github.com/go-sql-driver/mysql \
-		golang:protobuf:c9c7427:protobuf/src/github.com/golang/protobuf \
-		google:go-github:d683a1c:gogithub/src/github.com/google/go-github \
+		bugsnag:panicwrap:8a46439:panicwrap/src/github.com/bugsnag/panicwrap \
+		go-sql-driver:mysql:8fefef0:gomysql/src/github.com/go-sql-driver/mysql \
+		golang:protobuf:6a1fa94:protobuf/src/github.com/golang/protobuf \
+		google:go-github:4c4aea2:gogithub/src/github.com/google/go-github \
 		google:go-querystring:53e6ce1:querystring/src/github.com/google/go-querystring \
 		gorilla:securecookie:e59506c:securecookie/src/github.com/gorilla/securecookie \
-		gorilla:websocket:a91eba7:websocket/src/github.com/gorilla/websocket \
-		kardianos:osext:9d302b5:osext/src/github.com/kardianos/osext \
+		gorilla:websocket:7a8dacf:websocket/src/github.com/gorilla/websocket \
+		kardianos:osext:ae77be6:osext/src/github.com/kardianos/osext \
 		manucorporat:sse:ee05b12:sse/src/github.com/manucorporat/sse \
-		masterminds:squirrel:20f1922:squirrel/src/github.com/masterminds/squirrel \
+		masterminds:squirrel:36d675d:squirrel/src/github.com/masterminds/squirrel \
 		lann:builder:f22ce00:builder/src/github.com/lann/builder \
 		lann:ps:62de8c4:ps/src/github.com/lann/ps \
 		mattn:go-isatty:fc9e8d8:go_isatty/src/github.com/mattn/go-isatty \
-		russross:blackfriday:5f33e7b:blackfriday/src/github.com/russross/blackfriday \
-		shurcooL:sanitized_anchor_name:1dba4b3:sanitized/src/github.com/shurcooL/sanitized_anchor_name \
-		golang:net:6c23252:net/src/golang.org/x/net \
-		golang:crypto:459e265:crypto/src/golang.org/x/crypto \
-		go-playground:validator:5f57d22:playground/src/gopkg.in/go-playground/validator.v8 \
-		go-gorp:gorp:c87af80:gorp/src/gopkg.in/gorp.v1 \
-		go-yaml:yaml:a3f3340:yaml/src/gopkg.in/yaml.v2
+		russross:blackfriday:0ba0f2b:blackfriday/src/github.com/russross/blackfriday \
+		shurcooL:sanitized_anchor_name:541ff5e:sanitized/src/github.com/shurcooL/sanitized_anchor_name \
+		golang:net:1f92242:net/src/golang.org/x/net \
+		golang:crypto:5ef0053:crypto/src/golang.org/x/crypto \
+		go-playground:validator:fb68f39:playground/src/gopkg.in/go-playground/validator.v8 \
+		go-gorp:gorp:2ae7d17:gorp/src/gopkg.in/gorp.v1 \
+		go-yaml:yaml:e72f935:yaml/src/gopkg.in/yaml.v2 \
+		Sirupsen:logrus:e66f229:logrus/src/github.com/Sirupsen/logrus \
+		castawaylabs:mulekick:3a31c4b:mulekick/src/github.com/castawaylabs/mulekick \
+		gorilla:context:aed02d1:context/src/github.com/gorilla/context \
+		gorilla:mux:8c683ee:mux/src/github.com/gorilla/mux \
+		gorilla:handlers:a4d79d4:handlers/src/github.com/gorilla/handlers \
+		golang:sys:0e01648:sys/src/golang.org/x/sys \
+		go-ldap:ldap:37f35d7:ldap2/src/gopkg.in/ldap.v2 \
+		go-asn1-ber:asn1-ber:379148c:asn1/src/gopkg.in/asn1-ber.v1
 
 PLIST_FILES=	bin/semaphore \
 		"@sample etc/semaphore/semaphore_config.json.sample"
diff --git a/net-mgmt/semaphore/distinfo b/net-mgmt/semaphore/distinfo
index 82c692e84eb..1a2315dc8db 100644
--- a/net-mgmt/semaphore/distinfo
+++ b/net-mgmt/semaphore/distinfo
@@ -1,53 +1,67 @@
-TIMESTAMP = 1490753329
-SHA256 (ansible-semaphore-semaphore-v2.2.0_GH0.tar.gz) = e8495615640812853d729683c468bf653c1ba7b1823a1ce85532866a4f04dbc5
-SIZE (ansible-semaphore-semaphore-v2.2.0_GH0.tar.gz) = 150796
+TIMESTAMP = 1502639676
+SHA256 (ansible-semaphore-semaphore-v2.4.1_GH0.tar.gz) = bd3bfbe18cb08a799c76c30cb7c95675a1c64df823f130a5e3b3c965b376a30a
+SIZE (ansible-semaphore-semaphore-v2.4.1_GH0.tar.gz) = 160932
 SHA256 (ansible-semaphore-semaphore-vendor-dcb3abe_GH0.tar.gz) = cf3eea907e531447ab1992e080ef8e4be107673b91b35b7e465628bd9b7d580b
 SIZE (ansible-semaphore-semaphore-vendor-dcb3abe_GH0.tar.gz) = 1136879
-SHA256 (swills-semaphore-node_modules-v2.2.0_GH0.tar.gz) = 9c997fac40127dc7dc34816856da1ae0e83bdf3afed0c3eacb4f37bcf8b05b82
-SIZE (swills-semaphore-node_modules-v2.2.0_GH0.tar.gz) = 403647
-SHA256 (swills-semaphore-rendered_files-v2.2.0_GH0.tar.gz) = 58b37023b9d9ba8dfe8d4fd70c4c4d778588a325038070c301fa564f9af07e38
-SIZE (swills-semaphore-rendered_files-v2.2.0_GH0.tar.gz) = 144926
+SHA256 (swills-semaphore-node_modules-v2.4.1_GH0.tar.gz) = b7449ecf2c4bfc15e0cc4c8d15197b3ce16ece421da2001fc2c32f12e89926bb
+SIZE (swills-semaphore-node_modules-v2.4.1_GH0.tar.gz) = 408759
+SHA256 (swills-semaphore-rendered_files-v2.4.1_GH0.tar.gz) = 219aedc54222f5ae4768882fd37d3d38a6dc24631cbba558b71d8f73f1741158
+SIZE (swills-semaphore-rendered_files-v2.4.1_GH0.tar.gz) = 142806
 SHA256 (bugsnag-bugsnag-go-70e1420_GH0.tar.gz) = 0c2b8f68195bef850283162fdde5235b5408172c268f4f1db26ed76f9d410b34
 SIZE (bugsnag-bugsnag-go-70e1420_GH0.tar.gz) = 111367
-SHA256 (bugsnag-panicwrap-aa7703c_GH0.tar.gz) = 64040e32f60b49d681d676b238a0458ed3bf230149f3dc1bfb11119ed83813a7
-SIZE (bugsnag-panicwrap-aa7703c_GH0.tar.gz) = 8463
-SHA256 (gin-gonic-gin-e2212d4_GH0.tar.gz) = ee90311f24299aeb72d5f2910330144e681e1975f78ef0e4e86778b15bf43d0a
-SIZE (gin-gonic-gin-e2212d4_GH0.tar.gz) = 111382
-SHA256 (go-sql-driver-mysql-9dee4ca_GH0.tar.gz) = d1c75ba6276a9b7688a561165b8939f3b0c1a8738305d852e27a185b062d6f1b
-SIZE (go-sql-driver-mysql-9dee4ca_GH0.tar.gz) = 62093
-SHA256 (golang-protobuf-c9c7427_GH0.tar.gz) = 71a9a376cdfd472f583ec0d1cd8e35baa14c5bb63b7ae4416ba5f378cc73b826
-SIZE (golang-protobuf-c9c7427_GH0.tar.gz) = 245281
-SHA256 (google-go-github-d683a1c_GH0.tar.gz) = f8320f37f17299b2ef74fe1472c6d5d0d3d85e62f0dfa041489f240b1f881e9f
-SIZE (google-go-github-d683a1c_GH0.tar.gz) = 167507
+SHA256 (bugsnag-panicwrap-8a46439_GH0.tar.gz) = 7c72abe39013868350978f2e2a26ef6f98b2e812acc735bb0f54aa28dbd4044a
+SIZE (bugsnag-panicwrap-8a46439_GH0.tar.gz) = 8466
+SHA256 (go-sql-driver-mysql-8fefef0_GH0.tar.gz) = c4dc7c85ec03466a9e46195b5fc285ae4e1367370f61016c782dbce0cbd59289
+SIZE (go-sql-driver-mysql-8fefef0_GH0.tar.gz) = 69072
+SHA256 (golang-protobuf-6a1fa94_GH0.tar.gz) = e68ff13fa60587972dd169ee3677d690304760308a0b42e877e14f02ca604f06
+SIZE (golang-protobuf-6a1fa94_GH0.tar.gz) = 253318
+SHA256 (google-go-github-4c4aea2_GH0.tar.gz) = 9ed34b33f2ce820208ac857d4f5278a85490be45c7ef863ab8ba060bff8e371e
+SIZE (google-go-github-4c4aea2_GH0.tar.gz) = 175349
 SHA256 (google-go-querystring-53e6ce1_GH0.tar.gz) = 85e0895aef7f6045e3cc046f498c623c6ec467215ec831578be71ae63ec412af
 SIZE (google-go-querystring-53e6ce1_GH0.tar.gz) = 7490
 SHA256 (gorilla-securecookie-e59506c_GH0.tar.gz) = 3ad0c8b32b0b56ddf1808f765752398549386ca7816c04e0e1a50cbf61e0e8e2
 SIZE (gorilla-securecookie-e59506c_GH0.tar.gz) = 41286
-SHA256 (gorilla-websocket-a91eba7_GH0.tar.gz) = a62ed1f44e71e958c085caca430f4bdc8c2fe6040acb9b6b2980567aefebb96d
-SIZE (gorilla-websocket-a91eba7_GH0.tar.gz) = 42935
-SHA256 (kardianos-osext-9d302b5_GH0.tar.gz) = 8d62c9a81b4194c30ce17ff84d7ff88e0ca874991ee6b2b05840d52dd80339a8
-SIZE (kardianos-osext-9d302b5_GH0.tar.gz) = 4841
+SHA256 (gorilla-websocket-7a8dacf_GH0.tar.gz) = b47fcf26b1a73dda5bd409746669ec5ebe8c28bc96c70d82c00dfa7185eb1db7
+SIZE (gorilla-websocket-7a8dacf_GH0.tar.gz) = 42985
+SHA256 (kardianos-osext-ae77be6_GH0.tar.gz) = 539367f48ed1d4f1b8bec4cf742ac7bce7c5b9319f4338a12310edddec005213
+SIZE (kardianos-osext-ae77be6_GH0.tar.gz) = 4851
 SHA256 (manucorporat-sse-ee05b12_GH0.tar.gz) = 8ae20e2320e0756b3e38cf444e4eb4077d7977ef4c57b2a35ba5836a8ff1e2bc
 SIZE (manucorporat-sse-ee05b12_GH0.tar.gz) = 5409
-SHA256 (masterminds-squirrel-20f1922_GH0.tar.gz) = 682de3fad9912908bfa03e867de64a2f00de180e208f9ed9ba6fa12d17d76836
-SIZE (masterminds-squirrel-20f1922_GH0.tar.gz) = 16299
+SHA256 (masterminds-squirrel-36d675d_GH0.tar.gz) = ee0d99457feb11015a3d50d1a88ea32c45a7e587b176980425014dab18040e23
+SIZE (masterminds-squirrel-36d675d_GH0.tar.gz) = 16596
 SHA256 (lann-builder-f22ce00_GH0.tar.gz) = fbf3d5c84d3f836f36f8de96644875cc58cdaeffbf6409851fd3a31dc9a80696
 SIZE (lann-builder-f22ce00_GH0.tar.gz) = 5094
 SHA256 (lann-ps-62de8c4_GH0.tar.gz) = dd3cb64a93f9766d8a3762d9832aa0c25fcf475f32c5972866fe9050422d4dce
 SIZE (lann-ps-62de8c4_GH0.tar.gz) = 5529
 SHA256 (mattn-go-isatty-fc9e8d8_GH0.tar.gz) = bba2afe8904228211ac3f5fc4c14e065478e585a4052f56aa39671ab8c3140f3
 SIZE (mattn-go-isatty-fc9e8d8_GH0.tar.gz) = 3258
-SHA256 (russross-blackfriday-5f33e7b_GH0.tar.gz) = 30ec0d8bb17b404f7f3a59d574fa5728adc15b0248d433bd14d3ade1b8935b0e
-SIZE (russross-blackfriday-5f33e7b_GH0.tar.gz) = 71950
-SHA256 (shurcooL-sanitized_anchor_name-1dba4b3_GH0.tar.gz) = 0188ebad02ba0773a70431647bf7f40655dc0fdfccec8a3c682a20e97fd42d36
-SIZE (shurcooL-sanitized_anchor_name-1dba4b3_GH0.tar.gz) = 2054
-SHA256 (golang-net-6c23252_GH0.tar.gz) = 349e7e0743b43065d68657a0ef290996aa4aecae3a496bfb717f5ebf5cbb8942
-SIZE (golang-net-6c23252_GH0.tar.gz) = 859543
-SHA256 (golang-crypto-459e265_GH0.tar.gz) = ffb8479183f6b1d7ff5e444c7fedb28bf8995e33df7ae917a6c447b75b1dfc18
-SIZE (golang-crypto-459e265_GH0.tar.gz) = 1317091
-SHA256 (go-playground-validator-5f57d22_GH0.tar.gz) = 53b8e2eedf83fe9860e3b54668cb45d5064704de28747660a3a71aee0af3bf0f
-SIZE (go-playground-validator-5f57d22_GH0.tar.gz) = 61529
-SHA256 (go-gorp-gorp-c87af80_GH0.tar.gz) = 32cdd3d8b52b291074a58a3dc347eaf5e9ea0e3bf9dfaa9b8083af091b77d0b4
-SIZE (go-gorp-gorp-c87af80_GH0.tar.gz) = 36726
-SHA256 (go-yaml-yaml-a3f3340_GH0.tar.gz) = e2a3af32b0d55b2426229ea6efca85e4219209225f05fb57af55834a2dee2d1a
-SIZE (go-yaml-yaml-a3f3340_GH0.tar.gz) = 60720
+SHA256 (russross-blackfriday-0ba0f2b_GH0.tar.gz) = 23c7c51647ce253607c4c3ab3e19ad177bf45b042280fd3a7b75678005370c83
+SIZE (russross-blackfriday-0ba0f2b_GH0.tar.gz) = 73534
+SHA256 (shurcooL-sanitized_anchor_name-541ff5e_GH0.tar.gz) = b1ca801fa24eaa938d0a26cc4d77e1da74afb3d4a091475a2660cb977b7c8f54
+SIZE (shurcooL-sanitized_anchor_name-541ff5e_GH0.tar.gz) = 2063
+SHA256 (golang-net-1f92242_GH0.tar.gz) = 36214f159a920605a1cb12965356b52fcfb721bdaf84eac89cee1106ed68f041
+SIZE (golang-net-1f92242_GH0.tar.gz) = 910214
+SHA256 (golang-crypto-5ef0053_GH0.tar.gz) = f489cdcc70f56a9c97451bbe46c8dc3eb72fb2dee357e2afd0d84b62e5ea6c20
+SIZE (golang-crypto-5ef0053_GH0.tar.gz) = 1342552
+SHA256 (go-playground-validator-fb68f39_GH0.tar.gz) = dcdb834c705e5fc773707f4a36a342c066914d05ac7646ff412cc93084b73609
+SIZE (go-playground-validator-fb68f39_GH0.tar.gz) = 75572
+SHA256 (go-gorp-gorp-2ae7d17_GH0.tar.gz) = 44d83ca43a68ff011e6fd81ef71184045338ae5d5b71b6fa3a71cb4564ed43eb
+SIZE (go-gorp-gorp-2ae7d17_GH0.tar.gz) = 50238
+SHA256 (go-yaml-yaml-e72f935_GH0.tar.gz) = e4ba84fc3f4cdf387b3c7bf72de1def2668c35f95c481a555225216f62ce2e42
+SIZE (go-yaml-yaml-e72f935_GH0.tar.gz) = 60706
+SHA256 (Sirupsen-logrus-e66f229_GH0.tar.gz) = 1f510af4751412860581e274cae461cd9c2b8ba7db72389a8bedd2670cc711f5
+SIZE (Sirupsen-logrus-e66f229_GH0.tar.gz) = 27844
+SHA256 (castawaylabs-mulekick-3a31c4b_GH0.tar.gz) = 1f1cbb03c8d1af86af6db23c0f579c70bb893a4c0a98717ebf0d3539d7e78f22
+SIZE (castawaylabs-mulekick-3a31c4b_GH0.tar.gz) = 3349
+SHA256 (gorilla-context-aed02d1_GH0.tar.gz) = d2954089ea8e54370c6569f9c510212a34ffc9e0d84fe1c3c99bc95258c80ed7
+SIZE (gorilla-context-aed02d1_GH0.tar.gz) = 4381
+SHA256 (gorilla-mux-8c683ee_GH0.tar.gz) = 3f480a521a40ba638f0c3202ed05ec8e8feee3d7d5704bce7153314ea122170b
+SIZE (gorilla-mux-8c683ee_GH0.tar.gz) = 29397
+SHA256 (gorilla-handlers-a4d79d4_GH0.tar.gz) = 309b72496b3aee4d928602346457b887c7bfae61a33f1567a98220b5a96c291f
+SIZE (gorilla-handlers-a4d79d4_GH0.tar.gz) = 17656
+SHA256 (golang-sys-0e01648_GH0.tar.gz) = 1714e8fc8d14f01ea95837fb57c017bfe0043624540f75203e0c1d7083363037
+SIZE (golang-sys-0e01648_GH0.tar.gz) = 718531
+SHA256 (go-ldap-ldap-37f35d7_GH0.tar.gz) = 62703fd083ef75ff020360cdc4210e59c1fcf9a8a16bbbc7d54649c2478dbb65
+SIZE (go-ldap-ldap-37f35d7_GH0.tar.gz) = 36435
+SHA256 (go-asn1-ber-asn1-ber-379148c_GH0.tar.gz) = 44ceb8c541e40f1ae212a34f4b0ae86622f57d1d7bdfa8baf1dc545d6a7e56ba
+SIZE (go-asn1-ber-asn1-ber-379148c_GH0.tar.gz) = 12429
diff --git a/net-p2p/bitcoin-daemon/Makefile b/net-p2p/bitcoin-daemon/Makefile
index bc08adba22f..52820693c10 100644
--- a/net-p2p/bitcoin-daemon/Makefile
+++ b/net-p2p/bitcoin-daemon/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 MASTERDIR=	${.CURDIR}/../bitcoin
-PORTREVISION=	7
 PKGNAMESUFFIX=	-daemon
 
 COMMENT=	Virtual Peer-to-Peer Currency (Daemon)
@@ -23,7 +22,8 @@ CONFIGURE_ARGS=	--with-daemon \
 		--without-qrencode \
 		--without-utils
 
-PLIST_FILES=	bin/bitcoind
+PLIST_FILES=	bin/bitcoind \
+		man/man1/bitcoind.1.gz
 
 USE_RC_SUBR=	bitcoind
 
diff --git a/net-p2p/bitcoin-utils/Makefile b/net-p2p/bitcoin-utils/Makefile
index 30db8bdd4aa..f63ad4f3391 100644
--- a/net-p2p/bitcoin-utils/Makefile
+++ b/net-p2p/bitcoin-utils/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 MASTERDIR=	${.CURDIR}/../bitcoin
-PORTREVISION=	6
 PKGNAMESUFFIX=	-utils
 
 COMMENT=	Virtual Peer-to-Peer Currency (CLI and Utilities)
@@ -17,9 +16,11 @@ CONFIGURE_ARGS=	--without-daemon \
 		--without-gui \
 		--without-libs \
 		--without-qrencode \
+		--without-miniupnpc \
 		--with-utils \
 		--disable-wallet
 
-PLIST_FILES=	bin/bitcoin-cli bin/bitcoin-tx
+PLIST_FILES=	bin/bitcoin-cli bin/bitcoin-tx \
+		man/man1/bitcoin-cli.1.gz man/man1/bitcoin-tx.1.gz
 
 .include "${MASTERDIR}/Makefile"
diff --git a/net-p2p/bitcoin/Makefile b/net-p2p/bitcoin/Makefile
index 49a0efe5090..2497418b575 100644
--- a/net-p2p/bitcoin/Makefile
+++ b/net-p2p/bitcoin/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	bitcoin
-PORTVERSION=	0.12.1
+PORTVERSION=	0.14.2
 DISTVERSIONPREFIX=	v
-PORTREVISION=	12
 CATEGORIES=	net-p2p finance
 
 MAINTAINER=	robbak@robbak.com
@@ -17,7 +16,7 @@ LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs \
 
 BROKEN_powerpc64=	fails to compile: util.cpp: undefined reference to boost::program_options::to_internal
 
-USES=		autoreconf compiler:c++0x gmake libtool pkgconfig shebangfix ssl
+USES=		autoreconf compiler:c++11-lib gmake libtool pkgconfig shebangfix ssl
 SHEBANG_FILES=	src/test/*.py
 USE_GITHUB=	yes
 GNU_CONFIGURE=	yes
@@ -26,13 +25,13 @@ SLAVE_PORT?=	no
 
 .if defined(SLAVE_PORT) && ${SLAVE_PORT} == "no"
 USES+=		desktop-file-utils
-USE_QT4=	corelib gui moc_build linguisttools_build network qmake_build \
-		rcc_build uic_build
+USE_QT5=	core gui network widgets \
+		buildtools_build linguisttools_build qmake_build
 
 BUILD_DEPENDS+=	protoc:devel/protobuf
 LIB_DEPENDS+=	libprotobuf.so:devel/protobuf
 
-TESTS_USE=		QT4=testlib
+TESTS_USE=		QT5=testlib
 TESTS_PLIST_FILES=	bin/test_bitcoin-qt \
 			bin/test_bitcoin
 .endif
@@ -47,8 +46,8 @@ TESTS_DESC=	Build test binary and unit tests
 WALLET_DESC=	Wallet Management Support
 ZMQ_DESC=	Block and transaction broadcasting with ZeroMQ
 
-DBUS_CONFIGURE_WITH=	qtdbus
-DBUS_USE=		QT4=dbus
+DBUS_CONFIGURE_WITH=	dbus
+DBUS_USE=		QT5=dbus
 
 DEBUG_CONFIGURE_ENABLE=		debug
 DEBUG_INSTALL_TARGET_OFF=	install-strip
@@ -81,7 +80,7 @@ ZMQ_RUN_DEPENDS=	libzmq4>0:net/libzmq4
 GH_ACCOUNT=	bitcoin
 
 CONFIGURE_ARGS?=	--without-libs \
-			--with-gui=qt4 \
+			--with-gui=qt5 \
 			--without-daemon \
 			--without-utils
 
@@ -90,8 +89,8 @@ CONFIGURE_ENV=	CRYPTO_CFLAGS="-I${OPENSSLINC}" CRYPTO_LIBS="-L${OPENSSLLIB} -lcr
 		OBJCXX="${CXX}" OBJCXXFLAGS="${CXXFLAGS}"
 MAKE_ENV+=	V=1
 
-PLIST_FILES?=	bin/bitcoin-qt share/applications/bitcoin-qt.desktop \
-		share/pixmaps/bitcoin128.png
+PLIST_FILES?=	bin/bitcoin-qt man/man1/bitcoin-qt.1.gz \
+		share/applications/bitcoin-qt.desktop share/pixmaps/bitcoin128.png
 
 .if defined(SLAVE_PORT) && ${SLAVE_PORT} == "no"
 
diff --git a/net-p2p/bitcoin/distinfo b/net-p2p/bitcoin/distinfo
index cfd7d66485f..f6a7edca348 100644
--- a/net-p2p/bitcoin/distinfo
+++ b/net-p2p/bitcoin/distinfo
@@ -1,2 +1,3 @@
-SHA256 (bitcoin-bitcoin-v0.12.1_GH0.tar.gz) = 7bdc287575067461c123e1afcb48843f9f78eb5e6cac95b413e2e09f1f7fc7bd
-SIZE (bitcoin-bitcoin-v0.12.1_GH0.tar.gz) = 6751284
+TIMESTAMP = 1500590635
+SHA256 (bitcoin-bitcoin-v0.14.2_GH0.tar.gz) = e0ac23f01a953fcc6290c96799deeffb32aa76ca8e216c564d20c18e75a25219
+SIZE (bitcoin-bitcoin-v0.14.2_GH0.tar.gz) = 7180535
diff --git a/net-p2p/bitcoin/files/patch-src_leveldb_helpers_memenv_memenv.cc b/net-p2p/bitcoin/files/patch-src_leveldb_helpers_memenv_memenv.cc
deleted file mode 100644
index 98e900ffdd5..00000000000
--- a/net-p2p/bitcoin/files/patch-src_leveldb_helpers_memenv_memenv.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/leveldb/helpers/memenv/memenv.cc.orig	2015-07-10 17:23:55 UTC
-+++ src/leveldb/helpers/memenv/memenv.cc
-@@ -2,6 +2,8 @@
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file. See the AUTHORS file for names of contributors.
- 
-+#define __STDC_LIMIT_MACROS
-+
- #include "helpers/memenv/memenv.h"
- 
- #include "leveldb/env.h"
diff --git a/net/ceph-devel/Makefile b/net/ceph-devel/Makefile
index 216ee5adc04..1b259b624f9 100644
--- a/net/ceph-devel/Makefile
+++ b/net/ceph-devel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ceph
-DISTVERSION=	wip.v2017-05-01
+DISTVERSION=	wip.v2017-07-27-1
 CATEGORIES=	net
 PKGNAMESUFFIX=	-devel
 
@@ -17,7 +17,8 @@ BUILD_DEPENDS=	\
 	pkgconf:devel/pkgconf \
 	cython>=0.25.2:lang/cython \
 	sphinx-build:textproc/py-sphinx \
-	${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops
+	${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops \
+	gperf:devel/gperf
 LIB_DEPENDS=	\
 	libboost_python.so:devel/boost-python-libs \
 	libboost_thread.so:devel/boost-libs \
@@ -41,24 +42,28 @@ RUN_DEPENDS=	\
 	flock:sysutils/flock \
 	virtualenv:devel/py-virtualenv
 
+USES=	gmake cmake:outsource,noninja python:2.7 fuse gettext-runtime shebangfix
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	wjwithagen:DEFAULT
-GH_TUPLE+=	facebook:rocksdb:2.7.fb-4991-g9f2cc5:rocksdb/src/rocksdb
-GH_TUPLE+=	ceph:ceph-erasure-code-corpus:master:cepherasurecodecorpus/ceph-erasure-code-corpus
-GH_TUPLE+=	ceph:ceph-object-corpus:master:cephobjectcorpus/ceph-object-corpus
-GH_TUPLE+=	ceph:civetweb:v1.5-1809-g7f9f5d1:civetweb/src/civetweb
-GH_TUPLE+=	ceph:jerasure:v2-ceph:jerasure/src/erasure-code/jerasure/jerasure
-GH_TUPLE+=	ceph:gf-complete:v3-ceph:gfcomplete/src/erasure-code/jerasure/gf-complete
-GH_TUPLE+=	ceph:googletest:ceph-release-1.7.x:googletest/src/googletest
-GH_TUPLE+=	ceph:spdk:v17.03-34-g5742e9b9:spdk/src/spdk
-GH_TUPLE+=	ceph:xxHash:v0.5.1-2-g1f40c65:xxHash/src/xxHash
-GH_TUPLE+=	ceph:isa-l:v2.16.0:isal/src/isa-l
-GH_TUPLE+=	ceph:lua:5.3.2-2-g1fce39c:lua/src/lua
-GH_TUPLE+=	ceph:Beast:999e2fa:Beast/src/Beast
-GH_TUPLE+=	boostorg:boost:boost-1.61.0-275-g1790aff:boost/src/boost
-GH_TUPLE+=	ceph:dpdk:v16.11:dpd/src/dpd
-GH_TUPLE+=	facebook:zstd:v1.1.2:zstd/src/zstd
-GH_TUPLE+=	01org:isa-l_crypto:603529a:isalcrypto/src/crypto/isa-l/isa-l_crypto
+GH_TUPLE+=	ceph:ceph-erasure-code-corpus:2d7d78b:ceph_erasure_code_corpus/ceph-erasure-code-corpus
+GH_TUPLE+=	ceph:ceph-object-corpus:f0ba19f:ceph_object_corpus/ceph-object-corpus
+GH_TUPLE+=	ceph:Beast:d8db5f1:Beast/src/Beast
+GH_TUPLE+=	ceph:blkin:f24ceec:blkin/src/blkin
+GH_TUPLE+=	boostorg:boost:1790aff:boost/src/boost
+GH_TUPLE+=	ceph:civetweb:de23828:civetweb/src/civetweb
+GH_TUPLE+=	01org:isa-l_crypto:603529a:isa_l_crypto/src/crypto/isa-l/isa-l_crypto
+GH_TUPLE+=	ceph:dpdk:d3bfeaa:dpdk/src/dpdk
+GH_TUPLE+=	ceph:gf-complete:7e61b44:gf_complete/src/erasure-code/jerasure/gf-complete
+GH_TUPLE+=	ceph:jerasure:96c76b8:jerasure/src/erasure-code/jerasure/jerasure
+GH_TUPLE+=	ceph:googletest:fdb8504:googletest/src/googletest
+GH_TUPLE+=	ceph:isa-l:7e1a337:isa_l/src/isa-l
+GH_TUPLE+=	ceph:lua:1fce39c:lua/src/lua
+GH_TUPLE+=	ceph:rapidjson:f54b0e4:rapidjson/src/rapidjson
+GH_TUPLE+=	ceph:rocksdb:e15382c:rocksdb/src/rocksdb
+GH_TUPLE+=	ceph:spdk:5742e9b:spdk/src/spdk
+GH_TUPLE+=	ceph:xxHash:1f40c65:xxHash/src/xxHash
+GH_TUPLE+=	facebook:zstd:dc99312:zstd/src/zstd
 
 CMAKE_BUILD_TYPE=	Release
 CMAKE_ARGS=	\
@@ -66,6 +71,7 @@ CMAKE_ARGS=	\
 	-D WITH_SYSTEM_BOOST:BOOL=ON \
 	-D CEPH_MAN_DIR:STRING=man \
 	-D WITH_LTTNG:BOOL=OFF \
+	-D WITH_BABELTRACE:BOOL=OFF \
 	-D WITH_FUSE:BOOL=ON \
 	-D WITH_KRBD:BOOL=OFF \
 	-D WITH_XFS:BOOL=OFF \
@@ -74,7 +80,6 @@ CMAKE_ARGS=	\
 	-D WITH_CEPHFS:BOOL=OFF \
 	-D WITH_EMBEDDED:BOOL=OFF
 
-USES=	gmake cmake:outsource,noninja python:2.7 fuse gettext-runtime shebangfix
 SHEBANG_FILES=src/rbdmap src/ceph-post-file.in src/rbd-replay-many \
 	src/brag/client/ceph-brag src/ceph-rest-api \
 	src/tools/ceph-monstore-update-crush.sh src/mount.fuse.ceph \
@@ -94,6 +99,7 @@ pre-configure:
 	${LN} -s ${CONFIGURE_WRKSRC} ${WRKSRC}/build
 
 post-install:
+	# create directory infra used by ceph daemons
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/ceph
 	${MKDIR} ${STAGEDIR}/var/lib/ceph/bootstrap-mds
 	${MKDIR} ${STAGEDIR}/var/lib/ceph/bootstrap-osd
@@ -107,12 +113,6 @@ post-install:
 	${MKDIR} ${STAGEDIR}/var/lib/ceph/radosgw
 	${MKDIR} ${STAGEDIR}/var/log/ceph
 	${MKDIR} ${STAGEDIR}/var/run/ceph
-	${CHOWN} -R 167:167 ${STAGEDIR}/var/lib/ceph
-	${CHOWN} 167:167 ${STAGEDIR}/var/log/ceph
-	${CHOWN} 167:167 ${STAGEDIR}/var/run/ceph
-	${CHMOD} -R 750 ${STAGEDIR}/var/lib/ceph
-	${CHOWN} 750 ${STAGEDIR}/var/log/ceph
-	${CHOWN} 750 ${STAGEDIR}/var/run/ceph
 	# Use the Ceph init.d script as the interface to regular
 	# starting and stopping deamons. rc.d work is done thru
 	# a separate rc.d/ceph script calling init-ceph again.
diff --git a/net/ceph-devel/distinfo b/net/ceph-devel/distinfo
index f46833dbb72..b98f54da63c 100644
--- a/net/ceph-devel/distinfo
+++ b/net/ceph-devel/distinfo
@@ -1,35 +1,39 @@
-TIMESTAMP = 1493758988
-SHA256 (wjwithagen-ceph-wip.v2017-05-01_GH0.tar.gz) = 124f21e9b696d65e178107f1fbebd5f91a0136db0c38a13ca6d6d4329c53a45e
-SIZE (wjwithagen-ceph-wip.v2017-05-01_GH0.tar.gz) = 10046369
-SHA256 (facebook-rocksdb-2.7.fb-4991-g9f2cc5_GH0.tar.gz) = de92acb5f01d157331c9c978152016c8855049cd361d65e366fc379834265f37
-SIZE (facebook-rocksdb-2.7.fb-4991-g9f2cc5_GH0.tar.gz) = 3270485
-SHA256 (ceph-ceph-erasure-code-corpus-master_GH0.tar.gz) = 0a0129c92c3c1b717c39810833a476e16086b73736f2d2a77af93e3070b79356
-SIZE (ceph-ceph-erasure-code-corpus-master_GH0.tar.gz) = 3515705
-SHA256 (ceph-ceph-object-corpus-master_GH0.tar.gz) = 0f3efedf4a8e05d53fba6cd10ef0961562879cd455abb8dfa38c7196f93a3191
-SIZE (ceph-ceph-object-corpus-master_GH0.tar.gz) = 1328809
-SHA256 (ceph-civetweb-v1.5-1809-g7f9f5d1_GH0.tar.gz) = 5d08d3c7b8d09cb055e8e67df4c956e7292efb7ae556e03b6c1f0d9f4fa7fd82
-SIZE (ceph-civetweb-v1.5-1809-g7f9f5d1_GH0.tar.gz) = 6850432
-SHA256 (ceph-jerasure-v2-ceph_GH0.tar.gz) = 62c69cf8e2215f1f3b242bc153c2fbb5f3edaf2d0a92b2943310a8c3a6f8030b
-SIZE (ceph-jerasure-v2-ceph_GH0.tar.gz) = 806324
-SHA256 (ceph-gf-complete-v3-ceph_GH0.tar.gz) = 064e1ed16d01f21203feaaa0e58697caa667c51de48adddd02b0a95a28369050
-SIZE (ceph-gf-complete-v3-ceph_GH0.tar.gz) = 342297
-SHA256 (ceph-googletest-ceph-release-1.7.x_GH0.tar.gz) = 4a70b3a6b1a92ba0f623a560c9d1cdc84b925bd90458e080ebc2c4100225d54e
-SIZE (ceph-googletest-ceph-release-1.7.x_GH0.tar.gz) = 1281303
-SHA256 (ceph-spdk-v17.03-34-g5742e9b9_GH0.tar.gz) = c7d507c6f92655b872ae67f581c96d660131f3878d586cce800d012229cdc037
-SIZE (ceph-spdk-v17.03-34-g5742e9b9_GH0.tar.gz) = 672123
-SHA256 (ceph-xxHash-v0.5.1-2-g1f40c65_GH0.tar.gz) = bd0de02be53b8019f5844776a534439bee0b1f982cb1e8af4fae79f78cfb0924
-SIZE (ceph-xxHash-v0.5.1-2-g1f40c65_GH0.tar.gz) = 25494
-SHA256 (ceph-isa-l-v2.16.0_GH0.tar.gz) = 6fab1d920db76dc58f43df09020b0e8a1e08e455962dfb4dde111ea697ab8845
-SIZE (ceph-isa-l-v2.16.0_GH0.tar.gz) = 364853
-SHA256 (ceph-lua-5.3.2-2-g1fce39c_GH0.tar.gz) = 1c9701430df18509002b5af05e78d09ac6decb86a974814556a0505991035e2d
-SIZE (ceph-lua-5.3.2-2-g1fce39c_GH0.tar.gz) = 366840
-SHA256 (ceph-Beast-999e2fa_GH0.tar.gz) = f3ac9a1c891b138e68137c0a1a2b37befa09b53f7e551f6ebb67fa8ed9b792f4
-SIZE (ceph-Beast-999e2fa_GH0.tar.gz) = 521462
-SHA256 (boostorg-boost-boost-1.61.0-275-g1790aff_GH0.tar.gz) = 22d2d0fcb83044a185ee0c1d009dd9eb43bf340c0d25432df4e889bdd67f2445
-SIZE (boostorg-boost-boost-1.61.0-275-g1790aff_GH0.tar.gz) = 1096867
-SHA256 (ceph-dpdk-v16.11_GH0.tar.gz) = cf2ef6faf8cd056abbbebba779b7850eb3f79edd0d91767bcdbc216a2cde4fd1
-SIZE (ceph-dpdk-v16.11_GH0.tar.gz) = 10864287
-SHA256 (facebook-zstd-v1.1.2_GH0.tar.gz) = 980b8febb0118e22f6ed70d23b5b3e600995dbf7489c1f6d6122c1411cdda8d8
-SIZE (facebook-zstd-v1.1.2_GH0.tar.gz) = 769017
+TIMESTAMP = 1501162350
+SHA256 (wjwithagen-ceph-wip.v2017-07-27-1_GH0.tar.gz) = 0c9ca0dee5ad347a6e3d3cd147bb36aae1acaa8d8b4ad6ea4317a4c706543caf
+SIZE (wjwithagen-ceph-wip.v2017-07-27-1_GH0.tar.gz) = 16773256
+SHA256 (ceph-ceph-erasure-code-corpus-2d7d78b_GH0.tar.gz) = 466f7185015df8d13f8b2b9a17ee30ab419bcd667284ce2b6d32a1128c4640f1
+SIZE (ceph-ceph-erasure-code-corpus-2d7d78b_GH0.tar.gz) = 3634266
+SHA256 (ceph-ceph-object-corpus-f0ba19f_GH0.tar.gz) = 90e4052c6dca0e272bdca492216e62fdc0d19719e121451798295799bdf95499
+SIZE (ceph-ceph-object-corpus-f0ba19f_GH0.tar.gz) = 1837935
+SHA256 (ceph-Beast-d8db5f1_GH0.tar.gz) = a0dda7ee9abdef7f6e2a3f178e85dbfa7ebc8ce428ccc6cd0ac76883f406808b
+SIZE (ceph-Beast-d8db5f1_GH0.tar.gz) = 17823430
+SHA256 (ceph-blkin-f24ceec_GH0.tar.gz) = fe4102f569f7e21e126ebef12d34537e565e53b0ec5c40eaafac9e2a525672f9
+SIZE (ceph-blkin-f24ceec_GH0.tar.gz) = 19628
+SHA256 (boostorg-boost-1790aff_GH0.tar.gz) = 3cc1b0c5047e37deaffa13584620358965710b0a799432783fed5fd28551929c
+SIZE (boostorg-boost-1790aff_GH0.tar.gz) = 1096788
+SHA256 (ceph-civetweb-de23828_GH0.tar.gz) = a9a95dd58e9b4a696fa0c822c1401856c55ef9b67fb28cf15d97f19f1af2ecbd
+SIZE (ceph-civetweb-de23828_GH0.tar.gz) = 6850197
 SHA256 (01org-isa-l_crypto-603529a_GH0.tar.gz) = 52708b98c832bb7e6db60c949ece261d9609c822ae55239b0f2133cec2b3d155
 SIZE (01org-isa-l_crypto-603529a_GH0.tar.gz) = 439149
+SHA256 (ceph-dpdk-d3bfeaa_GH0.tar.gz) = 4a0053ee644467fb20682c8eb86823871e9e4321010fef6d91205a5616739c63
+SIZE (ceph-dpdk-d3bfeaa_GH0.tar.gz) = 10864497
+SHA256 (ceph-gf-complete-7e61b44_GH0.tar.gz) = 7b0e5c1b41399d2c7d97ed7a7547ebf40023bcd104ed9a8b2b75bdee440c1a4d
+SIZE (ceph-gf-complete-7e61b44_GH0.tar.gz) = 342303
+SHA256 (ceph-jerasure-96c76b8_GH0.tar.gz) = 06edaeb8cb5c3076e34cb53dd91c91d54d46fb8c3b837c6280ea2ed076556beb
+SIZE (ceph-jerasure-96c76b8_GH0.tar.gz) = 806334
+SHA256 (ceph-googletest-fdb8504_GH0.tar.gz) = ece3265dae4d0fe5a52e7164432bb416de8bdb45e1c8cf8f361bbe893db30bb8
+SIZE (ceph-googletest-fdb8504_GH0.tar.gz) = 1281068
+SHA256 (ceph-isa-l-7e1a337_GH0.tar.gz) = 8099bc6ca3ca6ed9376f6cc5072a84d7a1863e2d7f2344bf08682d4efb7ae788
+SIZE (ceph-isa-l-7e1a337_GH0.tar.gz) = 458398
+SHA256 (ceph-lua-1fce39c_GH0.tar.gz) = fb5f778ce4da349ca903512a2fdb3987b12e3f0a52ab088fb011a8e4dd55848c
+SIZE (ceph-lua-1fce39c_GH0.tar.gz) = 366778
+SHA256 (ceph-rapidjson-f54b0e4_GH0.tar.gz) = 35c330d40ed9def99e8dea8f3b0e4fda7610b813b6f4aac9a70ffefcb9ab1f1e
+SIZE (ceph-rapidjson-f54b0e4_GH0.tar.gz) = 1019457
+SHA256 (ceph-rocksdb-e15382c_GH0.tar.gz) = e23177dd893b81b4d3d959464ee8e5c4fe64a408841c2584b29540c60ac5cf47
+SIZE (ceph-rocksdb-e15382c_GH0.tar.gz) = 3278113
+SHA256 (ceph-spdk-5742e9b_GH0.tar.gz) = 92ad8cb3f9814044d859533ceaf1e6c4a273f503148a875d30a3424873cf5bee
+SIZE (ceph-spdk-5742e9b_GH0.tar.gz) = 671818
+SHA256 (ceph-xxHash-1f40c65_GH0.tar.gz) = 809e06b7493ed01f13c7ba972393a5a6d23dd92fd6b884381aa907005e569372
+SIZE (ceph-xxHash-1f40c65_GH0.tar.gz) = 25484
+SHA256 (facebook-zstd-dc99312_GH0.tar.gz) = e10abc649b2708ad9112e138001a9c88eed05cae35e1139f5b96a51a549cf724
+SIZE (facebook-zstd-dc99312_GH0.tar.gz) = 769078
diff --git a/net/ceph-devel/files/patch-src_test_rgw_CMakeLists.txt b/net/ceph-devel/files/patch-src_test_rgw_CMakeLists.txt
deleted file mode 100644
index e08082e2d94..00000000000
--- a/net/ceph-devel/files/patch-src_test_rgw_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/test/rgw/CMakeLists.txt
-+++ src/test/rgw/CMakeLists.txt
-@@ -99,9 +99,8 @@ target_link_libraries(unittest_rgw_crypto
-   cls_user_client
-   librados
-   global
--  curl
--  uuid
--  expat
-+  ${CURL_LIBRARIES}
-+  ${EXPAT_LIBRARIES}
-   ${CMAKE_DL_LIBS}
-   ${UNITTEST_LIBS}
-   ${CRYPTO_LIBS}
-
diff --git a/net/ceph-devel/pkg-plist b/net/ceph-devel/pkg-plist
index 704e224d620..3f2e58db28c 100644
--- a/net/ceph-devel/pkg-plist
+++ b/net/ceph-devel/pkg-plist
@@ -37,10 +37,12 @@ bin/osdmaptool
 bin/rados
 bin/radosgw
 bin/radosgw-admin
+bin/radosgw-es
 bin/radosgw-object-expirer
 bin/radosgw-token
 bin/rbd
 bin/rbd-fuse
+bin/rbd-ggate
 bin/rbd-mirror
 bin/rbd-replay
 bin/rbd-replay-many
@@ -58,6 +60,7 @@ include/rados/librados.h
 include/rados/librados.hpp
 include/rados/librgw.h
 include/rados/memory.h
+include/rados/objclass.h
 include/rados/page.h
 include/rados/rados_types.h
 include/rados/rados_types.hpp
@@ -81,8 +84,6 @@ lib/ceph/crypto/libceph_crypto_isal.so
 lib/ceph/crypto/libceph_crypto_isal.so.1
 lib/ceph/crypto/libceph_crypto_isal.so.1.0.0
 lib/ceph/erasure-code/libec_isa.so
-lib/ceph/erasure-code/libec_isa.so.2
-lib/ceph/erasure-code/libec_isa.so.2.14.0
 lib/ceph/erasure-code/libec_jerasure.so
 lib/ceph/erasure-code/libec_jerasure_generic.so
 lib/ceph/erasure-code/libec_jerasure_sse3.so
@@ -94,37 +95,1097 @@ lib/ceph/erasure-code/libec_shec_sse3.so
 lib/ceph/erasure-code/libec_shec_sse4.so
 lib/ceph/libceph-common.so
 lib/ceph/libceph-common.so.0
+lib/ceph/mgr/status/__init__.py
+lib/ceph/mgr/status/module.py
 lib/ceph/mgr/.gitignore
-lib/ceph/mgr/fsstatus/__init__.py
-lib/ceph/mgr/fsstatus/module.py
+lib/ceph/mgr/restful/module.py
+lib/ceph/mgr/restful/common.py
+lib/ceph/mgr/restful/__init__.py
+lib/ceph/mgr/restful/api/request.py
+lib/ceph/mgr/restful/api/config.py
+lib/ceph/mgr/restful/api/doc.py
+lib/ceph/mgr/restful/api/crush.py
+lib/ceph/mgr/restful/api/pool.py
+lib/ceph/mgr/restful/api/osd.py
+lib/ceph/mgr/restful/api/server.py
+lib/ceph/mgr/restful/api/mon.py
+lib/ceph/mgr/restful/api/__init__.py
+lib/ceph/mgr/restful/hooks.py
+lib/ceph/mgr/restful/decorators.py
+lib/ceph/mgr/dashboard/HACKING.rst
+lib/ceph/mgr/dashboard/static/Ceph_Logo_Standard_RGB_White_120411_fa.png
+lib/ceph/mgr/dashboard/static/logo-mini.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/.gitignore
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/composer.json
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/documentation/index.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/documentation/build/include/license.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/documentation/build/include/dependencies.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/documentation/build/include/layout.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/documentation/build/include/download.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/documentation/build/include/implementations.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/documentation/build/include/adminlte-options.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/documentation/build/include/upgrade.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/documentation/build/include/advice.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/documentation/build/include/browsers.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/documentation/build/include/plugins.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/documentation/build/include/faq.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/documentation/build/include/introduction.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/documentation/build/include/components.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/documentation/build/index.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/documentation/docs.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/documentation/style.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/bower.json
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/index2.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/.jshintrc
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/package.json
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/pages/layout/boxed.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/pages/layout/collapsed-sidebar.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/pages/layout/fixed.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/pages/layout/top-nav.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/pages/widgets.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/pages/charts/flot.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/pages/charts/chartjs.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/pages/charts/inline.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/pages/charts/morris.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/pages/forms/advanced.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/pages/forms/editors.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/pages/forms/general.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/pages/examples/register.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/pages/examples/404.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/pages/examples/invoice.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/pages/examples/login.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/pages/examples/blank.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/pages/examples/pace.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/pages/examples/lockscreen.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/pages/examples/profile.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/pages/examples/500.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/pages/examples/invoice-print.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/pages/calendar.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/pages/tables/simple.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/pages/tables/data.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/pages/UI/icons.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/pages/UI/timeline.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/pages/UI/modals.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/pages/UI/general.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/pages/UI/sliders.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/pages/UI/buttons.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/pages/mailbox/compose.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/pages/mailbox/read-mail.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/pages/mailbox/mailbox.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/img/user1-128x128.jpg
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/img/avatar3.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/img/user3-128x128.jpg
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/img/default-50x50.gif
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/img/photo1.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/img/user5-128x128.jpg
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/img/photo4.jpg
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/img/photo3.jpg
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/img/user2-160x160.jpg
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/img/boxed-bg.jpg
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/img/avatar.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/img/user8-128x128.jpg
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/img/avatar04.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/img/user7-128x128.jpg
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/img/avatar5.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/img/avatar2.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/img/user4-128x128.jpg
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/img/photo2.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/img/user6-128x128.jpg
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/img/icons.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/img/credit/paypal2.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/img/credit/mestro.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/img/credit/cirrus.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/img/credit/mastercard.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/img/credit/paypal.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/img/credit/american-express.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/img/credit/visa.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/img/boxed-bg.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/js/demo.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/js/pages/dashboard2.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/js/pages/dashboard.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/js/app.min.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/js/app.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/css/AdminLTE.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/css/skins/skin-black.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/css/skins/skin-yellow.min.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/css/skins/skin-green.min.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/css/skins/skin-red-light.min.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/css/skins/skin-black.min.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/css/skins/skin-red.min.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/css/skins/skin-blue.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/css/skins/skin-green-light.min.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/css/skins/skin-yellow-light.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/css/skins/skin-black-light.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/css/skins/skin-purple-light.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/css/skins/_all-skins.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/css/skins/skin-green-light.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/css/skins/skin-blue-light.min.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/css/skins/skin-yellow-light.min.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/css/skins/skin-purple-light.min.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/css/skins/_all-skins.min.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/css/skins/skin-blue-light.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/css/skins/skin-red.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/css/skins/skin-yellow.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/css/skins/skin-purple.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/css/skins/skin-green.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/css/skins/skin-black-light.min.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/css/skins/skin-blue.min.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/css/skins/skin-red-light.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/css/skins/skin-purple.min.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/dist/css/AdminLTE.min.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/bootstrap-slider/bootstrap-slider.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/bootstrap-slider/slider.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/sparkline/jquery.sparkline.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/sparkline/jquery.sparkline.min.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/select2.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/select2.full.min.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/select2.min.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/select2.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/i18n/zh-TW.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/i18n/en.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/i18n/vi.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/i18n/zh-CN.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/i18n/ko.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/i18n/pl.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/i18n/km.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/i18n/nb.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/i18n/it.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/i18n/ru.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/i18n/he.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/i18n/sr.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/i18n/tr.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/i18n/el.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/i18n/mk.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/i18n/hr.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/i18n/fr.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/i18n/ar.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/i18n/fa.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/i18n/sv.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/i18n/hu.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/i18n/id.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/i18n/is.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/i18n/nl.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/i18n/pt.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/i18n/gl.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/i18n/eu.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/i18n/et.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/i18n/sk.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/i18n/ms.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/i18n/cs.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/i18n/lt.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/i18n/de.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/i18n/lv.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/i18n/hi.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/i18n/pt-BR.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/i18n/th.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/i18n/fi.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/i18n/ro.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/i18n/es.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/i18n/uk.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/i18n/az.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/i18n/sr-Cyrl.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/i18n/ja.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/i18n/da.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/i18n/ca.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/i18n/bg.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/select2.full.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/select2/select2.min.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/bootstrap-datepicker.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/datepicker3.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.ja.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.pt-BR.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.ca.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.da.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.bg.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.sl.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.es.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.kr.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.az.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.no.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.lv.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.th.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.ro.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.fi.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.nl-BE.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.ka.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.pt.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.nl.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.gl.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.ms.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.sk.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.et.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.de.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.lt.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.cs.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.hu.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.kk.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.rs.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.id.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.is.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.zh-CN.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.sw.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.cy.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.fa.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.zh-TW.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.sv.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.ru.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.it.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.nb.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.pl.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.tr.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.he.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.mk.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.hr.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.el.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.ar.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.fr.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.rs-latin.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.sq.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.vi.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datepicker/locales/bootstrap-datepicker.ua.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.min.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ionslider/ion.rangeSlider.min.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ionslider/img/sprite-skin-nice.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ionslider/img/sprite-skin-flat.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ionslider/ion.rangeSlider.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ionslider/ion.rangeSlider.skinFlat.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ionslider/ion.rangeSlider.skinNice.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/slimScroll/jquery.slimscroll.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/slimScroll/jquery.slimscroll.min.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/pace/pace.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/pace/pace.min.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/pace/pace.min.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/pace/pace.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/jQuery/jquery-2.2.3.min.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/morris/morris.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/morris/morris.min.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/morris/morris.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/colorpicker/img/hue-horizontal.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/colorpicker/img/hue.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/colorpicker/img/saturation.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/colorpicker/img/alpha.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/colorpicker/img/alpha-horizontal.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/colorpicker/bootstrap-colorpicker.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/colorpicker/bootstrap-colorpicker.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/colorpicker/bootstrap-colorpicker.min.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/colorpicker/bootstrap-colorpicker.min.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/skins/moono/editor.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/skins/moono/dialog_ie.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/skins/moono/editor_ie.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/skins/moono/icons.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/skins/moono/images/lock-open.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/skins/moono/images/refresh.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/skins/moono/images/lock.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/skins/moono/images/arrow.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/skins/moono/images/close.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/skins/moono/images/hidpi/close.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/skins/moono/images/hidpi/refresh.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/skins/moono/images/hidpi/lock.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/skins/moono/images/hidpi/lock-open.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/skins/moono/images/spinner.gif
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/skins/moono/readme.md
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/skins/moono/editor_ie7.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/skins/moono/dialog.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/skins/moono/icons_hidpi.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/skins/moono/editor_iequirks.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/skins/moono/dialog_ie7.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/skins/moono/editor_ie8.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/skins/moono/editor_gecko.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/skins/moono/dialog_iequirks.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/skins/moono/dialog_ie8.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/adapters/jquery.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/styles.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/old/sample.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/old/inlinetextarea.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/old/assets/outputxhtml/outputxhtml.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/old/assets/inlineall/logo.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/old/assets/posteddata.php
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/old/assets/uilanguages/languages.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/old/assets/sample.jpg
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/old/inlinebycode.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/old/api.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/old/index.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/old/magicline/magicline.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/old/sample_posteddata.php
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/old/replacebyclass.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/old/divreplace.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/old/enterkey/enterkey.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/old/uicolor.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/old/uilanguages.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/old/jquery.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/old/ajax.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/old/replacebycode.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/old/toolbar/toolbar.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/old/datafiltering.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/old/readonly.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/old/appendto.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/old/inlineall.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/old/wysiwygarea/fullpage.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/old/htmlwriter/outputforflash.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/old/htmlwriter/assets/outputforflash/outputforflash.swf
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/old/htmlwriter/assets/outputforflash/swfobject.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/old/htmlwriter/assets/outputforflash/outputforflash.fla
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/old/htmlwriter/outputhtml.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/old/tabindex.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/old/sample.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/old/dialog/assets/my_dialog.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/old/dialog/dialog.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/old/xhtmlstyle.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/js/sample.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/js/sf.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/toolbarconfigurator/index.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/toolbarconfigurator/js/fulltoolbareditor.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/toolbarconfigurator/js/abstracttoolbarmodifier.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/toolbarconfigurator/js/toolbartextmodifier.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/toolbarconfigurator/js/toolbarmodifier.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/toolbarconfigurator/css/fontello.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/toolbarconfigurator/font/config.json
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/toolbarconfigurator/font/fontello.ttf
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/toolbarconfigurator/font/LICENSE.txt
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/toolbarconfigurator/font/fontello.woff
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/toolbarconfigurator/font/fontello.eot
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/toolbarconfigurator/font/fontello.svg
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/toolbarconfigurator/lib/codemirror/LICENSE
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/toolbarconfigurator/lib/codemirror/neo.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/toolbarconfigurator/lib/codemirror/javascript.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/img/header-bg.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/img/logo.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/img/navigation-tip.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/img/header-separator.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/img/github-top.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/index.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/samples/css/samples.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/ckeditor.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/eo.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/vi.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/ko.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/en-ca.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/af.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/sq.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/bn.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/en.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/mk.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/hr.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/gu.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/el.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/ar.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/fr.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/it.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/ru.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/pl.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/km.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/nb.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/tr.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/he.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/sr.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/ug.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/fa.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/sv.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/mn.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/pt-br.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/cy.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/is.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/fr-ca.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/hu.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/tt.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/id.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/sk.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/ms.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/et.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/de.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/en-au.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/lt.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/cs.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/ku.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/nl.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/pt.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/eu.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/gl.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/th.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/sr-latn.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/hi.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/fi.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/ro.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/zh.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/ka.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/no.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/lv.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/si.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/de-ch.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/en-gb.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/sl.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/bs.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/es.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/uk.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/fo.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/bg.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/ja.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/ca.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/zh-cn.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/lang/da.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/README.md
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/build-config.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/contents.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/config.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/CHANGES.md
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/icons_hidpi.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/tabletools/dialogs/tableCell.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/th.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/zh.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/no.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/si.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/et.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/de.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/gl.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/eu.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/fo.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/ja.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/da.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/de-ch.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/es.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/en-gb.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/el.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/km.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/sr-latn.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/it.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/sr.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/he.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/ko.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/af.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/en.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/sq.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/tt.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/fr-ca.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/id.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/sv.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/clipboard/dialogs/paste.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/about/dialogs/logo_ckeditor.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/about/dialogs/hidpi/logo_ckeditor.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/about/dialogs/about.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/magicline/images/icon.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/magicline/images/hidpi/icon.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/magicline/images/hidpi/icon-rtl.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/magicline/images/icon-rtl.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/link/images/anchor.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/link/images/hidpi/anchor.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/link/dialogs/anchor.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/link/dialogs/link.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/pastefromword/filter/default.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/scayt/README.md
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/scayt/LICENSE.md
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/scayt/CHANGELOG.md
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/scayt/dialogs/toolbar.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/scayt/dialogs/options.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/table/dialogs/table.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/icons.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/wsc/LICENSE.md
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/wsc/dialogs/ciframe.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/wsc/dialogs/wsc.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/wsc/dialogs/wsc.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/wsc/dialogs/wsc_ie.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/wsc/README.md
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/image/dialogs/image.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/image/images/noimage.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/specialchar.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/fi.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/zh.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/th.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/si.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/no.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/lv.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/de.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/cs.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/lt.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/sk.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/et.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/eu.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/gl.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/ku.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/nl.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/pt.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/bg.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/ca.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/en-gb.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/da.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/de-ch.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/ja.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/uk.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/sl.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/es.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/ar.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/fr.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/hr.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/el.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/tr.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/he.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/it.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/ru.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/pl.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/km.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/nb.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/ko.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/eo.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/vi.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/sq.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/en.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/af.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/id.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/hu.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/tt.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/sv.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/ug.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/fa.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/cy.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/specialchar/dialogs/lang/fr-ca.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/plugins/dialog/dialogDefinition.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/ckeditor/LICENSE.md
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/timepicker/bootstrap-timepicker.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/timepicker/bootstrap-timepicker.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/timepicker/bootstrap-timepicker.min.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/timepicker/bootstrap-timepicker.min.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/fastclick/fastclick.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/fastclick/fastclick.min.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/fullcalendar/fullcalendar.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/fullcalendar/fullcalendar.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/fullcalendar/fullcalendar.min.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/fullcalendar/fullcalendar.min.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/fullcalendar/fullcalendar.print.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/Responsive/License.txt
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/Responsive/examples/child-rows/column-control.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/Responsive/examples/child-rows/index.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/Responsive/examples/child-rows/custom-renderer.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/Responsive/examples/child-rows/disable-child-rows.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/Responsive/examples/child-rows/right-column.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/Responsive/examples/child-rows/whole-row-control.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/Responsive/examples/index.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/Responsive/examples/display-control/index.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/Responsive/examples/display-control/classes.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/Responsive/examples/display-control/init-classes.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/Responsive/examples/display-control/auto.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/Responsive/examples/display-control/complexHeader.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/Responsive/examples/display-control/fixedHeader.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/Responsive/examples/styling/index.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/Responsive/examples/styling/bootstrap.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/Responsive/examples/styling/foundation.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/Responsive/examples/styling/compact.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/Responsive/examples/styling/scrolling.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/Responsive/examples/initialisation/default.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/Responsive/examples/initialisation/new.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/Responsive/examples/initialisation/index.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/Responsive/examples/initialisation/ajax.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/Responsive/examples/initialisation/option.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/Responsive/examples/initialisation/className.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/Responsive/Readme.md
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/Responsive/js/dataTables.responsive.min.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/Responsive/js/dataTables.responsive.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/Responsive/css/dataTables.responsive.scss
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/Responsive/css/dataTables.responsive.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/ColReorder/Readme.md
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/ColReorder/images/insert.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/ColReorder/License.txt
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/ColReorder/js/dataTables.colReorder.min.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/ColReorder/js/dataTables.colReorder.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/ColReorder/css/dataTables.colReorder.min.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/ColReorder/css/dataTables.colReorder.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/ColReorder/examples/colvis.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/ColReorder/examples/server_side.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/ColReorder/examples/realtime.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/ColReorder/examples/fixedcolumns.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/ColReorder/examples/predefined.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/ColReorder/examples/scrolling.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/ColReorder/examples/index.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/ColReorder/examples/reset.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/ColReorder/examples/state_save.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/ColReorder/examples/jqueryui.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/ColReorder/examples/col_filter.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/ColReorder/examples/simple.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/ColReorder/examples/new_init.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/ColReorder/examples/alt_insert.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/ColReorder/examples/fixedheader.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/KeyTable/css/dataTables.keyTable.min.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/KeyTable/css/dataTables.keyTable.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/KeyTable/js/dataTables.keyTable.min.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/KeyTable/js/dataTables.keyTable.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/KeyTable/Readme.txt
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/KeyTable/examples/events.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/KeyTable/examples/simple.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/KeyTable/examples/index.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/KeyTable/examples/html.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/KeyTable/examples/scrolling.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/AutoFill/Readme.txt
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/AutoFill/css/dataTables.autoFill.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/AutoFill/css/dataTables.autoFill.min.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/AutoFill/js/dataTables.autoFill.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/AutoFill/js/dataTables.autoFill.min.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/AutoFill/images/filler.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/AutoFill/examples/scrolling.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/AutoFill/examples/fill-both.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/AutoFill/examples/index.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/AutoFill/examples/step-callback.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/AutoFill/examples/simple.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/AutoFill/examples/complete-callback.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/AutoFill/examples/columns.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/AutoFill/examples/fill-horizontal.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/FixedHeader/Readme.txt
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/FixedHeader/css/dataTables.fixedHeader.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/FixedHeader/css/dataTables.fixedHeader.min.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/FixedHeader/examples/two_tables.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/FixedHeader/examples/simple.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/FixedHeader/examples/index.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/FixedHeader/examples/zIndexes.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/FixedHeader/examples/top_left_right.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/FixedHeader/examples/header_footer.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/FixedHeader/js/dataTables.fixedHeader.min.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/FixedHeader/js/dataTables.fixedHeader.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/FixedColumns/js/dataTables.fixedColumns.min.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/FixedColumns/js/dataTables.fixedColumns.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/FixedColumns/examples/index.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/FixedColumns/examples/two_columns.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/FixedColumns/examples/size_fluid.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/FixedColumns/examples/rowspan.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/FixedColumns/examples/server-side-processing.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/FixedColumns/examples/colvis.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/FixedColumns/examples/size_fixed.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/FixedColumns/examples/css_size.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/FixedColumns/examples/right_column.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/FixedColumns/examples/col_filter.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/FixedColumns/examples/index_column.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/FixedColumns/examples/simple.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/FixedColumns/examples/left_right_columns.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/FixedColumns/examples/bootstrap.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/FixedColumns/License.txt
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/FixedColumns/css/dataTables.fixedColumns.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/FixedColumns/css/dataTables.fixedColumns.min.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/FixedColumns/Readme.md
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/Scroller/examples/data/ssp.php
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/Scroller/examples/data/2500.txt
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/Scroller/examples/large_js_source.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/Scroller/examples/simple.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/Scroller/examples/state_saving.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/Scroller/examples/index.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/Scroller/examples/api_scrolling.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/Scroller/examples/server-side_processing.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/Scroller/css/dataTables.scroller.min.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/Scroller/css/dataTables.scroller.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/Scroller/Readme.txt
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/Scroller/images/loading-background.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/Scroller/js/dataTables.scroller.min.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/Scroller/js/dataTables.scroller.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/TableTools/images/copy.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/TableTools/images/xls.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/TableTools/images/xls_hover.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/TableTools/images/csv.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/TableTools/images/collection_hover.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/TableTools/images/pdf.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/TableTools/images/copy_hover.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/TableTools/images/pdf_hover.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/TableTools/images/print.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/TableTools/images/print_hover.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/TableTools/images/psd/collection.psd
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/TableTools/images/psd/file_types.psd
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/TableTools/images/psd/copy document.psd
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/TableTools/images/psd/printer.psd
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/TableTools/images/collection.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/TableTools/images/csv_hover.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/TableTools/swf/copy_csv_xls.swf
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/TableTools/swf/copy_csv_xls_pdf.swf
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/TableTools/css/dataTables.tableTools.min.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/TableTools/css/dataTables.tableTools.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/TableTools/examples/plug-in.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/TableTools/examples/index.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/TableTools/examples/select_column.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/TableTools/examples/select_single.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/TableTools/examples/multi_instance.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/TableTools/examples/ajax.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/TableTools/examples/button_text.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/TableTools/examples/defaults.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/TableTools/examples/alter_buttons.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/TableTools/examples/simple.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/TableTools/examples/pdf_message.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/TableTools/examples/select_os.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/TableTools/examples/bootstrap.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/TableTools/examples/jqueryui.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/TableTools/examples/multiple_tables.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/TableTools/examples/swf_path.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/TableTools/examples/collection.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/TableTools/examples/new_init.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/TableTools/examples/select_multi.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/TableTools/js/dataTables.tableTools.min.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/TableTools/js/dataTables.tableTools.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/TableTools/Readme.md
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/ColVis/examples/exclude_columns.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/ColVis/examples/mouseover.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/ColVis/examples/restore.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/ColVis/examples/two_tables.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/ColVis/examples/title_callback.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/ColVis/examples/new_init.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/ColVis/examples/text.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/ColVis/examples/two_tables_identical.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/ColVis/examples/group_columns.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/ColVis/examples/index.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/ColVis/examples/simple.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/ColVis/examples/button_order.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/ColVis/examples/jqueryui.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/ColVis/css/dataTables.colVis.min.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/ColVis/css/dataTables.colvis.jqueryui.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/ColVis/css/dataTables.colVis.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/ColVis/License.txt
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/ColVis/Readme.md
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/ColVis/js/dataTables.colVis.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/extensions/ColVis/js/dataTables.colVis.min.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/dataTables.bootstrap.min.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/images/sort_asc.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/images/sort_both.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/images/sort_desc_disabled.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/images/sort_desc.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/images/sort_asc_disabled.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/jquery.dataTables.min.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/dataTables.bootstrap.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/jquery.dataTables.min.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/jquery.dataTables.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/dataTables.bootstrap.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/jquery.dataTables_themeroller.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/datatables/jquery.dataTables.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/line/green.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/line/_all.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/line/grey.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/line/blue.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/line/aero.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/line/yellow.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/line/purple.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/line/orange.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/line/line@2x.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/line/pink.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/line/line.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/line/line.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/line/red.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/square/purple.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/square/yellow.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/square/green@2x.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/square/orange@2x.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/square/pink.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/square/yellow@2x.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/square/pink.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/square/purple.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/square/yellow.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/square/square@2x.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/square/square.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/square/green.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/square/red.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/square/green.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/square/square.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/square/red@2x.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/square/red.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/square/blue@2x.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/square/_all.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/square/grey@2x.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/square/orange.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/square/pink@2x.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/square/grey.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/square/aero.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/square/blue.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/square/purple@2x.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/square/grey.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/square/blue.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/square/aero.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/square/aero@2x.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/square/orange.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/minimal/grey.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/minimal/aero@2x.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/minimal/blue.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/minimal/aero.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/minimal/yellow@2x.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/minimal/minimal.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/minimal/grey@2x.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/minimal/minimal.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/minimal/orange@2x.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/minimal/pink@2x.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/minimal/grey.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/minimal/aero.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/minimal/blue.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/minimal/green.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/minimal/orange.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/minimal/orange.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/minimal/green.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/minimal/_all.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/minimal/blue@2x.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/minimal/purple.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/minimal/yellow.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/minimal/minimal@2x.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/minimal/green@2x.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/minimal/red.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/minimal/purple.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/minimal/red.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/minimal/yellow.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/minimal/red@2x.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/minimal/pink.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/minimal/purple@2x.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/minimal/pink.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/icheck.min.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/futurico/futurico.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/futurico/futurico.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/futurico/futurico@2x.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/icheck.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/polaris/polaris@2x.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/polaris/polaris.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/polaris/polaris.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/all.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/flat/purple@2x.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/flat/red@2x.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/flat/red.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/flat/red.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/flat/pink.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/flat/purple.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/flat/yellow.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/flat/flat.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/flat/green@2x.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/flat/purple.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/flat/pink.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/flat/flat.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/flat/yellow.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/flat/orange.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/flat/aero.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/flat/blue@2x.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/flat/blue.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/flat/grey.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/flat/blue.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/flat/aero.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/flat/orange.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/flat/grey.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/flat/green.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/flat/orange@2x.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/flat/pink@2x.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/flat/_all.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/flat/grey@2x.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/flat/flat@2x.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/flat/aero@2x.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/flat/green.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/iCheck/flat/yellow@2x.png
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/chartjs/Chart.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/chartjs/Chart.min.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/flot/jquery.flot.navigate.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/flot/jquery.flot.selection.min.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/flot/jquery.flot.symbol.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/flot/jquery.flot.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/flot/jquery.flot.categories.min.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/flot/jquery.flot.image.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/flot/jquery.flot.resize.min.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/flot/jquery.flot.symbol.min.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/flot/jquery.flot.fillbetween.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/flot/excanvas.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/flot/jquery.flot.stack.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/flot/jquery.flot.fillbetween.min.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/flot/jquery.flot.selection.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/flot/jquery.colorhelpers.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/flot/jquery.flot.time.min.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/flot/jquery.flot.errorbars.min.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/flot/jquery.flot.time.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/flot/jquery.flot.canvas.min.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/flot/jquery.flot.pie.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/flot/jquery.flot.errorbars.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/flot/jquery.flot.categories.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/flot/excanvas.min.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/flot/jquery.flot.resize.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/flot/jquery.flot.threshold.min.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/flot/jquery.flot.pie.min.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/flot/jquery.flot.crosshair.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/flot/jquery.flot.min.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/flot/jquery.flot.crosshair.min.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/flot/jquery.colorhelpers.min.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/flot/jquery.flot.image.min.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/flot/jquery.flot.threshold.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/flot/jquery.flot.canvas.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/flot/jquery.flot.navigate.min.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/flot/jquery.flot.stack.min.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/input-mask/phone-codes/readme.txt
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/input-mask/phone-codes/phone-be.json
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/input-mask/phone-codes/phone-codes.json
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/input-mask/jquery.inputmask.numeric.extensions.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/input-mask/jquery.inputmask.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/input-mask/jquery.inputmask.phone.extensions.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/input-mask/jquery.inputmask.regex.extensions.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/input-mask/jquery.inputmask.extensions.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/input-mask/jquery.inputmask.date.extensions.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/knob/jquery.knob.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/jvectormap/jquery-jvectormap-1.2.2.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/jvectormap/jquery-jvectormap-world-mill-en.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/jvectormap/jquery-jvectormap-1.2.2.min.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/jvectormap/jquery-jvectormap-usa-en.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/daterangepicker/daterangepicker.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/daterangepicker/daterangepicker.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/daterangepicker/moment.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/daterangepicker/moment.min.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/jQueryUI/jquery-ui.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/plugins/jQueryUI/jquery-ui.min.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/LICENSE
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/changelog.md
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/README.md
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/bootstrap-less/mixins.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/bootstrap-less/mixins/nav-divider.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/bootstrap-less/mixins/size.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/bootstrap-less/mixins/table-row.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/bootstrap-less/mixins/reset-filter.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/bootstrap-less/mixins/labels.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/bootstrap-less/mixins/buttons.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/bootstrap-less/mixins/image.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/bootstrap-less/mixins/progress-bar.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/bootstrap-less/mixins/grid.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/bootstrap-less/mixins/alerts.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/bootstrap-less/mixins/list-group.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/bootstrap-less/mixins/reset-text.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/bootstrap-less/mixins/vendor-prefixes.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/bootstrap-less/mixins/resize.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/bootstrap-less/mixins/background-variant.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/bootstrap-less/mixins/responsive-visibility.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/bootstrap-less/mixins/text-overflow.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/bootstrap-less/mixins/pagination.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/bootstrap-less/mixins/clearfix.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/bootstrap-less/mixins/opacity.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/bootstrap-less/mixins/text-emphasis.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/bootstrap-less/mixins/forms.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/bootstrap-less/mixins/nav-vertical-align.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/bootstrap-less/mixins/grid-framework.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/bootstrap-less/mixins/center-block.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/bootstrap-less/mixins/panels.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/bootstrap-less/mixins/gradients.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/bootstrap-less/mixins/hide-text.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/bootstrap-less/mixins/border-radius.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/bootstrap-less/mixins/tab-focus.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/bootstrap-less/variables.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/select2.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/alerts.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/boxes.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/control-sidebar.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/mixins.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/info-box.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/timeline.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/header.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/miscellaneous.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/dropdown.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/modal.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/.csslintrc
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/small-box.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/login_and_register.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/callout.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/carousel.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/labels.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/variables.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/navs.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/sidebar.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/fullcalendar.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/social-widgets.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/AdminLTE.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/invoice.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/progress-bars.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/print.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/buttons.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/skins/skin-purple-light.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/skins/skin-blue.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/skins/skin-blue-light.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/skins/skin-red-light.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/skins/skin-green.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/skins/skin-yellow-light.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/skins/_all-skins.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/skins/skin-purple.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/skins/skin-green-light.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/skins/skin-black-light.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/skins/skin-black.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/skins/skin-yellow.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/skins/skin-red.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/sidebar-mini.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/table.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/profile.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/users-list.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/mailbox.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/direct-chat.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/core.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/forms.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/bootstrap-social.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/products.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/lockscreen.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/build/less/404_500_errors.less
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/bootstrap/js/npm.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/bootstrap/js/bootstrap.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/bootstrap/js/bootstrap.min.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/bootstrap/fonts/glyphicons-halflings-regular.eot
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/bootstrap/fonts/glyphicons-halflings-regular.woff2
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/bootstrap/fonts/glyphicons-halflings-regular.svg
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/bootstrap/fonts/glyphicons-halflings-regular.ttf
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/bootstrap/fonts/glyphicons-halflings-regular.woff
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/bootstrap/css/bootstrap.min.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/bootstrap/css/bootstrap.min.css.map
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/bootstrap/css/bootstrap.css.map
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/bootstrap/css/bootstrap.css
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/starter.html
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/Gruntfile.js
+lib/ceph/mgr/dashboard/static/AdminLTE-2.3.7/index.html
+lib/ceph/mgr/dashboard/static/favicon.ico
+lib/ceph/mgr/dashboard/static/rivets.bundled.min.js
+lib/ceph/mgr/dashboard/static/underscore-min.js
+lib/ceph/mgr/dashboard/servers.html
+lib/ceph/mgr/dashboard/rbd.html
+lib/ceph/mgr/dashboard/clients.html
+lib/ceph/mgr/dashboard/osd_perf.html
+lib/ceph/mgr/dashboard/remote_view_cache.py
+lib/ceph/mgr/dashboard/rbd_ls.py
+lib/ceph/mgr/dashboard/base.html
+lib/ceph/mgr/dashboard/health.html
+lib/ceph/mgr/dashboard/osds.html
+lib/ceph/mgr/dashboard/cephfs_clients.py
+lib/ceph/mgr/dashboard/module.py
+lib/ceph/mgr/dashboard/README.rst
+lib/ceph/mgr/dashboard/filesystem.html
+lib/ceph/mgr/dashboard/types.py
+lib/ceph/mgr/dashboard/__init__.py
+lib/ceph/mgr/zabbix/module.py
+lib/ceph/mgr/zabbix/zabbix_template.xml
+lib/ceph/mgr/zabbix/__init__.py
 lib/ceph/mgr/mgr_module.py
-lib/ceph/mgr/rest/__init__.py
-lib/ceph/mgr/rest/app/__init__.py
-lib/ceph/mgr/rest/app/fixtures/ceph_fake.json
-lib/ceph/mgr/rest/app/management/__init__.py
-lib/ceph/mgr/rest/app/management/commands/__init__.py
-lib/ceph/mgr/rest/app/management/commands/api_docs.py
-lib/ceph/mgr/rest/app/manager/__init__.py
-lib/ceph/mgr/rest/app/manager/osd_request_factory.py
-lib/ceph/mgr/rest/app/manager/pool_request_factory.py
-lib/ceph/mgr/rest/app/manager/request_collection.py
-lib/ceph/mgr/rest/app/manager/request_factory.py
-lib/ceph/mgr/rest/app/manager/user_request.py
-lib/ceph/mgr/rest/app/models.py
-lib/ceph/mgr/rest/app/serializers/__init__.py
-lib/ceph/mgr/rest/app/serializers/fields.py
-lib/ceph/mgr/rest/app/serializers/v2.py
-lib/ceph/mgr/rest/app/settings.py
-lib/ceph/mgr/rest/app/types.py
-lib/ceph/mgr/rest/app/urls/__init__.py
-lib/ceph/mgr/rest/app/urls/v2.py
-lib/ceph/mgr/rest/app/util.py
-lib/ceph/mgr/rest/app/views/__init__.py
-lib/ceph/mgr/rest/app/views/paginated_mixin.py
-lib/ceph/mgr/rest/app/views/rpc_view.py
-lib/ceph/mgr/rest/app/views/v2.py
-lib/ceph/mgr/rest/logger.py
-lib/ceph/mgr/rest/module.py
 lib/librados.so
 lib/librados.so.2
 lib/librados.so.2.0.0
@@ -230,6 +1291,9 @@ lib/rados-classes/libcls_replica_log.so.1.0.0
 lib/rados-classes/libcls_rgw.so
 lib/rados-classes/libcls_rgw.so.1
 lib/rados-classes/libcls_rgw.so.1.0.0
+lib/rados-classes/libcls_sdk.so
+lib/rados-classes/libcls_sdk.so.1
+lib/rados-classes/libcls_sdk.so.1.0.0
 lib/rados-classes/libcls_statelog.so
 lib/rados-classes/libcls_statelog.so.1
 lib/rados-classes/libcls_statelog.so.1.0.0
@@ -272,8 +1336,8 @@ man/man8/rados.8.gz
 man/man8/radosgw-admin.8.gz
 man/man8/radosgw.8.gz
 man/man8/rbd-fuse.8.gz
+man/man8/rbd-ggate.8.gz
 man/man8/rbd-mirror.8.gz
-man/man8/rbd-nbd.8.gz
 man/man8/rbd-replay-many.8.gz
 man/man8/rbd-replay-prep.8.gz
 man/man8/rbd-replay.8.gz
@@ -285,6 +1349,13 @@ sbin/mount.fuse.ceph
 %%DATADIR%%/id_rsa_drop.ceph.com
 %%DATADIR%%/id_rsa_drop.ceph.com.pub
 %%DATADIR%%/known_hosts_drop.ceph.com
+@owner root
+@group wheel
+@mode 755
+@dir /var/lib
+@owner 167
+@group 167
+@mode 750
 @dir /var/lib/ceph/bootstrap-mds
 @dir /var/lib/ceph/bootstrap-osd
 @dir /var/lib/ceph/bootstrap-rgw
@@ -296,6 +1367,5 @@ sbin/mount.fuse.ceph
 @dir /var/lib/ceph/tmp
 @dir /var/lib/ceph/radosgw
 @dir /var/lib/ceph
-@dir /var/lib
 @dir /var/log/ceph
 @dir /var/run/ceph
diff --git a/net/go-cs/Makefile b/net/go-cs/Makefile
index 5a104087094..8b9e344e56d 100644
--- a/net/go-cs/Makefile
+++ b/net/go-cs/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	go-cs
-PORTVERSION=	0.8
+PORTVERSION=	0.9
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net
 
diff --git a/net/go-cs/distinfo b/net/go-cs/distinfo
index 4ed0262c64f..64ec5aa3a40 100644
--- a/net/go-cs/distinfo
+++ b/net/go-cs/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1499319273
-SHA256 (akosela-go-cs-v0.8_GH0.tar.gz) = 92d3365811cab2b67450f7dc768b4d406d65db2c3aa106e7a84f93af26b0d4c0
-SIZE (akosela-go-cs-v0.8_GH0.tar.gz) = 8646
+SHA256 (akosela-go-cs-v0.9_GH0.tar.gz) = 4e07fa2fc629a2c886e4430a10e69532a45d305c84fad12ca307abd2c8df7076
+SIZE (akosela-go-cs-v0.9_GH0.tar.gz) = 9278
diff --git a/net/go-nats/Makefile b/net/go-nats/Makefile
index 1801681a3aa..924ad8c24cc 100644
--- a/net/go-nats/Makefile
+++ b/net/go-nats/Makefile
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
-PORTNAME=	nats
+PORTNAME=	go-nats
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.2.2
+DISTVERSION=	1.3.0
 CATEGORIES=	net
-PKGNAMEPREFIX=	go-
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Go client for NATS
diff --git a/net/go-nats/distinfo b/net/go-nats/distinfo
index 2b9fe53e3db..ea44a58cabc 100644
--- a/net/go-nats/distinfo
+++ b/net/go-nats/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1477548721
-SHA256 (nats-io-nats-v1.2.2_GH0.tar.gz) = a5419ee989ef8044bbf4bda4e636deb25cfaddfc8efe078cecc59d9d8e5868ef
-SIZE (nats-io-nats-v1.2.2_GH0.tar.gz) = 80756
+TIMESTAMP = 1502451222
+SHA256 (nats-io-go-nats-v1.3.0_GH0.tar.gz) = 53c0b143b97074c8e5eee743121dc263098780aff1bd5a98b2cf229cc750525c
+SIZE (nats-io-go-nats-v1.3.0_GH0.tar.gz) = 89372
diff --git a/net/go-nats/pkg-plist b/net/go-nats/pkg-plist
index b1e978d8a66..73174fe5277 100644
--- a/net/go-nats/pkg-plist
+++ b/net/go-nats/pkg-plist
@@ -1,8 +1,11 @@
 %%GO_LIBDIR%%/%%GO_PKGNAME%%.a
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/LICENSE
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/README.md
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/bench/bench.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/bench/benchlib_test.go
-%%GO_SRCDIR%%/%%GO_PKGNAME%%/enc_test.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/context.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/enc.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/enc_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/encoders/builtin/default_enc.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/encoders/builtin/enc_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/encoders/builtin/gob_enc.go
@@ -20,13 +23,12 @@
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/examples/nats-req.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/examples/nats-rply.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/examples/nats-sub.go
-%%GO_SRCDIR%%/%%GO_PKGNAME%%/LICENSE
-%%GO_SRCDIR%%/%%GO_PKGNAME%%/nats_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/nats.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/nats_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/netchan.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/parser.go
-%%GO_SRCDIR%%/%%GO_PKGNAME%%/README.md
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/scripts/cov.sh
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/staticcheck.ignore
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/test/auth_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/test/basic_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/test/bench_test.go
@@ -38,6 +40,9 @@
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/test/configs/certs/server.pem
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/test/configs/tls.conf
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/test/configs/tlsverify.conf
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/test/context_test.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/timer.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/timer_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/test/conn_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/test/netchan_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/test/reconnect_test.go
diff --git a/net/openntpd/Makefile b/net/openntpd/Makefile
index 85285bfd7ad..cd2079c0f64 100644
--- a/net/openntpd/Makefile
+++ b/net/openntpd/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	openntpd
 PORTVERSION=	6.2p1
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	net
 MASTER_SITES=	OPENBSD/OpenNTPD
diff --git a/net/openntpd/files/patch-src_parse.y b/net/openntpd/files/patch-src_parse.y
new file mode 100644
index 00000000000..0f1a3b91213
--- /dev/null
+++ b/net/openntpd/files/patch-src_parse.y
@@ -0,0 +1,23 @@
+--- 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/opentracker/Makefile b/net/opentracker/Makefile
index 7ec43a2385d..06233f63352 100644
--- a/net/opentracker/Makefile
+++ b/net/opentracker/Makefile
@@ -1,11 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	opentracker
-PORTVERSION=	0.2010.05.30
-PORTREVISION=	1
+PORTVERSION=	0.2017.08.13
 CATEGORIES=	net
 MASTER_SITES=	http://www.bayofrum.net/dist/${PORTNAME}/ \
-		https://www.glenbarber.us/ports/net/${PORTNAME}/
 
 MAINTAINER=	crees@FreeBSD.org
 COMMENT=	Free lightweight bittorrent tracker using libowfat
diff --git a/net/opentracker/distinfo b/net/opentracker/distinfo
index 6e9c95c2451..fdd7b9ca979 100644
--- a/net/opentracker/distinfo
+++ b/net/opentracker/distinfo
@@ -1,2 +1,3 @@
-SHA256 (opentracker-0.2010.05.30.tar.bz2) = 53b111cafd101ead61fb2b26760935b66657e5eba9067e28115be325391ec0bc
-SIZE (opentracker-0.2010.05.30.tar.bz2) = 48228
+TIMESTAMP = 1502634309
+SHA256 (opentracker-0.2017.08.13.tar.bz2) = 3795a2aebaa4abc6d100e5cb510d2646a60624fb87cf770df547c0d8b428fe3e
+SIZE (opentracker-0.2017.08.13.tar.bz2) = 277504
diff --git a/net/opentracker/files/patch-Makefile b/net/opentracker/files/patch-Makefile
index d0fed3d54e6..8ec3d77678f 100644
--- a/net/opentracker/files/patch-Makefile
+++ b/net/opentracker/files/patch-Makefile
@@ -1,6 +1,8 @@
---- Makefile.orig	2010-05-30 16:16:13.000000000 +0100
-+++ Makefile	2010-05-30 16:17:20.000000000 +0100
-@@ -8,14 +8,14 @@
+diff --git a/Makefile b/Makefile
+index da2c8f1..9b16f13 100644
+--- Makefile
++++ Makefile
+@@ -8,14 +8,14 @@ CC?=gcc
  # LIBOWFAT_LIBRARY=$(PREFIX)/lib
  
  # BSD flavour
@@ -21,16 +23,16 @@
  
  BINDIR?=$(PREFIX)/bin
  
-@@ -35,7 +35,7 @@
- #FEATURES+=-DWANT_MODEST_FULLSCRAPES
+@@ -37,7 +37,7 @@ BINDIR?=$(PREFIX)/bin
  #FEATURES+=-DWANT_SPOT_WOODPECKER
  #FEATURES+=-DWANT_SYSLOGS
+ #FEATURES+=-DWANT_DEV_RANDOM
 -FEATURES+=-DWANT_FULLSCRAPE
 +#FEATURES+=-DWANT_FULLSCRAPE
  
  #FEATURES+=-D_DEBUG_HTTPERROR
  
-@@ -56,14 +56,13 @@
+@@ -59,7 +59,7 @@ OBJECTS_proxy_debug = $(SOURCES_proxy:%.c=%.debug.o)
  
  .SUFFIXES: .debug.o .o .c
  
@@ -39,10 +41,3 @@
  
  CFLAGS_production = $(CFLAGS) $(OPTS_production) $(FEATURES)
  CFLAGS_debug = $(CFLAGS) $(OPTS_debug) $(FEATURES)
- 
- $(BINARY): $(OBJECTS) $(HEADERS)
- 	$(CC) -o $@ $(OBJECTS) $(LDFLAGS)
--	strip $@
- $(BINARY).debug: $(OBJECTS_debug) $(HEADERS)
- 	$(CC) -o $@ $(OBJECTS_debug) $(LDFLAGS)
- proxy: $(OBJECTS_proxy) $(HEADERS)
diff --git a/net/opentracker/files/patch-ot_accesslist.c b/net/opentracker/files/patch-ot_accesslist.c
deleted file mode 100644
index 246499770a3..00000000000
--- a/net/opentracker/files/patch-ot_accesslist.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- ot_accesslist.c.orig	2010-11-04 17:34:00.000000000 -0700
-+++ ot_accesslist.c	2010-11-04 17:51:33.000000000 -0700
-@@ -54,8 +54,7 @@
-     return;
-   }
- 
--  /* No use to scan if there's not enough room for another full info_hash */
--  map_end = map + maplen - 40;
-+  map_end = map + maplen;
-   read_offs = map;
- 
-   /* We do ignore anything that is not of the form "^[:xdigit:]{40}[^:xdigit:].*" */
diff --git a/net/p5-Net-SIP/Makefile b/net/p5-Net-SIP/Makefile
index 9e29840dc50..4de42a12773 100644
--- a/net/p5-Net-SIP/Makefile
+++ b/net/p5-Net-SIP/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Net-SIP
-PORTVERSION=	0.809
+PORTVERSION=	0.810
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-SIP/distinfo b/net/p5-Net-SIP/distinfo
index 4468bc80e4d..06fafc8eac9 100644
--- a/net/p5-Net-SIP/distinfo
+++ b/net/p5-Net-SIP/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1489571944
-SHA256 (Net-SIP-0.809.tar.gz) = c3e3b405f37e87ade71cc431f6a2d73807f67154711a3e1e2fb4ee812d500d93
-SIZE (Net-SIP-0.809.tar.gz) = 200525
+TIMESTAMP = 1502473916
+SHA256 (Net-SIP-0.810.tar.gz) = 2f7b4afaa77b7edb9a4acd7f1291ea543a2dde7b9deeac540e7ce74c3d182558
+SIZE (Net-SIP-0.810.tar.gz) = 201508
diff --git a/net/p5-Net-Server/Makefile b/net/p5-Net-Server/Makefile
index 0d8f4fbf78c..db1f5a3012e 100644
--- a/net/p5-Net-Server/Makefile
+++ b/net/p5-Net-Server/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Net-Server
-PORTVERSION=	2.008
-PORTREVISION=	3
+PORTVERSION=	2.009
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -13,12 +12,14 @@ COMMENT=	Configurable base class for writing internet servers in Perl
 
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-IO-Multiplex>=1.01:devel/p5-IO-Multiplex
+BUILD_DEPENDS=	p5-IO-Multiplex>=1.05:devel/p5-IO-Multiplex
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	IPV6
 
+NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure
 
diff --git a/net/p5-Net-Server/distinfo b/net/p5-Net-Server/distinfo
index 965c993b9cc..2d7f596cde0 100644
--- a/net/p5-Net-Server/distinfo
+++ b/net/p5-Net-Server/distinfo
@@ -1,2 +1,3 @@
-SHA256 (Net-Server-2.008.tar.gz) = 0921056aedc871a59c4b76f58764f0e0a16c1816b58c366a9d80e46367744fa0
-SIZE (Net-Server-2.008.tar.gz) = 119565
+TIMESTAMP = 1502473930
+SHA256 (Net-Server-2.009.tar.gz) = 8267c6560355e2e0f483d3cc16195f342f32fe13cae9dde75a0a1ece5e9a813f
+SIZE (Net-Server-2.009.tar.gz) = 146781
diff --git a/net/py-cloudflare-scrape/Makefile b/net/py-cloudflare-scrape/Makefile
index ef22a43446a..373f7da6f54 100644
--- a/net/py-cloudflare-scrape/Makefile
+++ b/net/py-cloudflare-scrape/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cloudflare-scrape
-PORTVERSION=	1.8.0
+PORTVERSION=	1.8.1
 CATEGORIES=	net python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
diff --git a/net/py-cloudflare-scrape/distinfo b/net/py-cloudflare-scrape/distinfo
index e4b31cb257c..8b8c503197d 100644
--- a/net/py-cloudflare-scrape/distinfo
+++ b/net/py-cloudflare-scrape/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495173015
-SHA256 (Anorov-cloudflare-scrape-1.8.0_GH0.tar.gz) = 59cc3b1a39a5965cf989bd459769c6ff76418cc133c32320bfd0880857d3e8d7
-SIZE (Anorov-cloudflare-scrape-1.8.0_GH0.tar.gz) = 7703
+TIMESTAMP = 1502390097
+SHA256 (Anorov-cloudflare-scrape-1.8.1_GH0.tar.gz) = 714babf2fd198be7bd732d9fc4c149dcc697dcc26312af34a195300a48de39f4
+SIZE (Anorov-cloudflare-scrape-1.8.1_GH0.tar.gz) = 8025
diff --git a/net/rubygem-fog-profitbricks/Makefile b/net/rubygem-fog-profitbricks/Makefile
index 5e944fe7560..a0c771a83c2 100644
--- a/net/rubygem-fog-profitbricks/Makefile
+++ b/net/rubygem-fog-profitbricks/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	fog-profitbricks
-PORTVERSION=	3.0.0
-PORTREVISION=	1
+PORTVERSION=	4.0.0
 CATEGORIES=	net rubygems
 MASTER_SITES=	RG
 
diff --git a/net/rubygem-fog-profitbricks/distinfo b/net/rubygem-fog-profitbricks/distinfo
index 9cf9c5b062b..a17ba7bbe9b 100644
--- a/net/rubygem-fog-profitbricks/distinfo
+++ b/net/rubygem-fog-profitbricks/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480756124
-SHA256 (rubygem/fog-profitbricks-3.0.0.gem) = 5525e808a88fa07fedc0f05b8e6cc84f741760e883939da83cdd4e578951f0ae
-SIZE (rubygem/fog-profitbricks-3.0.0.gem) = 66048
+TIMESTAMP = 1502473897
+SHA256 (rubygem/fog-profitbricks-4.0.0.gem) = 13a9760d335a84d14bcb8c6758c74be2fd40a80fff433b3d7d128e350128ab09
+SIZE (rubygem/fog-profitbricks-4.0.0.gem) = 80384
diff --git a/net/rubygem-gitlab_omniauth-ldap/Makefile b/net/rubygem-gitlab_omniauth-ldap/Makefile
index 97e64ee11a7..5d14a161965 100644
--- a/net/rubygem-gitlab_omniauth-ldap/Makefile
+++ b/net/rubygem-gitlab_omniauth-ldap/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gitlab_omniauth-ldap
-PORTVERSION=	2.0.3
+PORTVERSION=	2.0.4
 CATEGORIES=	net rubygems
 MASTER_SITES=	RG
 
diff --git a/net/rubygem-gitlab_omniauth-ldap/distinfo b/net/rubygem-gitlab_omniauth-ldap/distinfo
index a9ee5610fbf..006cb576361 100644
--- a/net/rubygem-gitlab_omniauth-ldap/distinfo
+++ b/net/rubygem-gitlab_omniauth-ldap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500642237
-SHA256 (rubygem/gitlab_omniauth-ldap-2.0.3.gem) = 8bfcbfedba95f37c175b9774a5c4bb169d7f086a00bbe4a3e15b898a9657a5d3
-SIZE (rubygem/gitlab_omniauth-ldap-2.0.3.gem) = 14336
+TIMESTAMP = 1502473995
+SHA256 (rubygem/gitlab_omniauth-ldap-2.0.4.gem) = 7b3a11e5c08433fbc529f870a9f0a78fb26a308e385456f60b7c8b827a53f2b2
+SIZE (rubygem/gitlab_omniauth-ldap-2.0.4.gem) = 14336
diff --git a/net/syncthing/Makefile b/net/syncthing/Makefile
index 9d5bd3d8858..f615549b645 100644
--- a/net/syncthing/Makefile
+++ b/net/syncthing/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	syncthing
-PORTVERSION=	0.14.32
+PORTVERSION=	0.14.36
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net
 
@@ -21,9 +21,8 @@ USERS=		syncthing
 GROUPS=		syncthing
 
 do-build:
-	# timestamp here refers to source, not build time
 	@cd ${WRKSRC}/src/github.com/${PORTNAME}/${PORTNAME} ; \
-		${SETENV} GOPATH=${WRKSRC} go run build.go -no-upgrade=true -version v${PORTVERSION}
+		${SETENV} go run build.go -no-upgrade=true -version v${PORTVERSION}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/${PORTNAME}/${PORTNAME}/bin/syncthing \
diff --git a/net/syncthing/distinfo b/net/syncthing/distinfo
index ba5ca85c8a9..f2cf6707176 100644
--- a/net/syncthing/distinfo
+++ b/net/syncthing/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500534028
-SHA256 (syncthing-syncthing-v0.14.32_GH0.tar.gz) = d5b5d5bcb1b13f47d7889d9dbe7e13fed6080750fb4a93241a7fb7cf6324a463
-SIZE (syncthing-syncthing-v0.14.32_GH0.tar.gz) = 6943444
+TIMESTAMP = 1502580682
+SHA256 (syncthing-syncthing-v0.14.36_GH0.tar.gz) = 7373d1fee983529c2988f92b4137c32899d4c8233bc052df88fecf92c34d9fbd
+SIZE (syncthing-syncthing-v0.14.36_GH0.tar.gz) = 8236194
diff --git a/net/xrdp-devel/Makefile b/net/xrdp-devel/Makefile
index 9e4078a3d7f..b3a71aeeac9 100644
--- a/net/xrdp-devel/Makefile
+++ b/net/xrdp-devel/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	xrdp
-PORTVERSION=	0.9.1
+PORTVERSION=	0.9.3
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	net
 PKGNAMESUFFIX=	-devel
@@ -28,9 +27,9 @@ USE_LDCONFIG=	${PREFIX}/lib/xrdp
 USE_GITHUB=	yes
 GH_ACCOUNT=	neutrinolabs
 GH_PROJECT=	xrdp librfxcodec:librfxcodec libpainter:libpainter
-GH_TAGNAME=	v0.1.0:librfxcodec v0.1.0:libpainter
+GH_TAGNAME=	v0.1.2:librfxcodec v0.1.1:libpainter
 
-CONFIGURE_ARGS=	--localstatedir=/var \
+CONFIGURE_ARGS=	--localstatedir=/var --enable-strict-locations \
 		--with-pkgconfigdir=${LOCALBASE}/libdata/pkgconfig \
 		--enable-jpeg --enable-pixman --enable-rfxcodec --enable-painter
 LDFLAGS+=	-L${LOCALBASE}/lib -L${OPENSSLLIB} -lssl
@@ -49,6 +48,7 @@ OPUS_DESC=	Enable Opus for audio redirection
 IPV6_CONFIGURE_ENABLE=	ipv6
 DEBUG_CONFIGURE_ENABLE=	xrdpdebug
 FUSE_CONFIGURE_ENABLE=	fuse
+FUSE_USES=		fuse
 MP3LAME_CONFIGURE_ENABLE=	mp3lame
 MP3LAME_LIB_DEPENDS=	libmp3lame.so:audio/lame
 OPUS_CONFIGURE_ENABLE=	opus
@@ -58,12 +58,6 @@ OPUS_LIB_DEPENDS=	libopus.so:audio/opus
 PULSE_VERSION=	${MAKE} -C ${PORTSDIR}/audio/pulseaudio -VPORTVERSION
 PULSE_WRKSRC=	${MAKE} -C ${PORTSDIR}/audio/pulseaudio -VWRKSRC
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MFUSE}
-USES+=	fuse
-.endif
-
 post-extract:
 	# librfxcodec is provided as git submodule
 	@${CP} -r ${WRKSRC_librfxcodec}/ ${WRKSRC}/librfxcodec/
@@ -100,7 +94,7 @@ post-stage:
 	@${RM} ${STAGEDIR}${PREFIX}/etc/xrdp/rsakeys.ini
 	@${RM} ${STAGEDIR}${PREFIX}/etc/xrdp/cert.pem
 	@${RM} ${STAGEDIR}${PREFIX}/etc/xrdp/key.pem
-.for f in sesman.ini startwm.sh xrdp.ini xrdp_keyboard.ini
+.for f in sesman.ini startwm.sh reconnectwm.sh xrdp.ini xrdp_keyboard.ini
 	@${MV} ${STAGEDIR}${PREFIX}/etc/xrdp/$f ${STAGEDIR}${PREFIX}/etc/xrdp/$f.sample
 .endfor
 
diff --git a/net/xrdp-devel/distinfo b/net/xrdp-devel/distinfo
index 50b9291520c..5940502fca4 100644
--- a/net/xrdp-devel/distinfo
+++ b/net/xrdp-devel/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1482726509
-SHA256 (xrdp/neutrinolabs-xrdp-v0.9.1_GH0.tar.gz) = 9bfafb0277b07e8242bfdbede2928423d28c5714efb0c226118759fab06c42ab
-SIZE (xrdp/neutrinolabs-xrdp-v0.9.1_GH0.tar.gz) = 1885192
-SHA256 (xrdp/neutrinolabs-librfxcodec-v0.1.0_GH0.tar.gz) = b05c1812e2daef373bf5e647bc86ee11f136adbe7ea999b5109180f406071f0a
-SIZE (xrdp/neutrinolabs-librfxcodec-v0.1.0_GH0.tar.gz) = 38590
-SHA256 (xrdp/neutrinolabs-libpainter-v0.1.0_GH0.tar.gz) = 9fd2a3a85ba4f3e311cea34e9824bd38f3673e60951906c06744cf6b8f73397a
-SIZE (xrdp/neutrinolabs-libpainter-v0.1.0_GH0.tar.gz) = 9859
+TIMESTAMP = 1500361123
+SHA256 (xrdp/neutrinolabs-xrdp-v0.9.3_GH0.tar.gz) = 36f096d013b2cf09324cc1bf9c27caadc733001f2bcbe24e67f93233260afe5b
+SIZE (xrdp/neutrinolabs-xrdp-v0.9.3_GH0.tar.gz) = 1866654
+SHA256 (xrdp/neutrinolabs-librfxcodec-v0.1.2_GH0.tar.gz) = f4aa7f4247a42f6f5e49fc56eb70589a1d26cae7c8d5d4e32f75200d5c473a42
+SIZE (xrdp/neutrinolabs-librfxcodec-v0.1.2_GH0.tar.gz) = 46139
+SHA256 (xrdp/neutrinolabs-libpainter-v0.1.1_GH0.tar.gz) = 6caee8444fbd72677ac5e125c7ac99490688474975451668e751a9d9187ee5e6
+SIZE (xrdp/neutrinolabs-libpainter-v0.1.1_GH0.tar.gz) = 13929
diff --git a/net/xrdp-devel/files/patch-configure.ac b/net/xrdp-devel/files/patch-configure.ac
index 7d46d6c5062..fe1670e6d4f 100644
--- a/net/xrdp-devel/files/patch-configure.ac
+++ b/net/xrdp-devel/files/patch-configure.ac
@@ -1,22 +1,40 @@
-diff --git configure.ac configure.ac
-index 5c73168a..abbf4135 100644
---- configure.ac
+--- configure.ac.orig	2017-07-14 12:22:02 UTC
 +++ configure.ac
-@@ -138,8 +138,15 @@ AC_CHECK_FUNC(dlopen, [],
+@@ -152,11 +152,35 @@ AC_CHECK_FUNC(dlopen, [],
  AC_SUBST(DLOPEN_LIBS)
-
+ 
  # checking for openssl
--PKG_CHECK_MODULES([OPENSSL], [openssl >= 0], [],
--  [AC_MSG_ERROR([please install libssl-dev or openssl-devel])])
+-PKG_CHECK_MODULES([OPENSSL], [openssl >= 0.9.8], [],
 +if test "x$freebsd" = "xyes"; then
-+  # FreeBSD base doesn't supply "*.pc"
-+  AC_CHECK_HEADER([openssl/rc4.h], [],
-+    [AC_MSG_ERROR([please install libssl-dev or openssl-devel])],
-+    [#include <stdlib.h>])
++  # FreeBSD may have two OpenSSL, base and port however
++  # base OpenSSL doesn.t have openssl.pc file.
++  PKG_CHECK_MODULES(
++                    [OPENSSL],
++                    [openssl >= 0],
++                    [freebsd_openssl=port],
++                    [
++		     AC_CHECK_HEADER(
++		       [openssl/rc4.h],
++		       [freebsd_openssl=base],
++		       [AC_MSG_ERROR([please install libssl-dev or openssl-devel])],
++		       [#include <stdlib.h>])
++		    ]
++                   )
++
++  if test "x$freebsd_openssl" = "xport"; then
++    OPENSSL_BIN=`$PKG_CONFIG --variable=exec_prefix openssl`/bin
++  elif test "x$freebsd_openssl" = "xbase"; then
++    OPENSSL_BIN=/usr/bin
++  fi
 +else
++  # OpenSSL detection for other OS
 +  PKG_CHECK_MODULES([OPENSSL], [openssl >= 0], [],
-+    [AC_MSG_ERROR([please install libssl-dev or openssl-devel])])
+   [AC_MSG_ERROR([please install libssl-dev or openssl-devel])])
++  OPENSSL_BIN=`$PKG_CONFIG --variable=exec_prefix openssl`/bin
 +fi
-
+ 
+ # look for openssl binary
+-OPENSSL_BIN=`$PKG_CONFIG --variable=exec_prefix openssl`/bin
+ AC_PATH_PROGS([OPENSSL], [openssl], [:], [$OPENSSL_BIN:$PATH])
+ 
  # checking for pam variation
- # Linux-PAM is used in Linux systems
diff --git a/net/xrdp-devel/files/patch-sesman_sesman.ini b/net/xrdp-devel/files/patch-sesman_sesman.ini
index b305be8257a..5d02badf7c0 100644
--- a/net/xrdp-devel/files/patch-sesman_sesman.ini
+++ b/net/xrdp-devel/files/patch-sesman_sesman.ini
@@ -1,8 +1,6 @@
-diff --git sesman/sesman.ini sesman/sesman.ini
-index 674665e9..45929d6d 100644
---- sesman/sesman.ini
+--- sesman/sesman.ini.orig	2017-07-14 12:22:02 UTC
 +++ sesman/sesman.ini
-@@ -84,8 +84,8 @@ param=xrdp/xorg.conf
+@@ -77,8 +77,8 @@ param=xrdp/xorg.conf
  param=-noreset
  param=-nolisten
  param=tcp
@@ -10,6 +8,6 @@ index 674665e9..45929d6d 100644
 -param=.xorgxrdp.%s.log
 +#param=-logfile
 +#param=.xorgxrdp.%s.log
-
+ 
  [Chansrv]
  ; drive redirection, defaults to xrdp_client if not set
diff --git a/net/xrdp-devel/files/patch-xrdp_xrdp.ini b/net/xrdp-devel/files/patch-xrdp_xrdp.ini
deleted file mode 100644
index 70efb641379..00000000000
--- a/net/xrdp-devel/files/patch-xrdp_xrdp.ini
+++ /dev/null
@@ -1,34 +0,0 @@
---- xrdp/xrdp.ini.orig	2016-12-22 17:04:29 UTC
-+++ xrdp/xrdp.ini
-@@ -147,24 +147,24 @@ tcutils=true
- ; Session types
- ;
- 
--[X11rdp]
--name=X11rdp
-+[Xorg]
-+name=Xorg
- lib=libxup.so
- username=ask
- password=ask
- ip=127.0.0.1
- port=-1
--xserverbpp=24
--code=10
-+code=20
- 
--[Xorg]
--name=Xorg
-+[X11rdp]
-+name=X11rdp
- lib=libxup.so
- username=ask
- password=ask
- ip=127.0.0.1
- port=-1
--code=20
-+xserverbpp=24
-+code=10
- 
- [Xvnc]
- name=Xvnc
diff --git a/net/xrdp-devel/pkg-plist b/net/xrdp-devel/pkg-plist
index b36e84ef44d..ac066783cb3 100644
--- a/net/xrdp-devel/pkg-plist
+++ b/net/xrdp-devel/pkg-plist
@@ -3,7 +3,6 @@ bin/xrdp-genkeymap
 bin/xrdp-keygen
 bin/xrdp-sesadmin
 bin/xrdp-sesrun
-bin/rfxcodectest
 lib/libpainter.a
 lib/libpainter.so
 lib/libpainter.so.0
@@ -19,6 +18,7 @@ include/rfxcodec_encode.h
 include/xrdp_client_info.h
 include/xrdp_constants.h
 include/xrdp_rail.h
+include/xrdp_sockets.h
 lib/pulse-%%PULSE_VERSION%%/modules/module-xrdp-sink.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-xrdp-source.so
 libdata/pkgconfig/libpainter.pc
@@ -30,28 +30,18 @@ lib/xrdp/libcommon.so.0
 lib/xrdp/libcommon.so.0.0.0
 lib/xrdp/libmc.a
 lib/xrdp/libmc.so
-lib/xrdp/libmc.so.0
-lib/xrdp/libmc.so.0.0.0
-lib/xrdp/librdp.a
-lib/xrdp/librdp.so
-lib/xrdp/librdp.so.0
-lib/xrdp/librdp.so.0.0.0
 lib/xrdp/libscp.a
 lib/xrdp/libscp.so
 lib/xrdp/libscp.so.0
 lib/xrdp/libscp.so.0.0.0
 lib/xrdp/libvnc.a
 lib/xrdp/libvnc.so
-lib/xrdp/libvnc.so.0
-lib/xrdp/libvnc.so.0.0.0
 lib/xrdp/libxrdp.a
 lib/xrdp/libxrdp.so
 lib/xrdp/libxrdp.so.0
 lib/xrdp/libxrdp.so.0.0.0
 lib/xrdp/libxup.a
 lib/xrdp/libxup.so
-lib/xrdp/libxup.so.0
-lib/xrdp/libxup.so.0.0.0
 lib/xrdp/libxrdpapi.so
 lib/xrdp/libxrdpapi.a
 lib/xrdp/libxrdpapi.so.0
@@ -80,10 +70,12 @@ etc/rc.d/xrdp
 %%ETCDIR%%/pulse/default.pa
 @postunexec if cmp -s %D/etc/xrdp/sesman.ini.sample %D/etc/xrdp/sesman.ini; then rm -f %D/etc/xrdp/sesman.ini; fi
 @postunexec if cmp -s %D/etc/xrdp/startwm.sh.sample %D/etc/xrdp/startwm.sh; then rm -f %D/etc/xrdp/startwm.sh; fi
+@postunexec if cmp -s %D/etc/xrdp/reconnectwm.sh.sample %D/etc/xrdp/reconnectwm.sh; then rm -f %D/etc/xrdp/reconnectwm.sh; fi
 @postunexec if cmp -s %D/etc/xrdp/xrdp.ini.sample %D/etc/xrdp/xrdp.ini; then rm -f %D/etc/xrdp/xrdp.ini; fi
 @postunexec if cmp -s %D/etc/xrdp/xrdp_keyboard.ini.sample %D/etc/xrdp/xrdp_keyboard.ini; then rm -f %D/etc/xrdp/xrdp_keyboard.ini; fi
 @sample %%ETCDIR%%/sesman.ini.sample
 @sample %%ETCDIR%%/startwm.sh.sample
+@sample %%ETCDIR%%/reconnectwm.sh.sample
 @sample %%ETCDIR%%/xrdp.ini.sample
 @sample %%ETCDIR%%/xrdp_keyboard.ini.sample
 man/man1/xrdp-dis.1.gz
@@ -96,11 +88,9 @@ man/man8/xrdp-keygen.8.gz
 man/man8/xrdp-sesadmin.8.gz
 man/man8/xrdp-sesman.8.gz
 man/man8/xrdp-sesrun.8.gz
-man/man8/xrdp-sessvc.8.gz
 sbin/xrdp
 sbin/xrdp-chansrv
 sbin/xrdp-sesman
-sbin/xrdp-sessvc
 %%DATADIR%%/ad24b.bmp
 %%DATADIR%%/ad256.bmp
 %%DATADIR%%/cursor0.cur
diff --git a/print/Makefile b/print/Makefile
index ce5be068368..9d2d751d07f 100644
--- a/print/Makefile
+++ b/print/Makefile
@@ -201,6 +201,7 @@
     SUBDIR += py-reportlab
     SUBDIR += py-reportlab1
     SUBDIR += py-rtf
+    SUBDIR += py-stapler
     SUBDIR += py-trml2pdf
     SUBDIR += py3-fonttools
     SUBDIR += py3-pycups
diff --git a/print/py-stapler/Makefile b/print/py-stapler/Makefile
new file mode 100644
index 00000000000..b3ee8ef1449
--- /dev/null
+++ b/print/py-stapler/Makefile
@@ -0,0 +1,23 @@
+# Created by: Ben Woods <woodsb02@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	stapler
+PORTVERSION=	0.3.3
+CATEGORIES=	print python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+#DISTNAME=	PyPDF2-${PORTVERSION}
+
+MAINTAINER=	woodsb02@FreeBSD.org
+COMMENT=	Manipulate PDF documents from the command line
+
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}more-itertools>=2.2:devel/py-more-itertools \
+		${PYTHON_PKGNAMEPREFIX}pdf2>=1.24:print/py-pdf2
+
+USES=		python:2.7
+USE_PYTHON=	autoplist distutils
+
+.include <bsd.port.mk>
diff --git a/print/py-stapler/distinfo b/print/py-stapler/distinfo
new file mode 100644
index 00000000000..4519ebd3fbd
--- /dev/null
+++ b/print/py-stapler/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1502515886
+SHA256 (stapler-0.3.3.tar.gz) = 326d2eeb2556e98162d1c2671f944deb912f757469cf0316de121a25d16a6e4a
+SIZE (stapler-0.3.3.tar.gz) = 8130
diff --git a/print/py-stapler/pkg-descr b/print/py-stapler/pkg-descr
new file mode 100644
index 00000000000..320b6c83d27
--- /dev/null
+++ b/print/py-stapler/pkg-descr
@@ -0,0 +1,20 @@
+Stapler is a pure Python alternative to PDFtk, a tool for manipulating PDF
+documents from the command line. Like pdftk, stapler is a command-line tool.
+
+With the select command, you can cherry-pick pages from pdfs and concatenate
+them into a new pdf file.
+
+The delete command works almost exactly the same as select, but inverse.
+It uses the pages and ranges which you didn't specify.
+
+The split command splits the specified pdf files into their single pages and
+writes each page into it's own pdf file.
+
+With the zip command, you can cherry-pick pages from pdfs (like select).
+The pages from each pdf are merged together in an interleaving manner.
+This can be used to collate a pdf with odd pages and a pdf with even pages
+into a single file.
+
+The info command shows information on the metadata stored inside a PDF file.
+
+WWW: https://github.com/hellerbarde/stapler
diff --git a/science/massxpert/Makefile b/science/massxpert/Makefile
index 5cde629e243..242efb7b9ee 100644
--- a/science/massxpert/Makefile
+++ b/science/massxpert/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	massxpert
 PORTVERSION=	3.4.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	science
 MASTER_SITES=	http://download.tuxfamily.org/massxpert/source/
 
@@ -26,6 +26,5 @@ USE_GNOME=	glib20
 USE_QT4=	corelib gui xml rcc_build qmake_build uic_build moc_build \
 		svg
 USE_LDCONFIG=	yes
-MAKE_JOBS_UNSAFE=	yes
 
 .include <bsd.port.mk>
diff --git a/science/massxpert/files/patch-lib_propListHolder.cpp b/science/massxpert/files/patch-lib_propListHolder.cpp
new file mode 100644
index 00000000000..b6f037a8009
--- /dev/null
+++ b/science/massxpert/files/patch-lib_propListHolder.cpp
@@ -0,0 +1,19 @@
+Fixes the build with GCC 6 (in addition to fixing an actual bug).
+
+/wrkdirs/usr/ports/science/massxpert/work/massxpert-3.4.0/lib/propListHolder.cpp: In member function 'bool massXpert::PropListHolder::removeProp(const QString&)':
+/wrkdirs/usr/ports/science/massxpert/work/massxpert-3.4.0/lib/propListHolder.cpp:216:2: error: this 'if' clause does not guard... [-Werror=misleading-indentation]
+  if(m_propList.at(iter)->name() == name);
+  ^~
+/wrkdirs/usr/ports/science/massxpert/work/massxpert-3.4.0/lib/propListHolder.cpp:217:2: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'if'
+  {
+--- lib/propListHolder.cpp.orig	2017-07-26 17:06:18 UTC
++++ lib/propListHolder.cpp
+@@ -213,7 +213,7 @@ namespace massXpert
+   {
+     for (int iter = 0; iter < m_propList.size(); ++iter)
+       {
+-	if(m_propList.at(iter)->name() == name);
++	if(m_propList.at(iter)->name() == name)
+ 	{
+ 	  m_propList.removeAt(iter);
+ 	  
diff --git a/security/Makefile b/security/Makefile
index 2a215a3de52..3bc15dd6e70 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -107,6 +107,7 @@
     SUBDIR += cyrus-sasl2-gssapi
     SUBDIR += cyrus-sasl2-ldapdb
     SUBDIR += cyrus-sasl2-saslauthd
+    SUBDIR += cyrus-sasl2-sql
     SUBDIR += cyrus-sasl2-srp
     SUBDIR += d0_blind_id
     SUBDIR += dcetest
@@ -208,6 +209,7 @@
     SUBDIR += hashcat
     SUBDIR += hashcat-legacy
     SUBDIR += heimdal
+    SUBDIR += highwayhash
     SUBDIR += hitch
     SUBDIR += hlfl
     SUBDIR += hmap
diff --git a/security/clambc/Makefile b/security/clambc/Makefile
index 82ba2be86de..422fb7b5bf9 100644
--- a/security/clambc/Makefile
+++ b/security/clambc/Makefile
@@ -3,15 +3,18 @@
 
 PORTNAME=	clambc
 DISTVERSION=	0.98.5rc1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	SF/clamav/${PORTNAME:tl}
 
-MAINTAINER=	zi@FreeBSD.org
+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
 
@@ -19,7 +22,7 @@ USES=		gmake libtool perl5
 ALL_TARGET=	clambc-only
 GNU_CONFIGURE=	yes
 CONFIGURE_OUTSOURCE=	yes
-USE_GCC=	any
+USE_GCC=	5	# fails to build with GCC 6+
 USE_LDCONFIG=	yes
 USE_PERL5=	build
 CONFIGURE_SCRIPT=llvm/configure
diff --git a/security/cyrus-sasl2-sql/Makefile b/security/cyrus-sasl2-sql/Makefile
new file mode 100644
index 00000000000..c6fb223519b
--- /dev/null
+++ b/security/cyrus-sasl2-sql/Makefile
@@ -0,0 +1,29 @@
+# $FreeBSD$
+
+PKGNAMESUFFIX=	-sql
+
+COMMENT=	SASL SQL plugins
+
+OPTIONS_DEFINE=	MYSQL PGSQL
+OPTIONS_RADIO=	SQLITE
+OPTIONS_RADIO_SQLITE=	SQLITE2 SQLITE3
+
+OPTIONS_DEFAULT=	MYSQL
+OPTIONS_SUB=	yes
+
+MYSQL_USES=	mysql
+MYSQL_CONFIGURE_ON=	--with-mysql=${LOCALBASE}
+MYSQL_CONFIGURE_OFF=	--without-mysql
+PGSQL_USES=	pgsql
+PGSQL_CONFIGURE_ON=	--with-pgsql=${LOCALBASE}
+PGSQL_CONFIGURE_OFF=	--without-pgsql
+SQLITE2_USES=	sqlite:2
+SQLITE2_CONFIGURE_ON=	--with-sqlite=${LOCALBASE}
+SQLITE2_CONFIGURE_OFF=	--without-sqlite
+SQLITE3_USES=	sqlite:3
+SQLITE3_CONFIGURE_ON=	--with-sqlite3=${LOCALBASE}
+SQLITE3_CONFIGURE_OFF=	--without-sqlite3
+
+CONFIGURE_ARGS+=	--enable-sql
+
+.include "${.CURDIR}/../../security/cyrus-sasl2/Makefile.common"
diff --git a/security/cyrus-sasl2-sql/pkg-descr b/security/cyrus-sasl2-sql/pkg-descr
new file mode 100644
index 00000000000..a0a0f928d52
--- /dev/null
+++ b/security/cyrus-sasl2-sql/pkg-descr
@@ -0,0 +1,3 @@
+SASL SQL database plugin support
+
+WWW: http://cyrusimap.web.cmu.edu/
diff --git a/security/duo/Makefile b/security/duo/Makefile
index 97462bd5dda..652d0bee329 100644
--- a/security/duo/Makefile
+++ b/security/duo/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	duo
-PORTVERSION=	1.9.21
+PORTVERSION=	1.10.0
 CATEGORIES=	security
 MASTER_SITES=	https://dl.duosecurity.com/ \
 		ZI
diff --git a/security/duo/distinfo b/security/duo/distinfo
index 7edf310a557..7d23718051f 100644
--- a/security/duo/distinfo
+++ b/security/duo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1496330220
-SHA256 (duo_unix-1.9.21.tar.gz) = 582ea3b533dea7b95c9be24c2be2e879288e2f315f956228d504b9a9315c8b50
-SIZE (duo_unix-1.9.21.tar.gz) = 470168
+TIMESTAMP = 1502374876
+SHA256 (duo_unix-1.10.0.tar.gz) = 229a8c2eafecaeac8d6bdba8812be2e8cb24802d1d733527d758ca5f7f62cee8
+SIZE (duo_unix-1.10.0.tar.gz) = 492227
diff --git a/security/highwayhash/Makefile b/security/highwayhash/Makefile
new file mode 100644
index 00000000000..fd64022340e
--- /dev/null
+++ b/security/highwayhash/Makefile
@@ -0,0 +1,37 @@
+# Created by: Yuri Victorovich <yuri@rawbw.com>
+# $FreeBSD$
+
+PORTNAME=	highwayhash
+PORTVERSION=	g20170512
+CATEGORIES=	security
+
+MAINTAINER=	yuri@rawbw.com
+COMMENT=	Fast strong hash functions: SipHash/HighwayHash
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+ONLY_FOR_ARCHS=	amd64 arm64 powerpc powerpc64
+ONLY_FOR_ARCHS_REASON=	Assembly is implemented only for specific architectures in highwayhash/tsc_timer.h
+
+USES=		gmake
+USE_GITHUB=	yes
+GH_ACCOUNT=	google
+GH_TAGNAME=	2b666ae
+USE_LDCONFIG=	yes
+
+post-patch:
+	# Install flags upstream issue: https://github.com/google/highwayhash/issues/58
+	@${REINPLACE_CMD} -e '\
+		s|LIBDIR|XLIBDIR|; \
+		s| -O3||; \
+		s|install -m0755 high|${INSTALL_DATA} high|; \
+       		s|install -m0755 lib|${INSTALL_LIB} lib|' \
+		${WRKSRC}/Makefile
+
+post-install:
+	# Symlink upstream issue: https://github.com/google/highwayhash/issues/57
+	${RM} ${STAGEDIR}${PREFIX}/lib/libhighwayhash.so
+	${LN} -s libhighwayhash.so.0 ${STAGEDIR}${PREFIX}/lib/libhighwayhash.so
+
+.include <bsd.port.mk>
diff --git a/security/highwayhash/distinfo b/security/highwayhash/distinfo
new file mode 100644
index 00000000000..36ecbcf69d7
--- /dev/null
+++ b/security/highwayhash/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1502493406
+SHA256 (google-highwayhash-g20170512-2b666ae_GH0.tar.gz) = 294320a52169a3365818b98c7ee8438583d9f627ec84e4b61f2cb94f86796a73
+SIZE (google-highwayhash-g20170512-2b666ae_GH0.tar.gz) = 139398
diff --git a/security/highwayhash/files/patch-highwayhash_os__specific.cc b/security/highwayhash/files/patch-highwayhash_os__specific.cc
new file mode 100644
index 00000000000..0c98b9000c4
--- /dev/null
+++ b/security/highwayhash/files/patch-highwayhash_os__specific.cc
@@ -0,0 +1,64 @@
+--- highwayhash/os_specific.cc.orig	2017-05-08 14:09:02 UTC
++++ highwayhash/os_specific.cc
+@@ -40,6 +40,16 @@
+ #define OS_LINUX 0
+ #endif
+ 
++#ifdef __FreeBSD__
++#define OS_FREEBSD 1
++#include <sched.h>
++#include <sys/time.h>
++#include <sys/param.h>
++#include <sys/cpuset.h>
++#else
++#define OS_FREEBSD 0
++#endif
++
+ #ifdef __MACH__
+ #define OS_MAC 1
+ #include <mach/mach.h>
+@@ -134,6 +144,10 @@ ThreadAffinity* GetThreadAffinity() {
+   const int err = cpuset_getaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, pid,
+                                      sizeof(cpuset_t), &affinity->set);
+   CHECK(err == 0);
++#elif OS_FREEBSD
++  const pid_t pid = 0;  // current thread
++  const int err = cpuset_getaffinity(CPU_LEVEL_WHICH, CPU_WHICH_TID, pid, sizeof(cpuset_t), &affinity->set);
++  CHECK(err == 0);
+ #endif
+   return affinity;
+ }
+@@ -165,6 +179,10 @@ void SetThreadAffinity(ThreadAffinity* a
+   const int err = cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, pid,
+                                      sizeof(cpuset_t), &affinity->set);
+   CHECK(err == 0);
++#elif OS_FREEBSD
++  const pid_t pid = 0;  // current thread
++  const int err = cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_TID, pid, sizeof(cpuset_t), &affinity->set);
++  CHECK(err == 0);
+ #else
+ #error "port"
+ #endif
+@@ -192,6 +210,12 @@ std::vector<int> AvailableCPUs() {
+       cpus.push_back(cpu);
+     }
+   }
++#elif OS_FREEBSD
++  for (size_t cpu = 0; cpu < sizeof(cpuset_t) * 8; ++cpu) {
++    if (CPU_ISSET(cpu, &affinity->set)) {
++      cpus.push_back(cpu);
++    }
++  }
+ #else
+ #error "port"
+ #endif
+@@ -208,6 +232,9 @@ void PinThreadToCPU(const int cpu) {
+ #elif OS_FREEBSD
+   CPU_ZERO(&affinity.set);
+   CPU_SET(cpu, &affinity.set);
++#elif OS_FREEBSD
++  CPU_ZERO(&affinity.set);
++  CPU_SET(cpu, &affinity.set);
+ #else
+ #error "port"
+ #endif
diff --git a/security/highwayhash/pkg-descr b/security/highwayhash/pkg-descr
new file mode 100644
index 00000000000..43f45b9553e
--- /dev/null
+++ b/security/highwayhash/pkg-descr
@@ -0,0 +1,5 @@
+Strong (well-distributed and unpredictable) hashes:
+* Portable implementation of SipHash
+* HighwayHash, a 5x faster SIMD hash with security claims
+
+WWW: https://github.com/google/highwayhash
diff --git a/security/highwayhash/pkg-plist b/security/highwayhash/pkg-plist
new file mode 100644
index 00000000000..036bd26068a
--- /dev/null
+++ b/security/highwayhash/pkg-plist
@@ -0,0 +1,32 @@
+include/highwayhash/arch_specific.h
+include/highwayhash/c_bindings.h
+include/highwayhash/compiler_specific.h
+include/highwayhash/data_parallel.h
+include/highwayhash/endianess.h
+include/highwayhash/hh_avx2.h
+include/highwayhash/hh_buffer.h
+include/highwayhash/hh_portable.h
+include/highwayhash/hh_sse41.h
+include/highwayhash/hh_types.h
+include/highwayhash/highwayhash.h
+include/highwayhash/highwayhash_target.h
+include/highwayhash/highwayhash_test_target.h
+include/highwayhash/iaca.h
+include/highwayhash/instruction_sets.h
+include/highwayhash/load3.h
+include/highwayhash/nanobenchmark.h
+include/highwayhash/os_specific.h
+include/highwayhash/profiler.h
+include/highwayhash/robust_statistics.h
+include/highwayhash/scalar.h
+include/highwayhash/scalar_sip_tree_hash.h
+include/highwayhash/sip_hash.h
+include/highwayhash/sip_tree_hash.h
+include/highwayhash/state_helpers.h
+include/highwayhash/tsc_timer.h
+include/highwayhash/vector128.h
+include/highwayhash/vector256.h
+include/highwayhash/vector_test_target.h
+lib/libhighwayhash.a
+lib/libhighwayhash.so
+lib/libhighwayhash.so.0
diff --git a/security/highwayhash/tags b/security/highwayhash/tags
new file mode 100644
index 00000000000..cdaa8a38598
--- /dev/null
+++ b/security/highwayhash/tags
@@ -0,0 +1,15 @@
+!_TAG_FILE_SORTED	2	/0=unsorted, 1=sorted, 2=foldcase/
+CATEGORIES	/usr/home/ricky/FreeBSD/ports/security/highwayhash/Makefile	/^CATEGORIES=	security$/;"	m	language:Make
+COMMENT	/usr/home/ricky/FreeBSD/ports/security/highwayhash/Makefile	/^COMMENT=	Fast strong hash functions: SipHash\/HighwayHash$/;"	m	language:Make
+GH_ACCOUNT	/usr/home/ricky/FreeBSD/ports/security/highwayhash/Makefile	/^GH_ACCOUNT=	google$/;"	m	language:Make
+GH_TAGNAME	/usr/home/ricky/FreeBSD/ports/security/highwayhash/Makefile	/^GH_TAGNAME=	2b666ae$/;"	m	language:Make
+LICENSE	/usr/home/ricky/FreeBSD/ports/security/highwayhash/Makefile	/^LICENSE=	APACHE20$/;"	m	language:Make
+LICENSE_FILE	/usr/home/ricky/FreeBSD/ports/security/highwayhash/Makefile	/^LICENSE_FILE=	${WRKSRC}\/LICENSE$/;"	m	language:Make
+MAINTAINER	/usr/home/ricky/FreeBSD/ports/security/highwayhash/Makefile	/^MAINTAINER=	yuri@rawbw.com$/;"	m	language:Make
+ONLY_FOR_ARCHS	/usr/home/ricky/FreeBSD/ports/security/highwayhash/Makefile	/^ONLY_FOR_ARCHS=	amd64 arm64 powerpc powerpc64$/;"	m	language:Make
+ONLY_FOR_ARCHS_REASON	/usr/home/ricky/FreeBSD/ports/security/highwayhash/Makefile	/^ONLY_FOR_ARCHS_REASON=	Assembly is implemented only for specific architectures in highwayhash\/tsc_timer.h$/;"	m	language:Make
+PORTNAME	/usr/home/ricky/FreeBSD/ports/security/highwayhash/Makefile	/^PORTNAME=	highwayhash$/;"	m	language:Make
+PORTVERSION	/usr/home/ricky/FreeBSD/ports/security/highwayhash/Makefile	/^PORTVERSION=	g20170512$/;"	m	language:Make
+USES	/usr/home/ricky/FreeBSD/ports/security/highwayhash/Makefile	/^USES=		gmake$/;"	m	language:Make
+USE_GITHUB	/usr/home/ricky/FreeBSD/ports/security/highwayhash/Makefile	/^USE_GITHUB=	yes$/;"	m	language:Make
+USE_LDCONFIG	/usr/home/ricky/FreeBSD/ports/security/highwayhash/Makefile	/^USE_LDCONFIG=	yes$/;"	m	language:Make
diff --git a/security/libhijack/Makefile b/security/libhijack/Makefile
index 1ebbd3c3382..e3cb60ca0b2 100644
--- a/security/libhijack/Makefile
+++ b/security/libhijack/Makefile
@@ -9,6 +9,8 @@ COMMENT=	Runtime process infection made easy
 
 LICENSE=	BSD2CLAUSE
 
+ONLY_FOR_ARCHS=	amd64
+
 MAKE_JOBS_UNSAFE=	yes
 
 USE_GITHUB=	yes
diff --git a/security/putty-nogtk/Makefile b/security/putty-nogtk/Makefile
index df342de9462..66c753139ed 100644
--- a/security/putty-nogtk/Makefile
+++ b/security/putty-nogtk/Makefile
@@ -3,7 +3,7 @@
 
 PKGNAMESUFFIX=		-nogtk
 
-OPTIONS_EXCLUDE=	GTK2
+OPTIONS_EXCLUDE=	GTK3
 
 CONFLICTS_INSTALL=	pssh-[0-9]* putty-[0-9]*
 
diff --git a/security/putty/Makefile b/security/putty/Makefile
index 2e0693b40a3..338deffb7b6 100644
--- a/security/putty/Makefile
+++ b/security/putty/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	putty
-PORTVERSION=	0.69
-PORTREVISION=	1
+PORTVERSION=	0.70
 CATEGORIES=	security ipv6
 MASTER_SITES=	http://the.earth.li/~sgtatham/putty/${PORTVERSION}/ \
 		ftp://ftp.chiark.greenend.org.uk/users/sgtatham/putty-latest/
@@ -24,8 +23,11 @@ CPE_VENDOR=	simon_tatham
 PLIST_FILES=	bin/plink bin/pscp bin/psftp bin/puttygen
 PLIST_FILES+=	man/man1/plink.1.gz man/man1/pscp.1.gz man/man1/psftp.1.gz man/man1/puttygen.1.gz
 
-OPTIONS_DEFINE=	GSSAPI GTK3
-OPTIONS_DEFAULT=GSSAPI GTK3
+OPTIONS_DEFINE=	GTK3
+OPTIONS_DEFAULT=GSSAPI_BASE GTK3
+OPTIONS_SINGLE=	GSSAPI_SELECT
+OPTIONS_SINGLE_GSSAPI_SELECT=	GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL \
+				GSSAPI_MIT
 
 CONFLICTS_INSTALL?=	pssh-[0-9]* putty-nogtk-[0-9]*
 
@@ -52,10 +54,18 @@ DESKTOP_ENTRIES="PuTTY" \
 MAKE_ARGS+=	GTK_CONFIG=:
 .endif
 
-.if ${PORT_OPTIONS:MGSSAPI}
+.if ${PORT_OPTIONS:MGSSAPI_BASE}
 _COMPAT=		-DSTATIC_GSSAPI
 USES+=		gssapi:base,flags
 MAKE_ARGS+=	KRB5CONFIG=${KRB5CONFIG}
+.elif ${PORT_OPTIONS:MGSSAPI_HEIMDAL}
+_COMPAT=		-DSTATIC_GSSAPI
+USES+=		gssapi:heimdal,flags
+MAKE_ARGS+=	KRB5CONFIG=${KRB5CONFIG}
+.elif ${PORT_OPTIONS:MGSSAPI_MIT}
+_COMPAT=		-DSTATIC_GSSAPI
+USES+=		gssapi:mit,flags
+MAKE_ARGS+=	KRB5CONFIG=${KRB5CONFIG}
 .else
 _COMPAT=		-DNO_GSSAPI
 .endif
diff --git a/security/putty/distinfo b/security/putty/distinfo
index 58cd447b0ef..29f6624e99a 100644
--- a/security/putty/distinfo
+++ b/security/putty/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1493852442
-SHA256 (putty-0.69.tar.gz) = b7dad241ff01b0cbb9dc4c1471ec7cacf8f08d98a581aeb2f336da3c0eb96ad1
-SIZE (putty-0.69.tar.gz) = 2122306
+TIMESTAMP = 1500391843
+SHA256 (putty-0.70.tar.gz) = bb8aa49d6e96c5a8e18a057f3150a1695ed99a24eef699e783651d1f24e7b0be
+SIZE (putty-0.70.tar.gz) = 2386108
diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index 34b8ae2a725..472772eff59 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	zsh
-DISTVERSION=	5.3.1
-PORTREVISION=	1
+DISTVERSION=	5.4.1
 CATEGORIES=	shells
 MASTER_SITES=	http://www.zsh.org/pub/ \
 		SF \
@@ -21,7 +20,7 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 MAKE_JOBS_UNSAFE=	yes
 
-USES=		iconv ncurses shebangfix tar:xz
+USES=		autoreconf iconv ncurses shebangfix tar:xz
 
 USE_HARDENING=	pie relro safestack
 
diff --git a/shells/zsh/distinfo b/shells/zsh/distinfo
index 3c8d344094f..b90f0861786 100644
--- a/shells/zsh/distinfo
+++ b/shells/zsh/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1482410948
-SHA256 (zsh-5.3.1.tar.xz) = fc886cb2ade032d006da8322c09a7e92b2309177811428b121192d44832920da
-SIZE (zsh-5.3.1.tar.xz) = 2928832
-SHA256 (zsh-5.3.1-doc.tar.xz) = d51762fcb5699c332da8a4e404cb9eb8d5de8fa4e0235a08bcf252c915bda6ed
-SIZE (zsh-5.3.1-doc.tar.xz) = 3161408
+TIMESTAMP = 1502363252
+SHA256 (zsh-5.4.1.tar.xz) = 94cbd57508287e8faa081424509738d496f5f41e32ed890e3a5498ce05d3633b
+SIZE (zsh-5.4.1.tar.xz) = 2972824
+SHA256 (zsh-5.4.1-doc.tar.xz) = b8b1a40aeec852806ad2b74b0a0c534320bf517e2fe2a087c0c9d39e75dc29f1
+SIZE (zsh-5.4.1-doc.tar.xz) = 3197560
diff --git a/shells/zsh/files/patch-Completion-BSD-Command-_kld b/shells/zsh/files/patch-Completion-BSD-Command-_kld
deleted file mode 100644
index 48eda64ee75..00000000000
--- a/shells/zsh/files/patch-Completion-BSD-Command-_kld
+++ /dev/null
@@ -1,11 +0,0 @@
---- Completion/BSD/Command/_kld.orig
-+++ Completion/BSD/Command/_kld
-@@ -26,7 +26,7 @@
-   case "$service" in
-     kldload)
-       _arguments -s -S -A "-*" \
--        "-n[don't try to load module if already loaded]"
-+        "-n[don't try to load module if already loaded]" \
-         '-v[be verbose]' \
-         '-q[silence any extraneous warnings]' \
-         '*:module to load:_kld_module'
diff --git a/shells/zsh/pkg-plist b/shells/zsh/pkg-plist
index 744d20358e4..79c2f187414 100644
--- a/shells/zsh/pkg-plist
+++ b/shells/zsh/pkg-plist
@@ -207,6 +207,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_dchroot-dsa
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_dcut
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_deb_architectures
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_deb_codenames
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_deb_packages
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_debbugs_bugnumber
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_debchange
@@ -267,6 +268,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_iwconfig
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_kpartx
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_losetup
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_lsblk
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_lsusb
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_ltrace
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_mdadm
@@ -343,6 +345,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_attr
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_augeas
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_awk
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_basename
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_baudrates
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_baz
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_beep
@@ -368,6 +371,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_chown
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_chsh
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_clay
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_cmdambivalent
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_cmdstring
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_cmp
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_comm
@@ -414,6 +418,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_elm
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_email_addresses
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_enscript
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_entr
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_env
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_espeak
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_etags
@@ -429,6 +434,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_finger
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_flasher
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_flex
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_fmt
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_fortune
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_fsh
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_fuser
@@ -544,6 +550,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_openstack
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_other_accounts
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_pack
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_paste
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_patch
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_patchutils
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_path_commands
@@ -627,6 +634,8 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_subversion
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_sudo
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_surfraw
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_swaks
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_swift
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_sys_calls
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_sysctl
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_tail
@@ -661,6 +670,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_ttys
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_twidge
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_twisted
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_umountable
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_unace
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_uname
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_unexpand
@@ -925,6 +935,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Prompts/prompt_bart_setup
 %%DATADIR%%/%%ZSH_VER%%/functions/Prompts/prompt_bigfade_setup
 %%DATADIR%%/%%ZSH_VER%%/functions/Prompts/prompt_clint_setup
+%%DATADIR%%/%%ZSH_VER%%/functions/Prompts/prompt_default_setup
 %%DATADIR%%/%%ZSH_VER%%/functions/Prompts/prompt_elite2_setup
 %%DATADIR%%/%%ZSH_VER%%/functions/Prompts/prompt_elite_setup
 %%DATADIR%%/%%ZSH_VER%%/functions/Prompts/prompt_fade_setup
@@ -933,6 +944,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Prompts/prompt_oliver_setup
 %%DATADIR%%/%%ZSH_VER%%/functions/Prompts/prompt_pws_setup
 %%DATADIR%%/%%ZSH_VER%%/functions/Prompts/prompt_redhat_setup
+%%DATADIR%%/%%ZSH_VER%%/functions/Prompts/prompt_restore_setup
 %%DATADIR%%/%%ZSH_VER%%/functions/Prompts/prompt_special_chars
 %%DATADIR%%/%%ZSH_VER%%/functions/Prompts/prompt_suse_setup
 %%DATADIR%%/%%ZSH_VER%%/functions/Prompts/prompt_walters_setup
@@ -997,6 +1009,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/VCS_Info/VCS_INFO_realpath
 %%DATADIR%%/%%ZSH_VER%%/functions/VCS_Info/VCS_INFO_reposub
 %%DATADIR%%/%%ZSH_VER%%/functions/VCS_Info/VCS_INFO_set
+%%DATADIR%%/%%ZSH_VER%%/functions/VCS_Info/VCS_INFO_set-patch-format
 %%DATADIR%%/%%ZSH_VER%%/functions/VCS_Info/vcs_info
 %%DATADIR%%/%%ZSH_VER%%/functions/VCS_Info/vcs_info_hookadd
 %%DATADIR%%/%%ZSH_VER%%/functions/VCS_Info/vcs_info_hookdel
diff --git a/sysutils/Makefile b/sysutils/Makefile
index b2450142d3c..f8fcacb9249 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -139,12 +139,14 @@
     SUBDIR += cfengine
     SUBDIR += cfengine-masterfiles
     SUBDIR += cfengine-masterfiles310
+    SUBDIR += cfengine-masterfiles311
     SUBDIR += cfengine-masterfiles36
     SUBDIR += cfengine-masterfiles37
     SUBDIR += cfengine-masterfiles38
     SUBDIR += cfengine-masterfiles39
     SUBDIR += cfengine22
     SUBDIR += cfengine310
+    SUBDIR += cfengine311
     SUBDIR += cfengine32
     SUBDIR += cfengine33
     SUBDIR += cfengine34
@@ -854,6 +856,7 @@
     SUBDIR += puppet-lint
     SUBDIR += puppet-mode.el
     SUBDIR += puppet4
+    SUBDIR += puppet5
     SUBDIR += puppetserver
     SUBDIR += pv
     SUBDIR += pwd_unmkdb
diff --git a/sysutils/anvil/Makefile b/sysutils/anvil/Makefile
index 1f8091d92dd..9c136d0383e 100644
--- a/sysutils/anvil/Makefile
+++ b/sysutils/anvil/Makefile
@@ -1,7 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	anvil
-PORTVERSION=	0.0.9
+PORTVERSION=	0.0.10
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	dvl@FreeBSD.org
@@ -19,6 +20,20 @@ SUB_FILES+=	cert-shifter.conf.sample cert-puller.conf.sample pkg-install pkg-mes
 
 NO_BUILD=	yes
 
+OPTIONS_SINGLE=	SG1
+OPTIONS_SINGLE_SG1=	 FETCH CURL WGET
+OPTIONS_DEFAULT=	FETCH
+FETCH_DESC=	Use fetch
+CURL_DESC=	Use curl, not fetch
+WGET_DESC=	Use wget, not fetch
+
+CURL_RUN_DEPENDS=	curl:ftp/curl
+WGET_RUN_DEPENDS=	wget:ftp/wget
+
+FETCH_FETCH_TOOL=	fetch
+CURL_FETCH_TOOL=	curl
+WGET_FETCH_TOOL=	wget
+
 do-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${MKDIR} ${STAGEDIR}/var/db/anvil
diff --git a/sysutils/anvil/distinfo b/sysutils/anvil/distinfo
index 801c34c0b35..bfcdb413239 100644
--- a/sysutils/anvil/distinfo
+++ b/sysutils/anvil/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500667509
-SHA256 (dlangille-anvil-0.0.9_GH0.tar.gz) = 07203464c0239a8aa22c5fff2323859094d5d5299feb4b2a5a227221655de257
-SIZE (dlangille-anvil-0.0.9_GH0.tar.gz) = 79368
+TIMESTAMP = 1502476475
+SHA256 (dlangille-anvil-0.0.10_GH0.tar.gz) = edc7007abc3262ee4cb7759e812f49230afafde8370a49d01bb71bfc9f91ccbd
+SIZE (dlangille-anvil-0.0.10_GH0.tar.gz) = 79550
diff --git a/sysutils/anvil/files/cert-puller.conf.sample.in b/sysutils/anvil/files/cert-puller.conf.sample.in
index 5d1efd7f755..0967184800d 100644
--- a/sysutils/anvil/files/cert-puller.conf.sample.in
+++ b/sysutils/anvil/files/cert-puller.conf.sample.in
@@ -1,3 +1,4 @@
 CERT_SERVER="https://certs.example.org/certs"
 MYCERTS="services.example.org"
 SERVICES="nginx"
+FETCH_TOOL="%%FETCH_TOOL%%"
diff --git a/sysutils/anvil/files/pkg-message.in b/sysutils/anvil/files/pkg-message.in
index a4086721a2f..58183412720 100644
--- a/sysutils/anvil/files/pkg-message.in
+++ b/sysutils/anvil/files/pkg-message.in
@@ -44,5 +44,11 @@ MAILTO=you@example.org
 19 20 * * * /usr/local/bin/cert-shifter
 ###
 
+To use wget, set FETCH_TOOL="wget" in cert-puller.conf
+To use curl, set FETCH_TOOL="curl" in cert-puller.conf
+
+The default argments to fetch, curl, and wget can be overridden
+in cert-puller.conf.  See the website for details.
+
 ****************************************************************************
 
diff --git a/sysutils/cfengine-masterfiles/Makefile b/sysutils/cfengine-masterfiles/Makefile
index a4e6ba82ef7..f2fea9840ce 100644
--- a/sysutils/cfengine-masterfiles/Makefile
+++ b/sysutils/cfengine-masterfiles/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-VERSIONS=		36 37 38 39 310
+VERSIONS=		36 37 38 39 310 311
 CFENGINE_VERSION?=	310
 
 MASTERDIR=		${.CURDIR}/../cfengine-masterfiles${CFENGINE_VERSION}
diff --git a/sysutils/cfengine-masterfiles311/Makefile b/sysutils/cfengine-masterfiles311/Makefile
new file mode 100644
index 00000000000..90d352ad24b
--- /dev/null
+++ b/sysutils/cfengine-masterfiles311/Makefile
@@ -0,0 +1,35 @@
+# Created by: cy@FreeBSD.org
+# $FreeBSD$
+
+PORTNAME=	cfengine-masterfiles
+PORTVERSION=	3.11.0
+CATEGORIES=	sysutils
+MASTER_SITES=	https://cfengine-package-repos.s3.amazonaws.com/tarballs/
+
+MAINTAINER=	cy@FreeBSD.org
+#		gjb@FreeBSD.org is also committer for this port
+#		skreuzer@FreeBSD.org is also committer for this port
+COMMENT=	cfengine sample policies for installations and upgrades
+
+LICENSE=	GPLv3
+
+CPE_VENDOR=	gnu
+
+.if !defined(MASTERDIR)
+PKGNAMESUFFIX=	311
+.endif
+
+RUN_DEPENDS=	cf-agent:sysutils/cfengine${PKGNAMESUFFIX}
+
+FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
+
+CONFLICTS=	cfengine-masterfiles[6-9]*
+
+MAKE_JOBS_UNSAFE=	yes
+USES=		cpe gmake python:build shebangfix
+HAS_CONFIGURE=	yes
+EXAMPLESDIR=	${PREFIX}/share/examples/cfengine-masterfiles
+CONFIGURE_ARGS=	--prefix=${EXAMPLESDIR}
+SHEBANG_FILES=	modules/packages/yum  modules/packages/zypper
+
+.include <bsd.port.mk>
diff --git a/sysutils/cfengine-masterfiles311/distinfo b/sysutils/cfengine-masterfiles311/distinfo
new file mode 100644
index 00000000000..be11d289c20
--- /dev/null
+++ b/sysutils/cfengine-masterfiles311/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1502459345
+SHA256 (cfengine-masterfiles-3.11.0.tar.gz) = 052a25d8dc9f2480825a4c6097e9db74762d6726afc163fbc1fef010bb6adab8
+SIZE (cfengine-masterfiles-3.11.0.tar.gz) = 474803
diff --git a/sysutils/cfengine-masterfiles311/pkg-descr b/sysutils/cfengine-masterfiles311/pkg-descr
new file mode 100644
index 00000000000..5b2d2217b44
--- /dev/null
+++ b/sysutils/cfengine-masterfiles311/pkg-descr
@@ -0,0 +1,10 @@
+CFEngine 3 is a popular open source configuration management system.
+Its primary function is to provide automated configuration and
+maintenance of large-scale computer systems.
+
+The repository is intended to provide a stable base policy for
+installations and upgrades, and is used by CFEngine 3.6 and newer.
+The port installs the repository as examples which should be copied by
+the user to the masterfiles directory (usually /var/cfengine/masterfiles).
+
+WWW: https://cfengine.com/
diff --git a/sysutils/cfengine-masterfiles311/pkg-plist b/sysutils/cfengine-masterfiles311/pkg-plist
new file mode 100644
index 00000000000..78d068fe6a9
--- /dev/null
+++ b/sysutils/cfengine-masterfiles311/pkg-plist
@@ -0,0 +1,133 @@
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/CFE_cfengine.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/core/deprecated/cfengine_processes.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/core/host_info_report.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/core/limit_robot_agents.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/core/log_rotation.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/core/main.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/core/watchdog/watchdog.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/CFE_hub_specific.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/CFE_knowledge.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/file_change.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/ha/ha.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/ha/ha_def.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/ha/ha_update.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/main.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/mission_portal.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/templates/httpd.conf.mustache
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/templates/runalerts.php.mustache
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/templates/runalerts.sh.mustache
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/update/cfe_internal_dc_workflow.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/update/cfe_internal_local_git_remote.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/update/cfe_internal_update_from_repository.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/update/lib.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/update/systemd_units.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/update/update_bins.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/update/update_policy.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/update/update_processes.cf
+%%EXAMPLESDIR%%/masterfiles/controls/3.6/cf_agent.cf
+%%EXAMPLESDIR%%/masterfiles/controls/3.6/cf_execd.cf
+%%EXAMPLESDIR%%/masterfiles/controls/3.6/cf_hub.cf
+%%EXAMPLESDIR%%/masterfiles/controls/3.6/cf_monitord.cf
+%%EXAMPLESDIR%%/masterfiles/controls/3.6/cf_runagent.cf
+%%EXAMPLESDIR%%/masterfiles/controls/3.6/cf_serverd.cf
+%%EXAMPLESDIR%%/masterfiles/controls/3.6/def.cf
+%%EXAMPLESDIR%%/masterfiles/controls/3.6/def_inputs.cf
+%%EXAMPLESDIR%%/masterfiles/controls/3.6/reports.cf
+%%EXAMPLESDIR%%/masterfiles/controls/3.6/update_def.cf
+%%EXAMPLESDIR%%/masterfiles/controls/3.6/update_def_inputs.cf
+%%EXAMPLESDIR%%/masterfiles/controls/cf_agent.cf
+%%EXAMPLESDIR%%/masterfiles/controls/cf_execd.cf
+%%EXAMPLESDIR%%/masterfiles/controls/cf_hub.cf
+%%EXAMPLESDIR%%/masterfiles/controls/cf_monitord.cf
+%%EXAMPLESDIR%%/masterfiles/controls/cf_runagent.cf
+%%EXAMPLESDIR%%/masterfiles/controls/cf_serverd.cf
+%%EXAMPLESDIR%%/masterfiles/controls/def.cf
+%%EXAMPLESDIR%%/masterfiles/controls/def_inputs.cf
+%%EXAMPLESDIR%%/masterfiles/controls/reports.cf
+%%EXAMPLESDIR%%/masterfiles/controls/update_def.cf
+%%EXAMPLESDIR%%/masterfiles/controls/update_def_inputs.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/aix.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/any.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/debian.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/freebsd.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/generic.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/linux.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/lsb.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/macos.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/os.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/redhat.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/suse.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/windows.cf
+%%EXAMPLESDIR%%/masterfiles/lib/3.6/autorun.cf
+%%EXAMPLESDIR%%/masterfiles/lib/3.6/bundles.cf
+%%EXAMPLESDIR%%/masterfiles/lib/3.6/cfe_internal.cf
+%%EXAMPLESDIR%%/masterfiles/lib/3.6/cfe_internal_hub.cf
+%%EXAMPLESDIR%%/masterfiles/lib/3.6/cfengine_enterprise_hub_ha.cf
+%%EXAMPLESDIR%%/masterfiles/lib/3.6/commands.cf
+%%EXAMPLESDIR%%/masterfiles/lib/3.6/common.cf
+%%EXAMPLESDIR%%/masterfiles/lib/3.6/databases.cf
+%%EXAMPLESDIR%%/masterfiles/lib/3.6/edit_xml.cf
+%%EXAMPLESDIR%%/masterfiles/lib/3.6/examples.cf
+%%EXAMPLESDIR%%/masterfiles/lib/3.6/feature.cf
+%%EXAMPLESDIR%%/masterfiles/lib/3.6/files.cf
+%%EXAMPLESDIR%%/masterfiles/lib/3.6/guest_environments.cf
+%%EXAMPLESDIR%%/masterfiles/lib/3.6/monitor.cf
+%%EXAMPLESDIR%%/masterfiles/lib/3.6/packages.cf
+%%EXAMPLESDIR%%/masterfiles/lib/3.6/paths.cf
+%%EXAMPLESDIR%%/masterfiles/lib/3.6/processes.cf
+%%EXAMPLESDIR%%/masterfiles/lib/3.6/services.cf
+%%EXAMPLESDIR%%/masterfiles/lib/3.6/stdlib.cf
+%%EXAMPLESDIR%%/masterfiles/lib/3.6/storage.cf
+%%EXAMPLESDIR%%/masterfiles/lib/3.6/users.cf
+%%EXAMPLESDIR%%/masterfiles/lib/3.6/vcs.cf
+%%EXAMPLESDIR%%/masterfiles/lib/3.7/README.md
+%%EXAMPLESDIR%%/masterfiles/lib/autorun.cf
+%%EXAMPLESDIR%%/masterfiles/lib/bundles.cf
+%%EXAMPLESDIR%%/masterfiles/lib/cfe_internal.cf
+%%EXAMPLESDIR%%/masterfiles/lib/cfe_internal_hub.cf
+%%EXAMPLESDIR%%/masterfiles/lib/cfengine_enterprise_hub_ha.cf
+%%EXAMPLESDIR%%/masterfiles/lib/commands.cf
+%%EXAMPLESDIR%%/masterfiles/lib/common.cf
+%%EXAMPLESDIR%%/masterfiles/lib/databases.cf
+%%EXAMPLESDIR%%/masterfiles/lib/edit_xml.cf
+%%EXAMPLESDIR%%/masterfiles/lib/event.cf
+%%EXAMPLESDIR%%/masterfiles/lib/examples.cf
+%%EXAMPLESDIR%%/masterfiles/lib/feature.cf
+%%EXAMPLESDIR%%/masterfiles/lib/files.cf
+%%EXAMPLESDIR%%/masterfiles/lib/guest_environments.cf
+%%EXAMPLESDIR%%/masterfiles/lib/monitor.cf
+%%EXAMPLESDIR%%/masterfiles/lib/packages.cf
+%%EXAMPLESDIR%%/masterfiles/lib/paths.cf
+%%EXAMPLESDIR%%/masterfiles/lib/processes.cf
+%%EXAMPLESDIR%%/masterfiles/lib/reports.cf
+%%EXAMPLESDIR%%/masterfiles/lib/services.cf
+%%EXAMPLESDIR%%/masterfiles/lib/stdlib.cf
+%%EXAMPLESDIR%%/masterfiles/lib/storage.cf
+%%EXAMPLESDIR%%/masterfiles/lib/testing.cf
+%%EXAMPLESDIR%%/masterfiles/lib/users.cf
+%%EXAMPLESDIR%%/masterfiles/lib/vcs.cf
+%%EXAMPLESDIR%%/masterfiles/promises.cf
+%%EXAMPLESDIR%%/masterfiles/services/autorun/hello.cf
+%%EXAMPLESDIR%%/masterfiles/services/main.cf
+%%EXAMPLESDIR%%/masterfiles/sketches/meta/api-runfile.cf
+%%EXAMPLESDIR%%/masterfiles/standalone_self_upgrade.cf
+%%EXAMPLESDIR%%/masterfiles/templates/cf-apache.service.mustache
+%%EXAMPLESDIR%%/masterfiles/templates/cf-consumer.service.mustache
+%%EXAMPLESDIR%%/masterfiles/templates/cf-execd.service.mustache
+%%EXAMPLESDIR%%/masterfiles/templates/cf-hub.service.mustache
+%%EXAMPLESDIR%%/masterfiles/templates/cf-monitord.service.mustache
+%%EXAMPLESDIR%%/masterfiles/templates/cf-postgres.service.mustache
+%%EXAMPLESDIR%%/masterfiles/templates/cf-redis-server.service.mustache
+%%EXAMPLESDIR%%/masterfiles/templates/cf-runalerts.service.mustache
+%%EXAMPLESDIR%%/masterfiles/templates/cf-serverd.service.mustache
+%%EXAMPLESDIR%%/masterfiles/templates/cfengine3.service.mustache
+%%EXAMPLESDIR%%/masterfiles/templates/cfengine_watchdog.mustache
+%%EXAMPLESDIR%%/masterfiles/templates/host_info_report.mustache
+%%EXAMPLESDIR%%/masterfiles/update.cf
+%%EXAMPLESDIR%%/modules/packages/apt_get
+%%EXAMPLESDIR%%/modules/packages/freebsd_ports
+%%EXAMPLESDIR%%/modules/packages/nimclient
+%%EXAMPLESDIR%%/modules/packages/pkg
+%%EXAMPLESDIR%%/modules/packages/pkgsrc
+%%EXAMPLESDIR%%/modules/packages/yum
+%%EXAMPLESDIR%%/modules/packages/zypper
diff --git a/sysutils/cfengine/Makefile b/sysutils/cfengine/Makefile
index 8de3929b77c..389227a94a9 100644
--- a/sysutils/cfengine/Makefile
+++ b/sysutils/cfengine/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-VERSIONS=		22 32 33 34 35 36 37 38 39 310
+VERSIONS=		22 32 33 34 35 36 37 38 39 310 311
 CFENGINE_VERSION?=	310
 
 MASTERDIR=		${.CURDIR}/../cfengine${CFENGINE_VERSION}
diff --git a/sysutils/cfengine311/Makefile b/sysutils/cfengine311/Makefile
new file mode 100644
index 00000000000..df5176eb9dd
--- /dev/null
+++ b/sysutils/cfengine311/Makefile
@@ -0,0 +1,70 @@
+# Created by: jrhett@netconsonance.com
+# $FreeBSD$
+
+PORTNAME=	cfengine
+PORTVERSION=	3.11.0
+CATEGORIES=	sysutils
+MASTER_SITES=	https://s3.amazonaws.com/cfengine-package-repos/tarballs/
+
+MAINTAINER=	cy@FreeBSD.org
+#		gjb@FreeBSD.org is also committer for this port
+#		skreuzer@FreeBSD.org is also committer for this port
+COMMENT=	Systems administration tool for networks
+
+LICENSE=	GPLv3
+
+CPE_VENDOR=	gnu
+
+.if !defined(MASTERDIR)
+PKGNAMESUFFIX=	311
+.endif
+
+FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
+
+CONFLICTS=	cfengine-[12-9]*
+
+USE_RC_SUBR=	cf-execd cf-serverd cf-monitord
+
+MAKE_JOBS_UNSAFE=	yes
+USE_LDCONFIG=	yes
+GNU_CONFIGURE=	yes
+USES=		autoreconf \
+		cpe gmake localbase libtool shebangfix ssl
+USE_GNOME=	libxml2
+SHEBANG_FILES=	examples/remake_outputs.pl
+CFLAGS+=	-Wno-return-type
+# EXAMPLESDIR=	${PREFIX}/share/examples/cfengine3
+DOCSDIR=	${PREFIX}/share/doc/cfengine
+MAKE_ENV=	EXPLICIT_VERSION=${PORTVERSION}
+CONFIGURE_ENV=	EXPLICIT_VERSION=${PORTVERSION}
+CONFIGURE_ARGS=	--docdir=${DOCSDIR} \
+		--htmldir=${DOCSDIR}/html \
+		--libexecdir=${PREFIX}/libexec \
+		--libdir=${PREFIX}/libexec \
+		--mandir=${PREFIX}/man \
+		--with-workdir=/var/cfengine \
+		--with-pcre=${LOCALBASE} \
+		--with-lmdb=${LOCALBASE} \
+		--enable-fhs
+INSTALL_TARGET=	install-strip
+
+LIB_DEPENDS+=	libpcre.so:devel/pcre \
+		liblmdb.so:databases/lmdb \
+		libyaml.so:textproc/libyaml \
+		libcurl.so:ftp/curl
+
+OPTIONS_DEFINE=	PGSQL MYSQL LIBVIRT
+
+PGSQL_USES=		pgsql
+PGSQL_CONFIGURE_WITH=	--with-postgresql=${LOCALBASE}
+
+MYSQL_USES=		mysql
+MYSQL_BROKEN=		configure: error: MySQL client library exports symbols (EVP_CIPHER_CTX_init) clashing with OpenSSL.
+MYSQL_CONFIGURE_WITH=	--with-mysql=${LOCALBASE}
+MYSQL_LIB_DEPENDS=	libmysqlclient.so:${_MYSQL_CLIENT}
+MYSQL_LDFLAGS=		-L${LOCALBASE}/lib/mysql
+
+LIBVIRT_CONFIGURE_WITH=	--with-libvirt=${LOCALBASE}
+LIBVIRT_LIB_DEPENDS+=	libvirt.so:devel/libvirt
+
+.include <bsd.port.mk>
diff --git a/sysutils/cfengine311/distinfo b/sysutils/cfengine311/distinfo
new file mode 100644
index 00000000000..50c311b968a
--- /dev/null
+++ b/sysutils/cfengine311/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1502457851
+SHA256 (cfengine-3.11.0.tar.gz) = 19524cf311c3cd7bf2d6c471c9b704c597671d2f89871d3d42302ba231de5865
+SIZE (cfengine-3.11.0.tar.gz) = 2396482
diff --git a/sysutils/cfengine311/files/cf-execd.in b/sysutils/cfengine311/files/cf-execd.in
new file mode 100644
index 00000000000..1ee33104e76
--- /dev/null
+++ b/sysutils/cfengine311/files/cf-execd.in
@@ -0,0 +1,28 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: cf-execd
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following line to /etc/rc.conf[.local] to enable cf-execd(8)
+#
+# cf_execd_enable (bool):        Set to "NO" by default.
+#                               Set it to "YES" to enable cf-execd.
+# cf_execd_flags (str):          Custom additional arguments to be passed
+#                               to cf-execd (default empty).
+#
+
+. /etc/rc.subr
+
+name="cf_execd"
+rcvar=cf_execd_enable
+
+command="%%PREFIX%%/sbin/cf-execd"
+
+load_rc_config $name
+
+: ${cf_execd_enable="NO"}
+
+run_rc_command "$1"
diff --git a/sysutils/cfengine311/files/cf-monitord.in b/sysutils/cfengine311/files/cf-monitord.in
new file mode 100644
index 00000000000..471ee108622
--- /dev/null
+++ b/sysutils/cfengine311/files/cf-monitord.in
@@ -0,0 +1,28 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: cf-monitord
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following line to /etc/rc.conf[.local] to enable cf-monitord(8)
+#
+# cf_monitord_enable (bool):        Set to "NO" by default.
+#                               Set it to "YES" to enable cf-monitord.
+# cf_monitord_flags (str):          Custom additional arguments to be passed
+#                               to cf-monitord (default empty).
+#
+
+. /etc/rc.subr
+
+name="cf_monitord"
+rcvar=cf_monitord_enable
+
+command="%%PREFIX%%/sbin/cf-monitord"
+
+load_rc_config $name
+
+: ${cf_monitord_enable="NO"}
+
+run_rc_command "$1"
diff --git a/sysutils/cfengine311/files/cf-serverd.in b/sysutils/cfengine311/files/cf-serverd.in
new file mode 100644
index 00000000000..9fbd07cc148
--- /dev/null
+++ b/sysutils/cfengine311/files/cf-serverd.in
@@ -0,0 +1,28 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: cf-serverd
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following line to /etc/rc.conf[.local] to enable cf-serverd(8)
+#
+# cf_serverd_enable (bool):        Set to "NO" by default.
+#                               Set it to "YES" to enable cf-serverd.
+# cf_serverd_flags (str):          Custom additional arguments to be passed
+#                               to cf-serverd (default empty).
+#
+
+. /etc/rc.subr
+
+name="cf_serverd"
+rcvar=cf_serverd_enable
+
+command="%%PREFIX%%/sbin/cf-serverd"
+
+load_rc_config $name
+
+: ${cf_serverd_enable="NO"}
+
+run_rc_command "$1"
diff --git a/sysutils/cfengine311/files/patch-m4-strndup.m4 b/sysutils/cfengine311/files/patch-m4-strndup.m4
new file mode 100644
index 00000000000..31e4b7e264d
--- /dev/null
+++ b/sysutils/cfengine311/files/patch-m4-strndup.m4
@@ -0,0 +1,54 @@
+--- /dev/null	2014-07-29 08:00:54.000000000 -0700
++++ m4/strndup.m4	2014-07-29 08:01:42.499328796 -0700
+@@ -0,0 +1,51 @@
++# strndup.m4 serial 21
++dnl Copyright (C) 2002-2003, 2005-2013 Free Software Foundation, Inc.
++dnl This file is free software; the Free Software Foundation
++dnl gives unlimited permission to copy and/or distribute it,
++dnl with or without modifications, as long as this notice is preserved.
++
++AC_DEFUN([cf3_FUNC_STRNDUP],
++[
++  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
++  AC_CHECK_DECLS([strndup])
++  AC_REPLACE_FUNCS([strndup])
++  if test $ac_cv_have_decl_strndup = no; then
++    HAVE_DECL_STRNDUP=0
++  fi
++
++  if test $ac_cv_func_strndup = yes; then
++    HAVE_STRNDUP=1
++    # AIX 5.3 has a function that tries to copy the entire range specified
++    # by n, instead of just the length of src.
++    AC_CACHE_CHECK([for working strndup], [cf3_cv_func_strndup_works],
++      [AC_RUN_IFELSE([
++         AC_LANG_PROGRAM([[#include <string.h>
++                           #include <stdlib.h>]], [[
++#if !HAVE_DECL_STRNDUP
++  extern
++  #ifdef __cplusplus
++  "C"
++  #endif
++  char *strndup (const char *, size_t);
++#endif
++  char *s;
++  // Will crash if strndup tries to traverse all 2GB.
++  s = strndup ("string", 2000000000);
++  return 0;]])],
++         [cf3_cv_func_strndup_works=yes],
++         [cf3_cv_func_strndup_works=no],
++         [
++changequote(,)dnl
++          case $host_os in
++            aix | aix[3-6]*) cf3_cv_func_strndup_works="guessing no";;
++            *)               cf3_cv_func_strndup_works="guessing yes";;
++          esac
++changequote([,])dnl
++         ])])
++    case $cf3_cv_func_strndup_works in
++      *no) AC_LIBOBJ([strndup]) ;;
++    esac
++  else
++    HAVE_STRNDUP=0
++  fi
++])
diff --git a/sysutils/cfengine311/files/patch-m4__strndup.m4 b/sysutils/cfengine311/files/patch-m4__strndup.m4
new file mode 100644
index 00000000000..cb6d41d2e7c
--- /dev/null
+++ b/sysutils/cfengine311/files/patch-m4__strndup.m4
@@ -0,0 +1,56 @@
+Index: m4/strndup.m4
+===================================================================
+--- /dev/null	2014-07-29 08:00:54.000000000 -0700
++++ m4/strndup.m4	2014-07-29 08:01:42.499328796 -0700
+@@ -0,0 +1,51 @@
++# strndup.m4 serial 21
++dnl Copyright (C) 2002-2003, 2005-2013 Free Software Foundation, Inc.
++dnl This file is free software; the Free Software Foundation
++dnl gives unlimited permission to copy and/or distribute it,
++dnl with or without modifications, as long as this notice is preserved.
++
++AC_DEFUN([cf3_FUNC_STRNDUP],
++[
++  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
++  AC_CHECK_DECLS([strndup])
++  AC_REPLACE_FUNCS([strndup])
++  if test $ac_cv_have_decl_strndup = no; then
++    HAVE_DECL_STRNDUP=0
++  fi
++
++  if test $ac_cv_func_strndup = yes; then
++    HAVE_STRNDUP=1
++    # AIX 5.3 has a function that tries to copy the entire range specified
++    # by n, instead of just the length of src.
++    AC_CACHE_CHECK([for working strndup], [cf3_cv_func_strndup_works],
++      [AC_RUN_IFELSE([
++         AC_LANG_PROGRAM([[#include <string.h>
++                           #include <stdlib.h>]], [[
++#if !HAVE_DECL_STRNDUP
++  extern
++  #ifdef __cplusplus
++  "C"
++  #endif
++  char *strndup (const char *, size_t);
++#endif
++  char *s;
++  // Will crash if strndup tries to traverse all 2GB.
++  s = strndup ("string", 2000000000);
++  return 0;]])],
++         [cf3_cv_func_strndup_works=yes],
++         [cf3_cv_func_strndup_works=no],
++         [
++changequote(,)dnl
++          case $host_os in
++            aix | aix[3-6]*) cf3_cv_func_strndup_works="guessing no";;
++            *)               cf3_cv_func_strndup_works="guessing yes";;
++          esac
++changequote([,])dnl
++         ])])
++    case $cf3_cv_func_strndup_works in
++      *no) AC_LIBOBJ([strndup]) ;;
++    esac
++  else
++    HAVE_STRNDUP=0
++  fi
++])
diff --git a/sysutils/cfengine311/pkg-descr b/sysutils/cfengine311/pkg-descr
new file mode 100644
index 00000000000..47d900688ce
--- /dev/null
+++ b/sysutils/cfengine311/pkg-descr
@@ -0,0 +1,10 @@
+Cfengine is an automated suite of programs for configuring and
+maintaining Unix-like computers. It has been used on computing arrays
+of between 1 and 20,000 computers since 1993 by a wide range of
+organizations. Cfengine is supported by active research and was the
+first autonomic, hands-free management system for Unix-like operating
+systems. Cfengine is an autonomic maintenance system not merely a
+change management roll-out tool. Cfengine has a history of security
+and adaptability.
+
+WWW: https://cfengine.com/
diff --git a/sysutils/cfengine311/pkg-plist b/sysutils/cfengine311/pkg-plist
new file mode 100644
index 00000000000..308de89dbcd
--- /dev/null
+++ b/sysutils/cfengine311/pkg-plist
@@ -0,0 +1,393 @@
+bin/cf-agent
+bin/cf-execd
+bin/cf-key
+bin/cf-monitord
+bin/cf-net
+bin/cf-promises
+bin/cf-runagent
+bin/cf-serverd
+bin/cf-upgrade
+bin/rpmvercmp
+libexec/cfengine/libpromises.so
+libexec/cfengine/libpromises.so.3
+libexec/cfengine/libpromises.so.3.0.6
+%%DOCSDIR%%/ChangeLog
+%%DOCSDIR%%/README.md
+%%DOCSDIR%%/examples/abort.cf
+%%DOCSDIR%%/examples/accessed_before.cf
+%%DOCSDIR%%/examples/accessedbefore.cf
+%%DOCSDIR%%/examples/accumulated_time.cf
+%%DOCSDIR%%/examples/acl.cf
+%%DOCSDIR%%/examples/acl_generic.cf
+%%DOCSDIR%%/examples/acl_ntfs.cf
+%%DOCSDIR%%/examples/acl_secret.cf
+%%DOCSDIR%%/examples/active_directory.cf
+%%DOCSDIR%%/examples/activedirectory_listusers.cf
+%%DOCSDIR%%/examples/activedirectory_showuser.cf
+%%DOCSDIR%%/examples/ago.cf
+%%DOCSDIR%%/examples/app_baseline.cf
+%%DOCSDIR%%/examples/appgroups.cf
+%%DOCSDIR%%/examples/arrays.cf
+%%DOCSDIR%%/examples/augment.cf
+%%DOCSDIR%%/examples/backreferences_files.cf
+%%DOCSDIR%%/examples/badpromise.cf
+%%DOCSDIR%%/examples/badtype.cf
+%%DOCSDIR%%/examples/bsdflags.cf
+%%DOCSDIR%%/examples/bundle_return_values.cf
+%%DOCSDIR%%/examples/bundlesmatching.cf
+%%DOCSDIR%%/examples/bundlestate.cf
+%%DOCSDIR%%/examples/canonify.cf
+%%DOCSDIR%%/examples/cf2_integration.cf
+%%DOCSDIR%%/examples/change_detect.cf
+%%DOCSDIR%%/examples/changedbefore.cf
+%%DOCSDIR%%/examples/chdir.cf
+%%DOCSDIR%%/examples/classes_global.cf
+%%DOCSDIR%%/examples/classesmatching.cf
+%%DOCSDIR%%/examples/classmatch.cf
+%%DOCSDIR%%/examples/classvar_convergence.cf
+%%DOCSDIR%%/examples/commands.cf
+%%DOCSDIR%%/examples/compare.cf
+%%DOCSDIR%%/examples/container_iteration.cf
+%%DOCSDIR%%/examples/container_key_iteration.cf
+%%DOCSDIR%%/examples/control_expand.cf
+%%DOCSDIR%%/examples/controlclasses.cf
+%%DOCSDIR%%/examples/copy.cf
+%%DOCSDIR%%/examples/copy_classes.cf
+%%DOCSDIR%%/examples/copy_copbl.cf
+%%DOCSDIR%%/examples/copy_edit.cf
+%%DOCSDIR%%/examples/copydir_copbl.cf
+%%DOCSDIR%%/examples/copylinks.cf
+%%DOCSDIR%%/examples/countclassesmatching.cf
+%%DOCSDIR%%/examples/countlinesmatching.cf
+%%DOCSDIR%%/examples/create_filedir.cf
+%%DOCSDIR%%/examples/createdb.cf
+%%DOCSDIR%%/examples/customize_by_named_list.cf
+%%DOCSDIR%%/examples/data_expand.cf
+%%DOCSDIR%%/examples/data_readstringarray.cf
+%%DOCSDIR%%/examples/data_regextract.cf
+%%DOCSDIR%%/examples/datastate.cf
+%%DOCSDIR%%/examples/defaults.cf
+%%DOCSDIR%%/examples/defaults2.cf
+%%DOCSDIR%%/examples/defaults3.cf
+%%DOCSDIR%%/examples/definitions.cf
+%%DOCSDIR%%/examples/deletelines.cf
+%%DOCSDIR%%/examples/depends_on.cf
+%%DOCSDIR%%/examples/depends_on2.cf
+%%DOCSDIR%%/examples/difference.cf
+%%DOCSDIR%%/examples/dirname.cf
+%%DOCSDIR%%/examples/disable.cf
+%%DOCSDIR%%/examples/disable_and_rotate_files.cf
+%%DOCSDIR%%/examples/diskfree.cf
+%%DOCSDIR%%/examples/dollar.cf
+%%DOCSDIR%%/examples/edit_column_files.cf
+%%DOCSDIR%%/examples/edit_comment_lines.cf
+%%DOCSDIR%%/examples/edit_deletenotmatch.cf
+%%DOCSDIR%%/examples/edit_insert_fuzzylines.cf
+%%DOCSDIR%%/examples/edit_insert_lines.cf
+%%DOCSDIR%%/examples/edit_insert_lines_silly.cf
+%%DOCSDIR%%/examples/edit_passwd_file.cf
+%%DOCSDIR%%/examples/edit_passwd_file_basic.cf
+%%DOCSDIR%%/examples/edit_replace_string.cf
+%%DOCSDIR%%/examples/edit_sectioned_file.cf
+%%DOCSDIR%%/examples/edit_setvar.cf
+%%DOCSDIR%%/examples/edit_template.cf
+%%DOCSDIR%%/examples/edit_triggerclass.cf
+%%DOCSDIR%%/examples/edit_xml.cf
+%%DOCSDIR%%/examples/ensure_line_present_prepend_append.cf
+%%DOCSDIR%%/examples/env.cf
+%%DOCSDIR%%/examples/epimenides.cf
+%%DOCSDIR%%/examples/escape.cf
+%%DOCSDIR%%/examples/eval.cf
+%%DOCSDIR%%/examples/every.cf
+%%DOCSDIR%%/examples/exec_args.cf
+%%DOCSDIR%%/examples/exec_in_sequence.cf
+%%DOCSDIR%%/examples/execd.cf
+%%DOCSDIR%%/examples/execresult.cf
+%%DOCSDIR%%/examples/expand.cf
+%%DOCSDIR%%/examples/failedcommand.cf
+%%DOCSDIR%%/examples/failsafe.cf
+%%DOCSDIR%%/examples/file_change_detection.cf
+%%DOCSDIR%%/examples/file_hash.cf
+%%DOCSDIR%%/examples/file_owner_list_template.cf
+%%DOCSDIR%%/examples/fileexists.cf
+%%DOCSDIR%%/examples/filenames.cf
+%%DOCSDIR%%/examples/fileperms.cf
+%%DOCSDIR%%/examples/filesexist.cf
+%%DOCSDIR%%/examples/filesexist2.cf
+%%DOCSDIR%%/examples/filesize.cf
+%%DOCSDIR%%/examples/filestat.cf
+%%DOCSDIR%%/examples/filter.cf
+%%DOCSDIR%%/examples/findfiles.cf
+%%DOCSDIR%%/examples/fix_names.cf
+%%DOCSDIR%%/examples/format.cf
+%%DOCSDIR%%/examples/getclassmetatags.cf
+%%DOCSDIR%%/examples/getenv.cf
+%%DOCSDIR%%/examples/getfields.cf
+%%DOCSDIR%%/examples/getgid.cf
+%%DOCSDIR%%/examples/getindices.cf
+%%DOCSDIR%%/examples/getindices_and_values.cf
+%%DOCSDIR%%/examples/getmacaddress.cf
+%%DOCSDIR%%/examples/getregistry.cf
+%%DOCSDIR%%/examples/getuid.cf
+%%DOCSDIR%%/examples/getuserinfo.cf
+%%DOCSDIR%%/examples/getusers.cf
+%%DOCSDIR%%/examples/getvalues.cf
+%%DOCSDIR%%/examples/getvariablemetatags.cf
+%%DOCSDIR%%/examples/global_list_expansion.cf
+%%DOCSDIR%%/examples/global_list_expansion_2.cf
+%%DOCSDIR%%/examples/grep.cf
+%%DOCSDIR%%/examples/groupexists.cf
+%%DOCSDIR%%/examples/guest_environment_kvm.cf
+%%DOCSDIR%%/examples/hash.cf
+%%DOCSDIR%%/examples/hashcomment.cf
+%%DOCSDIR%%/examples/hashmatch.cf
+%%DOCSDIR%%/examples/hashuncomment.cf
+%%DOCSDIR%%/examples/helloworld.cf
+%%DOCSDIR%%/examples/host2ip.cf
+%%DOCSDIR%%/examples/hostrange.cf
+%%DOCSDIR%%/examples/hostsseen.cf
+%%DOCSDIR%%/examples/hostswithclass.cf
+%%DOCSDIR%%/examples/hub.cf
+%%DOCSDIR%%/examples/id.cf
+%%DOCSDIR%%/examples/inherit.cf
+%%DOCSDIR%%/examples/insert_users.cf
+%%DOCSDIR%%/examples/intarray.cf
+%%DOCSDIR%%/examples/intersection.cf
+%%DOCSDIR%%/examples/inventory_cpu.cf
+%%DOCSDIR%%/examples/ip2host.cf
+%%DOCSDIR%%/examples/iprange.cf
+%%DOCSDIR%%/examples/irange.cf
+%%DOCSDIR%%/examples/isdir.cf
+%%DOCSDIR%%/examples/isexecutable.cf
+%%DOCSDIR%%/examples/isgreaterthan.cf
+%%DOCSDIR%%/examples/isipinsubnet.cf
+%%DOCSDIR%%/examples/islessthan.cf
+%%DOCSDIR%%/examples/islink.cf
+%%DOCSDIR%%/examples/isnewerthan.cf
+%%DOCSDIR%%/examples/isplain.cf
+%%DOCSDIR%%/examples/isvariable.cf
+%%DOCSDIR%%/examples/iteration.cf
+%%DOCSDIR%%/examples/join.cf
+%%DOCSDIR%%/examples/kill_process_running_wrong_user.cf
+%%DOCSDIR%%/examples/knowledge_driver.cf
+%%DOCSDIR%%/examples/knowledge_txt.cf
+%%DOCSDIR%%/examples/lastnode.cf
+%%DOCSDIR%%/examples/ldap.cf
+%%DOCSDIR%%/examples/length.cf
+%%DOCSDIR%%/examples/linking.cf
+%%DOCSDIR%%/examples/literal_server.cf
+%%DOCSDIR%%/examples/local_group_present.cf
+%%DOCSDIR%%/examples/local_user_password.cf
+%%DOCSDIR%%/examples/local_user_secondary_group_member.cf
+%%DOCSDIR%%/examples/local_users_absent.cf
+%%DOCSDIR%%/examples/local_users_locked.cf
+%%DOCSDIR%%/examples/local_users_present.cf
+%%DOCSDIR%%/examples/locate_files_and_compress.cf
+%%DOCSDIR%%/examples/log_private.cf
+%%DOCSDIR%%/examples/loops.cf
+%%DOCSDIR%%/examples/lsdir.cf
+%%DOCSDIR%%/examples/maparray.cf
+%%DOCSDIR%%/examples/mapdata.cf
+%%DOCSDIR%%/examples/mapdata_jsonpipe.cf
+%%DOCSDIR%%/examples/maplist.cf
+%%DOCSDIR%%/examples/max-min-mean-variance.cf
+%%DOCSDIR%%/examples/measure_log.cf
+%%DOCSDIR%%/examples/measurements.cf
+%%DOCSDIR%%/examples/menu.cf
+%%DOCSDIR%%/examples/mergedata.cf
+%%DOCSDIR%%/examples/meta.cf
+%%DOCSDIR%%/examples/method.cf
+%%DOCSDIR%%/examples/method_polymorph.cf
+%%DOCSDIR%%/examples/method_validate.cf
+%%DOCSDIR%%/examples/method_var.cf
+%%DOCSDIR%%/examples/method_var2.cf
+%%DOCSDIR%%/examples/module_exec.cf
+%%DOCSDIR%%/examples/module_exec_2.cf
+%%DOCSDIR%%/examples/monitord.cf
+%%DOCSDIR%%/examples/mount_fs.cf
+%%DOCSDIR%%/examples/multipassvars.cf
+%%DOCSDIR%%/examples/multiple_outcomes.cf
+%%DOCSDIR%%/examples/mustache_template_motd.cf
+%%DOCSDIR%%/examples/namespace.cf
+%%DOCSDIR%%/examples/namespace1.cf
+%%DOCSDIR%%/examples/namespace2.cf
+%%DOCSDIR%%/examples/namespace3.cf
+%%DOCSDIR%%/examples/namespace_class1.cf
+%%DOCSDIR%%/examples/namespace_classes.cf
+%%DOCSDIR%%/examples/namespace_var_meta.cf
+%%DOCSDIR%%/examples/namespace_var_meta2.cf
+%%DOCSDIR%%/examples/neighbourhood_watch.cf
+%%DOCSDIR%%/examples/none.cf
+%%DOCSDIR%%/examples/nth.cf
+%%DOCSDIR%%/examples/null_config.cf
+%%DOCSDIR%%/examples/occurrences.cf
+%%DOCSDIR%%/examples/orchestrate_chain1.cf
+%%DOCSDIR%%/examples/orchestrate_chain2.cf
+%%DOCSDIR%%/examples/orchestrate_delay_trigger.cf
+%%DOCSDIR%%/examples/orchestrate_dominoes1.cf
+%%DOCSDIR%%/examples/orchestrate_dominoes2.cf
+%%DOCSDIR%%/examples/orchestrate_dragon.cf
+%%DOCSDIR%%/examples/orchestrate_dragon_load_balancer.cf
+%%DOCSDIR%%/examples/orchestrate_n_of_m.cf
+%%DOCSDIR%%/examples/orchestration_hostlist.cf
+%%DOCSDIR%%/examples/ordering.cf
+%%DOCSDIR%%/examples/package_apt.cf
+%%DOCSDIR%%/examples/package_bundles.cf
+%%DOCSDIR%%/examples/package_freebsd.cf
+%%DOCSDIR%%/examples/package_latest.cf
+%%DOCSDIR%%/examples/package_msi_file.cf
+%%DOCSDIR%%/examples/package_msi_version.cf
+%%DOCSDIR%%/examples/package_rpm.cf
+%%DOCSDIR%%/examples/package_solaris.cf
+%%DOCSDIR%%/examples/package_windows_feature.cf
+%%DOCSDIR%%/examples/package_yum.cf
+%%DOCSDIR%%/examples/package_zypper.cf
+%%DOCSDIR%%/examples/packagesmatching.cf
+%%DOCSDIR%%/examples/parallel_exec.cf
+%%DOCSDIR%%/examples/parseintrealstringarray.cf
+%%DOCSDIR%%/examples/parsestringarray.cf
+%%DOCSDIR%%/examples/parsestringarrayidx.cf
+%%DOCSDIR%%/examples/pathtype.cf
+%%DOCSDIR%%/examples/pattern_and_edit.cf
+%%DOCSDIR%%/examples/peerleader.cf
+%%DOCSDIR%%/examples/peerleaders.cf
+%%DOCSDIR%%/examples/peers.cf
+%%DOCSDIR%%/examples/postfix.cf
+%%DOCSDIR%%/examples/process_kill.cf
+%%DOCSDIR%%/examples/process_matching.cf
+%%DOCSDIR%%/examples/process_matching2.cf
+%%DOCSDIR%%/examples/process_matching3.cf
+%%DOCSDIR%%/examples/process_restart.cf
+%%DOCSDIR%%/examples/process_restart_basic.cf
+%%DOCSDIR%%/examples/process_signalling.cf
+%%DOCSDIR%%/examples/processes_define_class_based_on_process_runtime.cf
+%%DOCSDIR%%/examples/product.cf
+%%DOCSDIR%%/examples/promise_knowledge.cf
+%%DOCSDIR%%/examples/promises.cf
+%%DOCSDIR%%/examples/quoting.cf
+%%DOCSDIR%%/examples/randomint.cf
+%%DOCSDIR%%/examples/readcsv.cf
+%%DOCSDIR%%/examples/readdata.cf
+%%DOCSDIR%%/examples/readfile.cf
+%%DOCSDIR%%/examples/readintrealstringlist.cf
+%%DOCSDIR%%/examples/readlist.cf
+%%DOCSDIR%%/examples/readtcp.cf
+%%DOCSDIR%%/examples/reg_multiline.cf
+%%DOCSDIR%%/examples/regarray.cf
+%%DOCSDIR%%/examples/regcmp.cf
+%%DOCSDIR%%/examples/regex_replace.cf
+%%DOCSDIR%%/examples/regex_win.cf
+%%DOCSDIR%%/examples/regextract.cf
+%%DOCSDIR%%/examples/registry.cf
+%%DOCSDIR%%/examples/registry_cache.cf
+%%DOCSDIR%%/examples/registryvalue.cf
+%%DOCSDIR%%/examples/regline.cf
+%%DOCSDIR%%/examples/reglist.cf
+%%DOCSDIR%%/examples/remake_outputs.pl
+%%DOCSDIR%%/examples/remoteclasses.cf
+%%DOCSDIR%%/examples/remoteclasses2.cf
+%%DOCSDIR%%/examples/remotescalar.cf
+%%DOCSDIR%%/examples/remove_deadlinks.cf
+%%DOCSDIR%%/examples/rename.cf
+%%DOCSDIR%%/examples/repairedcommand.cf
+%%DOCSDIR%%/examples/report_custom.cf
+%%DOCSDIR%%/examples/report_diffs.cf
+%%DOCSDIR%%/examples/report_state.cf
+%%DOCSDIR%%/examples/reporting.cf
+%%DOCSDIR%%/examples/reports.cf
+%%DOCSDIR%%/examples/reporttofile.cf
+%%DOCSDIR%%/examples/resolveconf.cf
+%%DOCSDIR%%/examples/returnszero.cf
+%%DOCSDIR%%/examples/reverse.cf
+%%DOCSDIR%%/examples/root_passwd.cf
+%%DOCSDIR%%/examples/select_class.cf
+%%DOCSDIR%%/examples/select_mode.cf
+%%DOCSDIR%%/examples/select_region.cf
+%%DOCSDIR%%/examples/select_size.cf
+%%DOCSDIR%%/examples/selectservers.cf
+%%DOCSDIR%%/examples/server_callback.cf
+%%DOCSDIR%%/examples/server_copy_localhost.cf
+%%DOCSDIR%%/examples/server_copy_purge.cf
+%%DOCSDIR%%/examples/server_copy_remote.cf
+%%DOCSDIR%%/examples/server_flatcopy_localhost.cf
+%%DOCSDIR%%/examples/service_catalogue.cf
+%%DOCSDIR%%/examples/service_catalogue_separate.cf
+%%DOCSDIR%%/examples/service_disable.cf
+%%DOCSDIR%%/examples/service_start.cf
+%%DOCSDIR%%/examples/services.cf
+%%DOCSDIR%%/examples/services_concept.cf
+%%DOCSDIR%%/examples/services_default_service_bundle.cf
+%%DOCSDIR%%/examples/services_win.cf
+%%DOCSDIR%%/examples/setuidlog.cf
+%%DOCSDIR%%/examples/setvar.cf
+%%DOCSDIR%%/examples/shuffle.cf
+%%DOCSDIR%%/examples/simple_ssh_key_distribution.cf
+%%DOCSDIR%%/examples/software_dist.cf
+%%DOCSDIR%%/examples/software_update_version_yum.cf
+%%DOCSDIR%%/examples/some.cf
+%%DOCSDIR%%/examples/sort.cf
+%%DOCSDIR%%/examples/splitstring.cf
+%%DOCSDIR%%/examples/sql_table_structure.cf
+%%DOCSDIR%%/examples/storage.cf
+%%DOCSDIR%%/examples/strcmp.cf
+%%DOCSDIR%%/examples/strftime.cf
+%%DOCSDIR%%/examples/string_downcase.cf
+%%DOCSDIR%%/examples/string_head.cf
+%%DOCSDIR%%/examples/string_length.cf
+%%DOCSDIR%%/examples/string_mustache.cf
+%%DOCSDIR%%/examples/string_reverse.cf
+%%DOCSDIR%%/examples/string_split.cf
+%%DOCSDIR%%/examples/string_tail.cf
+%%DOCSDIR%%/examples/string_upcase.cf
+%%DOCSDIR%%/examples/stringarray.cf
+%%DOCSDIR%%/examples/sublist.cf
+%%DOCSDIR%%/examples/sum.cf
+%%DOCSDIR%%/examples/switchcase.cf
+%%DOCSDIR%%/examples/symlink.cf
+%%DOCSDIR%%/examples/symlink_children.cf
+%%DOCSDIR%%/examples/syslog.cf
+%%DOCSDIR%%/examples/syslog2.cf
+%%DOCSDIR%%/examples/template.cf
+%%DOCSDIR%%/examples/template2.cf
+%%DOCSDIR%%/examples/test_environment.cf
+%%DOCSDIR%%/examples/tidy_all_files.cf
+%%DOCSDIR%%/examples/translatepath.cf
+%%DOCSDIR%%/examples/unique.cf
+%%DOCSDIR%%/examples/unpack_method_calls.cf
+%%DOCSDIR%%/examples/update.cf
+%%DOCSDIR%%/examples/user_edit.cf
+%%DOCSDIR%%/examples/user_edit_method.cf
+%%DOCSDIR%%/examples/userexists.cf
+%%DOCSDIR%%/examples/users_type.cf
+%%DOCSDIR%%/examples/varclass.cf
+%%DOCSDIR%%/examples/varexpansion.cf
+%%DOCSDIR%%/examples/variablesmatching.cf
+%%DOCSDIR%%/examples/variablesmatching_as_data.cf
+%%DOCSDIR%%/examples/varnet.cf
+%%DOCSDIR%%/examples/vars.cf
+%%DOCSDIR%%/examples/warnifline.cf
+%%DOCSDIR%%/examples/webserver.cf
+%%DOCSDIR%%/examples/win_dns_client.cf
+%%DOCSDIR%%/examples/win_emergency.cf
+%%DOCSDIR%%/examples/win_registry.cf
+%%DOCSDIR%%/examples/win_schedule.cf
+%%DOCSDIR%%/examples/zenoss.cf
+%%DOCSDIR%%/examples/mustache_comments.cf
+%%DOCSDIR%%/examples/mustache_extension_compact_json.cf
+%%DOCSDIR%%/examples/mustache_extension_expand_key.cf
+%%DOCSDIR%%/examples/mustache_extension_multiline_json.cf
+%%DOCSDIR%%/examples/mustache_extension_top.cf
+%%DOCSDIR%%/examples/mustache_sections_empty_list.cf
+%%DOCSDIR%%/examples/mustache_sections_inverted.cf
+%%DOCSDIR%%/examples/mustache_sections_non_empty_list.cf
+%%DOCSDIR%%/examples/mustache_sections_non_false_value.cf
+%%DOCSDIR%%/examples/mustache_set_delimiters.cf
+%%DOCSDIR%%/examples/mustache_variables.cf
+%%DOCSDIR%%/examples/readenvfile.cf
+%%DOCSDIR%%/examples/with.cf
+@dir /var/cfengine/inputs
+@dir /var/cfengine/modules
+@dir /var/cfengine/outputs
+@dir /var/cfengine/plugins
+@dir(root,wheel,700) /var/cfengine/ppkeys
+@dir /var/cfengine
diff --git a/sysutils/dsbdriverd/Makefile b/sysutils/dsbdriverd/Makefile
index 40bcb456d55..62a421dab0e 100644
--- a/sysutils/dsbdriverd/Makefile
+++ b/sysutils/dsbdriverd/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dsbdriverd
-PORTVERSION=	0.1.4
+PORTVERSION=	0.2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://freeshell.de/~mk/download/
 
@@ -10,6 +10,7 @@ MAINTAINER=	mk@nic-nac-project.org
 COMMENT=	Hardware detecting, device driver loading daemon
 
 LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		tar:tgz
 
diff --git a/sysutils/dsbdriverd/distinfo b/sysutils/dsbdriverd/distinfo
index 91239563f50..f18ad491818 100644
--- a/sysutils/dsbdriverd/distinfo
+++ b/sysutils/dsbdriverd/distinfo
@@ -1,2 +1,3 @@
-SHA256 (dsbdriverd-0.1.4.tgz) = f3e0cf4a2065915f7d27c42723ede686e6c5f8e628e86a893cdcc558d273a185
-SIZE (dsbdriverd-0.1.4.tgz) = 62464
+TIMESTAMP = 1502406928
+SHA256 (dsbdriverd-0.2.tgz) = 4890d31a061607ae62bec37b06d53bb642b30babc081d6ca7678268910791d2a
+SIZE (dsbdriverd-0.2.tgz) = 22742
diff --git a/sysutils/dsbdriverd/files/patch-Makefile b/sysutils/dsbdriverd/files/patch-Makefile
deleted file mode 100644
index ba9aed72ade..00000000000
--- a/sysutils/dsbdriverd/files/patch-Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
---- Makefile.orig	2016-03-15 11:38:05 UTC
-+++ Makefile
-@@ -17,9 +17,9 @@ PROGRAM_FLAGS += -DPATH_DRIVERS_DB=\"${D
- PROGRAM_FLAGS += -DPATH_LOG=\"${LOGFILE}\"
- PROGRAM_FLAGS += -DPATH_PID_FILE=\"${PIDFILE}\"
- PROGRAM_LIBS   = -lusb
--INSTALL_DATA   = install -g wheel -o root -m 0644
--INSTALL_SCRIPT = install -g wheel -m 0755 -o root
--INSTALL_PROGRAM= install -s -g wheel -m 0755 -o root
-+INSTALL_DATA   = install -m 0644
-+INSTALL_SCRIPT = install -m 0755
-+INSTALL_PROGRAM= install -s -m 0755
- 
- all: ${INSTALL_TARGETS}
- 
diff --git a/sysutils/facter/Makefile b/sysutils/facter/Makefile
index 2ec7825782e..a7824cf041f 100644
--- a/sysutils/facter/Makefile
+++ b/sysutils/facter/Makefile
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	facter
-PORTVERSION=	3.1.3
-PORTREVISION=	6
-CATEGORIES=	sysutils
+PORTVERSION=	3.7.1
+PORTREVISION?=	0
+CATEGORIES?=	sysutils
 MASTER_SITES=	http://downloads.puppetlabs.com/facter/
 
 MAINTAINER=	puppet@FreeBSD.org
@@ -12,25 +12,53 @@ COMMENT=	Cross-platform library for retrieving facts from OS
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
-		libyaml-cpp.so:devel/yaml-cpp
+USES=		cmake
 
+.if !defined(PKGNAMEPREFIX)
+
+BROKEN_DragonFly=	DragonFly is not supported upstream
 BROKEN_powerpc64=	fails to compile: collection.cc: 'stoi' was not declared in this scope
 
+CONFLICTS_INSTALL=	rubygem-facter-2*
+
+LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
+		liblibcpp-hocon.so:devel/cpp-hocon \
+		libleatherman_locale.so:devel/leatherman \
+		libyaml-cpp.so:devel/yaml-cpp
+
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
 USE_LDCONFIG=	yes
 USE_RUBY=	yes
-USES=	cmake compiler:c++11-lib
+USES+=		compiler:c++11-lib ssl
 CMAKE_ARGS+=	-DMAN_PATH=${MANPREFIX}/man
 
-CONFLICTS_INSTALL=	rubygem-facter-2*
+test: build
+	cd ${WRKSRC}/lib && bundle install --path vendor
+	cd ${WRKSRC} && ninja test
 
-BROKEN_DragonFly=	DragonFly is not supported upstream
+.elif ${PKGNAMEPREFIX} == java-
+
+LIB_DEPENDS=	libfacter.so:sysutils/facter
+
+ALL_TARGET=	facter-jruby
+USE_JAVA=	yes
+JAVA_BUILD=	yes
+CMAKE_ARGS+=	-DJAVA_HOME=${JAVA_HOME}
+
+# Ignore sysutils/facter's pkg-plist by providing a non-existent file
+PLIST=		${WRKDIR}/no-plist
+PLIST_FILES=	${PREFIX}/lib/ruby/vendor_ruby/facter.jar
+
+do-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/lib/ruby/vendor_ruby
+	cd ${WRKSRC} && ${INSTALL_DATA} lib/facter.jar ${STAGEDIR}${PREFIX}/lib/ruby/vendor_ruby
+
+.endif
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${COMPILER_FEATURES:Mlibstdc++}
+.if !defined(PKGNAMEPREFIX) && ${OPSYS} == FreeBSD && ${COMPILER_FEATURES:Mlibstdc++}
 BROKEN=		Build with system libstdc++ is unsupported
 .endif
 
diff --git a/sysutils/facter/distinfo b/sysutils/facter/distinfo
index 0a2a571349e..c661479dc30 100644
--- a/sysutils/facter/distinfo
+++ b/sysutils/facter/distinfo
@@ -1,2 +1,3 @@
-SHA256 (facter-3.1.3.tar.gz) = b27bfeade320331a02a68d3d2b41491d5cfcbb889292a8e9e1a11bd8641ff7d9
-SIZE (facter-3.1.3.tar.gz) = 603386
+TIMESTAMP = 1500912593
+SHA256 (facter-3.7.1.tar.gz) = 54fc56bfc3997b40c806982759c837f609a7268f669764921424fd41fda83467
+SIZE (facter-3.7.1.tar.gz) = 330767
diff --git a/sysutils/facter/files/patch-cmake_FindCPPHOCON.cmake b/sysutils/facter/files/patch-cmake_FindCPPHOCON.cmake
new file mode 100644
index 00000000000..7140c04de4e
--- /dev/null
+++ b/sysutils/facter/files/patch-cmake_FindCPPHOCON.cmake
@@ -0,0 +1,12 @@
+
+$FreeBSD$
+
+--- cmake/FindCPPHOCON.cmake.orig	2017-06-27 17:42:22 UTC
++++ cmake/FindCPPHOCON.cmake
+@@ -1,5 +1,5 @@
+ include(FindDependency)
+-find_dependency(CPPHOCON DISPLAY "cpp-hocon" HEADERS "hocon/config.hpp" LIBRARIES "libcpp-hocon.a")
++find_dependency(CPPHOCON DISPLAY "cpp-hocon" HEADERS "hocon/config.hpp" LIBRARIES "liblibcpp-hocon.so")
+ 
+ include(FeatureSummary)
+ set_package_properties(CPPHOCON PROPERTIES DESCRIPTION "A C++ parser for the HOCON configuration language" URL "https://github.com/puppetlabs/cpp-hocon")
diff --git a/sysutils/facter/files/patch-lib_CMakeLists.txt b/sysutils/facter/files/patch-lib_CMakeLists.txt
new file mode 100644
index 00000000000..818477d3567
--- /dev/null
+++ b/sysutils/facter/files/patch-lib_CMakeLists.txt
@@ -0,0 +1,14 @@
+--- lib/CMakeLists.txt.orig	2017-07-18 18:49:09 UTC
++++ lib/CMakeLists.txt
+@@ -203,6 +203,11 @@ elseif ("${CMAKE_SYSTEM_NAME}" MATCHES "
+         "src/facts/freebsd/dmi_resolver.cc"
+         "src/facts/freebsd/networking_resolver.cc"
+         "src/util/bsd/scoped_ifaddrs.cc"
++        "src/facts/freebsd/virtualization_resolver.cc"
++        "src/facts/freebsd/memory_resolver.cc"
++        "src/facts/freebsd/zfs_resolver.cc"
++        "src/facts/freebsd/zpool_resolver.cc"
++        "src/facts/freebsd/operating_system_resolver.cc"
+     )
+ elseif ("${CMAKE_SYSTEM_NAME}" MATCHES "OpenBSD")
+     set(LIBFACTER_PLATFORM_SOURCES
diff --git a/sysutils/facter/files/patch-lib_inc_facter_facts_fact.hpp b/sysutils/facter/files/patch-lib_inc_facter_facts_fact.hpp
new file mode 100644
index 00000000000..3969df45b36
--- /dev/null
+++ b/sysutils/facter/files/patch-lib_inc_facter_facts_fact.hpp
@@ -0,0 +1,31 @@
+--- lib/inc/facter/facts/fact.hpp.orig	2017-07-18 18:49:09 UTC
++++ lib/inc/facter/facts/fact.hpp
+@@ -528,9 +528,9 @@ namespace facter { namespace facts {
+         constexpr static char const* zfs_version = "zfs_version";
+ 
+         /**
+-         * The ZFS supported feature numbers.
++         * The ZFS supported version numbers.
+          */
+-        constexpr static char const* zfs_featurenumbers = "zfs_featurenumbers";
++        constexpr static char const* zfs_versionnumbers = "zfs_featurenumbers";
+ 
+         /**
+          * The ZFS storage pool (zpool) version fact.
+@@ -538,9 +538,14 @@ namespace facter { namespace facts {
+         constexpr static char const* zpool_version = "zpool_version";
+ 
+         /**
+-         * The ZFS storage pool supported feature numbers.
++         * The ZFS storage pool supported feature flags.
+          */
+-        constexpr static char const* zpool_featurenumbers = "zpool_featurenumbers";
++        constexpr static char const* zpool_featureflags = "zpool_featureflags";
++
++        /**
++         * The ZFS storage pool supported version numbers.
++         */
++        constexpr static char const* zpool_versionnumbers = "zpool_featurenumbers";
+ 
+         /**
+          * The fact for number of Solaris zones.
diff --git a/sysutils/facter/files/patch-lib_inc_facter_facts_vm.hpp b/sysutils/facter/files/patch-lib_inc_facter_facts_vm.hpp
new file mode 100644
index 00000000000..002bbf1b2ae
--- /dev/null
+++ b/sysutils/facter/files/patch-lib_inc_facter_facts_vm.hpp
@@ -0,0 +1,14 @@
+--- lib/inc/facter/facts/vm.hpp.orig	2017-06-27 17:42:22 UTC
++++ lib/inc/facter/facts/vm.hpp
+@@ -137,6 +137,11 @@ namespace facter { namespace facts {
+          * The name for Solaris ldom
+          */
+         constexpr static char const* ldom = "ldom";
++
++        /**
++         * The name of FreeBSD jails
++         */
++        constexpr static char const* jail = "jail";
+     };
+ 
+ }}  // namespace facter::facts
diff --git a/sysutils/facter/files/patch-lib_inc_internal_facts_freebsd_memory__resolver.hpp b/sysutils/facter/files/patch-lib_inc_internal_facts_freebsd_memory__resolver.hpp
new file mode 100644
index 00000000000..531c5e7b43a
--- /dev/null
+++ b/sysutils/facter/files/patch-lib_inc_internal_facts_freebsd_memory__resolver.hpp
@@ -0,0 +1,28 @@
+--- lib/inc/internal/facts/freebsd/memory_resolver.hpp.orig	2017-07-10 14:30:58 UTC
++++ lib/inc/internal/facts/freebsd/memory_resolver.hpp
+@@ -0,0 +1,25 @@
++/**
++ * @file
++ * Declares the FreeBSD memory fact resolver.
++ */
++#pragma once
++
++#include "../resolvers/memory_resolver.hpp"
++
++namespace facter { namespace facts { namespace freebsd {
++
++    /**
++     * Responsible for resolving memory facts.
++     */
++    struct memory_resolver : resolvers::memory_resolver
++    {
++     protected:
++        /**
++         * Collects the resolver data.
++         * @param facts The fact collection that is resolving facts.
++         * @return Returns the resolver data.
++         */
++        virtual data collect_data(collection& facts) override;
++    };
++
++}}}  // namespace facter::facts::osx
diff --git a/sysutils/facter/files/patch-lib_inc_internal_facts_freebsd_operating__system__resolver.hpp b/sysutils/facter/files/patch-lib_inc_internal_facts_freebsd_operating__system__resolver.hpp
new file mode 100644
index 00000000000..ba9ee565de2
--- /dev/null
+++ b/sysutils/facter/files/patch-lib_inc_internal_facts_freebsd_operating__system__resolver.hpp
@@ -0,0 +1,27 @@
+--- lib/inc/internal/facts/freebsd/operating_system_resolver.hpp.orig	2017-07-28 07:09:48 UTC
++++ lib/inc/internal/facts/freebsd/operating_system_resolver.hpp
+@@ -0,0 +1,24 @@
++/**
++ * @file
++ * Declares the FreeBSD operating system fact resolver.
++ */
++#pragma once
++
++#include "../posix/operating_system_resolver.hpp"
++
++namespace facter { namespace facts { namespace freebsd {
++
++    /**
++     * Responsible for resolving operating system facts.
++     */
++    struct operating_system_resolver : posix::operating_system_resolver
++    {
++    protected:
++        /**
++         * Collects the resolver's release data.
++         * @param facts The fact collection that is resolving facts.
++         * @param result The current resolver data.
++         */
++        virtual void collect_release_data(collection& facts, data& result) override;
++    };
++}}}  // namespace facter::facts::freebsd
diff --git a/sysutils/facter/files/patch-lib_inc_internal_facts_freebsd_virtualization__resolver.hpp b/sysutils/facter/files/patch-lib_inc_internal_facts_freebsd_virtualization__resolver.hpp
new file mode 100644
index 00000000000..8ef5b5a2993
--- /dev/null
+++ b/sysutils/facter/files/patch-lib_inc_internal_facts_freebsd_virtualization__resolver.hpp
@@ -0,0 +1,30 @@
+--- lib/inc/internal/facts/freebsd/virtualization_resolver.hpp.orig	2017-07-10 14:30:58 UTC
++++ lib/inc/internal/facts/freebsd/virtualization_resolver.hpp
+@@ -0,0 +1,27 @@
++/**
++ * @file
++ * Declares the FreeBSD virtualization fact resolver.
++ */
++#pragma once
++
++#include "../resolvers/virtualization_resolver.hpp"
++
++namespace facter { namespace facts { namespace freebsd {
++
++    /**
++     * Responsible for resolving virtualization facts.
++     */
++    struct virtualization_resolver : resolvers::virtualization_resolver
++    {
++     protected:
++        /**
++         * Gets the name of the hypervisor.
++         * @param facts The fact collection that is resolving facts.
++         * @return Returns the name of the hypervisor or empty string if no hypervisor.
++         */
++        virtual std::string get_hypervisor(collection& facts) override;
++     private:
++        static std::string get_jail_vm();
++    };
++
++}}}  // namespace facter::facts::freebsd
diff --git a/sysutils/facter/files/patch-lib_inc_internal_facts_freebsd_zfs__resolver.hpp b/sysutils/facter/files/patch-lib_inc_internal_facts_freebsd_zfs__resolver.hpp
new file mode 100644
index 00000000000..467a2be60e4
--- /dev/null
+++ b/sysutils/facter/files/patch-lib_inc_internal_facts_freebsd_zfs__resolver.hpp
@@ -0,0 +1,27 @@
+--- lib/inc/internal/facts/freebsd/zfs_resolver.hpp.orig	2017-07-10 16:43:09 UTC
++++ lib/inc/internal/facts/freebsd/zfs_resolver.hpp
+@@ -0,0 +1,24 @@
++/**
++ * @file
++ * Declares the ZFS fact resolver.
++ */
++#pragma once
++
++#include "../resolvers/zfs_resolver.hpp"
++
++namespace facter { namespace facts { namespace freebsd {
++
++    /**
++     * Responsible for resolving ZFS facts.
++     */
++    struct zfs_resolver : resolvers::zfs_resolver
++    {
++     protected:
++        /**
++         * Gets the platform's ZFS command.
++         * @return Returns the platform's ZFS command.
++         */
++        virtual std::string zfs_command();
++    };
++
++}}}  // namespace facter::facts::freebsd
diff --git a/sysutils/facter/files/patch-lib_inc_internal_facts_freebsd_zpool__resolver.hpp b/sysutils/facter/files/patch-lib_inc_internal_facts_freebsd_zpool__resolver.hpp
new file mode 100644
index 00000000000..b4f839362a3
--- /dev/null
+++ b/sysutils/facter/files/patch-lib_inc_internal_facts_freebsd_zpool__resolver.hpp
@@ -0,0 +1,27 @@
+--- lib/inc/internal/facts/freebsd/zpool_resolver.hpp.orig	2017-07-10 16:43:09 UTC
++++ lib/inc/internal/facts/freebsd/zpool_resolver.hpp
+@@ -0,0 +1,24 @@
++/**
++ * @file
++ * Declares the FreeBSD ZFS storage pool (zpool) fact resolver.
++ */
++#pragma once
++
++#include "../resolvers/zpool_resolver.hpp"
++
++namespace facter { namespace facts { namespace freebsd {
++
++    /**
++     * Responsible for resolving ZFS storage pool (zpool) facts.
++     */
++    struct zpool_resolver : resolvers::zpool_resolver
++    {
++     protected:
++        /**
++         * Gets the platform's zpool command.
++         * @return Returns the platform's zpool command.
++         */
++        virtual std::string zpool_command();
++    };
++
++}}}  // namespace facter::facts::freebsd
diff --git a/sysutils/facter/files/patch-lib_inc_internal_facts_resolvers_operating__system__resolver.hpp b/sysutils/facter/files/patch-lib_inc_internal_facts_resolvers_operating__system__resolver.hpp
new file mode 100644
index 00000000000..47e3bac4731
--- /dev/null
+++ b/sysutils/facter/files/patch-lib_inc_internal_facts_resolvers_operating__system__resolver.hpp
@@ -0,0 +1,23 @@
+--- lib/inc/internal/facts/resolvers/operating_system_resolver.hpp.orig	2017-07-18 18:49:09 UTC
++++ lib/inc/internal/facts/resolvers/operating_system_resolver.hpp
+@@ -216,6 +216,20 @@ namespace facter { namespace facts { nam
+          * @return Returns the resolver data.
+          */
+         virtual data collect_data(collection& facts);
++
++        /**
++         * Collects the resolver's kernel data.
++         * @param facts The fact collection that is resolving facts.
++         * @param result The current resolver data.
++         */
++        virtual void collect_kernel_data(collection& facts, data &result);
++
++        /**
++         * Collects the resolver's release data.
++         * @param facts The fact collection that is resolving facts.
++         * @param result The current resolver data.
++         */
++        virtual void collect_release_data(collection& facts, data &result);
+     };
+ 
+ }}}  // namespace facter::facts::resolvers
diff --git a/sysutils/facter/files/patch-lib_inc_internal_facts_resolvers_zfs__resolver.hpp b/sysutils/facter/files/patch-lib_inc_internal_facts_resolvers_zfs__resolver.hpp
new file mode 100644
index 00000000000..cbdd2f9b2dc
--- /dev/null
+++ b/sysutils/facter/files/patch-lib_inc_internal_facts_resolvers_zfs__resolver.hpp
@@ -0,0 +1,14 @@
+--- lib/inc/internal/facts/resolvers/zfs_resolver.hpp.orig	2017-07-18 18:49:09 UTC
++++ lib/inc/internal/facts/resolvers/zfs_resolver.hpp
+@@ -43,9 +43,9 @@ namespace facter { namespace facts { nam
+              */
+             std::string version;
+             /**
+-             * Stores the ZFS feature numbers.
++             * Stores the ZFS version numbers.
+              */
+-            std::vector<std::string> features;
++            std::vector<std::string> versions;
+         };
+ 
+         /**
diff --git a/sysutils/facter/files/patch-lib_inc_internal_facts_resolvers_zpool__resolver.hpp b/sysutils/facter/files/patch-lib_inc_internal_facts_resolvers_zpool__resolver.hpp
new file mode 100644
index 00000000000..2018c2a72a9
--- /dev/null
+++ b/sysutils/facter/files/patch-lib_inc_internal_facts_resolvers_zpool__resolver.hpp
@@ -0,0 +1,18 @@
+--- lib/inc/internal/facts/resolvers/zpool_resolver.hpp.orig	2017-07-18 18:49:09 UTC
++++ lib/inc/internal/facts/resolvers/zpool_resolver.hpp
+@@ -43,9 +43,13 @@ namespace facter { namespace facts { nam
+              */
+             std::string version;
+             /**
+-             * Stores the zpool feature numbers.
++             * Stores the zpool feature flags.
+              */
+-            std::vector<std::string> features;
++            std::vector<std::string> feature_flags;
++            /**
++             * Stores the zpool version numbers.
++             */
++            std::vector<std::string> versions;
+         };
+ 
+         /**
diff --git a/sysutils/facter/files/patch-lib_schema_facter.yaml b/sysutils/facter/files/patch-lib_schema_facter.yaml
new file mode 100644
index 00000000000..a08a9dcc7b8
--- /dev/null
+++ b/sysutils/facter/files/patch-lib_schema_facter.yaml
@@ -0,0 +1,17 @@
+--- lib/schema/facter.yaml.orig	2017-07-18 18:49:09 UTC
++++ lib/schema/facter.yaml
+@@ -1894,6 +1894,14 @@ zones:
+     caveats: |
+         Solaris: the `zoneadm` utility must be present.
+ 
++zpool_featureflags:
++    type: string
++    description: Return the comma-delimited feature flags for ZFS storage pools.
++    resolution: |
++        Solaris: use the `zpool` utility to retrieve the feature numbers for ZFS storage pools
++    caveats: |
++        Solaris: the `zpool` utility must be present.
++
+ zpool_featurenumbers:
+     type: string
+     description: Return the comma-delimited feature numbers for ZFS storage pools.
diff --git a/sysutils/facter/files/patch-lib_src_facts_bsd_collection.cc b/sysutils/facter/files/patch-lib_src_facts_bsd_collection.cc
new file mode 100644
index 00000000000..123f9669e1c
--- /dev/null
+++ b/sysutils/facter/files/patch-lib_src_facts_bsd_collection.cc
@@ -0,0 +1,19 @@
+--- lib/src/facts/bsd/collection.cc.orig	2017-06-27 17:42:22 UTC
++++ lib/src/facts/bsd/collection.cc
+@@ -1,6 +1,6 @@
+ #include <facter/facts/collection.hpp>
+ #include <internal/facts/posix/kernel_resolver.hpp>
+-#include <internal/facts/resolvers/operating_system_resolver.hpp>
++#include <internal/facts/posix/operating_system_resolver.hpp>
+ #include <internal/facts/bsd/uptime_resolver.hpp>
+ #include <internal/facts/bsd/filesystem_resolver.hpp>
+ #include <internal/facts/posix/ssh_resolver.hpp>
+@@ -15,7 +15,7 @@ namespace facter { namespace facts {
+     void collection::add_platform_facts()
+     {
+         add(make_shared<posix::kernel_resolver>());
+-        add(make_shared<resolvers::operating_system_resolver>());
++        add(make_shared<posix::operating_system_resolver>());
+         add(make_shared<bsd::uptime_resolver>());
+         add(make_shared<bsd::filesystem_resolver>());
+         add(make_shared<posix::ssh_resolver>());
diff --git a/sysutils/facter/files/patch-lib_src_facts_freebsd_collection.cc b/sysutils/facter/files/patch-lib_src_facts_freebsd_collection.cc
new file mode 100644
index 00000000000..9a52c59224b
--- /dev/null
+++ b/sysutils/facter/files/patch-lib_src_facts_freebsd_collection.cc
@@ -0,0 +1,36 @@
+--- lib/src/facts/freebsd/collection.cc.orig	2017-07-18 18:49:09 UTC
++++ lib/src/facts/freebsd/collection.cc
+@@ -8,8 +8,12 @@
+ #include <internal/facts/posix/kernel_resolver.hpp>
+ #include <internal/facts/posix/ssh_resolver.hpp>
+ #include <internal/facts/posix/timezone_resolver.hpp>
+-#include <internal/facts/resolvers/operating_system_resolver.hpp>
++#include <internal/facts/freebsd/operating_system_resolver.hpp>
+ #include <internal/facts/freebsd/networking_resolver.hpp>
++#include <internal/facts/freebsd/virtualization_resolver.hpp>
++#include <internal/facts/freebsd/memory_resolver.hpp>
++#include <internal/facts/freebsd/zfs_resolver.hpp>
++#include <internal/facts/freebsd/zpool_resolver.hpp>
+ 
+ using namespace std;
+ 
+@@ -18,7 +22,7 @@ namespace facter { namespace facts {
+     void collection::add_platform_facts()
+     {
+         add(make_shared<posix::kernel_resolver>());
+-        add(make_shared<resolvers::operating_system_resolver>());
++        add(make_shared<freebsd::operating_system_resolver>());
+         add(make_shared<freebsd::networking_resolver>());
+         add(make_shared<bsd::uptime_resolver>());
+         add(make_shared<bsd::filesystem_resolver>());
+@@ -28,6 +32,10 @@ namespace facter { namespace facts {
+         add(make_shared<glib::load_average_resolver>());
+         add(make_shared<freebsd::processor_resolver>());
+         add(make_shared<freebsd::dmi_resolver>());
++        add(make_shared<freebsd::virtualization_resolver>());
++        add(make_shared<freebsd::memory_resolver>());
++        add(make_shared<freebsd::zfs_resolver>());
++        add(make_shared<freebsd::zpool_resolver>());
+     }
+ 
+ }}  // namespace facter::facts
diff --git a/sysutils/facter/files/patch-lib_src_facts_freebsd_memory__resolver.cc b/sysutils/facter/files/patch-lib_src_facts_freebsd_memory__resolver.cc
new file mode 100644
index 00000000000..ed3c654f36e
--- /dev/null
+++ b/sysutils/facter/files/patch-lib_src_facts_freebsd_memory__resolver.cc
@@ -0,0 +1,79 @@
+--- lib/src/facts/freebsd/memory_resolver.cc.orig	2017-07-10 14:30:58 UTC
++++ lib/src/facts/freebsd/memory_resolver.cc
+@@ -0,0 +1,76 @@
++#include <internal/facts/freebsd/memory_resolver.hpp>
++#include <leatherman/execution/execution.hpp>
++#include <leatherman/logging/logging.hpp>
++#include <sys/types.h>
++#include <sys/param.h>
++#include <sys/sysctl.h>
++#include <vm/vm_param.h>
++#include <unistd.h>
++
++using namespace std;
++using namespace leatherman::execution;
++
++namespace facter { namespace facts { namespace freebsd {
++
++    memory_resolver::data memory_resolver::collect_data(collection& facts)
++    {
++        data result;
++
++        size_t size;
++        int pagesize = getpagesize();
++
++        // Memory usage
++
++        unsigned long physmem;
++        size = sizeof(physmem);
++        if (0 == sysctlbyname("hw.physmem", &physmem, &size, NULL, 0)) {
++            result.mem_total = physmem;
++        }
++
++        unsigned int inactive_count = 0;
++        size = sizeof(inactive_count);
++        sysctlbyname("vm.stats.vm.v_inactive_count", &inactive_count, &size, NULL, 0);
++
++        unsigned int cache_count = 0;
++        size = sizeof(cache_count);
++        sysctlbyname("vm.stats.vm.v_cache_count", &cache_count, &size, NULL, 0);
++
++        unsigned int free_count = 0;
++        size = sizeof(free_count);
++        sysctlbyname("vm.stats.vm.v_free_count", &free_count, &size, NULL, 0);
++
++        long mem_free_page_count = inactive_count + cache_count + free_count;
++        result.mem_free = mem_free_page_count * pagesize;
++
++        // Swap usage
++
++        struct xswdev xsw;
++        size = sizeof(xsw);
++
++        int mib[16];
++        size_t mibsize;
++        mibsize = sizeof mib / sizeof mib[0];
++        if (sysctlnametomib("vm.swap_info", mib, &mibsize) == -1) {
++            LOG_DEBUG("sysctlnametomib() failed");
++        } else {
++            for (int n = 0; ; ++n) {
++                mib[mibsize] = n;
++                if (-1 == sysctl(mib, mibsize + 1, &xsw, &size, NULL, 0))
++                    break;
++
++                if (xsw.xsw_version != XSWDEV_VERSION) {
++                    LOG_DEBUG("xswdev version mismatch");
++                } else {
++                    result.swap_total += xsw.xsw_nblks;
++                    result.swap_free += xsw.xsw_nblks - xsw.xsw_used;
++                }
++            }
++
++            result.swap_free *= pagesize;
++            result.swap_total *= pagesize;
++        }
++
++        return result;
++    }
++
++}}}  // namespace facter::facts::freebsd
diff --git a/sysutils/facter/files/patch-lib_src_facts_freebsd_operating__system__resolver.cc b/sysutils/facter/files/patch-lib_src_facts_freebsd_operating__system__resolver.cc
new file mode 100644
index 00000000000..bc1e9661b10
--- /dev/null
+++ b/sysutils/facter/files/patch-lib_src_facts_freebsd_operating__system__resolver.cc
@@ -0,0 +1,20 @@
+--- lib/src/facts/freebsd/operating_system_resolver.cc.orig	2017-07-28 07:09:48 UTC
++++ lib/src/facts/freebsd/operating_system_resolver.cc
+@@ -0,0 +1,17 @@
++#include <leatherman/execution/execution.hpp>
++
++#include <internal/facts/freebsd/operating_system_resolver.hpp>
++
++using namespace std;
++using namespace leatherman::execution;
++
++namespace facter { namespace facts { namespace freebsd {
++
++    void operating_system_resolver::collect_release_data(collection& facts, data& result)
++    {
++        auto exec = execute("freebsd-version");
++        if (exec.success) {
++            result.release = exec.output;
++        }
++    }
++} } }  // namespace facter::facts::freebsd
diff --git a/sysutils/facter/files/patch-lib_src_facts_freebsd_virtualization__resolver.cc b/sysutils/facter/files/patch-lib_src_facts_freebsd_virtualization__resolver.cc
new file mode 100644
index 00000000000..86674d25809
--- /dev/null
+++ b/sysutils/facter/files/patch-lib_src_facts_freebsd_virtualization__resolver.cc
@@ -0,0 +1,47 @@
+--- lib/src/facts/freebsd/virtualization_resolver.cc.orig	2017-07-10 14:30:58 UTC
++++ lib/src/facts/freebsd/virtualization_resolver.cc
+@@ -0,0 +1,44 @@
++#include <internal/facts/freebsd/virtualization_resolver.hpp>
++#include <facter/facts/scalar_value.hpp>
++#include <facter/facts/collection.hpp>
++#include <facter/facts/fact.hpp>
++#include <facter/facts/vm.hpp>
++#include <leatherman/execution/execution.hpp>
++#include <boost/algorithm/string.hpp>
++
++#include <sys/types.h>
++#include <sys/sysctl.h>
++
++using namespace std;
++using namespace facter::facts;
++using namespace leatherman::execution;
++
++namespace facter { namespace facts { namespace freebsd {
++
++    string virtualization_resolver::get_hypervisor(collection& facts)
++    {
++        string value = get_jail_vm();
++
++        if (value.empty()) {
++            auto product_name = facts.get<string_value>(fact::product_name);
++            if (product_name) {
++                value = get_product_name_vm(product_name->value());
++            }
++        }
++
++        return value;
++    }
++
++    string virtualization_resolver::get_jail_vm()
++    {
++        int jailed;
++        size_t size = sizeof(jailed);
++        if (sysctlbyname("security.jail.jailed", &jailed, &size, NULL, 0) == 0) {
++            if (jailed)
++                return vm::jail;
++        }
++
++        return {};
++    }
++
++} } }  // namespace facter::facts::freebsd
diff --git a/sysutils/facter/files/patch-lib_src_facts_freebsd_zfs__resolver.cc b/sysutils/facter/files/patch-lib_src_facts_freebsd_zfs__resolver.cc
new file mode 100644
index 00000000000..9a89f989d08
--- /dev/null
+++ b/sysutils/facter/files/patch-lib_src_facts_freebsd_zfs__resolver.cc
@@ -0,0 +1,15 @@
+--- lib/src/facts/freebsd/zfs_resolver.cc.orig	2017-07-10 16:43:09 UTC
++++ lib/src/facts/freebsd/zfs_resolver.cc
+@@ -0,0 +1,12 @@
++#include <internal/facts/freebsd/zfs_resolver.hpp>
++
++using namespace std;
++
++namespace facter { namespace facts { namespace freebsd {
++
++    string zfs_resolver::zfs_command()
++    {
++        return "/sbin/zfs";
++    }
++
++}}}  // namespace facter::facts::freebsd
diff --git a/sysutils/facter/files/patch-lib_src_facts_freebsd_zpool__resolver.cc b/sysutils/facter/files/patch-lib_src_facts_freebsd_zpool__resolver.cc
new file mode 100644
index 00000000000..e5333b32342
--- /dev/null
+++ b/sysutils/facter/files/patch-lib_src_facts_freebsd_zpool__resolver.cc
@@ -0,0 +1,15 @@
+--- lib/src/facts/freebsd/zpool_resolver.cc.orig	2017-07-10 16:43:09 UTC
++++ lib/src/facts/freebsd/zpool_resolver.cc
+@@ -0,0 +1,12 @@
++#include <internal/facts/freebsd/zpool_resolver.hpp>
++
++using namespace std;
++
++namespace facter { namespace facts { namespace freebsd {
++
++    string zpool_resolver::zpool_command()
++    {
++        return "/sbin/zpool";
++    }
++
++}}}  // namespace facter::facts::freebsd
diff --git a/sysutils/facter/files/patch-lib_src_facts_openbsd_collection.cc b/sysutils/facter/files/patch-lib_src_facts_openbsd_collection.cc
new file mode 100644
index 00000000000..eced293ca45
--- /dev/null
+++ b/sysutils/facter/files/patch-lib_src_facts_openbsd_collection.cc
@@ -0,0 +1,20 @@
+--- lib/src/facts/openbsd/collection.cc.orig	2017-06-27 17:42:22 UTC
++++ lib/src/facts/openbsd/collection.cc
+@@ -11,7 +11,7 @@
+ #include <internal/facts/posix/kernel_resolver.hpp>
+ #include <internal/facts/posix/ssh_resolver.hpp>
+ #include <internal/facts/posix/timezone_resolver.hpp>
+-#include <internal/facts/resolvers/operating_system_resolver.hpp>
++#include <internal/facts/posix/operating_system_resolver.hpp>
+ 
+ using namespace std;
+ 
+@@ -20,7 +20,7 @@ namespace facter { namespace facts {
+     void collection::add_platform_facts()
+     {
+         add(make_shared<posix::kernel_resolver>());
+-        add(make_shared<resolvers::operating_system_resolver>());
++        add(make_shared<posix::operating_system_resolver>());
+         add(make_shared<bsd::uptime_resolver>());
+         add(make_shared<bsd::filesystem_resolver>());
+         add(make_shared<posix::ssh_resolver>());
diff --git a/sysutils/facter/files/patch-lib_src_facts_resolvers_operating__system__resolver.cc b/sysutils/facter/files/patch-lib_src_facts_resolvers_operating__system__resolver.cc
new file mode 100644
index 00000000000..668ef0fc98b
--- /dev/null
+++ b/sysutils/facter/files/patch-lib_src_facts_resolvers_operating__system__resolver.cc
@@ -0,0 +1,32 @@
+--- lib/src/facts/resolvers/operating_system_resolver.cc.orig	2017-07-18 18:49:09 UTC
++++ lib/src/facts/resolvers/operating_system_resolver.cc
+@@ -231,18 +231,27 @@ namespace facter { namespace facts { nam
+     {
+         data result;
+ 
++        collect_kernel_data(facts, result);
++        collect_release_data(facts, result);
++
++        return result;
++    }
++
++    void operating_system_resolver::collect_kernel_data(collection& facts, data& result)
++    {
+         auto kernel = facts.get<string_value>(fact::kernel);
+         if (kernel) {
+             result.name = kernel->value();
+             result.family = kernel->value();
+         }
++    }
+ 
++    void operating_system_resolver::collect_release_data(collection& facts, data& result)
++    {
+         auto release = facts.get<string_value>(fact::kernel_release);
+         if (release) {
+             result.release = release->value();
+         }
+-
+-        return result;
+     }
+ 
+     tuple<string, string> operating_system_resolver::parse_distro(string const& name, string const& release)
diff --git a/sysutils/facter/files/patch-lib_src_facts_resolvers_zfs__resolver.cc b/sysutils/facter/files/patch-lib_src_facts_resolvers_zfs__resolver.cc
new file mode 100644
index 00000000000..232cd75a5cc
--- /dev/null
+++ b/sysutils/facter/files/patch-lib_src_facts_resolvers_zfs__resolver.cc
@@ -0,0 +1,40 @@
+--- lib/src/facts/resolvers/zfs_resolver.cc.orig	2017-07-18 18:49:09 UTC
++++ lib/src/facts/resolvers/zfs_resolver.cc
+@@ -18,7 +18,7 @@ namespace facter { namespace facts { nam
+             "ZFS",
+             {
+                 fact::zfs_version,
+-                fact::zfs_featurenumbers
++                fact::zfs_versionnumbers
+             })
+     {
+     }
+@@ -30,8 +30,8 @@ namespace facter { namespace facts { nam
+         if (!data.version.empty()) {
+             facts.add(fact::zfs_version, make_value<string_value>(move(data.version)));
+         }
+-        if (!data.features.empty()) {
+-            facts.add(fact::zfs_featurenumbers, make_value<string_value>(boost::join(data.features, ",")));
++        if (!data.versions.empty()) {
++            facts.add(fact::zfs_versionnumbers, make_value<string_value>(boost::join(data.versions, ",")));
+         }
+     }
+ 
+@@ -48,12 +48,12 @@ namespace facter { namespace facts { nam
+             return true;
+         });
+ 
+-        // Get the ZFS features
+-        static boost::regex zfs_feature("\\s*(\\d+)[ ]");
++        // Get the ZFS versions
++        static boost::regex zfs_supported_version("^\\s*(\\d+)[ ]");
+         each_line(zfs_command(), {"upgrade", "-v"}, [&] (string& line) {
+-            string feature;
+-            if (re_search(line, zfs_feature, &feature)) {
+-                result.features.emplace_back(move(feature));
++            string version;
++            if (re_search(line, zfs_supported_version, &version)) {
++                result.versions.emplace_back(move(version));
+             }
+             return true;
+         });
diff --git a/sysutils/facter/files/patch-lib_src_facts_resolvers_zpool__resolver.cc b/sysutils/facter/files/patch-lib_src_facts_resolvers_zpool__resolver.cc
new file mode 100644
index 00000000000..c807ff39619
--- /dev/null
+++ b/sysutils/facter/files/patch-lib_src_facts_resolvers_zpool__resolver.cc
@@ -0,0 +1,82 @@
+--- lib/src/facts/resolvers/zpool_resolver.cc.orig	2017-07-18 18:49:09 UTC
++++ lib/src/facts/resolvers/zpool_resolver.cc
+@@ -18,7 +18,8 @@ namespace facter { namespace facts { nam
+             "ZFS storage pool",
+             {
+                 fact::zpool_version,
+-                fact::zpool_featurenumbers,
++                fact::zpool_featureflags,
++                fact::zpool_versionnumbers,
+             })
+     {
+     }
+@@ -30,8 +31,11 @@ namespace facter { namespace facts { nam
+         if (!data.version.empty()) {
+             facts.add(fact::zpool_version, make_value<string_value>(move(data.version)));
+         }
+-        if (!data.features.empty()) {
+-            facts.add(fact::zpool_featurenumbers, make_value<string_value>(boost::join(data.features, ",")));
++        if (!data.feature_flags.empty()) {
++            facts.add(fact::zpool_featureflags, make_value<string_value>(boost::join(data.feature_flags, ",")));
++        }
++        if (!data.versions.empty()) {
++            facts.add(fact::zpool_versionnumbers, make_value<string_value>(boost::join(data.versions, ",")));
+         }
+     }
+ 
+@@ -39,16 +43,47 @@ namespace facter { namespace facts { nam
+     {
+         data result;
+ 
++        enum { UNKNOWN, FEATURES, VERSIONS } state = UNKNOWN;
++
+         // Get the zpool version and features
+-        static boost::regex zpool_version("ZFS pool version (\\d+)[.]");
+-        static boost::regex zpool_feature("\\s*(\\d+)[ ]");
++        static boost::regex zpool_version("^This system is currently running ZFS pool version (\\d+)\\.$");
++        static boost::regex zpool_feature_flags("^This system supports ZFS pool feature flags\\.$");
++
++        static boost::regex zpool_supported_feature_header("^The following features are supported:$");
++        static boost::regex zpool_supported_versions_header("^The following versions are supported:$");
++        static boost::regex zpool_supported_legacy_versions_header("^The following legacy versions are also supported:$");
++
++        static boost::regex zpool_supported_feature("^([[:alnum:]_]+)(\\s+\\(read-only compatible\\))?$");
++        static boost::regex zpool_supported_version("^\\s*(\\d+)[ ]");
++
++        string feature;
+         each_line(zpool_command(), {"upgrade", "-v"}, [&] (string& line) {
+-            if (re_search(line, zpool_version, &result.version)) {
+-                return true;
+-            }
+-            string feature;
+-            if (re_search(line, zpool_feature, &feature)) {
+-                result.features.emplace_back(move(feature));
++            switch (state) {
++            case UNKNOWN:
++                if (re_search(line, zpool_version, &result.version)) {
++                } else if (re_search(line, zpool_feature_flags)) {
++                    result.version = "5000";
++                } else if (re_search(line, zpool_supported_feature_header)) {
++                    state = FEATURES;
++                } else if (re_search(line, zpool_supported_versions_header)) {
++                    state = VERSIONS;
++                }
++                break;
++
++            case FEATURES:
++                if (re_search(line, zpool_supported_feature, &feature)) {
++                    result.feature_flags.emplace_back(move(feature));
++                } else if (re_search(line, zpool_supported_legacy_versions_header)) {
++                    state = VERSIONS;
++                }
++                break;
++
++            case VERSIONS:
++                string feature;
++                if (re_search(line, zpool_supported_version, &feature)) {
++                    result.versions.emplace_back(move(feature));
++                }
++                break;
+             }
+             return true;
+         });
diff --git a/sysutils/facter/files/patch-lib_tests_facts_resolvers_zfs__resolver.cc b/sysutils/facter/files/patch-lib_tests_facts_resolvers_zfs__resolver.cc
new file mode 100644
index 00000000000..9428440d185
--- /dev/null
+++ b/sysutils/facter/files/patch-lib_tests_facts_resolvers_zfs__resolver.cc
@@ -0,0 +1,20 @@
+--- lib/tests/facts/resolvers/zfs_resolver.cc.orig	2017-07-18 18:49:09 UTC
++++ lib/tests/facts/resolvers/zfs_resolver.cc
+@@ -37,7 +37,7 @@ struct test_zfs_resolver : zfs_resolver
+     {
+         data result;
+         result.version = "1";
+-        result.features = { "1", "2", "3" };
++        result.versions = { "1", "2", "3" };
+         return result;
+     }
+ };
+@@ -57,7 +57,7 @@ SCENARIO("using the ZFS resolver") {
+             auto value = facts.get<string_value>(fact::zfs_version);
+             REQUIRE(value);
+             REQUIRE(value->value() == "1");
+-            value = facts.get<string_value>(fact::zfs_featurenumbers);
++            value = facts.get<string_value>(fact::zfs_versionnumbers);
+             REQUIRE(value);
+             REQUIRE(value->value() == "1,2,3");
+         }
diff --git a/sysutils/facter/files/patch-lib_tests_facts_resolvers_zpool__resolver.cc b/sysutils/facter/files/patch-lib_tests_facts_resolvers_zpool__resolver.cc
new file mode 100644
index 00000000000..bd5a0e131ac
--- /dev/null
+++ b/sysutils/facter/files/patch-lib_tests_facts_resolvers_zpool__resolver.cc
@@ -0,0 +1,31 @@
+--- lib/tests/facts/resolvers/zpool_resolver.cc.orig	2017-07-18 18:49:09 UTC
++++ lib/tests/facts/resolvers/zpool_resolver.cc
+@@ -37,7 +37,8 @@ struct test_zpool_resolver : zpool_resol
+     {
+         data result;
+         result.version = "1";
+-        result.features = { "1", "2", "3" };
++        result.versions = { "1", "2", "3" };
++        result.feature_flags = { "async_destroy", "lz4_compress", "enabled_txg" };
+         return result;
+     }
+ };
+@@ -53,13 +54,16 @@ SCENARIO("using the zpool resolver") {
+     WHEN("data is present") {
+         facts.add(make_shared<test_zpool_resolver>());
+         THEN("flat facts are added") {
+-            REQUIRE(facts.size() == 2u);
++            REQUIRE(facts.size() == 3u);
+             auto value = facts.get<string_value>(fact::zpool_version);
+             REQUIRE(value);
+             REQUIRE(value->value() == "1");
+-            value = facts.get<string_value>(fact::zpool_featurenumbers);
++            value = facts.get<string_value>(fact::zpool_versionnumbers);
+             REQUIRE(value);
+             REQUIRE(value->value() == "1,2,3");
++            value = facts.get<string_value>(fact::zpool_featureflags);
++            REQUIRE(value);
++            REQUIRE(value->value() == "async_destroy,lz4_compress,enabled_txg");
+         }
+     }
+ }
diff --git a/sysutils/facter/files/patch-lib_tests_facts_schema.cc b/sysutils/facter/files/patch-lib_tests_facts_schema.cc
new file mode 100644
index 00000000000..b0044e13e22
--- /dev/null
+++ b/sysutils/facter/files/patch-lib_tests_facts_schema.cc
@@ -0,0 +1,21 @@
+--- lib/tests/facts/schema.cc.orig	2017-07-18 18:49:09 UTC
++++ lib/tests/facts/schema.cc
+@@ -396,7 +396,7 @@ protected:
+     {
+         data result;
+         result.version = 1;
+-        result.features = { "1", "2", "3" };
++        result.versions = { "1", "2", "3" };
+         return result;
+     }
+ };
+@@ -433,7 +433,8 @@ protected:
+     {
+         data result;
+         result.version = 1;
+-        result.features = { "1", "2", "3" };
++        result.versions = { "1", "2", "3" };
++        result.feature_flags = { "async_destroy", "lz4_compress", "enabled_txg" };
+         return result;
+     }
+ };
diff --git a/sysutils/facter/files/patch-vendor_leatherman_cmake_cflags.cmake b/sysutils/facter/files/patch-vendor_leatherman_cmake_cflags.cmake
deleted file mode 100644
index 0863dec5b6c..00000000000
--- a/sysutils/facter/files/patch-vendor_leatherman_cmake_cflags.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
---- vendor/leatherman/cmake/cflags.cmake.orig	2015-09-14 20:07:07 UTC
-+++ vendor/leatherman/cmake/cflags.cmake
-@@ -2,7 +2,7 @@
- # Each of our project dirs sets CMAKE_CXX_FLAGS based on these. We do
- # not set CMAKE_CXX_FLAGS globally because gtest is not warning-clean.
- if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "\\w*Clang")
--    set(LEATHERMAN_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wextra -Werror -Wno-unused-parameter -Wno-tautological-constant-out-of-range-compare")
-+    set(LEATHERMAN_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-error")
- 
-     # Clang warns that 'register' is deprecated; 'register' is used throughout boost, so it can't be an error yet.
-     # The warning flag is different on different clang versions so we need to extract the clang version.
diff --git a/sysutils/facter/files/patch-vendor_leatherman_logging_src_logging.cc b/sysutils/facter/files/patch-vendor_leatherman_logging_src_logging.cc
deleted file mode 100644
index 46c863d767d..00000000000
--- a/sysutils/facter/files/patch-vendor_leatherman_logging_src_logging.cc
+++ /dev/null
@@ -1,19 +0,0 @@
-(LTH-115) Fix Boost.Log sink initialization with Boost 1.62
-
-In Boost 1.62, the way sink argument forwarding appears to have changed
-in such a way that it failed to identify the implicit creation of a
-color_writer. Switch to explicitly creating the color_writer sink.
-
-https://github.com/puppetlabs/leatherman/commit/e8196d55ecac7f2bf3aa5cb0aefef0122e63db21
-
---- vendor/leatherman/logging/src/logging.cc.orig	2015-11-25 00:14:00 UTC
-+++ vendor/leatherman/logging/src/logging.cc
-@@ -72,7 +72,7 @@ namespace leatherman { namespace logging
-         core->remove_all_sinks();
- 
-         using sink_t = sinks::synchronous_sink<color_writer>;
--        boost::shared_ptr<sink_t> sink(new sink_t(&dst));
-+        boost::shared_ptr<sink_t> sink = boost::make_shared<sink_t>(boost::make_shared<color_writer>(&dst));
-         core->add_sink(sink);
- 
- #if (!defined(__sun) && !defined(_AIX)) || !defined(__GNUC__)
diff --git a/sysutils/facter/pkg-plist b/sysutils/facter/pkg-plist
index 4c2fa08e562..69ac8cc89a6 100644
--- a/sysutils/facter/pkg-plist
+++ b/sysutils/facter/pkg-plist
@@ -13,6 +13,7 @@ include/facter/facts/value.hpp
 include/facter/facts/vm.hpp
 include/facter/logging/logging.hpp
 include/facter/ruby/ruby.hpp
+include/facter/util/config.hpp
 include/facter/util/string.hpp
 include/facter/version.h
 lib/libfacter.so
diff --git a/sysutils/linux-crashplan/Makefile b/sysutils/linux-crashplan/Makefile
index 8284e894639..5eaace73313 100644
--- a/sysutils/linux-crashplan/Makefile
+++ b/sysutils/linux-crashplan/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	crashplan
-DISTVERSION=	4.7.0
-PORTREVISION=	1
+DISTVERSION=	4.8.3
 CATEGORIES=	sysutils java linux
 MASTER_SITES=	https://download.code42.com/installs/linux/install/CrashPlan/
 PKGNAMEPREFIX=	linux-
@@ -12,38 +11,41 @@ DISTNAME=	CrashPlan_${DISTVERSION}_Linux
 MAINTAINER=	subtil@gmail.com
 COMMENT=	Backs up data to remote servers or hard drives
 
+ONLY_FOR_ARCHS=	amd64 i386
+
 RUN_DEPENDS=	bash:shells/bash
 
+USES=		linux shebangfix tar:tgz
+USE_LDCONFIG=	yes
+USE_LINUX=	expat fontconfig xorglibs
+USE_RC_SUBR=	crashplan
+
 USE_JAVA=	yes
 JAVA_OS=	linux
 JAVA_VERSION=	1.7+
 
 WRKSRC=		${WRKDIR}/crashplan-install
 
-USES=		linux shebangfix tar:tgz
-USE_LINUX=	expat fontconfig xorglibs
-USE_RC_SUBR=	crashplan
-
 SHEBANG_FILES=	scripts/CrashPlanEngine scripts/CrashPlanDesktop
 
-ONLY_FOR_ARCHS=	i386 amd64
-
 NO_BUILD=	yes
 
-CRASHDIR=	${PREFIX}/share/crashplan
 LOGDIR=		/var/log/crashplan
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${CRASHDIR}
-	cd ${STAGEDIR}${CRASHDIR} && ${CAT} ${WRKSRC}/CrashPlan_${DISTVERSION}.cpi | ${GZIP_CMD} -d -c - | ${CPIO} -i --no-preserve-owner
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	cd ${STAGEDIR}${DATADIR} && ${CAT} ${WRKSRC}/CrashPlan_${DISTVERSION}.cpi | ${GZIP_CMD} -d -c - | ${CPIO} -i --no-preserve-owner
+	@${MV} ${STAGEDIR}${DATADIR}/lang/* ${STAGEDIR}${DATADIR}/conf
+	@${RMDIR} ${STAGEDIR}${DATADIR}/lang
+	${RLN} ${STAGEDIR}${DATADIR}/conf ${STAGEDIR}${DATADIR}/lang
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/CrashPlanDesktop ${STAGEDIR}${PREFIX}/bin/
-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/CrashPlanEngine ${STAGEDIR}${CRASHDIR}/bin/
-	${CP} ${WRKSRC}/scripts/run.conf ${STAGEDIR}${CRASHDIR}/bin/
-	${ECHO_CMD} > ${STAGEDIR}${CRASHDIR}/install.vars
-	${ECHO_CMD} "TARGETDIR=${CRASHDIR}" >> ${STAGEDIR}${CRASHDIR}/install.vars
-	${ECHO_CMD} "BINSDIR=${CRASHDIR}/bin" >> ${STAGEDIR}${CRASHDIR}/install.vars
-	${ECHO_CMD} "JAVACOMMON=${JAVA}" >> ${STAGEDIR}${CRASHDIR}/install.vars
-	${ECHO_CMD} "LOGDIR=${LOGDIR}" >> ${STAGEDIR}${CRASHDIR}/install.vars
-	${CAT} ${WRKSRC}/install.defaults >> ${STAGEDIR}${CRASHDIR}/install.vars
+	${INSTALL_SCRIPT} ${WRKSRC}/scripts/CrashPlanEngine ${STAGEDIR}${DATADIR}/bin/
+	${CP} ${WRKSRC}/scripts/run.conf ${STAGEDIR}${DATADIR}/bin/
+	${ECHO_CMD} > ${STAGEDIR}${DATADIR}/install.vars
+	${ECHO_CMD} "TARGETDIR=${DATADIR}" >> ${STAGEDIR}${DATADIR}/install.vars
+	${ECHO_CMD} "BINSDIR=${DATADIR}/bin" >> ${STAGEDIR}${DATADIR}/install.vars
+	${ECHO_CMD} "JAVACOMMON=${JAVA}" >> ${STAGEDIR}${DATADIR}/install.vars
+	${ECHO_CMD} "LOGDIR=${LOGDIR}" >> ${STAGEDIR}${DATADIR}/install.vars
+	${CAT} ${WRKSRC}/install.defaults >> ${STAGEDIR}${DATADIR}/install.vars
 
 .include <bsd.port.mk>
diff --git a/sysutils/linux-crashplan/distinfo b/sysutils/linux-crashplan/distinfo
index c7486cb3b96..2cb37a8153d 100644
--- a/sysutils/linux-crashplan/distinfo
+++ b/sysutils/linux-crashplan/distinfo
@@ -1,2 +1,3 @@
-SHA256 (CrashPlan_4.7.0_Linux.tgz) = bb3c52259cf56759c004b9c3126a8c483bf1795f2bfa4575d35de2cdb577a0e4
-SIZE (CrashPlan_4.7.0_Linux.tgz) = 47479484
+TIMESTAMP = 1502436078
+SHA256 (CrashPlan_4.8.3_Linux.tgz) = c25d87ec1d442a396b668547e39b70d66dcfe02250cc57a25916ebb42a407113
+SIZE (CrashPlan_4.8.3_Linux.tgz) = 47086668
diff --git a/sysutils/linux-crashplan/pkg-plist b/sysutils/linux-crashplan/pkg-plist
index 9d8382e7877..e336242e9f9 100644
--- a/sysutils/linux-crashplan/pkg-plist
+++ b/sysutils/linux-crashplan/pkg-plist
@@ -3,59 +3,64 @@ bin/CrashPlanDesktop
 %%DATADIR%%/bin/CrashPlanEngine
 %%DATADIR%%/bin/restartLinux.sh
 %%DATADIR%%/bin/run.conf
-%%DATADIR%%/conf/custom_sample.properties
 %%DATADIR%%/conf/default.service.xml
 %%DATADIR%%/conf/service.log.xml
 %%DATADIR%%/conf/ui.log.xml
 %%DATADIR%%/conf/ui.properties
 %%DATADIR%%/conf/upgradeui.log.xml
 %%DATADIR%%/conf/upgradeui.properties
+%%DATADIR%%/conf/txt.properties
+%%DATADIR%%/conf/txt_de.properties
+%%DATADIR%%/conf/txt_en_GB.properties
+%%DATADIR%%/conf/txt_en_US.properties
+%%DATADIR%%/conf/txt_es.properties
+%%DATADIR%%/conf/txt_es_ES.properties
+%%DATADIR%%/conf/txt_fr.properties
+%%DATADIR%%/conf/txt_it.properties
+%%DATADIR%%/conf/txt_ja.properties
+%%DATADIR%%/conf/txt_ko.properties
+%%DATADIR%%/conf/txt_nl.properties
+%%DATADIR%%/conf/txt_no.properties
+%%DATADIR%%/conf/txt_pt_BR.properties
+%%DATADIR%%/conf/txt_sv.properties
+%%DATADIR%%/conf/txt_th.properties
+%%DATADIR%%/conf/txt_zh.properties
+%%DATADIR%%/conf/txt_zh_TW.properties
 %%DATADIR%%/doc/readme.html
 %%DATADIR%%/doc/readme.odt
 %%DATADIR%%/doc/readme.pdf
 %%DATADIR%%/doc/readme.rtf
 %%DATADIR%%/install.vars
-%%DATADIR%%/lang/txt.properties
-%%DATADIR%%/lang/txt_de.properties
-%%DATADIR%%/lang/txt_en_GB.properties
-%%DATADIR%%/lang/txt_en_US.properties
-%%DATADIR%%/lang/txt_es.properties
-%%DATADIR%%/lang/txt_es_ES.properties
-%%DATADIR%%/lang/txt_fr.properties
-%%DATADIR%%/lang/txt_it.properties
-%%DATADIR%%/lang/txt_ja.properties
-%%DATADIR%%/lang/txt_ko.properties
-%%DATADIR%%/lang/txt_nl.properties
-%%DATADIR%%/lang/txt_no.properties
-%%DATADIR%%/lang/txt_pt_BR.properties
-%%DATADIR%%/lang/txt_sv.properties
-%%DATADIR%%/lang/txt_th.properties
-%%DATADIR%%/lang/txt_zh.properties
-%%DATADIR%%/lang/txt_zh_TW.properties
-%%DATADIR%%/lib/aopalliance.jar
-%%DATADIR%%/lib/bcpkix-jdk15on.jar
-%%DATADIR%%/lib/bcprov-jdk15on.jar
-%%DATADIR%%/lib/c42-shared-engine.jar
-%%DATADIR%%/lib/c42_protolib_client.jar
-%%DATADIR%%/lib/c42_protolib_shared.jar
+%%DATADIR%%/lang
+%%DATADIR%%/lib/aopalliance-1.0.jar
+%%DATADIR%%/lib/bcpkix-jdk15on-1.49.jar
+%%DATADIR%%/lib/bcprov-jdk15on-1.49.jar
+%%DATADIR%%/lib/c42-shared-engine-release_5.1.0_2015.09.19-13.24.30_e02dde1eec51.jar
+%%DATADIR%%/lib/c42_protolib_client-1.0.2.jar
+%%DATADIR%%/lib/c42_protolib_control-1.0.1.jar
+%%DATADIR%%/lib/c42_protolib_control-sources-1.0.1.jar
+%%DATADIR%%/lib/c42_protolib_shared-1.0.30.jar
+%%DATADIR%%/lib/c42_protolib_shared-sources-1.0.30.jar
 %%DATADIR%%/lib/com.backup42.desktop.jar
 %%DATADIR%%/lib/comfyj-2.10.jar
-%%DATADIR%%/lib/commons-beanutils-core.jar
+%%DATADIR%%/lib/common-3.6.100.v20120522-1841.jar
+%%DATADIR%%/lib/commons-beanutils-1.7.0.jar
+%%DATADIR%%/lib/commons-beanutils-bean-collections-1.7.0.jar
+%%DATADIR%%/lib/commons-beanutils-core-1.7.0.jar
 %%DATADIR%%/lib/commons-cli-1.2.jar
-%%DATADIR%%/lib/commons-codec.jar
-%%DATADIR%%/lib/commons-collections.jar
-%%DATADIR%%/lib/commons-io.jar
-%%DATADIR%%/lib/commons-jxpath-1.1.jar
-%%DATADIR%%/lib/commons-lang.jar
-%%DATADIR%%/lib/commons-logging.jar
-%%DATADIR%%/lib/ezmorph.jar
-%%DATADIR%%/lib/gson.jar
-%%DATADIR%%/lib/guava.jar
-%%DATADIR%%/lib/guice.jar
-%%DATADIR%%/lib/guice-multibindings.jar
-%%DATADIR%%/lib/javassist-3.20.0.jar
-%%DATADIR%%/lib/javax.inject.jar
-%%DATADIR%%/lib/javax.servlet-api-jar.jar
+%%DATADIR%%/lib/commons-codec-1.8.jar
+%%DATADIR%%/lib/commons-collections-3.2.1.jar
+%%DATADIR%%/lib/commons-io-2.4.jar
+%%DATADIR%%/lib/commons-lang-2.6.jar
+%%DATADIR%%/lib/commons-logging-1.1.3.jar
+%%DATADIR%%/lib/ezmorph-1.0.4.jar
+%%DATADIR%%/lib/gson-2.3.1.jar
+%%DATADIR%%/lib/guava-18.0.jar
+%%DATADIR%%/lib/guice-4.0.jar
+%%DATADIR%%/lib/guice-multibindings-4.0.jar
+%%DATADIR%%/lib/javassist-3.20.0-GA.jar
+%%DATADIR%%/lib/javax.inject-1.jar
+%%DATADIR%%/lib/javax.servlet-api-3.1.0.jar
 %%DATADIR%%/lib/jcip-annotations-1.0-1.jar
 %%DATADIR%%/lib/jetty-continuation-9.2.9.v20150224.jar
 %%DATADIR%%/lib/jetty-http-9.2.9.v20150224.jar
@@ -65,45 +70,43 @@ bin/CrashPlanDesktop
 %%DATADIR%%/lib/jetty-servlet-9.2.9.v20150224.jar
 %%DATADIR%%/lib/jetty-servlets-9.2.9.v20150224.jar
 %%DATADIR%%/lib/jetty-util-9.2.9.v20150224.jar
-%%DATADIR%%/lib/jna-platform.jar
-%%DATADIR%%/lib/jna.jar
-%%DATADIR%%/lib/jniwrap.jar
-%%DATADIR%%/lib/jniwrapper-macpack.jar
-%%DATADIR%%/lib/jniwrapper-winpack.jar
-%%DATADIR%%/lib/joda-time.jar
-%%DATADIR%%/lib/json-lib.jar
-%%DATADIR%%/lib/json.jar
-%%DATADIR%%/lib/jtux.jar
-%%DATADIR%%/lib/log4j-api.jar
-%%DATADIR%%/lib/log4j-core.jar
+%%DATADIR%%/lib/jface-3.8.101.v20120817-083647.jar
+%%DATADIR%%/lib/jna-4.1.0.jar
+%%DATADIR%%/lib/jna-platform-4.1.0.jar
+%%DATADIR%%/lib/jniwrapper-3.8.4.jar
+%%DATADIR%%/lib/jniwrapper-winpack-3.8.4.jar
+%%DATADIR%%/lib/joda-time-2.8.1.jar
+%%DATADIR%%/lib/json-20070829.jar
+%%DATADIR%%/lib/json-lib-2.4.jar
+%%DATADIR%%/lib/jtux-1.0.0.jar
+%%DATADIR%%/lib/log4j-api-2.1.jar
+%%DATADIR%%/lib/log4j-core-2.1.jar
 %%DATADIR%%/lib/log4j-iostreams-2.3.jar
 %%DATADIR%%/lib/log4j-jcl-2.1.jar
-%%DATADIR%%/lib/log4j-slf4j-impl.jar
-%%DATADIR%%/lib/metrics-core.jar
-%%DATADIR%%/lib/miglayout15-swt.jar
-%%DATADIR%%/lib/netty-all.jar
-%%DATADIR%%/lib/org.eclipse.core.commands_3.6.1.v20120814-150512.jar
-%%DATADIR%%/lib/org.eclipse.equinox.common_3.6.100.v20120522-1841.jar
-%%DATADIR%%/lib/org.eclipse.jface_3.8.101.v20120817-083647.jar
-%%DATADIR%%/lib/org.eclipse.osgi_3.8.1.v20120830-144521.jar
-%%DATADIR%%/lib/protobuf-java.jar
+%%DATADIR%%/lib/log4j-slf4j-impl-2.1.jar
+%%DATADIR%%/lib/metrics-core-3.0.1.jar
+%%DATADIR%%/lib/miglayout-swt-0.0.0_c42_legacy.jar
+%%DATADIR%%/lib/netty-all-4.1.3.Final.jar
+%%DATADIR%%/lib/org.eclipse.core.commands-3.6.1.v20120814-150512.jar
+%%DATADIR%%/lib/org.eclipse.swt.gtk.linux.x86.jar
+%%DATADIR%%/lib/org.eclipse.swt.gtk.linux.x86_64.jar
+%%DATADIR%%/lib/osgi-3.8.1.v20120830-144521.jar
+%%DATADIR%%/lib/owasp-java-html-sanitizer-20160628.1.jar
+%%DATADIR%%/lib/protobuf-java-2.6.1.jar
 %%DATADIR%%/lib/reflections-0.9.10.jar
-%%DATADIR%%/lib/rhino.jar
-%%DATADIR%%/lib/sbbi-upnplib.jar
-%%DATADIR%%/lib/slf4j-api.jar
-%%DATADIR%%/lib/sqlite-jdbc.jar
-%%DATADIR%%/lib/swt-64.jar
-%%DATADIR%%/lib/swt.jar
+%%DATADIR%%/lib/rhino-1.7R3.jar
+%%DATADIR%%/lib/slf4j-api-1.6.1.jar
+%%DATADIR%%/lib/sqlite-jdbc-3.7.15-M1.jar
 %%DATADIR%%/lib/tika-core-1.7.jar
-%%DATADIR%%/lib/trove.jar
-%%DATADIR%%/lib/twitter4j.jar
+%%DATADIR%%/lib/trove4j-3.0.2.jar
+%%DATADIR%%/lib/twitter4j-core-3.0.3.jar
 %%DATADIR%%/lib/websocket-api-9.2.9.v20150224.jar
 %%DATADIR%%/lib/websocket-common-9.2.9.v20150224.jar
 %%DATADIR%%/lib/websocket-server-9.2.9.v20150224.jar
 %%DATADIR%%/lib/websocket-servlet-9.2.9.v20150224.jar
+%%DATADIR%%/lib/weupnp-0.1.4.jar
 %%DATADIR%%/libc42archive.so
 %%DATADIR%%/libc42archive64.so
-%%DATADIR%%/libc42core.so
 %%DATADIR%%/libjniwrap.so
 %%DATADIR%%/libjniwrap64.so
 %%DATADIR%%/libjtux.so
diff --git a/sysutils/mcollective/Makefile b/sysutils/mcollective/Makefile
index 5987766608a..c21089831f7 100644
--- a/sysutils/mcollective/Makefile
+++ b/sysutils/mcollective/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mcollective
-PORTVERSION=	2.9.0
+PORTVERSION=	2.11.1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://downloads.puppetlabs.com/${PORTNAME}/
 
@@ -47,7 +47,7 @@ do-patch:
 do-install:
 	cd ${WRKSRC} ; ${RUBY} install.rb --destdir=${STAGEDIR} --configdir=${ETCDIR} --plugindir=${DATADIR}
 .for cfg in ${CFG_FILES}
-	mv ${STAGEDIR}${ETCDIR}/${cfg} ${STAGEDIR}${ETCDIR}/${cfg}.sample
+	${MV} ${STAGEDIR}${ETCDIR}/${cfg} ${STAGEDIR}${ETCDIR}/${cfg}.sample
 .endfor
 
 .include <bsd.port.mk>
diff --git a/sysutils/mcollective/distinfo b/sysutils/mcollective/distinfo
index f8333f60870..125c3163959 100644
--- a/sysutils/mcollective/distinfo
+++ b/sysutils/mcollective/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1471112087
-SHA256 (mcollective-2.9.0.tar.gz) = 2e8339f838e4a6a40cdc4ea8601cab2c1dd52bf4b212eee943aa68a4a002d771
-SIZE (mcollective-2.9.0.tar.gz) = 914796
+TIMESTAMP = 1500565990
+SHA256 (mcollective-2.11.1.tar.gz) = 24dd0dd006f287decc0a0d99d8b17f08f5b62a93144fd4200af1ccfd77870b23
+SIZE (mcollective-2.11.1.tar.gz) = 888750
diff --git a/sysutils/mcollective/files/mcollectived.in b/sysutils/mcollective/files/mcollectived.in
index 24abc8f8a16..08d4832b505 100644
--- a/sysutils/mcollective/files/mcollectived.in
+++ b/sysutils/mcollective/files/mcollectived.in
@@ -27,4 +27,20 @@ command="%%PREFIX%%/sbin/${name}"
 command_args="-p $pidfile"
 command_interpreter=%%RUBY%%
 
+PATH="${PATH}:/usr/local/bin"
+
+# An UTF-8 locale is required
+: LC_ALL=${LC_ALL:=C.UTF-8}
+case $LC_ALL in
+    *.UTF-8)
+	;;
+    *.*)
+	LC_ALL="${LC_ALL%.*}.UTF-8"
+	;;
+    *)
+	LC_ALL=C.UTF-8
+	;;
+esac
+export LC_ALL
+
 run_rc_command "$1"
diff --git a/sysutils/mcollective/pkg-plist b/sysutils/mcollective/pkg-plist
index 27ab7c300cf..5447262f929 100644
--- a/sysutils/mcollective/pkg-plist
+++ b/sysutils/mcollective/pkg-plist
@@ -155,6 +155,7 @@ bin/mco
 %%RUBY_SITELIBDIR%%/mcollective/vendor.rb
 %%RUBY_SITELIBDIR%%/mcollective/vendor/load_systemu.rb
 %%RUBY_SITELIBDIR%%/mcollective/vendor/require_vendored.rb
+%%RUBY_SITELIBDIR%%/mcollective/vendor/systemu/BSDL
 %%RUBY_SITELIBDIR%%/mcollective/vendor/systemu/LICENSE
 %%RUBY_SITELIBDIR%%/mcollective/vendor/systemu/README
 %%RUBY_SITELIBDIR%%/mcollective/vendor/systemu/README.erb
@@ -167,5 +168,7 @@ bin/mco
 %%RUBY_SITELIBDIR%%/mcollective/vendor/systemu/samples/e.rb
 %%RUBY_SITELIBDIR%%/mcollective/vendor/systemu/samples/f.rb
 %%RUBY_SITELIBDIR%%/mcollective/vendor/systemu/systemu.gemspec
+%%RUBY_SITELIBDIR%%/mcollective/vendor/systemu/test/systemu_test.rb
+%%RUBY_SITELIBDIR%%/mcollective/vendor/systemu/test/testing.rb
 %%RUBY_SITELIBDIR%%/mcollective/windows_daemon.rb
 @dir %%DATADIR%%
diff --git a/sysutils/mmc-utils/Makefile b/sysutils/mmc-utils/Makefile
index 1d329bc9082..b3d21b4e5a3 100644
--- a/sysutils/mmc-utils/Makefile
+++ b/sysutils/mmc-utils/Makefile
@@ -4,6 +4,7 @@
 PORTNAME=	mmc-utils
 PORTVERSION=	20170320
 DISTVERSIONSUFFIX=	-37c86e60
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	LOCAL/marius
 
diff --git a/sysutils/mmc-utils/files/patch-mmc_cmds.c b/sysutils/mmc-utils/files/patch-mmc_cmds.c
index 4bb8e20c0d1..25d228a13bc 100644
--- a/sysutils/mmc-utils/files/patch-mmc_cmds.c
+++ b/sysutils/mmc-utils/files/patch-mmc_cmds.c
@@ -32,3 +32,23 @@
  	if (res) {
  		fprintf(stderr, "Error getting device size, errno: %d\n",
  			errno);
+@@ -1506,13 +1521,18 @@ int do_read_extcsd(int nargs, char **arg
+ 	/* A441/A43: reserved	[197] [195] [193] [190] [188]
+ 	 * [186] [184] [182] [180] [176] */
+ 
+-	if (ext_csd_rev >= 6)
++	if (ext_csd_rev >= 6) {
+ 		printf("I/O Driver Strength [DRIVER_STRENGTH: 0x%02x]\n",
+ 			ext_csd[197]);
++		printf("Enhanced Strobe mode [STROBE_SUPPORT: 0x%02x]\n",
++			ext_csd[184]);
++	}
+ 
+ 	/* DEVICE_TYPE in A45, CARD_TYPE in A441 */
+ 	reg = ext_csd[196];
+ 	printf("Card Type [CARD_TYPE: 0x%02x]\n", reg);
++	if (reg & 0x80) printf(" HS400 Dual Data Rate eMMC @200MHz 1.2VI/O\n");
++	if (reg & 0x40) printf(" HS400 Dual Data Rate eMMC @200MHz 1.8VI/O\n");
+ 	if (reg & 0x20) printf(" HS200 Single Data Rate eMMC @200MHz 1.2VI/O\n");
+ 	if (reg & 0x10) printf(" HS200 Single Data Rate eMMC @200MHz 1.8VI/O\n");
+ 	if (reg & 0x08) printf(" HS Dual Data Rate eMMC @52MHz 1.2VI/O\n");
diff --git a/sysutils/packer/Makefile b/sysutils/packer/Makefile
index da35bca2d56..1f6c7ffb7ff 100644
--- a/sysutils/packer/Makefile
+++ b/sysutils/packer/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	packer
-PORTVERSION=	1.0.3
+PORTVERSION=	1.0.4
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
diff --git a/sysutils/packer/distinfo b/sysutils/packer/distinfo
index c77d2c6ab90..382691dc978 100644
--- a/sysutils/packer/distinfo
+++ b/sysutils/packer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500397570
-SHA256 (hashicorp-packer-v1.0.3_GH0.tar.gz) = 17190dfc3833f30b98a932b0048ab088b28312d08fe8abb40ba7ead567733e6b
-SIZE (hashicorp-packer-v1.0.3_GH0.tar.gz) = 4194417
+TIMESTAMP = 1502550554
+SHA256 (hashicorp-packer-v1.0.4_GH0.tar.gz) = a6066db69cc73f1abef3cd282b2b274a27b380b205991f94e28a4ed02fc5475d
+SIZE (hashicorp-packer-v1.0.4_GH0.tar.gz) = 4185993
diff --git a/sysutils/puppet4/Makefile b/sysutils/puppet4/Makefile
index 98b7f968239..593a5175302 100644
--- a/sysutils/puppet4/Makefile
+++ b/sysutils/puppet4/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	puppet
-PORTVERSION=	4.10.4
+PORTVERSION=	4.10.6
 CATEGORIES=	sysutils
 MASTER_SITES=	http://downloads.puppetlabs.com/puppet/
 PKGNAMESUFFIX=	4
@@ -20,7 +20,7 @@ RUN_DEPENDS=	rubygem-hiera>=2.0:sysutils/rubygem-hiera \
 
 USES=		cpe
 CPE_VENDOR=	puppetlabs
-CONFLICTS_INSTALL=	puppet38-* puppet37-*
+CONFLICTS_INSTALL=	puppet5-*
 NO_ARCH=	yes
 NO_BUILD=	yes
 USE_RUBY=	yes
@@ -75,7 +75,7 @@ post-patch:
 		${WRKSRC}/ext/rack/config.ru
 
 do-install:
-	@cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ${RUBY} ${WRKSRC}/install.rb --no-configs --destdir=${STAGEDIR} \
+	@cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} LC_ALL=C.UTF-8 ${RUBY} ${WRKSRC}/install.rb --no-configs --destdir=${STAGEDIR} \
 		--localedir=/var/puppet/share/locales
 
 post-install:
@@ -83,7 +83,7 @@ post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}/modules
 	${MKDIR} ${STAGEDIR}/var/puppet
 	${INSTALL_DATA} ${WRKSRC}/conf/auth.conf ${STAGEDIR}${ETCDIR}/auth.conf-dist
-	${RUBY} -I ${STAGEDIR}/${RUBY_SITELIBDIR} ${STAGEDIR}${PREFIX}/bin/puppet agent --genconfig \
+	${SETENV} LC_ALL=C.UTF-8 ${RUBY} -I ${STAGEDIR}/${RUBY_SITELIBDIR} ${STAGEDIR}${PREFIX}/bin/puppet agent --genconfig \
 		--confdir=${ETCDIR} \
 		--rundir=/var/run/puppet \
 		--vardir=/var/puppet \
diff --git a/sysutils/puppet4/distinfo b/sysutils/puppet4/distinfo
index 66a3f6a0d24..563b49154dd 100644
--- a/sysutils/puppet4/distinfo
+++ b/sysutils/puppet4/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1498495069
-SHA256 (puppet-4.10.4.tar.gz) = 59b8510ddf2f49342a39ccbe26bc7b2ea5e16d79de9dd572d929de58967aab90
-SIZE (puppet-4.10.4.tar.gz) = 2968202
+TIMESTAMP = 1502442267
+SHA256 (puppet-4.10.6.tar.gz) = 19250a3659339961953d48d71aa5951d52bcee3bac0a1e2f45042aa82fcf358a
+SIZE (puppet-4.10.6.tar.gz) = 2977099
diff --git a/sysutils/puppet4/files/puppet.in b/sysutils/puppet4/files/puppet.in
index 8ef80e5bd24..74ea2c3793f 100644
--- a/sysutils/puppet4/files/puppet.in
+++ b/sysutils/puppet4/files/puppet.in
@@ -30,4 +30,20 @@ unset puppet_flags
 pidfile="${puppet_rundir}/agent.pid"
 start_precmd="install -d -o puppet -g puppet ${pidfile%/*}"
 
+PATH="${PATH}:/usr/local/bin"
+
+# An UTF-8 locale is required
+: LC_ALL=${LC_ALL:=C.UTF-8}
+case $LC_ALL in
+    *.UTF-8)
+	;;
+    *.*)
+	LC_ALL="${LC_ALL%.*}.UTF-8"
+	;;
+    *)
+	LC_ALL=C.UTF-8
+	;;
+esac
+export LC_ALL
+
 run_rc_command "$1"
diff --git a/sysutils/puppet5/Makefile b/sysutils/puppet5/Makefile
new file mode 100644
index 00000000000..6e402558611
--- /dev/null
+++ b/sysutils/puppet5/Makefile
@@ -0,0 +1,110 @@
+# $FreeBSD$
+
+PORTNAME=	puppet
+PORTVERSION=	5.0.1
+CATEGORIES=	sysutils
+MASTER_SITES=	http://downloads.puppetlabs.com/puppet/
+PKGNAMESUFFIX=	5
+
+MAINTAINER=	puppet@FreeBSD.org
+COMMENT=	Configuration management framework written in Ruby
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BUILD_DEPENDS=	rubygem-hiera>=2.0:sysutils/rubygem-hiera \
+		rubygem-json_pure>=0:devel/rubygem-json_pure
+RUN_DEPENDS=	rubygem-hiera>=2.0:sysutils/rubygem-hiera \
+		rubygem-hocon>=0:devel/rubygem-hocon \
+		rubygem-json_pure>=0:devel/rubygem-json_pure \
+		rubygem-ruby-augeas>=0:textproc/rubygem-ruby-augeas
+
+USES=		cpe
+CPE_VENDOR=	puppetlabs
+CONFLICTS_INSTALL=	puppet4-*
+NO_ARCH=	yes
+NO_BUILD=	yes
+USE_RUBY=	yes
+USE_RC_SUBR=	puppet puppetmaster
+PORTDOCS=	LICENSE README.md
+PORTEXAMPLES=	*
+USERS=		puppet
+GROUPS=		puppet
+SUB_FILES+=	pkg-message
+SUB_LIST=	RUBY=${RUBY}
+
+OPTIONS_DEFINE=		DOCS EXAMPLES
+OPTIONS_DEFAULT=	CFACTER
+OPTIONS_RADIO=		FACTER
+OPTIONS_RADIO_FACTER=	CFACTER RFACTER
+
+RFACTER_DESC=	Use facter 2.x (written in Ruby)
+CFACTER_DESC=	Use facter 3.x (experimental rewrite in C++)
+
+RFACTER_BUILD_DEPENDS=	rubygem-facter>=2.0:sysutils/rubygem-facter
+RFACTER_RUN_DEPENDS=	rubygem-facter>=2.0:sysutils/rubygem-facter
+
+CFACTER_BUILD_DEPENDS=	facter>=3.0:sysutils/facter
+CFACTER_RUN_DEPENDS=	facter>=3.0:sysutils/facter
+
+post-patch:
+	@${REINPLACE_CMD} -e "s|/etc/puppetlabs/puppet|${ETCDIR}|" \
+		${WRKSRC}/install.rb \
+		${WRKSRC}/lib/puppet/reference/configuration.rb \
+		${WRKSRC}/lib/puppet/util/run_mode.rb
+	@${REINPLACE_CMD} -e "s|/etc/puppetlabs/code|${ETCDIR}|" \
+		${WRKSRC}/install.rb \
+		${WRKSRC}/lib/puppet/reference/configuration.rb \
+		${WRKSRC}/lib/puppet/util/run_mode.rb
+	@${REINPLACE_CMD} -e "s|/opt/puppetlabs/puppet/cache|/var/puppet|" \
+		${WRKSRC}/install.rb \
+		${WRKSRC}/lib/puppet/reference/configuration.rb \
+		${WRKSRC}/lib/puppet/util/run_mode.rb
+	@${REINPLACE_CMD} -e "s|/var/run/puppetlabs|/var/run/puppet|" \
+		${WRKSRC}/install.rb \
+		${WRKSRC}/lib/puppet/util/run_mode.rb
+	@${REINPLACE_CMD} -e "s|/var/log/puppetlabs/puppet|/var/log/puppet|" \
+		${WRKSRC}/install.rb \
+		${WRKSRC}/lib/puppet/util/run_mode.rb
+	@${REINPLACE_CMD} -e "s|/opt/puppetlabs/puppet/modules|${ETCDIR}/modules|" \
+		${WRKSRC}/lib/puppet/defaults.rb
+	@${REINPLACE_CMD} -e "s|/opt/puppetlabs/puppet/bin/gem|${LOCALBASE}/bin/gem|" \
+		${WRKSRC}/lib/puppet/provider/package/puppet_gem.rb
+	@${REINPLACE_CMD} -e "s|\$$confdir/ssl|/var/puppet/ssl|" \
+		${WRKSRC}/lib/puppet/defaults.rb
+	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" \
+		${WRKSRC}/ext/rack/config.ru
+
+do-install:
+	@cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} LC_ALL=C.UTF-8 ${RUBY} ${WRKSRC}/install.rb --no-configs --destdir=${STAGEDIR} \
+		--localedir=/var/puppet/share/locales
+
+post-install:
+	${MKDIR} ${STAGEDIR}${ETCDIR}/manifests
+	${MKDIR} ${STAGEDIR}${ETCDIR}/modules
+	${MKDIR} ${STAGEDIR}/var/puppet
+	${INSTALL_DATA} ${WRKSRC}/conf/auth.conf ${STAGEDIR}${ETCDIR}/auth.conf-dist
+	${SETENV} LC_ALL=C.UTF-8 ${RUBY} -I ${STAGEDIR}/${RUBY_SITELIBDIR} ${STAGEDIR}${PREFIX}/bin/puppet agent --genconfig \
+		--confdir=${ETCDIR} \
+		--rundir=/var/run/puppet \
+		--vardir=/var/puppet \
+		--logdir=/var/log/puppet \
+		--codedir=${ETCDIR} \
+		> ${STAGEDIR}${ETCDIR}/puppet.conf-dist
+	@${ECHO} ${STAGEDIR}${RUBY_SITELIBDIR}/puppet.rb | \
+		${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST}
+	@${FIND} ${STAGEDIR}${RUBY_SITELIBDIR}/${PORTNAME} -type f | \
+		${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST}
+	@${MKDIR} ${STAGEDIR}${WWWDIR}
+	${INSTALL_DATA} ${WRKSRC}/ext/rack/config.ru ${STAGEDIR}${WWWDIR}
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+
+post-install-EXAMPLES-on:
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/ext/rack/example-passenger-vhost.conf ${STAGEDIR}${EXAMPLESDIR}
+
+.include <bsd.port.mk>
diff --git a/sysutils/puppet5/distinfo b/sysutils/puppet5/distinfo
new file mode 100644
index 00000000000..73d8d882781
--- /dev/null
+++ b/sysutils/puppet5/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1501136893
+SHA256 (puppet-5.0.1.tar.gz) = ff80092c7bfde7198ec2cf776b8d0b8ba1c2c95be927a5cb5edae9f670038c4a
+SIZE (puppet-5.0.1.tar.gz) = 2715867
diff --git a/sysutils/puppet5/files/patch-ext__rack__config.ru b/sysutils/puppet5/files/patch-ext__rack__config.ru
new file mode 100644
index 00000000000..51facb11155
--- /dev/null
+++ b/sysutils/puppet5/files/patch-ext__rack__config.ru
@@ -0,0 +1,19 @@
+--- ext/rack/config.ru.orig	2015-08-09 23:14:59 UTC
++++ ext/rack/config.ru
+@@ -14,11 +14,11 @@ ARGV << "--rack"
+ # Rack applications typically don't start as root.  Set --confdir, --vardir,
+ # --logdir, --rundir to prevent reading configuration from
+ # ~/ based pathing.
+-ARGV << "--confdir" << "/etc/puppetlabs/puppet"
+-ARGV << "--vardir"  << "/opt/puppetlabs/server/data/puppetmaster"
+-ARGV << "--logdir"  << "/var/log/puppetlabs/puppetmaster"
+-ARGV << "--rundir"  << "/var/run/puppetlabs/puppetmaster"
+-ARGV << "--codedir"  << "/etc/puppetlabs/code"
++ARGV << "--confdir" << "%%PREFIX%%/etc/puppet"
++ARGV << "--vardir"  << "/var/puppet"
++ARGV << "--logdir"  << "/var/log/puppet"
++ARGV << "--rundir"  << "/var/run/puppet"
++ARGV << "--codedir" << "%%PREFIX%%/etc/puppet"
+ 
+ # always_cache_features is a performance improvement and safe for a master to
+ # apply. This is intended to allow agents to recognize new features that may be
diff --git a/sysutils/puppet5/files/patch-lib_puppet_provider_service_daemontools.rb b/sysutils/puppet5/files/patch-lib_puppet_provider_service_daemontools.rb
new file mode 100644
index 00000000000..3857c824a1b
--- /dev/null
+++ b/sysutils/puppet5/files/patch-lib_puppet_provider_service_daemontools.rb
@@ -0,0 +1,20 @@
+--- lib/puppet/provider/service/daemontools.rb.orig	2016-04-25 18:52:09 UTC
++++ lib/puppet/provider/service/daemontools.rb
+@@ -39,7 +39,7 @@ Puppet::Type.type(:service).provide :dae
+ 
+   EOT
+ 
+-  commands :svc  => "/usr/bin/svc", :svstat => "/usr/bin/svstat"
++  commands :svc  => "%%PREFIX%%/bin/svc", :svstat => "%%PREFIX%%/bin/svstat"
+ 
+   class << self
+     attr_writer :defpath
+@@ -88,7 +88,7 @@ Puppet::Type.type(:service).provide :dae
+   # find the service dir on this node
+   def servicedir
+     unless @servicedir
+-      ["/service", "/etc/service","/var/lib/svscan"].each do |path|
++      ["/var/service", "/etc/service","/var/lib/svscan"].each do |path|
+         if Puppet::FileSystem.exist?(path)
+           @servicedir = path
+           break
diff --git a/sysutils/puppet5/files/pkg-message.in b/sysutils/puppet5/files/pkg-message.in
new file mode 100644
index 00000000000..d036be0a93e
--- /dev/null
+++ b/sysutils/puppet5/files/pkg-message.in
@@ -0,0 +1,14 @@
+
+To enable the puppet agent, add the following to /etc/rc.conf:
+
+	puppet_enable="YES"
+
+To enable the puppetmaster, add the following to /etc/rc.conf:
+
+	puppetmaster_enable="YES"
+
+Individual config files such as %%PREFIX%%/etc/puppetmasterd.conf are
+deprecated. Use a single file, %%ETCDIR%%/puppet.conf.
+
+The default PID directory is /var/run/puppet
+
diff --git a/sysutils/puppet5/files/puppet.in b/sysutils/puppet5/files/puppet.in
new file mode 100644
index 00000000000..74ea2c3793f
--- /dev/null
+++ b/sysutils/puppet5/files/puppet.in
@@ -0,0 +1,49 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: puppet
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable the puppet agent:
+#
+# puppet_enable="YES"
+
+. /etc/rc.subr
+
+name="puppet"
+rcvar=puppet_enable
+
+load_rc_config "$name"
+
+: ${puppet_enable="NO"}
+: ${puppet_rundir="/var/run/puppet"}
+
+command="%%PREFIX%%/bin/puppet"
+command_args="agent ${puppet_flags} --rundir=${puppet_rundir}"
+command_interpreter=%%RUBY%%
+unset puppet_flags
+
+pidfile="${puppet_rundir}/agent.pid"
+start_precmd="install -d -o puppet -g puppet ${pidfile%/*}"
+
+PATH="${PATH}:/usr/local/bin"
+
+# An UTF-8 locale is required
+: LC_ALL=${LC_ALL:=C.UTF-8}
+case $LC_ALL in
+    *.UTF-8)
+	;;
+    *.*)
+	LC_ALL="${LC_ALL%.*}.UTF-8"
+	;;
+    *)
+	LC_ALL=C.UTF-8
+	;;
+esac
+export LC_ALL
+
+run_rc_command "$1"
diff --git a/sysutils/puppet5/files/puppetmaster.in b/sysutils/puppet5/files/puppetmaster.in
new file mode 100644
index 00000000000..8c7a93d1903
--- /dev/null
+++ b/sysutils/puppet5/files/puppetmaster.in
@@ -0,0 +1,56 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: puppetmaster
+# REQUIRE: LOGIN
+
+# Add the following lines to /etc/rc.conf to enable the puppetmaster:
+#
+# puppetmaster_enable="YES"
+#
+
+. /etc/rc.subr
+
+name="puppetmaster"
+rcvar=puppetmaster_enable
+
+load_rc_config "${name}"
+
+: ${puppetmaster_enable="NO"}
+: ${puppetmaster_rundir="/var/run/puppet"}
+: ${puppetmaster_flags="--rundir=${puppetmaster_rundir}"}
+
+command_interpreter=%%RUBY%%
+command="%%PREFIX%%/bin/puppet"
+command_args="master ${puppetmaster_flags}"
+unset puppetmaster_flags
+
+pidfile="${puppetmaster_rundir}/master.pid"
+puppet_manifest="$($command config print manifest)"
+
+start_precmd="puppetmaster_checkconfig"
+restart_precmd="puppetmaster_checkconfig"
+puppetmaster_checkconfig() {
+	echo -n "Performing sanity check of ${name} configuration: "
+	if ! ${command} parser validate "${puppet_manifest}"
+	then
+		echo "FAILED"
+		return 1
+	else
+		echo "OK"
+		return 0
+	fi
+}
+
+if [ -z "${puppetmaster_mongrel_ports}" ]; then
+	run_rc_command "$1"
+else
+	for port in ${puppetmaster_mongrel_ports}; do
+		pidfile="${puppetmaster_rundir}/mongrel.${port}.pid"
+		command_args="master --pidfile=${pidfile} --servertype=mongrel --masterport=${port}"
+		run_rc_command "$1"
+		_rc_restart_done="false"
+	done
+fi
diff --git a/sysutils/puppet5/pkg-descr b/sysutils/puppet5/pkg-descr
new file mode 100644
index 00000000000..89a2fce63e8
--- /dev/null
+++ b/sysutils/puppet5/pkg-descr
@@ -0,0 +1,7 @@
+Puppet lets you centrally manage every important aspect of your system using
+a cross-platform specification language that manages all the separate
+elements normally aggregated in different files, like users, cron jobs, and
+hosts, along with obviously discrete elements like packages, services, and
+files.
+
+WWW: https://puppetlabs.com/puppet/puppet-open-source
diff --git a/sysutils/puppet5/pkg-plist b/sysutils/puppet5/pkg-plist
new file mode 100644
index 00000000000..c66e6ffb91e
--- /dev/null
+++ b/sysutils/puppet5/pkg-plist
@@ -0,0 +1,47 @@
+bin/puppet
+%%ETCDIR%%/auth.conf-dist
+%%ETCDIR%%/puppet.conf-dist
+%%RUBY_SITELIBDIR%%/hiera/puppet_function.rb
+%%RUBY_SITELIBDIR%%/hiera/scope.rb
+%%RUBY_SITELIBDIR%%/hiera_puppet.rb
+%%RUBY_SITELIBDIR%%/puppet_x.rb
+man/man5/puppet.conf.5.gz
+man/man8/puppet-agent.8.gz
+man/man8/puppet-apply.8.gz
+man/man8/puppet-ca.8.gz
+man/man8/puppet-catalog.8.gz
+man/man8/puppet-cert.8.gz
+man/man8/puppet-certificate.8.gz
+man/man8/puppet-certificate_request.8.gz
+man/man8/puppet-certificate_revocation_list.8.gz
+man/man8/puppet-config.8.gz
+man/man8/puppet-describe.8.gz
+man/man8/puppet-device.8.gz
+man/man8/puppet-doc.8.gz
+man/man8/puppet-epp.8.gz
+man/man8/puppet-facts.8.gz
+man/man8/puppet-filebucket.8.gz
+man/man8/puppet-generate.8.gz
+man/man8/puppet-help.8.gz
+man/man8/puppet-key.8.gz
+man/man8/puppet-lookup.8.gz
+man/man8/puppet-man.8.gz
+man/man8/puppet-master.8.gz
+man/man8/puppet-module.8.gz
+man/man8/puppet-node.8.gz
+man/man8/puppet-parser.8.gz
+man/man8/puppet-plugin.8.gz
+man/man8/puppet-report.8.gz
+man/man8/puppet-resource.8.gz
+man/man8/puppet-status.8.gz
+man/man8/puppet.8.gz
+/var/puppet/share/locales/config.yaml
+/var/puppet/share/locales/puppet.pot
+@(puppet,puppet,) %%WWWDIR%%/config.ru
+@dir(puppet,puppet,) %%ETCDIR%%/manifests
+@dir(puppet,puppet,) %%ETCDIR%%/modules
+@dir(puppet,puppet,) /var/puppet
+@dir(puppet,puppet,) /var/puppet/share
+@dir(puppet,puppet,) /var/puppet/share/locales
+@dir(puppet,puppet,) /var/log/puppet
+@dir /var/run/puppet
diff --git a/sysutils/racktables/Makefile b/sysutils/racktables/Makefile
index c043a63a4d2..fd5cc736977 100644
--- a/sysutils/racktables/Makefile
+++ b/sysutils/racktables/Makefile
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	racktables
-DISTVERSION=	0.20.13
+DISTVERSION=	0.20.14
 CATEGORIES?=	sysutils www
 MASTER_SITES=	SF/${PORTNAME}/
 DISTNAME=	RackTables-${DISTVERSION}
 
-MAINTAINER=	zi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Server room asset management suite
 
 LICENSE=	GPLv2
diff --git a/sysutils/racktables/distinfo b/sysutils/racktables/distinfo
index a751bbb3e68..f48b8676bce 100644
--- a/sysutils/racktables/distinfo
+++ b/sysutils/racktables/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1496864467
-SHA256 (RackTables-0.20.13.tar.gz) = 562a3e885080f191da066c93bc93a017c9a0ab8a20463c6e9e84c1649101b482
-SIZE (RackTables-0.20.13.tar.gz) = 929650
+TIMESTAMP = 1502574752
+SHA256 (RackTables-0.20.14.tar.gz) = 5b0c3fdd1ff91412b10c8ae37c6cb69903f43970fd2c6b49d3d91adba4e69dec
+SIZE (RackTables-0.20.14.tar.gz) = 956477
diff --git a/sysutils/rsyslog8/Makefile b/sysutils/rsyslog8/Makefile
index 723bac77548..52cb6ae17bd 100644
--- a/sysutils/rsyslog8/Makefile
+++ b/sysutils/rsyslog8/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	rsyslog
-PORTVERSION=	8.28.0
+PORTVERSION=	8.29.0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.rsyslog.com/files/download/rsyslog/
 
diff --git a/sysutils/rsyslog8/distinfo b/sysutils/rsyslog8/distinfo
index 5c8d6f84085..06dfa6f61d3 100644
--- a/sysutils/rsyslog8/distinfo
+++ b/sysutils/rsyslog8/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1498662549
-SHA256 (rsyslog-8.28.0.tar.gz) = 4ca5405908d612d45da700e36856430510875518eb8028d296d1ee4d2c44678e
-SIZE (rsyslog-8.28.0.tar.gz) = 2471122
+TIMESTAMP = 1502366182
+SHA256 (rsyslog-8.29.0.tar.gz) = 220ba30b5afb0f3ddb328613fea7aa3966b01e4d0c52d6de9ab27b0858f19738
+SIZE (rsyslog-8.29.0.tar.gz) = 2447907
diff --git a/sysutils/rsyslog8/files/patch-plugins_impstats_impstats.c b/sysutils/rsyslog8/files/patch-plugins_impstats_impstats.c
deleted file mode 100644
index b58201bfd8d..00000000000
--- a/sysutils/rsyslog8/files/patch-plugins_impstats_impstats.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- plugins/impstats/impstats.c.orig	2017-04-28 07:04:53 UTC
-+++ plugins/impstats/impstats.c
-@@ -36,6 +36,7 @@
- #include <errno.h>
- #include <sys/time.h>
- #include <sys/resource.h>
-+#include <unistd.h>
- 
- #include "dirty.h"
- #include "cfsysline.h"
diff --git a/sysutils/rubygem-sys-proctable/Makefile b/sysutils/rubygem-sys-proctable/Makefile
index f2898d29727..db979672b3c 100644
--- a/sysutils/rubygem-sys-proctable/Makefile
+++ b/sysutils/rubygem-sys-proctable/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	sys-proctable
-PORTVERSION=	1.1.4
+PORTVERSION=	1.1.5
 DISTVERSIONSUFFIX=	-universal-freebsd
 CATEGORIES=	sysutils rubygems
 MASTER_SITES=	RG
diff --git a/sysutils/rubygem-sys-proctable/distinfo b/sysutils/rubygem-sys-proctable/distinfo
index 5a9176b66f1..2ffd63f3225 100644
--- a/sysutils/rubygem-sys-proctable/distinfo
+++ b/sysutils/rubygem-sys-proctable/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1490965977
-SHA256 (rubygem/sys-proctable-1.1.4-universal-freebsd.gem) = 8863b09ccad691ae18afa5911b5084ef3f8cb6a58fb9820a4f35050d54e2e280
-SIZE (rubygem/sys-proctable-1.1.4-universal-freebsd.gem) = 24576
+TIMESTAMP = 1502474001
+SHA256 (rubygem/sys-proctable-1.1.5-universal-freebsd.gem) = 2c4a5c25b6842286e4c5ea7b3800c50e0a221d4a0f5b08ae3fafc56d7551fb9b
+SIZE (rubygem/sys-proctable-1.1.5-universal-freebsd.gem) = 24576
diff --git a/sysutils/sec/Makefile b/sysutils/sec/Makefile
index f46539b6571..c07a5adf89f 100644
--- a/sysutils/sec/Makefile
+++ b/sysutils/sec/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	sec
-PORTVERSION=	2.7.10
+PORTVERSION=	2.7.11
 CATEGORIES=	sysutils
 MASTER_SITES=	SF/simple-evcorr/${PORTNAME}/${PORTVERSION}
 
@@ -10,12 +10,10 @@ COMMENT=	Simple event (logs) correlator
 
 LICENSE=	GPLv2
 
-USE_RC_SUBR=	sec
-
 USES=		perl5 shebangfix
+USE_RC_SUBR=	sec
 SHEBANG_FILES=	sec
 SUB_LIST=	PERL=${PERL}
-USE_PERL5=	run
 NO_ARCH=	yes
 NO_BUILD=	yes
 
diff --git a/sysutils/sec/distinfo b/sysutils/sec/distinfo
index 40003d7d653..1ed60d558c7 100644
--- a/sysutils/sec/distinfo
+++ b/sysutils/sec/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1467656371
-SHA256 (sec-2.7.10.tar.gz) = 8c1441db830d3689aa201c1b0a5e46a97a22e8187d3e0d1c2dbd8abbd47c3d21
-SIZE (sec-2.7.10.tar.gz) = 129875
+TIMESTAMP = 1502637445
+SHA256 (sec-2.7.11.tar.gz) = 59cd744c36be43c0cb69f1570d2aa6911ebb3492ff01fc292347ec8876dfe991
+SIZE (sec-2.7.11.tar.gz) = 134533
diff --git a/sysutils/siegfried/Makefile b/sysutils/siegfried/Makefile
index 1a43d8806a9..d4c41fcd615 100644
--- a/sysutils/siegfried/Makefile
+++ b/sysutils/siegfried/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=		siegfried
-PORTVERSION=		1.7.4
+PORTVERSION=		1.7.5
 DISTVERSIONPREFIX=	v
 CATEGORIES=		sysutils
 
diff --git a/sysutils/siegfried/distinfo b/sysutils/siegfried/distinfo
index cbfd080d279..47002bbf240 100644
--- a/sysutils/siegfried/distinfo
+++ b/sysutils/siegfried/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500057547
-SHA256 (richardlehane-siegfried-v1.7.4_GH0.tar.gz) = aca6140b2c215e3b540eecc74bcfe952be863e2db8ff448a9d58c3c686486305
-SIZE (richardlehane-siegfried-v1.7.4_GH0.tar.gz) = 23190440
+TIMESTAMP = 1502547557
+SHA256 (richardlehane-siegfried-v1.7.5_GH0.tar.gz) = 3f12202f93c76d643de405a1c3b095cca1aa5595d9e087e8778fc6937990c1fd
+SIZE (richardlehane-siegfried-v1.7.5_GH0.tar.gz) = 23741037
diff --git a/textproc/cgrep/Makefile b/textproc/cgrep/Makefile
index 18319a52e80..98f8b8cfc79 100644
--- a/textproc/cgrep/Makefile
+++ b/textproc/cgrep/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	cgrep
 PORTVERSION=	6.4.3
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	textproc
 
diff --git a/textproc/cgrep/files/patch-src_Main.hs b/textproc/cgrep/files/patch-src_Main.hs
new file mode 100644
index 00000000000..08eb8a0f328
--- /dev/null
+++ b/textproc/cgrep/files/patch-src_Main.hs
@@ -0,0 +1,32 @@
+Backport of:
+From 2f787c5c1ba42ccee2f1ced759b3a4570afa9b28 Mon Sep 17 00:00:00 2001
+From: ilovezfs <ilovezfs@icloud.com>
+Date: Mon, 23 May 2016 03:53:52 -0700
+Subject: [PATCH] cgrep: fix isSymbolicLink collision
+
+System.Directory.isSymbolicLink collides with
+System.PosixCompat.Files.isSymbolicLink (and with
+System.Posix.Files.isSymbolicLink)
+
+This applies the solution proposed here:
+https://github.com/haskell/directory/issues/52#issuecomment-220879392
+--- src/Main.hs.orig	2014-06-21 09:27:05 UTC
++++ src/Main.hs
+@@ -37,7 +37,7 @@ import System.Console.CmdArgs
+ import System.Directory
+ import System.FilePath ((</>), takeFileName)
+ import System.Environment
+-import System.Posix.Files
++import System.Posix.Files as PosixFiles
+ import System.IO
+ import System.Exit
+ 
+@@ -67,7 +67,7 @@ putRecursiveContents opts inchan topdir langs prunedir
+                 status  <- getFileStatus path
+                 lstatus <- getSymbolicLinkStatus path
+                 unless (cpath `Set.member` visited) $
+-                    if isDirectory status && (not (isSymbolicLink lstatus) || deference_recursive opts)
++                    if isDirectory status && (not (PosixFiles.isSymbolicLink lstatus) || deference_recursive opts)
+                        then unless (filename `elem` prunedir)  $
+                            putRecursiveContents opts inchan path langs prunedir (Set.insert cpath visited)
+                        else case getLang opts filename >>= (\f -> f `elemIndex` langs <|> toMaybe 0 (null langs) ) of
diff --git a/textproc/p5-RDFStore/files/patch-RDFStore.xs b/textproc/p5-RDFStore/files/patch-RDFStore.xs
new file mode 100644
index 00000000000..9526385da4f
--- /dev/null
+++ b/textproc/p5-RDFStore/files/patch-RDFStore.xs
@@ -0,0 +1,12 @@
+--- RDFStore.xs.orig	2006-06-19 10:00:51 UTC
++++ RDFStore.xs
+@@ -54,9 +54,6 @@ static PerlInterpreter *my_perl;
+ 
+ #ifndef DB_VERSION_MAJOR
+ 
+-#undef  dNOOP
+-#define dNOOP extern int Perl___notused
+-
+ /* Ditto for dXSARGS. */
+ #undef  dXSARGS
+ #define dXSARGS                             \
diff --git a/textproc/p5-Text-CSV-Encoded/Makefile b/textproc/p5-Text-CSV-Encoded/Makefile
index d27d205d0b8..32ee4edcf9c 100644
--- a/textproc/p5-Text-CSV-Encoded/Makefile
+++ b/textproc/p5-Text-CSV-Encoded/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Text-CSV-Encoded
 PORTVERSION=	0.25
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -13,10 +13,9 @@ COMMENT=	Perl module for Encoding aware CVS files parsing
 
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Test-Simple>=0:devel/p5-Test-Simple \
-		p5-Test-Harness>=0:devel/p5-Test-Harness \
-		p5-Text-CSV>=0:textproc/p5-Text-CSV
+BUILD_DEPENDS=	p5-Text-CSV>=0:textproc/p5-Text-CSV
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/textproc/p5-Text-CSV-Encoded/pkg-plist b/textproc/p5-Text-CSV-Encoded/pkg-plist
index 3471b676bfc..90f94d308f2 100644
--- a/textproc/p5-Text-CSV-Encoded/pkg-plist
+++ b/textproc/p5-Text-CSV-Encoded/pkg-plist
@@ -1,9 +1,9 @@
-%%PERL5_MAN3%%/Text::CSV::Encoded.3.gz
-%%PERL5_MAN3%%/Text::CSV::Encoded::Coder::Base.3.gz
-%%PERL5_MAN3%%/Text::CSV::Encoded::Coder::Encode.3.gz
-%%PERL5_MAN3%%/Text::CSV::Encoded::Coder::EncodeGuess.3.gz
 %%SITE_PERL%%/Text/CSV/Encoded.pm
 %%SITE_PERL%%/Text/CSV/Encoded/Coder/Base.pm
 %%SITE_PERL%%/Text/CSV/Encoded/Coder/Encode.pm
 %%SITE_PERL%%/Text/CSV/Encoded/Coder/EncodeGuess.pm
 %%SITE_PERL%%/Text/CSV/README.pod
+%%PERL5_MAN3%%/Text::CSV::Encoded.3.gz
+%%PERL5_MAN3%%/Text::CSV::Encoded::Coder::Base.3.gz
+%%PERL5_MAN3%%/Text::CSV::Encoded::Coder::Encode.3.gz
+%%PERL5_MAN3%%/Text::CSV::Encoded::Coder::EncodeGuess.3.gz
diff --git a/textproc/pdfgrep/Makefile b/textproc/pdfgrep/Makefile
index 6d70334f28c..efac47ba768 100644
--- a/textproc/pdfgrep/Makefile
+++ b/textproc/pdfgrep/Makefile
@@ -2,23 +2,25 @@
 # $FreeBSD$
 
 PORTNAME=	pdfgrep
-PORTVERSION=	1.4.1
-PORTREVISION=	4
+PORTVERSION=	2.0.1
 CATEGORIES=	textproc
 MASTER_SITES=	https://pdfgrep.org/download/
 
 MAINTAINER=	michael@ranner.eu
 COMMENT=	Tool to search text in PDF files
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpoppler.so:graphics/poppler
+LIB_DEPENDS=	libpcre.so:devel/pcre \
+		libpoppler.so:graphics/poppler \
+		libgcrypt.so:security/libgcrypt \
+		libgpg-error.so:security/libgpg-error
 
 BROKEN_powerpc64=	fails to link: pdfgrep.cc: undefined reference to poppler::set_debug_error_function
 
 GNU_CONFIGURE=	yes
-USES=		compiler:c++11-lib gmake pkgconfig
-CONFIGURE_ARGS=	poppler_CFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/poppler"
+USES=		pkgconfig
 
 PLIST_FILES=	bin/pdfgrep man/man1/pdfgrep.1.gz \
 		share/bash-completion/completions/pdfgrep \
diff --git a/textproc/pdfgrep/distinfo b/textproc/pdfgrep/distinfo
index 7bc56adf3bb..ca50fc87899 100644
--- a/textproc/pdfgrep/distinfo
+++ b/textproc/pdfgrep/distinfo
@@ -1,2 +1,3 @@
-SHA256 (pdfgrep-1.4.1.tar.gz) = db04a210e6bb7b77cd6c54b17f0f6fed0d123a85f97a541b270736a5d3840f2c
-SIZE (pdfgrep-1.4.1.tar.gz) = 151926
+TIMESTAMP = 1502322512
+SHA256 (pdfgrep-2.0.1.tar.gz) = 0370d744b3072d47383dbed2cb9c8b0b64b83c084da5a8961f8d4bc7669e941e
+SIZE (pdfgrep-2.0.1.tar.gz) = 187217
diff --git a/textproc/pdfgrep/pkg-descr b/textproc/pdfgrep/pkg-descr
index cb2019c8318..081d1351506 100644
--- a/textproc/pdfgrep/pkg-descr
+++ b/textproc/pdfgrep/pkg-descr
@@ -11,4 +11,4 @@ Features:
 	* and the most important feature: color output!
 
 
-WWW: http://pdfgrep.sourceforge.net/
+WWW: https://pdfgrep.org
diff --git a/textproc/rubygem-ox/Makefile b/textproc/rubygem-ox/Makefile
index fb9c305af23..5a75801cba2 100644
--- a/textproc/rubygem-ox/Makefile
+++ b/textproc/rubygem-ox/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	ox
-PORTVERSION=	2.5.0
+PORTVERSION=	2.6.0
 CATEGORIES=	textproc rubygems
 MASTER_SITES=	RG
 
@@ -10,8 +10,8 @@ COMMENT=	Speed-optimized XML parser and object serializer for Ruby
 
 LICENSE=	MIT
 
-USE_RUBY=	yes
 USES=		gem
+USE_RUBY=	yes
 
 # The original gem depends on ext/ox/ox.so,
 # but the ext directory is eliminated by FreeBSD's Uses/gem.mk framework.
diff --git a/textproc/rubygem-ox/distinfo b/textproc/rubygem-ox/distinfo
index 0fa9a449b3d..d747a227dfb 100644
--- a/textproc/rubygem-ox/distinfo
+++ b/textproc/rubygem-ox/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1494682326
-SHA256 (rubygem/ox-2.5.0.gem) = f0c0763f6f4d6f60e0d312fd41050b22f4ab6e9d287c9103537f585c72075965
-SIZE (rubygem/ox-2.5.0.gem) = 73728
+TIMESTAMP = 1502462093
+SHA256 (rubygem/ox-2.6.0.gem) = 03d11e927a96fb84083d81390e6dd939b48891ab1c49f95d4b270a189630b33a
+SIZE (rubygem/ox-2.6.0.gem) = 78336
diff --git a/www/Makefile b/www/Makefile
index d64225288ef..9e541279caf 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -463,6 +463,7 @@
     SUBDIR += mod_log_sql2
     SUBDIR += mod_log_sql2-dtc
     SUBDIR += mod_macro22
+    SUBDIR += mod_md-devel
     SUBDIR += mod_memcache
     SUBDIR += mod_memcache_block
     SUBDIR += mod_mono
diff --git a/www/axis2/Makefile b/www/axis2/Makefile
index f923f0d4e11..76ed90e8090 100644
--- a/www/axis2/Makefile
+++ b/www/axis2/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	axis2
-PORTVERSION=	1.7.5
+PORTVERSION=	1.7.6
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/axis/${PORTNAME}/java/core/${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
@@ -19,7 +19,7 @@ NO_BUILD=	yes
 NO_ARCH=	yes
 
 OPTIONS_SINGLE=	AS
-OPTIONS_SINGLE_AS=	TOMCAT6 TOMCAT7
+OPTIONS_SINGLE_AS=	TOMCAT6 TOMCAT7 TOMCAT85
 OPTIONS_DEFAULT=	TOMCAT6
 
 OPTIONS_DEFINE=	EXAMPLES
@@ -30,6 +30,9 @@ TOMCAT6_RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat6
 TOMCAT7_VARS=	APPHOME=${LOCALBASE}/apache-tomcat-7.0
 TOMCAT7_RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat7
 
+TOMCAT85_VARS=	APPHOME=${LOCALBASE}/apache-tomcat-8.5
+TOMCAT85_RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat85
+
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 SHAREOWN=	www
diff --git a/www/axis2/distinfo b/www/axis2/distinfo
index 6f7f29be968..46f80dc7812 100644
--- a/www/axis2/distinfo
+++ b/www/axis2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495071325
-SHA256 (axis2-1.7.5-bin.zip) = 14fe5b267a5c2dee6d7ba7df3103d4764e9e5ff6ba49ed54b01ddacc397327d0
-SIZE (axis2-1.7.5-bin.zip) = 22755053
+TIMESTAMP = 1502238679
+SHA256 (axis2-1.7.6-bin.zip) = 2f9d7acfbe366930ef87c4dc5764cef2dda8464e467dcef5d4a8649e848405d5
+SIZE (axis2-1.7.6-bin.zip) = 22741359
diff --git a/www/axis2/pkg-plist b/www/axis2/pkg-plist
index e056333c5ab..db5a9adc086 100644
--- a/www/axis2/pkg-plist
+++ b/www/axis2/pkg-plist
@@ -74,9 +74,9 @@
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/bcel-findbugs-6.0.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/commons-cli-1.2.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/commons-cli-LICENSE.txt
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/commons-codec-1.3.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/commons-codec-1.2.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/commons-codec-LICENSE.txt
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/commons-fileupload-1.3.1.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/commons-fileupload-1.3.3.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/commons-fileupload-LICENSE.txt
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/commons-httpclient-3.1.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/commons-httpclient-LICENSE.txt
diff --git a/www/firefox-esr/pkg-message b/www/firefox-esr/pkg-message
index 7e884f639b5..828dcc62c6a 100644
--- a/www/firefox-esr/pkg-message
+++ b/www/firefox-esr/pkg-message
@@ -1,5 +1,15 @@
 ======================================================================
 
+Some features available on other platforms are not implemented:
+- Native audio (OSS backend is incomplete, doesn't support WebRTC)
+- Encrypted Media Extensions (requires Widevine CDM binary)
+- Process sandboxing (requires Capsicum backend)
+- Reduced memory usage (requires mozjemalloc)
+- Performance profiling (requires GeckoProfiler)
+- Gamepad API (requires libusbhid backend)
+
+======================================================================
+
 smb:// issues (Gvfs/GIO option):
 Network group, machine, and share browsing does not work correctly.
 
diff --git a/www/firefox/files/patch-bug1144632 b/www/firefox/files/patch-bug1144632
new file mode 100644
index 00000000000..f6416f85589
--- /dev/null
+++ b/www/firefox/files/patch-bug1144632
@@ -0,0 +1,41 @@
+Revert bug 1323303 to unbreak build on big-endian architectures.
+
+--- toolkit/moz.configure.orig	2017-07-31 16:20:54 UTC
++++ toolkit/moz.configure
+@@ -771,11 +771,11 @@
+ # ==============================================================
+ option('--disable-skia', help='Disable use of Skia')
+ 
+-@depends('--disable-skia')
+-def skia(value):
+-    if not value:
+-        die('--disable-skia is not supported anymore')
+-    else:
++@depends('--disable-skia', target)
++def skia(value, target):
++    if value.origin == 'default' and target.endianness == 'big':
++        return None
++    if value:
+         return True
+ 
+ set_config('MOZ_ENABLE_SKIA', skia)
+--- gfx/2d/ScaledFontBase.cpp.orig	2017-07-31 16:20:54 UTC
++++ gfx/2d/ScaledFontBase.cpp
+@@ -212,14 +212,16 @@ ScaledFontBase::CopyGlyphsToBuilder(const GlyphBuffer 
+     cairoPath->AppendPathToBuilder(builder);
+     return;
+   }
++#endif
++#ifdef USE_SKIA
+   if (backendType == BackendType::RECORDING) {
+     SkPath skPath = GetSkiaPathForGlyphs(aBuffer);
+     RefPtr<Path> path = MakeAndAddRef<PathSkia>(skPath, FillRule::FILL_WINDING);
+     path->StreamToSink(aBuilder);
+     return;
+   }
+-  MOZ_ASSERT(false, "Path not being copied");
+ #endif
++  MOZ_ASSERT(false, "Path not being copied");
+ }
+ 
+ void
diff --git a/www/firefox/files/patch-bug1376268 b/www/firefox/files/patch-bug1376268
new file mode 100644
index 00000000000..716bdb42e65
--- /dev/null
+++ b/www/firefox/files/patch-bug1376268
@@ -0,0 +1,61 @@
+commit ec31e574ed81
+Author: Petr Sumbera <petr.sumbera@oracle.com>
+Date:   Mon Jun 26 06:54:12 2017 -0700
+
+    Bug 1376268 - Fix Spidermonkey build with no jit backend; r=bbouvier
+    
+    MozReview-Commit-ID: DgANwcf8oUh
+    
+    --HG--
+    extra : amend_source : 1c3efbe975e93ee996e6b84d3fc073781740156d
+---
+ js/src/jit/ExecutableAllocator.h      | 2 +-
+ js/src/jit/none/MacroAssembler-none.h | 8 ++++----
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git js/src/jit/ExecutableAllocator.h js/src/jit/ExecutableAllocator.h
+index 570a25ff0dc3..d106b31ba906 100644
+--- js/src/jit/ExecutableAllocator.h
++++ js/src/jit/ExecutableAllocator.h
+@@ -219,7 +219,7 @@ class ExecutableAllocator
+ 
+     static void poisonCode(JSRuntime* rt, JitPoisonRangeVector& ranges);
+ 
+-#if defined(JS_CODEGEN_X86) || defined(JS_CODEGEN_X64) || defined(JS_SIMULATOR_ARM64)
++#if defined(JS_CODEGEN_X86) || defined(JS_CODEGEN_X64) || defined(JS_SIMULATOR_ARM64) || defined(JS_CODEGEN_NONE)
+     static void cacheFlush(void*, size_t)
+     {
+     }
+diff --git js/src/jit/none/MacroAssembler-none.h js/src/jit/none/MacroAssembler-none.h
+index 9a40ec8a8f64..71ddca8b9f1c 100644
+--- js/src/jit/none/MacroAssembler-none.h
++++ js/src/jit/none/MacroAssembler-none.h
+@@ -48,7 +48,7 @@ static constexpr Register WasmIonExitRegE1 { Registers::invalid_reg };
+ 
+ static constexpr Register WasmIonExitRegReturnData { Registers::invalid_reg };
+ static constexpr Register WasmIonExitRegReturnType { Registers::invalid_reg };
+-static constexpr Register WasmIonExitTlsReg = { Registers::invalid_reg };
++static constexpr Register WasmIonExitTlsReg { Registers::invalid_reg };
+ static constexpr Register WasmIonExitRegD0 { Registers::invalid_reg };
+ static constexpr Register WasmIonExitRegD1 { Registers::invalid_reg };
+ static constexpr Register WasmIonExitRegD2 { Registers::invalid_reg };
+@@ -153,6 +153,8 @@ class Assembler : public AssemblerShared
+ 
+     static uintptr_t GetPointer(uint8_t*) { MOZ_CRASH(); }
+ 
++    static bool HasRoundInstruction(RoundingMode) { return false; }
++
+     void verifyHeapAccessDisassembly(uint32_t begin, uint32_t end,
+                                      const Disassembler::HeapAccess& heapAccess)
+     {
+@@ -196,9 +198,7 @@ class MacroAssemblerNone : public Assembler
+     static bool SupportsSimd() { return false; }
+     static bool SupportsUnalignedAccesses() { return false; }
+ 
+-    static bool HasRoundInstruction(RoundingMode) { return false; }
+-
+-    void executableCopy(void*, bool) { MOZ_CRASH(); }
++    void executableCopy(void*, bool = true) { MOZ_CRASH(); }
+     void copyJumpRelocationTable(uint8_t*) { MOZ_CRASH(); }
+     void copyDataRelocationTable(uint8_t*) { MOZ_CRASH(); }
+     void copyPreBarrierTable(uint8_t*) { MOZ_CRASH(); }
diff --git a/www/firefox/pkg-message b/www/firefox/pkg-message
index 7e884f639b5..dd05b38f33a 100644
--- a/www/firefox/pkg-message
+++ b/www/firefox/pkg-message
@@ -1,5 +1,16 @@
 ======================================================================
 
+Some features available on other platforms are not implemented:
+- Native audio (OSS backend is incomplete, doesn't support WebRTC)
+- Encrypted Media Extensions (requires Widevine CDM binary)
+- Process sandboxing (requires Capsicum backend)
+- Reduced memory usage (requires mozjemalloc)
+- Performance profiling (requires GeckoProfiler)
+- Gamepad API (requires libusbhid backend)
+- WebVR (requires open source runtime)
+
+======================================================================
+
 smb:// issues (Gvfs/GIO option):
 Network group, machine, and share browsing does not work correctly.
 
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index fe8f68f57c3..2cf4bdf26ff 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gitlab
-PORTVERSION=	9.2.9
-PORTREVISION=	1
+PORTVERSION=	9.2.10
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www devel
 
@@ -25,7 +24,7 @@ BUILD_DEPENDS=	gem:devel/ruby-gems
 # which makes maintaining this long list much easier!
 # only rubygem-pg and rubygem-mysql are defined later as RUN_DEPENDS
 # for the options
-RUN_DEPENDS=	git>=2.8.4:devel/git \
+RUN_DEPENDS=	git>=2.14.1:devel/git \
 	gitlab-shell>=5.0.4:devel/gitlab-shell\
 	gitlab-workhorse>=2.0.0:www/gitlab-workhorse \
 	redis>=2.8.23:databases/redis \
diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo
index b4f03681144..ee58d3bdc1f 100644
--- a/www/gitlab/distinfo
+++ b/www/gitlab/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500635141
-SHA256 (gitlabhq-gitlabhq-v9.2.9_GH0.tar.gz) = 586db6cca90c8d1545468fc759518f1eff9a95da6efc6031ce9125f59077a36b
-SIZE (gitlabhq-gitlabhq-v9.2.9_GH0.tar.gz) = 30980893
+TIMESTAMP = 1502437209
+SHA256 (gitlabhq-gitlabhq-v9.2.10_GH0.tar.gz) = b6125f7664e70008ad05f950cf3fe55714dc2f3d9e4b57f0561546608d03dc34
+SIZE (gitlabhq-gitlabhq-v9.2.10_GH0.tar.gz) = 30982505
diff --git a/www/gotty/Makefile b/www/gotty/Makefile
index 12fdca968dd..ff8cb033ea3 100644
--- a/www/gotty/Makefile
+++ b/www/gotty/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gotty
-PORTVERSION=	1.0.0
+PORTVERSION=	1.0.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www net ipv6
 
@@ -12,10 +12,10 @@ COMMENT=	Command line tool that turns your CLI tools into web applications
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+USES=		go
 USE_GITHUB=	yes
 GH_ACCOUNT=	yudai
 
-USES=		go
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
 
 PLIST_FILES=	bin/gotty
diff --git a/www/gotty/distinfo b/www/gotty/distinfo
index a015fcaa95c..02807ed98d6 100644
--- a/www/gotty/distinfo
+++ b/www/gotty/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495391950
-SHA256 (yudai-gotty-v1.0.0_GH0.tar.gz) = ca61d6a164fb1a2ba7491ce0e764f987ecb009f9caf8a602690253665c27a498
-SIZE (yudai-gotty-v1.0.0_GH0.tar.gz) = 2349996
+TIMESTAMP = 1502356940
+SHA256 (yudai-gotty-v1.0.1_GH0.tar.gz) = 32695d70a79f55efdf4fba6f06f830515a2055abc58fc15e2124dff5be75695b
+SIZE (yudai-gotty-v1.0.1_GH0.tar.gz) = 2370696
diff --git a/www/linux-flashplayer/Makefile b/www/linux-flashplayer/Makefile
index 0374eb20ca0..5cc64296e36 100644
--- a/www/linux-flashplayer/Makefile
+++ b/www/linux-flashplayer/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	flashplayer
-PORTVERSION=	26.0.0.137
+PORTVERSION=	26.0.0.151
 CATEGORIES=	www multimedia linux
 MASTER_SITES=	https://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION}/
 PKGNAMEPREFIX=	linux-
diff --git a/www/linux-flashplayer/distinfo b/www/linux-flashplayer/distinfo
index bb7a86d55e9..8512f1b3471 100644
--- a/www/linux-flashplayer/distinfo
+++ b/www/linux-flashplayer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499965920
-SHA256 (flashplayer/26.0.0.137/flash_player_npapi_linux.i386.tar.gz) = bc703c55973fe79c32a9968450d46162d1db04663b099529c8fe0ec342baa6ba
-SIZE (flashplayer/26.0.0.137/flash_player_npapi_linux.i386.tar.gz) = 8490349
+TIMESTAMP = 1502343857
+SHA256 (flashplayer/26.0.0.151/flash_player_npapi_linux.i386.tar.gz) = 179a751d1c3624f3a25ec4198a54e6a53023a11de0b24f71c86f5b12fafa2cb8
+SIZE (flashplayer/26.0.0.151/flash_player_npapi_linux.i386.tar.gz) = 8492462
diff --git a/www/mod_md-devel/Makefile b/www/mod_md-devel/Makefile
new file mode 100644
index 00000000000..f89e9e1ad49
--- /dev/null
+++ b/www/mod_md-devel/Makefile
@@ -0,0 +1,45 @@
+# Created by: Bernard Spil <brnrd@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	mod_md-devel
+PORTVERSION=	0.0.20170809
+CATEGORIES=	www
+
+MAINTAINER=	brnrd@FreeBSD.org
+COMMENT=	Early experience LetsEncrypt module for Apache httpd
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libjansson.so:devel/jansson
+
+USES=		autoreconf libtool ssl
+USE_GITHUB=	yes
+USE_APACHE=	24+
+
+GH_ACCOUNT=	icing
+GH_PROJECT=	mod_md
+GH_TAGNAME=	1e07174
+
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--program-prefix=ext-
+CONFIGURE_ENV=	CONFIG_SHELL=/bin/sh
+
+MODULENAME=	${GH_PROJECT}
+
+CFLAGS+=	-I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include
+
+#DOCSDIR=	share/docs/mod_md
+PORTDOCS=	README README.md
+PLIST_FILES=	${APACHEMODDIR}/mod_md.so.0.0.0 \
+		${APACHEMODDIR}/mod_md.so
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${MODULENAME}.so
+	${MV} ${STAGEDIR}${PREFIX}/share/doc/mod_cert ${STAGEDIR}${PREFIX}/share/doc/mod_md-devel
+	${RM} ${STAGEDIR}${PREFIX}/share/doc/mod_md-devel/LICENSE
+	${RM} ${STAGEDIR}${PREFIX}/bin/ext-a2md
+
+.include <bsd.port.mk>
diff --git a/www/mod_md-devel/distinfo b/www/mod_md-devel/distinfo
new file mode 100644
index 00000000000..41f46aebe2f
--- /dev/null
+++ b/www/mod_md-devel/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1502629875
+SHA256 (icing-mod_md-0.0.20170809-1e07174_GH0.tar.gz) = 26a9f89eb822c21faa5805a666167f687c651baa68b4aed235f9dffec2c85a4f
+SIZE (icing-mod_md-0.0.20170809-1e07174_GH0.tar.gz) = 163588
diff --git a/www/mod_md-devel/files/patch-src_md__crypt.c b/www/mod_md-devel/files/patch-src_md__crypt.c
new file mode 100644
index 00000000000..d431ab5dbfa
--- /dev/null
+++ b/www/mod_md-devel/files/patch-src_md__crypt.c
@@ -0,0 +1,437 @@
+--- src/md_crypt.c.orig	2017-08-09 13:30:59 UTC
++++ src/md_crypt.c
+@@ -116,6 +116,425 @@ static void seed_RAND(int pid)
+ 
+ #endif /*ifdef MD_HAVE_ARC4RANDOM (else part) */
+ 
++#ifdef LIBRESSL_VERSION_NUMBER
++
++/* Extracted from OpenSSL 1.0.2 */
++
++struct tm *OPENSSL_gmtime(const time_t *timer, struct tm *result)
++{
++    struct tm *ts = NULL;
++
++#if defined(OPENSSL_THREADS) && defined(OPENSSL_SYS_VMS)
++    {
++        struct tm data, *ts2 = &data;
++        if (gmtime_r(timer, ts2) == NULL)
++            return NULL;
++        memcpy(result, ts2, sizeof(struct tm));
++        ts = result;
++    }
++#elif defined(OPENSSL_THREADS) && !defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_SYS_MACOSX)
++    if (gmtime_r(timer, result) == NULL)
++        return NULL;
++    ts = result;
++#else
++    ts = gmtime(timer);
++    if (ts == NULL)
++        return NULL;
++
++    memcpy(result, ts, sizeof(struct tm));
++    ts = result;
++#endif
++    return ts;
++}
++
++#define SECS_PER_DAY (24 * 60 * 60)
++# define ASN1_STRING_FLAG_X509_TIME 0x100
++
++static int leap_year(const int year)
++{
++    if (year % 400 == 0 || (year % 100 != 0 && year % 4 == 0))
++        return 1;
++    return 0;
++}
++
++/*
++ * Compute the day of the week and the day of the year from the year, month
++ * and day.  The day of the year is straightforward, the day of the week uses
++ * a form of Zeller's congruence.  For this months start with March and are
++ * numbered 4 through 15.
++ */
++static void determine_days(struct tm *tm)
++{
++    static const int ydays[12] = {
++        0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334
++    };
++    int y = tm->tm_year + 1900;
++    int m = tm->tm_mon;
++    int d = tm->tm_mday;
++    int c;
++
++    tm->tm_yday = ydays[m] + d - 1;
++    if (m >= 2) {
++        /* March and onwards can be one day further into the year */
++        tm->tm_yday += leap_year(y);
++        m += 2;
++    } else {
++        /* Treat January and February as part of the previous year */
++        m += 14;
++        y--;
++    }
++    c = y / 100;
++    y %= 100;
++    /* Zeller's congruance */
++    tm->tm_wday = (d + (13 * m) / 5 + y + y / 4 + c / 4 + 5 * c + 6) % 7;
++}
++
++/*
++ * Convert date to and from julian day Uses Fliegel & Van Flandern algorithm
++ */
++static long date_to_julian(int y, int m, int d)
++{
++    return (1461 * (y + 4800 + (m - 14) / 12)) / 4 +
++        (367 * (m - 2 - 12 * ((m - 14) / 12))) / 12 -
++        (3 * ((y + 4900 + (m - 14) / 12) / 100)) / 4 + d - 32075;
++}
++
++static void julian_to_date(long jd, int *y, int *m, int *d)
++{
++    long L = jd + 68569;
++    long n = (4 * L) / 146097;
++    long i, j;
++
++    L = L - (146097 * n + 3) / 4;
++    i = (4000 * (L + 1)) / 1461001;
++    L = L - (1461 * i) / 4 + 31;
++    j = (80 * L) / 2447;
++    *d = L - (2447 * j) / 80;
++    L = j / 11;
++    *m = j + 2 - (12 * L);
++    *y = 100 * (n - 49) + i + L;
++}
++
++/* Convert tm structure and offset into julian day and seconds */
++static int julian_adj(const struct tm *tm, int off_day, long offset_sec,
++                      long *pday, int *psec)
++{
++    int offset_hms, offset_day;
++    long time_jd;
++    int time_year, time_month, time_day;
++    /* split offset into days and day seconds */
++    offset_day = offset_sec / SECS_PER_DAY;
++    /* Avoid sign issues with % operator */
++    offset_hms = offset_sec - (offset_day * SECS_PER_DAY);
++    offset_day += off_day;
++    /* Add current time seconds to offset */
++    offset_hms += tm->tm_hour * 3600 + tm->tm_min * 60 + tm->tm_sec;
++    /* Adjust day seconds if overflow */
++    if (offset_hms >= SECS_PER_DAY) {
++        offset_day++;
++        offset_hms -= SECS_PER_DAY;
++    } else if (offset_hms < 0) {
++        offset_day--;
++        offset_hms += SECS_PER_DAY;
++    }
++
++    /*
++     * Convert date of time structure into a Julian day number.
++     */
++
++    time_year = tm->tm_year + 1900;
++    time_month = tm->tm_mon + 1;
++    time_day = tm->tm_mday;
++
++    time_jd = date_to_julian(time_year, time_month, time_day);
++
++    /* Work out Julian day of new date */
++    time_jd += offset_day;
++
++    if (time_jd < 0)
++        return 0;
++
++    *pday = time_jd;
++    *psec = offset_hms;
++    return 1;
++}
++
++int OPENSSL_gmtime_adj(struct tm *tm, int off_day, long offset_sec)
++{
++    int time_sec, time_year, time_month, time_day;
++    long time_jd;
++
++    /* Convert time and offset into Julian day and seconds */
++    if (!julian_adj(tm, off_day, offset_sec, &time_jd, &time_sec))
++        return 0;
++
++    /* Convert Julian day back to date */
++
++    julian_to_date(time_jd, &time_year, &time_month, &time_day);
++
++    if (time_year < 1900 || time_year > 9999)
++        return 0;
++
++    /* Update tm structure */
++
++    tm->tm_year = time_year - 1900;
++    tm->tm_mon = time_month - 1;
++    tm->tm_mday = time_day;
++
++    tm->tm_hour = time_sec / 3600;
++    tm->tm_min = (time_sec / 60) % 60;
++    tm->tm_sec = time_sec % 60;
++
++    return 1;
++
++}
++
++int OPENSSL_gmtime_diff(int *pday, int *psec,
++                        const struct tm *from, const struct tm *to)
++{
++    int from_sec, to_sec, diff_sec;
++    long from_jd, to_jd, diff_day;
++    if (!julian_adj(from, 0, 0, &from_jd, &from_sec))
++        return 0;
++    if (!julian_adj(to, 0, 0, &to_jd, &to_sec))
++        return 0;
++    diff_day = to_jd - from_jd;
++    diff_sec = to_sec - from_sec;
++    /* Adjust differences so both positive or both negative */
++    if (diff_day > 0 && diff_sec < 0) {
++        diff_day--;
++        diff_sec += SECS_PER_DAY;
++    }
++    if (diff_day < 0 && diff_sec > 0) {
++        diff_day++;
++        diff_sec -= SECS_PER_DAY;
++    }
++
++    if (pday)
++        *pday = (int)diff_day;
++    if (psec)
++        *psec = diff_sec;
++
++    return 1;
++
++}
++
++int asn1_time_to_tm(struct tm *tm, const ASN1_TIME *d)
++{
++    static const int min[9] = { 0, 0, 1, 1, 0, 0, 0, 0, 0 };
++    static const int max[9] = { 99, 99, 12, 31, 23, 59, 59, 12, 59 };
++    static const int mdays[12] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
++    char *a;
++    int n, i, i2, l, o, min_l = 11, strict = 0, end = 6, btz = 5, md;
++    struct tm tmp;
++
++    /*
++     * ASN1_STRING_FLAG_X509_TIME is used to enforce RFC 5280
++     * time string format, in which:
++     *
++     * 1. "seconds" is a 'MUST'
++     * 2. "Zulu" timezone is a 'MUST'
++     * 3. "+|-" is not allowed to indicate a time zone
++     */
++    if (d->type == V_ASN1_UTCTIME) {
++        if (d->flags & ASN1_STRING_FLAG_X509_TIME) {
++            min_l = 13;
++            strict = 1;
++        }
++    } else if (d->type == V_ASN1_GENERALIZEDTIME) {
++        end = 7;
++        btz = 6;
++        if (d->flags & ASN1_STRING_FLAG_X509_TIME) {
++            min_l = 15;
++            strict = 1;
++        } else {
++            min_l = 13;
++        }
++    } else {
++        return 0;
++    }
++
++    l = d->length;
++    a = (char *)d->data;
++    o = 0;
++    memset(&tmp, 0, sizeof(tmp));
++
++    /*
++     * GENERALIZEDTIME is similar to UTCTIME except the year is represented
++     * as YYYY. This stuff treats everything as a two digit field so make
++     * first two fields 00 to 99
++     */
++
++    if (l < min_l)
++        goto err;
++    for (i = 0; i < end; i++) {
++        if (!strict && (i == btz) && ((a[o] == 'Z') || (a[o] == '+') || (a[o] == '-'))) {
++            i++;
++            break;
++        }
++        if (!isdigit(a[o]))
++            goto err;
++        n = a[o] - '0';
++        /* incomplete 2-digital number */
++        if (++o == l)
++            goto err;
++
++        if (!isdigit(a[o]))
++            goto err;
++        n = (n * 10) + a[o] - '0';
++        /* no more bytes to read, but we haven't seen time-zone yet */
++        if (++o == l)
++            goto err;
++
++        i2 = (d->type == V_ASN1_UTCTIME) ? i + 1 : i;
++
++        if ((n < min[i2]) || (n > max[i2]))
++            goto err;
++        switch (i2) {
++        case 0:
++            /* UTC will never be here */
++            tmp.tm_year = n * 100 - 1900;
++            break;
++        case 1:
++            if (d->type == V_ASN1_UTCTIME)
++                tmp.tm_year = n < 50 ? n + 100 : n;
++            else
++                tmp.tm_year += n;
++            break;
++        case 2:
++            tmp.tm_mon = n - 1;
++            break;
++        case 3:
++            /* check if tm_mday is valid in tm_mon */
++            if (tmp.tm_mon == 1) {
++                /* it's February */
++                md = mdays[1] + leap_year(tmp.tm_year + 1900);
++            } else {
++                md = mdays[tmp.tm_mon];
++            }
++            if (n > md)
++                goto err;
++            tmp.tm_mday = n;
++            determine_days(&tmp);
++            break;
++        case 4:
++            tmp.tm_hour = n;
++            break;
++        case 5:
++            tmp.tm_min = n;
++            break;
++        case 6:
++            tmp.tm_sec = n;
++            break;
++        }
++    }
++
++    /*
++     * Optional fractional seconds: decimal point followed by one or more
++     * digits.
++     */
++    if (d->type == V_ASN1_GENERALIZEDTIME && a[o] == '.') {
++        if (strict)
++            /* RFC 5280 forbids fractional seconds */
++            goto err;
++        if (++o == l)
++            goto err;
++        i = o;
++        while ((o < l) && isdigit(a[o]))
++            o++;
++        /* Must have at least one digit after decimal point */
++        if (i == o)
++            goto err;
++        /* no more bytes to read, but we haven't seen time-zone yet */
++        if (o == l)
++            goto err;
++    }
++
++    /*
++     * 'o' will never point to '\0' at this point, the only chance
++     * 'o' can point to '\0' is either the subsequent if or the first
++     * else if is true.
++     */
++    if (a[o] == 'Z') {
++        o++;
++    } else if (!strict && ((a[o] == '+') || (a[o] == '-'))) {
++        int offsign = a[o] == '-' ? 1 : -1;
++        int offset = 0;
++
++        o++;
++        /*
++         * if not equal, no need to do subsequent checks
++         * since the following for-loop will add 'o' by 4
++         * and the final return statement will check if 'l'
++         * and 'o' are equal.
++         */
++        if (o + 4 != l)
++            goto err;
++        for (i = end; i < end + 2; i++) {
++            if (!isdigit(a[o]))
++                goto err;
++            n = a[o] - '0';
++            o++;
++            if (!isdigit(a[o]))
++                goto err;
++            n = (n * 10) + a[o] - '0';
++            i2 = (d->type == V_ASN1_UTCTIME) ? i + 1 : i;
++            if ((n < min[i2]) || (n > max[i2]))
++                goto err;
++            /* if tm is NULL, no need to adjust */
++            if (tm != NULL) {
++                if (i == end)
++                    offset = n * 3600;
++                else if (i == end + 1)
++                    offset += n * 60;
++            }
++            o++;
++        }
++        if (offset && !OPENSSL_gmtime_adj(&tmp, 0, offset * offsign))
++            goto err;
++    } else {
++        /* not Z, or not +/- in non-strict mode */
++        goto err;
++    }
++    if (o == l) {
++        /* success, check if tm should be filled */
++        if (tm != NULL)
++            *tm = tmp;
++        return 1;
++    }
++ err:
++    return 0;
++}
++
++int ASN1_TIME_to_tm(const ASN1_TIME *s, struct tm *tm)
++{
++    if (s == NULL) {
++        time_t now_t;
++
++        time(&now_t);
++        memset(tm, 0, sizeof(*tm));
++        if (OPENSSL_gmtime(&now_t, tm) != NULL)
++            return 1;
++        return 0;
++    }
++
++    return asn1_time_to_tm(tm, s);
++}
++
++int ASN1_TIME_diff(int *pday, int *psec,
++                   const ASN1_TIME *from, const ASN1_TIME *to)
++{
++    struct tm tm_from, tm_to;
++
++    if (!ASN1_TIME_to_tm(from, &tm_from))
++        return 0;
++    if (!ASN1_TIME_to_tm(to, &tm_to))
++        return 0;
++    return OPENSSL_gmtime_diff(pday, psec, &tm_from, &tm_to);
++}
++
++#endif /*ifdef LIBRESSL_VERSION_NUMBER*/
++
+ 
+ apr_status_t md_crypt_init(apr_pool_t *pool)
+ {
+@@ -328,7 +747,7 @@ apr_status_t md_pkey_gen_rsa(md_pkey_t *
+     return rv;
+ }
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 
+ #ifndef NID_tlsfeature
+ #define NID_tlsfeature          1020
diff --git a/www/mod_md-devel/pkg-descr b/www/mod_md-devel/pkg-descr
new file mode 100644
index 00000000000..43427a0b368
--- /dev/null
+++ b/www/mod_md-devel/pkg-descr
@@ -0,0 +1,9 @@
+mod_md a module for Apache httpd that adds support for Let's Encrypt 
+(and other ACME CAs) as an early experience version.
+
+This port is here to help people review and comment and test before
+it is put into the main Apache httpd repository. Issues you can raise
+on the project's website. General discussion is probably best at the 
+apache httpd-dev mailing list.
+
+WWW: https://github.com/icing/mod_md
diff --git a/www/mod_md-devel/pkg-message b/www/mod_md-devel/pkg-message
new file mode 100644
index 00000000000..8778a677305
--- /dev/null
+++ b/www/mod_md-devel/pkg-message
@@ -0,0 +1,13 @@
+/!\ This is an early experience non-production-ready version /!\
+
+If you want to have the h2 module enabled in your apache installation,
+you need to add
+
+   LoadModule md_module modules/mod_md.so
+
+somewhere in your config files and add a line like
+
+   ManagedDomain your_domain.example.org www.your_domain.example.org
+
+Full documentation in the project's wiki 
+	https://github.com/icing/mod_md/wiki
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index dcee3a3f08f..a3bcb3cfd35 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nginx
-PORTVERSION=	1.13.3
+PORTVERSION=	1.13.4
 CATEGORIES=	www
 MASTER_SITES=	http://nginx.org/download/
 MASTER_SITES+=	LOCAL/osa
@@ -241,9 +241,9 @@ WANT_GNOME=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MX11}
-IMAGEMAGICK_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick
+IMAGEMAGICK_LIB_DEPENDS=	libMagickWand-6.so:graphics/ImageMagick
 .else
-IMAGEMAGICK_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick-nox11
+IMAGEMAGICK_LIB_DEPENDS=	libMagickWand-6.so:graphics/ImageMagick-nox11
 .endif
 
 .if ${PORT_OPTIONS:MPASSENGER}
@@ -262,10 +262,10 @@ HTTP_PORT?=	80
 NGINX_ACCESSLOG?=	${NGINX_LOGDIR}/access.log
 NGINX_ERRORLOG?=	${NGINX_LOGDIR}/error.log
 
-CONFLICTS?=     nginx-1.* \
-                nginx-full-1.* \
-                nginx-lite-1.* \
-                nginx-naxsi-1.*
+CONFLICTS?=	nginx-1.* \
+			nginx-full-1.* \
+			nginx-lite-1.* \
+			nginx-naxsi-1.*
 USE_RC_SUBR=	nginx
 SUB_FILES=	pkg-message
 SUB_LIST+=	WWWOWN=${WWWOWN} \
@@ -467,11 +467,11 @@ EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_http_echo_request_info.c
 .endif
 
 .if ${PORT_OPTIONS:MFASTDFS}
-NGINX_FASTDFS_VERSION=     5a8110f
-GH_ACCOUNT+=    happyfish100:fastdfs
-GH_PROJECT+=    fastdfs-nginx-module:fastdfs
-GH_TAGNAME+=    ${NGINX_FASTDFS_VERSION}:fastdfs
-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-fastdfs-src-config
+NGINX_FASTDFS_VERSION=	5a8110f
+GH_ACCOUNT+=	happyfish100:fastdfs
+GH_PROJECT+=	fastdfs-nginx-module:fastdfs
+GH_TAGNAME+=	${NGINX_FASTDFS_VERSION}:fastdfs
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-fastdfs-src-config
 BUILD_DEPENDS+=	${LOCALBASE}/include/fastcommon/logger.h:devel/libfastcommon \
 		${LOCALBASE}/include/fastdfs/fdfs_client.h:ftp/fastdfs
 LIB_DEPENDS+=	libfastcommon.so:devel/libfastcommon \
@@ -763,7 +763,7 @@ EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_http_sticky_misc.c
 
 .if ${PORT_OPTIONS:MHTTP_VIDEO_THUMBEXTRACTOR}
 NGINX_VIDEO_THUMBEXTRACTOR_VERSION=	0.7.0
-LIB_DEPENDS+= 	libavformat.so:multimedia/ffmpeg \
+LIB_DEPENDS+=	libavformat.so:multimedia/ffmpeg \
 		libavcodec.so:multimedia/ffmpeg \
 		libavutil.so:multimedia/ffmpeg \
 		libswscale.so:multimedia/ffmpeg
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index 58efac822b9..7e5961f86ad 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1499944007
-SHA256 (nginx-1.13.3.tar.gz) = 5b73f98004c302fb8e4a172abf046d9ce77739a82487e4873b39f9b0dcbb0d72
-SIZE (nginx-1.13.3.tar.gz) = 985931
+TIMESTAMP = 1502363751
+SHA256 (nginx-1.13.4.tar.gz) = de21f3c49ba65c611329d8759a63d72e5fcf719bc6f2a3270e2541348ef1fbba
+SIZE (nginx-1.13.4.tar.gz) = 988415
 SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c
 SIZE (ngx_cache_purge-2.3.tar.gz) = 12248
 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
diff --git a/www/node/Makefile b/www/node/Makefile
index 91a50c492a4..388d5a21a92 100644
--- a/www/node/Makefile
+++ b/www/node/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	node
-PORTVERSION=	8.2.1
+PORTVERSION=	8.3.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 MASTER_SITES=	http://nodejs.org/dist/v${PORTVERSION}/
@@ -84,18 +84,6 @@ CONFIGURE_ARGS+=--openssl-no-asm
 CXXFLAGS+=	-D_GLIBCXX_USE_C99
 .endif
 
-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 40
-# Conditinal work around for a bug in libc++ included with clang 3.x:
-# https://bugs.llvm.org/show_bug.cgi?id=18249
-# https://bugs.llvm.org/show_bug.cgi?id=18350
-# https://bugs.llvm.org/show_bug.cgi?id=18853
-#
-# Upstream Node.js adds the define to all FreeBSD builds. This breaks
-# the build with clang 4.0, so we patch it out (files/patch-common.gypi)
-# and add it here instead.
-CXXFLAGS+=	-D_LIBCPP_TRIVIAL_PAIR_COPY_CTOR
-.endif
-
 .if ${PORT_OPTIONS:MDTRACE}
 CONFIGURE_ARGS+=	--with-dtrace
 .endif
diff --git a/www/node/distinfo b/www/node/distinfo
index 3c56ab2648e..0cf5e394669 100644
--- a/www/node/distinfo
+++ b/www/node/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500933063
-SHA256 (node-v8.2.1.tar.gz) = 66fe1379bc7daf9a16c6b5c45ab695bf1cdcfae9738d2989e940104d6b31973f
-SIZE (node-v8.2.1.tar.gz) = 30334692
+TIMESTAMP = 1502344455
+SHA256 (node-v8.3.0.tar.gz) = 33fa7a02f265636c240be9ebd0f93942f77856a9c2c751592da1a0962b6ed010
+SIZE (node-v8.3.0.tar.gz) = 30588563
diff --git a/www/node/files/patch-common.gypi b/www/node/files/patch-common.gypi
deleted file mode 100644
index 820e6cc2c4e..00000000000
--- a/www/node/files/patch-common.gypi
+++ /dev/null
@@ -1,12 +0,0 @@
---- common.gypi.orig	2017-06-28 05:52:55 UTC
-+++ common.gypi
-@@ -407,9 +407,6 @@
-         'libraries': [ '-lelf' ],
-       }],
-       ['OS=="freebsd"', {
--        # Use this flag because on FreeBSD std::pairs copy constructor is non-trivial
--        # https://lists.freebsd.org/pipermail/freebsd-toolchain/2016-March/002094.html
--        'cflags': [ '-D_LIBCPP_TRIVIAL_PAIR_COPY_CTOR=1' ],
-         'ldflags': [
-           '-Wl,--export-dynamic',
-         ],
diff --git a/www/node/files/patch-deps_v8_src_base_cpu.cc b/www/node/files/patch-deps_v8_src_base_cpu.cc
index 8a155cb0109..b8bed3b277b 100644
--- a/www/node/files/patch-deps_v8_src_base_cpu.cc
+++ b/www/node/files/patch-deps_v8_src_base_cpu.cc
@@ -1,6 +1,6 @@
---- deps/v8/src/base/cpu.cc.orig	2017-06-19 14:24:53.928317000 +0000
-+++ deps/v8/src/base/cpu.cc	2017-06-19 14:24:57.294664000 +0000
-@@ -601,6 +601,7 @@
+--- deps/v8/src/base/cpu.cc.orig	2017-08-09 18:48:10 UTC
++++ deps/v8/src/base/cpu.cc
+@@ -607,6 +607,7 @@ CPU::CPU()
  
  #elif V8_HOST_ARCH_ARM64
  
@@ -8,7 +8,7 @@
    CPUInfo cpu_info;
  
    // Extract implementor from the "CPU implementer" field.
-@@ -634,6 +635,8 @@
+@@ -640,6 +641,8 @@ CPU::CPU()
      }
      delete[] part;
    }
diff --git a/www/node/files/patch-deps_v8_src_base_platform_platform-freebsd.cc b/www/node/files/patch-deps_v8_src_base_platform_platform-freebsd.cc
index 0844d5dee60..921c53da2cb 100644
--- a/www/node/files/patch-deps_v8_src_base_platform_platform-freebsd.cc
+++ b/www/node/files/patch-deps_v8_src_base_platform_platform-freebsd.cc
@@ -1,8 +1,8 @@
---- deps/v8/src/base/platform/platform-freebsd.cc.orig	2017-06-15 11:55:21 UTC
+--- deps/v8/src/base/platform/platform-freebsd.cc.orig	2017-08-09 18:48:10 UTC
 +++ deps/v8/src/base/platform/platform-freebsd.cc
-@@ -35,6 +35,48 @@
- namespace v8 {
- namespace base {
+@@ -48,6 +48,48 @@ void* OS::Allocate(const size_t requested, size_t* all
+   return mbase;
+ }
  
 +#ifdef __arm__
 +
@@ -47,5 +47,5 @@
 +#endif  // def __arm__
 +
  
- const char* OS::LocalTimezone(double time, TimezoneCache* cache) {
-   if (std::isnan(time)) return "";
+ static unsigned StringToLong(char* buffer) {
+   return static_cast<unsigned>(strtol(buffer, NULL, 16));  // NOLINT
diff --git a/www/node/pkg-plist b/www/node/pkg-plist
index e63c91105cd..ee414daa71d 100644
--- a/www/node/pkg-plist
+++ b/www/node/pkg-plist
@@ -111,6 +111,7 @@ include/node/v8-platform.h
 include/node/v8-profiler.h
 include/node/v8-testing.h
 include/node/v8-util.h
+include/node/v8-value-serializer-version.h
 include/node/v8-version.h
 include/node/v8-version-string.h
 include/node/v8.h
diff --git a/www/p5-HTML-Display/Makefile b/www/p5-HTML-Display/Makefile
index 0c8268788e0..0fc7acf2506 100644
--- a/www/p5-HTML-Display/Makefile
+++ b/www/p5-HTML-Display/Makefile
@@ -18,7 +18,6 @@ BUILD_DEPENDS=	p5-HTML-TokeParser-Simple>=2:www/p5-HTML-TokeParser-Simple \
 		p5-URI>=0:net/p5-URI \
 		p5-libwww>=5.69:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Harness>=2.30:devel/p5-Test-Harness
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/www/p5-Reddit-Client/Makefile b/www/p5-Reddit-Client/Makefile
index 5183529278e..932cf6da248 100644
--- a/www/p5-Reddit-Client/Makefile
+++ b/www/p5-Reddit-Client/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Reddit-Client
-PORTVERSION=	1.086
+PORTVERSION=	1.0901
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Reddit-Client/distinfo b/www/p5-Reddit-Client/distinfo
index 384d5ff6a1d..04f97b33cfd 100644
--- a/www/p5-Reddit-Client/distinfo
+++ b/www/p5-Reddit-Client/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499169814
-SHA256 (Reddit-Client-1.086.tar.gz) = d1faa17f4705009337039c90e4ff9ba4748f9f02cee3f7872855779683967a17
-SIZE (Reddit-Client-1.086.tar.gz) = 21601
+TIMESTAMP = 1502631732
+SHA256 (Reddit-Client-1.0901.tar.gz) = aae495762f970e7e4d795cadf30e3b632d69cfaf4874ca8934442e160e71fb4c
+SIZE (Reddit-Client-1.0901.tar.gz) = 23608
diff --git a/www/py-django-otp-yubikey/Makefile b/www/py-django-otp-yubikey/Makefile
index 6d39a8398c5..98d253c1427 100644
--- a/www/py-django-otp-yubikey/Makefile
+++ b/www/py-django-otp-yubikey/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	django-otp-yubikey
-PORTVERSION=	0.3.5
+PORTVERSION=	0.4.0
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,8 +12,8 @@ COMMENT=	Plugin that verifies YubiKey OTP tokens
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}YubiOTP>0:security/py-YubiOTP \
-		${PYTHON_PKGNAMEPREFIX}django-otp>0:www/py-django-otp
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}YubiOTP>=0.2.1:security/py-YubiOTP \
+		${PYTHON_PKGNAMEPREFIX}django-otp>0.4.0:www/py-django-otp
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-django-otp-yubikey/distinfo b/www/py-django-otp-yubikey/distinfo
index 3c97a9b9437..c32d895b343 100644
--- a/www/py-django-otp-yubikey/distinfo
+++ b/www/py-django-otp-yubikey/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1481318502
-SHA256 (django-otp-yubikey-0.3.5.tar.gz) = 94a2605cc2095fdb629d3d806e1702f5d288c1928f134baf2e96efd7c9286e60
-SIZE (django-otp-yubikey-0.3.5.tar.gz) = 14454
+TIMESTAMP = 1502651300
+SHA256 (django-otp-yubikey-0.4.0.tar.gz) = 489a83a35955f45ace058c1d908fc1182c55d5fefb3696555b3498f6cac9deb1
+SIZE (django-otp-yubikey-0.4.0.tar.gz) = 12847
diff --git a/www/py-django-otp/Makefile b/www/py-django-otp/Makefile
index bf785889e27..9c9e58dc593 100644
--- a/www/py-django-otp/Makefile
+++ b/www/py-django-otp/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	django-otp
-PORTVERSION=	0.3.14
+PORTVERSION=	0.4.0.1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/www/py-django-otp/distinfo b/www/py-django-otp/distinfo
index 676170f976b..e9f28529a2b 100644
--- a/www/py-django-otp/distinfo
+++ b/www/py-django-otp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1498508193
-SHA256 (django-otp-0.3.14.tar.gz) = 662243ccda83986ca9a61c2f4658905c42acfb8cee56a3664928959165be2276
-SIZE (django-otp-0.3.14.tar.gz) = 44302
+TIMESTAMP = 1502651042
+SHA256 (django-otp-0.4.0.1.tar.gz) = df881ab429f2d31da1598905430b38d64e93ec819b739a2308945807f488e77b
+SIZE (django-otp-0.4.0.1.tar.gz) = 40129
diff --git a/www/rubygem-jekyll/Makefile b/www/rubygem-jekyll/Makefile
index c0ec8652dc7..bc847bed05c 100644
--- a/www/rubygem-jekyll/Makefile
+++ b/www/rubygem-jekyll/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	jekyll
-PORTVERSION=	3.5.1
+PORTVERSION=	3.5.2
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 
diff --git a/www/rubygem-jekyll/distinfo b/www/rubygem-jekyll/distinfo
index 691600c88e5..1a515e2b164 100644
--- a/www/rubygem-jekyll/distinfo
+++ b/www/rubygem-jekyll/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500386610
-SHA256 (rubygem/jekyll-3.5.1.gem) = 6c4ef1e7d774760a3fce779d064a15891ffd6e05e4f33a990c4d1946b4c56c59
-SIZE (rubygem/jekyll-3.5.1.gem) = 92672
+TIMESTAMP = 1502640055
+SHA256 (rubygem/jekyll-3.5.2.gem) = 4b3c8c3bf75d23f49b984eccff2d5e8a029af4155db962cac89279dac7c97a35
+SIZE (rubygem/jekyll-3.5.2.gem) = 92672
diff --git a/www/rubygem-raindrops/Makefile b/www/rubygem-raindrops/Makefile
index 5cd0c9cc58b..6baba206bb3 100644
--- a/www/rubygem-raindrops/Makefile
+++ b/www/rubygem-raindrops/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	raindrops
-PORTVERSION=	0.18.0
+PORTVERSION=	0.19.0
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 
diff --git a/www/rubygem-raindrops/distinfo b/www/rubygem-raindrops/distinfo
index 295552bb9cd..6cb68c3a5cf 100644
--- a/www/rubygem-raindrops/distinfo
+++ b/www/rubygem-raindrops/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1490305878
-SHA256 (rubygem/raindrops-0.18.0.gem) = 9fe91a5c3efb7928889689744b9cf8671f427b0f248b0676dbd0834255aca420
-SIZE (rubygem/raindrops-0.18.0.gem) = 61952
+TIMESTAMP = 1502474006
+SHA256 (rubygem/raindrops-0.19.0.gem) = f7f93ee8a2cc29c5563ca3cf8534f22600eae0441464f1dd280c1017656aebe2
+SIZE (rubygem/raindrops-0.19.0.gem) = 61952
diff --git a/www/rubygem-selenium-webdriver/Makefile b/www/rubygem-selenium-webdriver/Makefile
index c9eeedd2e62..0800f8cb348 100644
--- a/www/rubygem-selenium-webdriver/Makefile
+++ b/www/rubygem-selenium-webdriver/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	selenium-webdriver
-PORTVERSION=	3.4.4
+PORTVERSION=	3.5.0
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 
diff --git a/www/rubygem-selenium-webdriver/distinfo b/www/rubygem-selenium-webdriver/distinfo
index c736dce46e1..12cb8dcaa3a 100644
--- a/www/rubygem-selenium-webdriver/distinfo
+++ b/www/rubygem-selenium-webdriver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500052190
-SHA256 (rubygem/selenium-webdriver-3.4.4.gem) = 4188bcf6db106b97e5961295a736492e72d02fae16942c6d70015410f1df0a57
-SIZE (rubygem/selenium-webdriver-3.4.4.gem) = 838144
+TIMESTAMP = 1502474014
+SHA256 (rubygem/selenium-webdriver-3.5.0.gem) = 60ac0c326fc2362735fee0e46e1ac840f7ef6fa42870874741f3c2c3c304d970
+SIZE (rubygem/selenium-webdriver-3.5.0.gem) = 829952
diff --git a/www/stagit/Makefile b/www/stagit/Makefile
index 922ac07effe..0b4c741c4b2 100644
--- a/www/stagit/Makefile
+++ b/www/stagit/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	stagit
-PORTVERSION=	0.5
+PORTVERSION=	0.6
 CATEGORIES=	www
 MASTER_SITES=	http://dl.2f30.org/releases/
 
@@ -16,15 +16,19 @@ LIB_DEPENDS=	libgit2.so:devel/libgit2
 
 MAKE_ARGS=	CC="${CC}" \
 		PREFIX="${PREFIX}" \
-		DOCSDIR="${DOCSDIR}" \
-		EXAMPLESDIR="${EXAMPLESDIR}" \
-		MANPREFIX="${MANPREFIX}/man" \
 		GITINC="${PREFIX}/include" \
 		GITLIB="${PREFIX}/lib"
 
-post-install:
-	${STRIP_CMD} \
-		${STAGEDIR}${PREFIX}/bin/stagit \
-		${STAGEDIR}${PREFIX}/bin/stagit-index
+post-patch:
+	@${REINPLACE_CMD} '/strlcat\.o/d; /strlcpy\.o/d' ${WRKSRC}/Makefile
+
+do-install:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${EXAMPLESDIR} ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/stagit ${WRKSRC}/stagit-index ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/stagit.1 ${WRKSRC}/stagit-index.1 ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+.for f in example_create.sh example_post-receive.sh favicon.png logo.png style.css
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${EXAMPLESDIR}
+.endfor
 
 .include <bsd.port.mk>
diff --git a/www/stagit/distinfo b/www/stagit/distinfo
index 3d2871e4b97..746b4d42ec4 100644
--- a/www/stagit/distinfo
+++ b/www/stagit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1483644879
-SHA256 (stagit-0.5.tar.gz) = a648f52ef8b0921dfea87a5c6aadcb2bba5b5ea801e2511e83437c613f6fa17a
-SIZE (stagit-0.5.tar.gz) = 15497
+TIMESTAMP = 1502646144
+SHA256 (stagit-0.6.tar.gz) = 71bfb26ed537955ef55119cf79c45654321a795a2d7e697dbce143324e48fd04
+SIZE (stagit-0.6.tar.gz) = 16523
diff --git a/www/stagit/files/patch-Makefile b/www/stagit/files/patch-Makefile
deleted file mode 100644
index 143d1f827d7..00000000000
--- a/www/stagit/files/patch-Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
---- Makefile.orig	2016-05-07 13:07:28 UTC
-+++ Makefile
-@@ -21,10 +21,7 @@ DOC = \
- 	TODO
- HDR = compat.h
- 
--COMPATOBJ = \
--	reallocarray.o\
--	strlcat.o\
--	strlcpy.o
-+COMPATOBJ = reallocarray.o
- 
- OBJ = ${SRC:.c=.o} ${COMPATOBJ}
- 
-@@ -66,13 +63,14 @@ install: all
- 	cp -f ${BIN} ${SCRIPTS} ${DESTDIR}${PREFIX}/bin
- 	for f in $(BIN) $(SCRIPTS); do chmod 755 ${DESTDIR}${PREFIX}/bin/$$f; done
- 	# installing example files.
--	mkdir -p ${DESTDIR}${PREFIX}/share/${NAME}
-+	mkdir -p ${DESTDIR}${DOCSDIR}
-+	cp -f README ${DESTDIR}${DOCSDIR}
-+	mkdir -p ${DESTDIR}${EXAMPLESDIR}
- 	cp -f style.css\
- 		favicon.png\
- 		logo.png\
- 		example.sh\
--		README\
--		${DESTDIR}${PREFIX}/share/${NAME}
-+		${DESTDIR}${EXAMPLESDIR}/
- 	# installing manual pages.
- 	mkdir -p ${DESTDIR}${MANPREFIX}/man1
- 	cp -f ${MAN1} ${DESTDIR}${MANPREFIX}/man1
diff --git a/www/stagit/pkg-plist b/www/stagit/pkg-plist
index f6b8eded6c8..41a3b9139a9 100644
--- a/www/stagit/pkg-plist
+++ b/www/stagit/pkg-plist
@@ -3,7 +3,8 @@ bin/stagit-index
 man/man1/stagit-index.1.gz
 man/man1/stagit.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_create.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_post-receive.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/favicon.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/logo.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/style.css
diff --git a/www/typo3-7/Makefile b/www/typo3-7/Makefile
index f3e1be565fc..a3c9026de5a 100644
--- a/www/typo3-7/Makefile
+++ b/www/typo3-7/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	typo3
 PORTVERSION=	${PORT_V_MAJOR}.${PORT_V_MINOR}.${PORT_V_PATCH}
 CATEGORIES=	www
-MASTER_SITES=	SF/${PORTNAME}/TYPO3%20Source%20and%20Dummy/TYPO3%20${PORTVERSION}
+MASTER_SITES=	https://typo3.azureedge.net/typo3/${PORTVERSION}/
 PKGNAMESUFFIX=	-${PORT_V_MAJOR}
 
 MAINTAINER=	freebsd-ports@charlieroot.de
@@ -24,7 +24,7 @@ WRKSRC=		${WRKDIR}/${TYPO3SRC}
 
 PORT_V_MAJOR=	7
 PORT_V_MINOR=	6
-PORT_V_PATCH=	20
+PORT_V_PATCH=	21
 
 TYPO3WWW=	www
 TYPO3SRC=	${PORTNAME}_src-${PORTVERSION}
diff --git a/www/typo3-7/distinfo b/www/typo3-7/distinfo
index 62485c66904..727608556da 100644
--- a/www/typo3-7/distinfo
+++ b/www/typo3-7/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499297168
-SHA256 (typo3_src-7.6.20.tar.gz) = 7c930d86f5fa8d8a97b562dc9b90c8a1a486f1be7b4a91188c8aab3fe40dae17
-SIZE (typo3_src-7.6.20.tar.gz) = 20469679
+TIMESTAMP = 1502367066
+SHA256 (typo3_src-7.6.21.tar.gz) = 8ba70e31ca46b07dfc3afab8097130f7296c2f88b0d8b0ec42fe058987d79176
+SIZE (typo3_src-7.6.21.tar.gz) = 20470284
diff --git a/www/typo3-8/Makefile b/www/typo3-8/Makefile
index 5fe30661be4..680ceba3de4 100644
--- a/www/typo3-8/Makefile
+++ b/www/typo3-8/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	typo3
 PORTVERSION=	${PORT_V_MAJOR}.${PORT_V_MINOR}.${PORT_V_PATCH}
 CATEGORIES=	www
-MASTER_SITES=	SF/${PORTNAME}/TYPO3%20Source%20and%20Dummy/TYPO3%20${PORTVERSION}
+MASTER_SITES=	https://typo3.azureedge.net/typo3/${PORTVERSION}/
 PKGNAMESUFFIX=	-${PORT_V_MAJOR}
 
 MAINTAINER=	freebsd-ports@charlieroot.de
@@ -26,7 +26,7 @@ WRKSRC=		${WRKDIR}/${TYPO3SRC}
 
 PORT_V_MAJOR=	8
 PORT_V_MINOR=	7
-PORT_V_PATCH=	3
+PORT_V_PATCH=	4
 
 TYPO3WWW=	www
 TYPO3SRC=	${PORTNAME}_src-${PORTVERSION}
diff --git a/www/typo3-8/distinfo b/www/typo3-8/distinfo
index 352aa575b16..c3f0de4022e 100644
--- a/www/typo3-8/distinfo
+++ b/www/typo3-8/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499297213
-SHA256 (typo3_src-8.7.3.tar.gz) = f354b2abb6a694e4dc521fa19936097a4acde504edadee86cfdc2b20ca0153bd
-SIZE (typo3_src-8.7.3.tar.gz) = 18024088
+TIMESTAMP = 1502368288
+SHA256 (typo3_src-8.7.4.tar.gz) = b0ba9a2cb09d5855b557f220ca1c535ffc9eb5f458bb48bd275ee647664b64d8
+SIZE (typo3_src-8.7.4.tar.gz) = 18431446
diff --git a/x11-drivers/xorgxrdp/Makefile b/x11-drivers/xorgxrdp/Makefile
index 15e3943cf0d..64dac1f6e69 100644
--- a/x11-drivers/xorgxrdp/Makefile
+++ b/x11-drivers/xorgxrdp/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xorgxrdp
-PORTVERSION=	0.2.2
+PORTVERSION=	0.2.3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	x11-drivers
 DIST_SUBDIR=	xrdp
@@ -23,7 +23,7 @@ USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	neutrinolabs
 GH_PROJECT=	xrdp:xrdp
-GH_TAGNAME=	v0.9.2:xrdp
+GH_TAGNAME=	v0.9.3:xrdp
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 
diff --git a/x11-drivers/xorgxrdp/distinfo b/x11-drivers/xorgxrdp/distinfo
index b5382b9e5d0..8c6734cbc19 100644
--- a/x11-drivers/xorgxrdp/distinfo
+++ b/x11-drivers/xorgxrdp/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1498019717
-SHA256 (xrdp/neutrinolabs-xorgxrdp-v0.2.2_GH0.tar.gz) = f35b79868a78d371bf88dd8956915d4fe6452ad4442f8c7eba735046de4c0ca5
-SIZE (xrdp/neutrinolabs-xorgxrdp-v0.2.2_GH0.tar.gz) = 86057
-SHA256 (xrdp/neutrinolabs-xrdp-v0.9.2_GH0.tar.gz) = 41d3abf64f95c527cc0e91bf32d744518a0dcfaefddbace13b44ece0314cbcdc
-SIZE (xrdp/neutrinolabs-xrdp-v0.9.2_GH0.tar.gz) = 1861921
+TIMESTAMP = 1500126402
+SHA256 (xrdp/neutrinolabs-xorgxrdp-v0.2.3_GH0.tar.gz) = 86dcf411dfef256b924b1f4e864dde4a6700932b5710231e102d4dfe0d2db544
+SIZE (xrdp/neutrinolabs-xorgxrdp-v0.2.3_GH0.tar.gz) = 86311
+SHA256 (xrdp/neutrinolabs-xrdp-v0.9.3_GH0.tar.gz) = 36f096d013b2cf09324cc1bf9c27caadc733001f2bcbe24e67f93233260afe5b
+SIZE (xrdp/neutrinolabs-xrdp-v0.9.3_GH0.tar.gz) = 1866654
diff --git a/x11/Makefile b/x11/Makefile
index 0e12ebc7171..866ed196436 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -291,6 +291,7 @@
     SUBDIR += rxvt-unicode
     SUBDIR += sakura
     SUBDIR += sbxkb
+    SUBDIR += screen-message
     SUBDIR += scripts
     SUBDIR += scrnsaverproto
     SUBDIR += sessreg
diff --git a/x11/p5-X11-XCB/Makefile b/x11/p5-X11-XCB/Makefile
index a0f1f672416..8b6ecd7d8fd 100644
--- a/x11/p5-X11-XCB/Makefile
+++ b/x11/p5-X11-XCB/Makefile
@@ -30,13 +30,11 @@ BUILD_DEPENDS=	\
 		p5-XS-Object-Magic>=0:devel/p5-XS-Object-Magic
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USES=		perl5
+USES=		localbase perl5
+USE_PERL5=	configure
 USE_XORG=	x11 xcb xproto xinerama
 MAKE_JOBS_UNSAFE=	yes
 
-pre-configure:
-	cd ${WRKSRC} && ${PERL} Makefile.PL
-
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/X11/XCB/XCB.so
 
diff --git a/x11/screen-message/Makefile b/x11/screen-message/Makefile
new file mode 100644
index 00000000000..06771ef3970
--- /dev/null
+++ b/x11/screen-message/Makefile
@@ -0,0 +1,29 @@
+# $FreeBSD$
+
+PORTNAME=	screen-message
+PORTVERSION=	0.25
+CATEGORIES=	x11
+
+MAINTAINER=	mail@dhauck.eu
+COMMENT=	Very simple tool to display some text as large as possible
+
+LICENSE=	GPLv2+
+
+USES=		gmake autoreconf pkgconfig gettext-runtime
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	nomeata
+GH_TAGNAME=	82c01f85d9ca9d0a3b2fe811249808d2fe4703ba
+
+GNU_CONFIGURE=	yes
+USE_GNOME=	gtk30 atk glib20 cairo gdkpixbuf2
+INSTALLS_ICONS=	yes
+
+PLIST_FILES=	bin/sm \
+		man/man6/sm.6.gz \
+		share/applications/sm.desktop \
+		share/icons/hicolor/48x48/apps/sm.png
+
+MAKE_ARGS=	execgamesdir=${PREFIX}/bin
+
+.include <bsd.port.mk>
diff --git a/x11/screen-message/distinfo b/x11/screen-message/distinfo
new file mode 100644
index 00000000000..4e7fb7d741e
--- /dev/null
+++ b/x11/screen-message/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1498154560
+SHA256 (nomeata-screen-message-0.25-82c01f85d9ca9d0a3b2fe811249808d2fe4703ba_GH0.tar.gz) = 988ce9f015f988d72362f1fd7ab56a30921fe1b332a0402f8c0804483359d2e2
+SIZE (nomeata-screen-message-0.25-82c01f85d9ca9d0a3b2fe811249808d2fe4703ba_GH0.tar.gz) = 264439
diff --git a/x11/screen-message/pkg-descr b/x11/screen-message/pkg-descr
new file mode 100644
index 00000000000..757728cddc9
--- /dev/null
+++ b/x11/screen-message/pkg-descr
@@ -0,0 +1,5 @@
+If you just want to disply a word or a short, possilby multi-line, text as
+large and as quickly as possible on your screen, then screen-message is the
+right too for you.
+
+WWW: http://sm.nomeata.de/
diff --git a/x11/swarp/Makefile b/x11/swarp/Makefile
index bbfca7434ce..b763e1675fb 100644
--- a/x11/swarp/Makefile
+++ b/x11/swarp/Makefile
@@ -7,7 +7,7 @@ PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://dl.suckless.org/tools/
 
-MAINTAINER=	mason@blisses.org
+MAINTAINER=	dg@syrec.org
 COMMENT=	X11 generic pointer warping utility
 
 LICENSE=	MIT