*/*: sync with upstream

Taken from: HardenedBSD
2019-12-16 16:49:13 +01:00 · 2019-12-16 16:49:13 +01:00 · d90c0afad5
commit d90c0afad5
parent 4c186a2fee
316 changed files with 2271 additions and 18116 deletions
--- a/archivers/engrampa/Makefile
+++ b/archivers/engrampa/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	engrampa
-PORTVERSION=	1.22.1
+PORTVERSION=	1.22.2
 CATEGORIES=	archivers mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
--- a/archivers/engrampa/distinfo
+++ b/archivers/engrampa/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1556382232
-SHA256 (mate/engrampa-1.22.1.tar.xz) = 336b05cf891b82c55373454e5c03bed09d5296c39aed977366c595a0dd46e31b
-SIZE (mate/engrampa-1.22.1.tar.xz) = 1363488
+TIMESTAMP = 1576493517
+SHA256 (mate/engrampa-1.22.2.tar.xz) = ed21d1ceafbbe31e35c9225f0dc6a451ae2f8aff454bacef60df5a31e6b3075e
+SIZE (mate/engrampa-1.22.2.tar.xz) = 1379564
--- a/archivers/engrampa/pkg-plist
+++ b/archivers/engrampa/pkg-plist
@ -754,6 +754,7 @@ share/locale/hu/LC_MESSAGES/engrampa.mo
 share/locale/hy/LC_MESSAGES/engrampa.mo
 share/locale/ia/LC_MESSAGES/engrampa.mo
 share/locale/id/LC_MESSAGES/engrampa.mo
+share/locale/ie/LC_MESSAGES/engrampa.mo
 share/locale/ig/LC_MESSAGES/engrampa.mo
 share/locale/is/LC_MESSAGES/engrampa.mo
 share/locale/it/LC_MESSAGES/engrampa.mo
--- a/archivers/gcab/Makefile
+++ b/archivers/gcab/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	gcab
-PORTVERSION=	1.0
+PORTVERSION=	1.3
 CATEGORIES=	archivers gnome
 MASTER_SITES=	GNOME

--- a/archivers/gcab/distinfo
+++ b/archivers/gcab/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1517044336
-SHA256 (gcab-1.0.tar.xz) = 297401e74f9e4b13510acc62c2b7600264f60efe22369fee625ee16e2f9228ca
-SIZE (gcab-1.0.tar.xz) = 75052
+TIMESTAMP = 1576482884
+SHA256 (gcab-1.3.tar.xz) = 10304cc8f6b550cf9f53fb3cebfb529c49394e982ef7e66e3fca9776c60a68e7
+SIZE (gcab-1.3.tar.xz) = 77900
--- a/archivers/gcab/pkg-plist
+++ b/archivers/gcab/pkg-plist
@ -12,9 +12,12 @@ libdata/pkgconfig/libgcab-1.0.pc
 man/man1/gcab.1.gz
 share/gir-1.0/GCab-1.0.gir
 share/gtk-doc/html/gcab/annotation-glossary.html
+share/gtk-doc/html/gcab/api-index-0-5.html
+share/gtk-doc/html/gcab/api-index-0-6.html
+share/gtk-doc/html/gcab/api-index-1-0.html
+share/gtk-doc/html/gcab/api-index-deprecated.html
 share/gtk-doc/html/gcab/api-index-full.html
 share/gtk-doc/html/gcab/ch01.html
-share/gtk-doc/html/gcab/deprecated-api-index.html
 share/gtk-doc/html/gcab/gcab-GCabCabinet.html
 share/gtk-doc/html/gcab/gcab-GCabFile.html
 share/gtk-doc/html/gcab/gcab-GCabFolder.html
@ -33,8 +36,10 @@ share/locale/cs/LC_MESSAGES/gcab.mo
 share/locale/da/LC_MESSAGES/gcab.mo
 share/locale/de/LC_MESSAGES/gcab.mo
 share/locale/el/LC_MESSAGES/gcab.mo
+share/locale/en_GB/LC_MESSAGES/gcab.mo
 share/locale/es/LC_MESSAGES/gcab.mo
 share/locale/eu/LC_MESSAGES/gcab.mo
+share/locale/fi/LC_MESSAGES/gcab.mo
 share/locale/fr/LC_MESSAGES/gcab.mo
 share/locale/fur/LC_MESSAGES/gcab.mo
 share/locale/gl/LC_MESSAGES/gcab.mo
@ -43,10 +48,12 @@ share/locale/id/LC_MESSAGES/gcab.mo
 share/locale/lt/LC_MESSAGES/gcab.mo
 share/locale/lv/LC_MESSAGES/gcab.mo
 share/locale/nb/LC_MESSAGES/gcab.mo
+share/locale/nl/LC_MESSAGES/gcab.mo
 share/locale/oc/LC_MESSAGES/gcab.mo
 share/locale/pl/LC_MESSAGES/gcab.mo
 share/locale/pt/LC_MESSAGES/gcab.mo
 share/locale/pt_BR/LC_MESSAGES/gcab.mo
+share/locale/ro/LC_MESSAGES/gcab.mo
 share/locale/ru/LC_MESSAGES/gcab.mo
 share/locale/sl/LC_MESSAGES/gcab.mo
 share/locale/sr/LC_MESSAGES/gcab.mo
--- a/archivers/gnome-autoar/Makefile
+++ b/archivers/gnome-autoar/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	gnome-autoar
-PORTVERSION=	0.2.3
+PORTVERSION=	0.2.4
 CATEGORIES=	archivers
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
--- a/archivers/gnome-autoar/distinfo
+++ b/archivers/gnome-autoar/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1525954206
-SHA256 (gnome3/gnome-autoar-0.2.3.tar.xz) = 5de9db0db028cd6cab7c2fec46ba90965474ecf9cd68cfd681a6488cf1fb240a
-SIZE (gnome3/gnome-autoar-0.2.3.tar.xz) = 297632
+TIMESTAMP = 1576486042
+SHA256 (gnome3/gnome-autoar-0.2.4.tar.xz) = 0a34c377f8841abbf4c29bc848b301fbd8e4e20c03d7318c777c58432033657a
+SIZE (gnome3/gnome-autoar-0.2.4.tar.xz) = 294956
--- a/astro/mkgmap/Makefile
+++ b/astro/mkgmap/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	mkgmap
-PORTVERSION=	r4389
+PORTVERSION=	r4397
 CATEGORIES=	astro converters java
 MASTER_SITES=	http://www.mkgmap.org.uk/download/ \
 		http://mirror.amdmi3.ru/distfiles/
--- a/astro/mkgmap/distinfo
+++ b/astro/mkgmap/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1576172051
-SHA256 (mkgmap-r4389.tar.gz) = de806c8337a3bdfede17646b7484921f65b68bc9a5fa0ebe285807a15df1ffa0
-SIZE (mkgmap-r4389.tar.gz) = 3392046
+TIMESTAMP = 1576506410
+SHA256 (mkgmap-r4397.tar.gz) = 624fdf85d2d3c92a2dbb4c44eccc082f037d204ff0458f0987ae99144372bf62
+SIZE (mkgmap-r4397.tar.gz) = 3413187
--- a/audio/avldrums-lv2/Makefile
+++ b/audio/avldrums-lv2/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	avldrums
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.4.0
+DISTVERSION=	0.4.1
 CATEGORIES=	audio
 PKGNAMESUFFIX=	-lv2

--- a/audio/avldrums-lv2/distinfo
+++ b/audio/avldrums-lv2/distinfo
@ -1,5 +1,5 @@
-TIMESTAMP = 1571362552
-SHA256 (x42-avldrums.lv2-v0.4.0_GH0.tar.gz) = ad3f7a989f9200302d33d89fe028ad2db79eb7abb367876408d5bd296779fea0
-SIZE (x42-avldrums.lv2-v0.4.0_GH0.tar.gz) = 35236247
+TIMESTAMP = 1576478146
+SHA256 (x42-avldrums.lv2-v0.4.1_GH0.tar.gz) = f72d553f48a2935bdfe7fd4b5f7756dc7f1ab2472f1f61331c88816e835f4da2
+SIZE (x42-avldrums.lv2-v0.4.1_GH0.tar.gz) = 35245158
 SHA256 (x42-robtk-bad6354_GH0.tar.gz) = 00324fa0a8c498cec4e2d8930599ea471ad69193a3251c6fc8e844ad4f490de1
 SIZE (x42-robtk-bad6354_GH0.tar.gz) = 114562
--- a/audio/gmsynth-lv2/Makefile
+++ b/audio/gmsynth-lv2/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	gmsynth
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.4.0
+DISTVERSION=	0.4.1
 CATEGORIES=	audio
 PKGNAMESUFFIX=	-lv2

--- a/audio/gmsynth-lv2/distinfo
+++ b/audio/gmsynth-lv2/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1571362407
-SHA256 (x42-gmsynth.lv2-v0.4.0_GH0.tar.gz) = 2fd29aff8e237c258b29400f72fdc5c5a2b759b19e9928b6774d309b9f51b007
-SIZE (x42-gmsynth.lv2-v0.4.0_GH0.tar.gz) = 28766906
+TIMESTAMP = 1576478183
+SHA256 (x42-gmsynth.lv2-v0.4.1_GH0.tar.gz) = 0958fc9e74bcc6eb1985061cf3bb3fa98e7e75ab9ee48640dacbbbc903eb3ba9
+SIZE (x42-gmsynth.lv2-v0.4.1_GH0.tar.gz) = 28776539
--- a/audio/oss/files/patch-kernel_OS_FreeBSD_os__freebsd.c
+++ b/audio/oss/files/patch-kernel_OS_FreeBSD_os__freebsd.c
@ -1,6 +1,23 @@
 --- kernel/OS/FreeBSD/os_freebsd.c.orig	2019-03-06 07:52:21 UTC
 +++ kernel/OS/FreeBSD/os_freebsd.c
-@@ -920,15 +920,9 @@ oss_poll (struct cdev *bsd_dev, int events, struct thr
+@@ -15,6 +15,8 @@
+ #include "oss_config.h"
+ #include "midi_core.h"
+ #include <oss_pci.h>
+#include <sys/param.h>
+#include <sys/types.h>
+ #include <sys/conf.h>
+ #include <sys/module.h>
+ #include <sys/proc.h>
+@@ -25,6 +28,7 @@
+ #include <sys/poll.h>
+ #include <sys/param.h>
+ #include <sys/filio.h>
+#include <sys/systm.h>
+ 
+ /* Function prototypes */
+ static d_open_t oss_open;
+@@ -920,15 +923,9 @@ oss_poll (struct cdev *bsd_dev, int events, struct thr
   return ev.revents;
 }
 
--- a/audio/yoshimi/Makefile
+++ b/audio/yoshimi/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	yoshimi
-DISTVERSION=	1.6.0.3
+DISTVERSION=	1.6.1
 CATEGORIES=	audio

 MAINTAINER=	tobik@FreeBSD.org
--- a/audio/yoshimi/distinfo
+++ b/audio/yoshimi/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1573625480
-SHA256 (Yoshimi-yoshimi-1.6.0.3_GH0.tar.gz) = f366d0f2d4049a970cf91823c530b8bd43ab04730f5163ca3d86dbb8abfd06bc
-SIZE (Yoshimi-yoshimi-1.6.0.3_GH0.tar.gz) = 9991767
+TIMESTAMP = 1576495028
+SHA256 (Yoshimi-yoshimi-1.6.1_GH0.tar.gz) = 524b808af9195229a11b260b236be55d3f5577f1ed69433dc414e31b34b60dad
+SIZE (Yoshimi-yoshimi-1.6.1_GH0.tar.gz) = 9979551
--- a/audio/yoshimi/pkg-plist
+++ b/audio/yoshimi/pkg-plist
@ -35,6 +35,7 @@ share/applications/yoshimi.desktop
 %%PORTDOCS%%%%DOCSDIR%%/Histories/Yoshimi_1.5.7_features.txt
 %%PORTDOCS%%%%DOCSDIR%%/Histories/Yoshimi_1.5.8_features.txt
 %%PORTDOCS%%%%DOCSDIR%%/Histories/Yoshimi_1.5.9_features.txt
+%%PORTDOCS%%%%DOCSDIR%%/Histories/Yoshimi_1.6.0_features.txt
 %%PORTDOCS%%%%DOCSDIR%%/Histories/Yoshimi_License_History.txt
 %%PORTDOCS%%%%DOCSDIR%%/Histories/Zyn_ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/Histories/Zyn_HISTORY.txt
@ -57,10 +58,10 @@ share/applications/yoshimi.desktop
 %%PORTDOCS%%%%DOCSDIR%%/Vector_Control.txt
 %%PORTDOCS%%%%DOCSDIR%%/Voice_Mod_Oscillators.txt
 %%PORTDOCS%%%%DOCSDIR%%/Yoshi_Zyn_NRPNs.txt
-%%PORTDOCS%%%%DOCSDIR%%/Yoshimi_1.6.0_features.txt
+%%PORTDOCS%%%%DOCSDIR%%/Yoshimi_1.6.1_features.txt
 %%PORTDOCS%%%%DOCSDIR%%/Yoshimi_Only_NRPNs.txt
 %%PORTDOCS%%%%DOCSDIR%%/Yoshimi_Quote.txt
-%%PORTDOCS%%%%DOCSDIR%%/yoshimi-user-manual-1.6.0.pdf
+%%PORTDOCS%%%%DOCSDIR%%/yoshimi-user-manual-1.6.1.pdf
 share/icons/hicolor/scalable/apps/yoshimi.svg
 share/icons/hicolor/scalable/apps/yoshimi_alt.svg
 share/metainfo/yoshimi.appdata.xml
@ -910,14 +911,15 @@ share/pixmaps/yoshimi.png
 %%DATADIR%%/banks/chip/0048-Glitch_in_the_Machine.xiz
 %%DATADIR%%/banks/chip/0049-Dings.xiz
 %%DATADIR%%/banks/chip/0050-Ghost_Bells.xiz
+%%DATADIR%%/examples/1st_README.txt
 %%DATADIR%%/examples/CoolSound.txt
 %%DATADIR%%/examples/CoolSound.xvy
 %%DATADIR%%/examples/CrossFade.txt
 %%DATADIR%%/examples/CrossFade.xiz
-%%DATADIR%%/examples/Microtonal Demo.txt
 %%DATADIR%%/examples/Microtonal Keymap Demo.kbm
 %%DATADIR%%/examples/Microtonal Ratio Scale.xsz
 %%DATADIR%%/examples/Microtonal Tuning Demo.scl
+%%DATADIR%%/examples/Microtonal_Demo.txt
 %%DATADIR%%/examples/Original Zyn Patchsets/0km.xmz
 %%DATADIR%%/examples/Original Zyn Patchsets/Arpeggio 1.xmz
 %%DATADIR%%/examples/Original Zyn Patchsets/Arpeggio 2.xmz
--- a/audio/zam-plugins-lv2/Makefile
+++ b/audio/zam-plugins-lv2/Makefile
@ -1,9 +1,7 @@
 # $FreeBSD$

 PORTNAME=	zam-plugins
-DISTVERSION=	3.11-1
-PORTREVISION=	1
-DISTVERSIONSUFFIX=	-gce45995
+DISTVERSION=	3.12
 CATEGORIES=	audio
 PKGNAMESUFFIX=	-lv2

--- a/audio/zam-plugins-lv2/distinfo
+++ b/audio/zam-plugins-lv2/distinfo
@ -1,5 +1,5 @@
-TIMESTAMP = 1560051677
-SHA256 (zamaudio-zam-plugins-3.11-1-gce45995_GH0.tar.gz) = 5b1a60afae86636d330096e851be11a639fe776583d9a54aca5bba5a57480d05
-SIZE (zamaudio-zam-plugins-3.11-1-gce45995_GH0.tar.gz) = 23926863
+TIMESTAMP = 1576465152
+SHA256 (zamaudio-zam-plugins-3.12_GH0.tar.gz) = e20fec56a781dc4cbba0357afad46d15cdcab980a819db57369f7e9da3ef378a
+SIZE (zamaudio-zam-plugins-3.12_GH0.tar.gz) = 23919689
 SHA256 (DISTRHO-DPF-68b3a57_GH0.tar.gz) = c5e188808d6887119bc5311433558331fd7192cff37f1dbf5ed97f25d44a378a
 SIZE (DISTRHO-DPF-68b3a57_GH0.tar.gz) = 1624216
--- a/databases/Makefile
+++ b/databases/Makefile
@ -493,6 +493,7 @@
    SUBDIR += p5-SQL-Abstract-Plugin-InsertMulti
    SUBDIR += p5-SQL-Interp
    SUBDIR += p5-SQL-Maker
+    SUBDIR += p5-SQL-NamedPlaceholder
    SUBDIR += p5-SQL-ReservedWords
    SUBDIR += p5-SQL-Statement
    SUBDIR += p5-SQL-Translator
--- a/databases/geoserver-mysql-plugin/Makefile
+++ b/databases/geoserver-mysql-plugin/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	geoserver
-PORTVERSION=	2.15.1
+PORTVERSION=	2.16.1
 CATEGORIES=	databases geography java
 MASTER_SITES=	SF/${PORTNAME}/GeoServer/${PORTVERSION}/extensions
 PKGNAMESUFFIX=	-mysql-plugin
@ -22,7 +22,7 @@ NO_ARCH=	yes

 GSLIBDIR=	geoserver/webapps/geoserver/WEB-INF/lib
 SUB_FILES=	pkg-message
-PLIST_FILES=	${GSLIBDIR}/gt-jdbc-mysql-21.1.jar \
+PLIST_FILES=	${GSLIBDIR}/gt-jdbc-mysql-22.1.jar \
 		${GSLIBDIR}/mysql-connector-java-5.1.46.jar

 do-install:
--- a/databases/geoserver-mysql-plugin/distinfo
+++ b/databases/geoserver-mysql-plugin/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1556648308
-SHA256 (geoserver-2.15.1-mysql-plugin.zip) = ba4570cadaea0b5c7f8b2faa75bb012521c0091576c64caddcabd59976e6205f
-SIZE (geoserver-2.15.1-mysql-plugin.zip) = 978322
+TIMESTAMP = 1576411446
+SHA256 (geoserver-2.16.1-mysql-plugin.zip) = 51e88757efacfdda606cad31090bc852b4224075ac4b2c59bd12de185872732d
+SIZE (geoserver-2.16.1-mysql-plugin.zip) = 978356
--- a/databases/p5-SQL-NamedPlaceholder/Makefile
+++ b/databases/p5-SQL-NamedPlaceholder/Makefile
@ -0,0 +1,28 @@
+# $FreeBSD$
+
+PORTNAME=	SQL-NamedPlaceholder
+PORTVERSION=	0.10
+CATEGORIES=	databases perl5
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=CPAN:SATOH
+PKGNAMEPREFIX=	p5-
+
+MAINTAINER=	bokutin@bokut.in
+COMMENT=	Extension of placeholder
+
+LICENSE=	ART10 GPLv1+
+LICENSE_COMB=	dual
+
+BUILD_DEPENDS=	p5-Module-Build>=0:devel/p5-Module-Build \
+		p5-Module-Build-Tiny>=0.035:devel/p5-Module-Build-Tiny
+RUN_DEPENDS=	p5-Exporter-Lite>=0:devel/p5-Exporter-Lite
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
+
+USES=		perl5
+USE_PERL5=	modbuild
+PLIST_FILES=	${SITE_PERL_REL}/SQL/NamedPlaceholder.pm \
+		${SITE_MAN3_REL}/SQL::NamedPlaceholder.3.gz
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
--- a/databases/p5-SQL-NamedPlaceholder/distinfo
+++ b/databases/p5-SQL-NamedPlaceholder/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1560854140
+SHA256 (SQL-NamedPlaceholder-0.10.tar.gz) = a87468204cb3d5a3ba329c1991bc68dcaa6b454724078db67779c03086d841ab
+SIZE (SQL-NamedPlaceholder-0.10.tar.gz) = 10338
--- a/databases/p5-SQL-NamedPlaceholder/pkg-descr
+++ b/databases/p5-SQL-NamedPlaceholder/pkg-descr
@ -0,0 +1,4 @@
+SQL::NamedPlaceholder is extension of placeholder.
+This enable more readable and robust code.
+
+WWW: https://metacpan.org/release/SQL-NamedPlaceholder
--- a/devel/R-cran-testthat/pkg-descr
+++ b/devel/R-cran-testthat/pkg-descr
@ -2,4 +2,4 @@ Software testing is important, but, in part because it is frustrating and
 boring, many of us avoid it. 'testthat' is a testing framework for R that is
 easy learn and use, and integrates with your existing 'workflow'.

-WWW: http://testthat.r-lib.org
+WWW: https://testthat.r-lib.org/
--- a/devel/desktop-file-utils/Makefile
+++ b/devel/desktop-file-utils/Makefile
@ -1,9 +1,8 @@
 # Created by: Jean-Yves Lefort <jylefort@brutele.be>
 # $FreeBSD$
-#   $MCom: ports/trunk/devel/desktop-file-utils/Makefile 17268 2013-04-01 05:13:11Z marcus $

 PORTNAME=	desktop-file-utils
-PORTVERSION=	0.23
+PORTVERSION=	0.24
 CATEGORIES=	devel
 MASTER_SITES=	http://freedesktop.org/software/${PORTNAME}/releases/

@ -26,12 +25,8 @@ PORT_MIMEDIRS=	${LOCALBASE}/share/applications

 MIMEDIRS=	${PORT_MIMEDIRS}

-post-patch:
-	@${SED} -e 's|%%MIMEDIRS%%|${MIMEDIRS}| ;\
-		s|%%PORT_MIMEDIRS%%|${PORT_MIMEDIRS}|' \
-		< ${FILESDIR}/pkg-deinstall.in > ${PKGDEINSTALL}
-	@${SED} -e 's|%%PORT_MIMEDIRS%%|${PORT_MIMEDIRS}|' \
-		< ${FILESDIR}/pkg-install.in > ${PKGINSTALL}
+SUB_FILES=	pkg-deinstall pkg-install
+SUB_LIST=	MIMEDIRS="${MIMEDIRS}"

 post-install:
 	${INSTALL_DATA} ${WRKSRC}/misc/desktop-entry-mode.el \
--- a/devel/desktop-file-utils/distinfo
+++ b/devel/desktop-file-utils/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1491153510
-SHA256 (desktop-file-utils-0.23.tar.xz) = 6c094031bdec46c9f621708f919084e1cb5294e2c5b1e4c883b3e70cb8903385
-SIZE (desktop-file-utils-0.23.tar.xz) = 132000
+TIMESTAMP = 1576486290
+SHA256 (desktop-file-utils-0.24.tar.xz) = a1de5da60cbdbe91e5c9c10ac9afee6c3deb019e0cee5fdb9a99dddc245f83d9
+SIZE (desktop-file-utils-0.24.tar.xz) = 137424
--- a/devel/gcc-arm-embedded/files/patch-src_gcc_gcc_tree-vect-loop.c
+++ b/devel/gcc-arm-embedded/files/patch-src_gcc_gcc_tree-vect-loop.c
@ -0,0 +1,11 @@
+--- src/gcc/gcc/tree-vect-loop.c.orig	2019-12-02 09:49:15 UTC
+++ src/gcc/gcc/tree-vect-loop.c
+@@ -55,6 +55,8 @@ along with GCC; see the file COPYING3.  If not see
+ #include "vec-perm-indices.h"
+ #include "tree-eh.h"
+ 
+#define vec_step vec_step_
+
+ /* Loop Vectorization Pass.
+ 
+    This pass tries to vectorize loops.
--- a/devel/json-glib/Makefile
+++ b/devel/json-glib/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	json-glib
-PORTVERSION=	1.4.2
+PORTVERSION=	1.4.4
 CATEGORIES=	devel
 MASTER_SITES=	GNOME

--- a/devel/json-glib/distinfo
+++ b/devel/json-glib/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1506973453
-SHA256 (json-glib-1.4.2.tar.xz) = 2d7709a44749c7318599a6829322e081915bdc73f5be5045882ed120bb686dc8
-SIZE (json-glib-1.4.2.tar.xz) = 163576
+TIMESTAMP = 1576493903
+SHA256 (json-glib-1.4.4.tar.xz) = 720c5f4379513dc11fd97dc75336eb0c0d3338c53128044d9fabec4374f4bc47
+SIZE (json-glib-1.4.4.tar.xz) = 165584
--- a/devel/json-glib/pkg-plist
+++ b/devel/json-glib/pkg-plist
@ -17,7 +17,7 @@ include/json-glib-1.0/json-glib/json-version.h
 %%GIR%%share/gir-1.0/Json-1.0.gir
 lib/libjson-glib-1.0.so
 lib/libjson-glib-1.0.so.0
-lib/libjson-glib-1.0.so.0.400.2
+lib/libjson-glib-1.0.so.0.400.4
 libdata/pkgconfig/json-glib-1.0.pc
 share/locale/as/LC_MESSAGES/json-glib-1.0.mo
 share/locale/bg/LC_MESSAGES/json-glib-1.0.mo
@ -39,6 +39,7 @@ share/locale/fur/LC_MESSAGES/json-glib-1.0.mo
 share/locale/gl/LC_MESSAGES/json-glib-1.0.mo
 share/locale/he/LC_MESSAGES/json-glib-1.0.mo
 share/locale/hi/LC_MESSAGES/json-glib-1.0.mo
+share/locale/hr/LC_MESSAGES/json-glib-1.0.mo
 share/locale/hu/LC_MESSAGES/json-glib-1.0.mo
 share/locale/id/LC_MESSAGES/json-glib-1.0.mo
 share/locale/it/LC_MESSAGES/json-glib-1.0.mo
@ -50,6 +51,7 @@ share/locale/lv/LC_MESSAGES/json-glib-1.0.mo
 share/locale/ml/LC_MESSAGES/json-glib-1.0.mo
 share/locale/nb/LC_MESSAGES/json-glib-1.0.mo
 share/locale/ne/LC_MESSAGES/json-glib-1.0.mo
+share/locale/nl/LC_MESSAGES/json-glib-1.0.mo
 share/locale/oc/LC_MESSAGES/json-glib-1.0.mo
 share/locale/or/LC_MESSAGES/json-glib-1.0.mo
 share/locale/pa/LC_MESSAGES/json-glib-1.0.mo
--- a/devel/libnotify/Makefile
+++ b/devel/libnotify/Makefile
@ -1,10 +1,8 @@
 # Created by: Andreas Kohn <andreas@syndrom23.de>
 # $FreeBSD$
-#   $MCom: ports/trunk/devel/libnotify/Makefile 19813 2014-08-15 19:44:33Z gusi $

 PORTNAME=	libnotify
-PORTVERSION=	0.7.7
-PORTREVISION=	1
+PORTVERSION=	0.7.8
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME

@ -14,12 +12,10 @@ COMMENT=	Library for desktop notifications
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING

-USES=		gmake gnome libtool pkgconfig tar:xz
+USES=		gmake gnome libtool meson pkgconfig tar:xz
 USE_GNOME=	glib20 gdkpixbuf2 introspection:build
 USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
-INSTALL_TARGET=	install-strip

-CONFIGURE_ARGS=	--disable-tests
+MESON_ARGS=	-Dtests=false -Ddocbook_docs=disabled -Dgtk_doc=false

 .include <bsd.port.mk>
--- a/devel/libnotify/distinfo
+++ b/devel/libnotify/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1491082336
-SHA256 (libnotify-0.7.7.tar.xz) = 9cb4ce315b2655860c524d46b56010874214ec27e854086c1a1d0260137efc04
-SIZE (libnotify-0.7.7.tar.xz) = 285356
+TIMESTAMP = 1576258634
+SHA256 (libnotify-0.7.8.tar.xz) = 69209e0b663776a00c7b6c0e560302a8dbf66b2551d55616304f240bba66e18c
+SIZE (libnotify-0.7.8.tar.xz) = 108436
--- a/devel/libnotify/pkg-plist
+++ b/devel/libnotify/pkg-plist
@ -4,25 +4,8 @@ include/libnotify/notify-enum-types.h
 include/libnotify/notify-features.h
 include/libnotify/notify.h
 lib/girepository-1.0/Notify-0.7.typelib
-lib/libnotify.a
 lib/libnotify.so
 lib/libnotify.so.4
 lib/libnotify.so.4.0.0
 libdata/pkgconfig/libnotify.pc
 share/gir-1.0/Notify-0.7.gir
-share/gtk-doc/html/libnotify/NotifyNotification.html
-share/gtk-doc/html/libnotify/annotation-glossary.html
-share/gtk-doc/html/libnotify/api-index-deprecated.html
-share/gtk-doc/html/libnotify/api-index-full.html
-share/gtk-doc/html/libnotify/ch01.html
-share/gtk-doc/html/libnotify/home.png
-share/gtk-doc/html/libnotify/index.html
-share/gtk-doc/html/libnotify/left-insensitive.png
-share/gtk-doc/html/libnotify/left.png
-share/gtk-doc/html/libnotify/libnotify-notify.html
-share/gtk-doc/html/libnotify/libnotify.devhelp2
-share/gtk-doc/html/libnotify/right-insensitive.png
-share/gtk-doc/html/libnotify/right.png
-share/gtk-doc/html/libnotify/style.css
-share/gtk-doc/html/libnotify/up-insensitive.png
-share/gtk-doc/html/libnotify/up.png
--- a/devel/libsigc++20/Makefile
+++ b/devel/libsigc++20/Makefile
@ -3,8 +3,7 @@
 #   $MCom: ports/trunk/devel/libsigc++20/Makefile 19952 2014-10-15 08:11:00Z gusi $

 PORTNAME=	libsigc++
-PORTVERSION=	2.10.0
-PORTREVISION=	4
+PORTVERSION=	2.10.2
 CATEGORIES=	devel
 MASTER_SITES=	GNOME

--- a/devel/libsigc++20/distinfo
+++ b/devel/libsigc++20/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1491080041
-SHA256 (libsigc++-2.10.0.tar.xz) = f843d6346260bfcb4426259e314512b99e296e8ca241d771d21ac64f28298d81
-SIZE (libsigc++-2.10.0.tar.xz) = 3794612
+TIMESTAMP = 1576494042
+SHA256 (libsigc++-2.10.2.tar.xz) = b1ca0253379596f9c19f070c83d362b12dfd39c0a3ea1dd813e8e21c1a097a98
+SIZE (libsigc++-2.10.2.tar.xz) = 3948080
--- a/devel/libsigc++20/pkg-plist
+++ b/devel/libsigc++20/pkg-plist
@ -398,10 +398,13 @@ libdata/pkgconfig/sigc++-%%API_VERSION%%.pc
 %%PORTDOCS%%%%DOCSDIR%%-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor7__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%-%%API_VERSION%%/reference/html/closed.png
 %%PORTDOCS%%%%DOCSDIR%%-%%API_VERSION%%/reference/html/deprecated.html
-%%PORTDOCS%%%%DOCSDIR%%-%%API_VERSION%%/reference/html/dir_0bd3c8d814eb03171de012519d7a2ccd.html
-%%PORTDOCS%%%%DOCSDIR%%-%%API_VERSION%%/reference/html/dir_5c02128c554eaa40138b2e605fc08970.html
-%%PORTDOCS%%%%DOCSDIR%%-%%API_VERSION%%/reference/html/dir_5fbc72877197f8c6013d0f619df5433c.html
-%%PORTDOCS%%%%DOCSDIR%%-%%API_VERSION%%/reference/html/dir_ea4abdd77c05d5873cecf571a6d96de7.html
+%%PORTDOCS%%%%DOCSDIR%%-%%API_VERSION%%/reference/html/dir_69292b900bf9f32fa1522c0a297aa561.html
+%%PORTDOCS%%%%DOCSDIR%%-%%API_VERSION%%/reference/html/dir_7061c03125b177af05ebe54a01c7815e.html
+%%PORTDOCS%%%%DOCSDIR%%-%%API_VERSION%%/reference/html/dir_a7a614a8e549e28882ee9909ca095aec.html
+%%PORTDOCS%%%%DOCSDIR%%-%%API_VERSION%%/reference/html/dir_d1b074183e01b19b1ce0df6f4868a06f.html
+%%PORTDOCS%%%%DOCSDIR%%-%%API_VERSION%%/reference/html/dir_e610d0fd7d8d422b14c5e759f0ef71be.html
+%%PORTDOCS%%%%DOCSDIR%%-%%API_VERSION%%/reference/html/dir_e7ee533ee50f0002bd12390b80ea971b.html
+%%PORTDOCS%%%%DOCSDIR%%-%%API_VERSION%%/reference/html/dir_ffa8fd617c28221f63108bd7d58d97eb.html
 %%PORTDOCS%%%%DOCSDIR%%-%%API_VERSION%%/reference/html/doc.png
 %%PORTDOCS%%%%DOCSDIR%%-%%API_VERSION%%/reference/html/doxygen-extra.css
 %%PORTDOCS%%%%DOCSDIR%%-%%API_VERSION%%/reference/html/doxygen.css
@ -410,12 +413,14 @@ libdata/pkgconfig/sigc++-%%API_VERSION%%.pc
 %%PORTDOCS%%%%DOCSDIR%%-%%API_VERSION%%/reference/html/folderclosed.png
 %%PORTDOCS%%%%DOCSDIR%%-%%API_VERSION%%/reference/html/folderopen.png
 %%PORTDOCS%%%%DOCSDIR%%-%%API_VERSION%%/reference/html/functions.html
+%%PORTDOCS%%%%DOCSDIR%%-%%API_VERSION%%/reference/html/functions_0x7e.html
 %%PORTDOCS%%%%DOCSDIR%%-%%API_VERSION%%/reference/html/functions_b.html
 %%PORTDOCS%%%%DOCSDIR%%-%%API_VERSION%%/reference/html/functions_c.html
 %%PORTDOCS%%%%DOCSDIR%%-%%API_VERSION%%/reference/html/functions_d.html
 %%PORTDOCS%%%%DOCSDIR%%-%%API_VERSION%%/reference/html/functions_e.html
 %%PORTDOCS%%%%DOCSDIR%%-%%API_VERSION%%/reference/html/functions_f.html
 %%PORTDOCS%%%%DOCSDIR%%-%%API_VERSION%%/reference/html/functions_func.html
+%%PORTDOCS%%%%DOCSDIR%%-%%API_VERSION%%/reference/html/functions_func_0x7e.html
 %%PORTDOCS%%%%DOCSDIR%%-%%API_VERSION%%/reference/html/functions_func_b.html
 %%PORTDOCS%%%%DOCSDIR%%-%%API_VERSION%%/reference/html/functions_func_c.html
 %%PORTDOCS%%%%DOCSDIR%%-%%API_VERSION%%/reference/html/functions_func_d.html
@ -433,7 +438,6 @@ libdata/pkgconfig/sigc++-%%API_VERSION%%.pc
 %%PORTDOCS%%%%DOCSDIR%%-%%API_VERSION%%/reference/html/functions_func_t.html
 %%PORTDOCS%%%%DOCSDIR%%-%%API_VERSION%%/reference/html/functions_func_u.html
 %%PORTDOCS%%%%DOCSDIR%%-%%API_VERSION%%/reference/html/functions_func_v.html
-%%PORTDOCS%%%%DOCSDIR%%-%%API_VERSION%%/reference/html/functions_func_~.html
 %%PORTDOCS%%%%DOCSDIR%%-%%API_VERSION%%/reference/html/functions_g.html
 %%PORTDOCS%%%%DOCSDIR%%-%%API_VERSION%%/reference/html/functions_h.html
 %%PORTDOCS%%%%DOCSDIR%%-%%API_VERSION%%/reference/html/functions_i.html
@ -460,7 +464,6 @@ libdata/pkgconfig/sigc++-%%API_VERSION%%.pc
 %%PORTDOCS%%%%DOCSDIR%%-%%API_VERSION%%/reference/html/functions_u.html
 %%PORTDOCS%%%%DOCSDIR%%-%%API_VERSION%%/reference/html/functions_v.html
 %%PORTDOCS%%%%DOCSDIR%%-%%API_VERSION%%/reference/html/functions_vars.html
-%%PORTDOCS%%%%DOCSDIR%%-%%API_VERSION%%/reference/html/functions_~.html
 %%PORTDOCS%%%%DOCSDIR%%-%%API_VERSION%%/reference/html/graph_legend.html
 %%PORTDOCS%%%%DOCSDIR%%-%%API_VERSION%%/reference/html/graph_legend.png
 %%PORTDOCS%%%%DOCSDIR%%-%%API_VERSION%%/reference/html/group__adaptors.html
--- a/devel/shfmt/Makefile
+++ b/devel/shfmt/Makefile
@ -2,8 +2,7 @@

 PORTNAME=	shfmt
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.6.4
-PORTREVISION=	1
+DISTVERSION=	3.0.0
 CATEGORIES=	devel

 MAINTAINER=	tobik@FreeBSD.org
@ -12,13 +11,26 @@ COMMENT=	Format shell scripts
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE

-USES=		go
-GO_PKGNAME=	mvdan.cc/sh
-GO_TARGET=	mvdan.cc/sh/cmd/shfmt
+USES=		go:modules
 USE_GITHUB=	yes
 GH_ACCOUNT=	mvdan
 GH_PROJECT=	sh
-
+GH_TUPLE=	go-errgo:errgo:v2.1.0:go_errgo_errgo/vendor/gopkg.in/errgo.v2 \
+		golang:crypto:34f69633bfdc:golang_crypto/vendor/golang.org/x/crypto \
+		golang:sync:cd5d95a43a6e:golang_sync/vendor/golang.org/x/sync \
+		golang:sys:33540a1f6037:golang_sys/vendor/golang.org/x/sys \
+		golang:xerrors:1b5146add898:golang_xerrors/vendor/golang.org/x/xerrors \
+		kr:pretty:v0.1.0:kr_pretty/vendor/github.com/kr/pretty \
+		kr:text:v0.1.0:kr_text/vendor/github.com/kr/text \
+		mvdan:editorconfig:890940e3f00e:mvdan_editorconfig/vendor/mvdan.cc/editorconfig \
+		pkg:diff:531926345625:pkg_diff/vendor/github.com/pkg/diff \
+		rogpeppe:go-internal:v1.5.0:rogpeppe_go_internal/vendor/github.com/rogpeppe/go-internal
+GO_TARGET=	./cmd/shfmt
 PLIST_FILES=	bin/shfmt

+do-test:
+	@cd ${WRKSRC} && \
+		${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} test ${GO_BUILDFLAGS} \
+		./cmd/shfmt
+
 .include <bsd.port.mk>
--- a/devel/shfmt/distinfo
+++ b/devel/shfmt/distinfo
@ -1,3 +1,23 @@
-TIMESTAMP = 1552244727
-SHA256 (mvdan-sh-v2.6.4_GH0.tar.gz) = 72c8e5833e61a31a4595bbd8a77bfb0a8ade9c60603638be70ea801e309d39fe
-SIZE (mvdan-sh-v2.6.4_GH0.tar.gz) = 138208
+TIMESTAMP = 1576505630
+SHA256 (mvdan-sh-v3.0.0_GH0.tar.gz) = 8bfd0d4b4d532d0b6ecd77f94c91d1f6da47b26a4453ed5c7567826113424116
+SIZE (mvdan-sh-v3.0.0_GH0.tar.gz) = 182624
+SHA256 (go-errgo-errgo-v2.1.0_GH0.tar.gz) = f6b10d77db65cb5a6c425be0f695e43b98e3e10ec83340209ac5bf4bf5c1b837
+SIZE (go-errgo-errgo-v2.1.0_GH0.tar.gz) = 9927
+SHA256 (golang-crypto-34f69633bfdc_GH0.tar.gz) = c3fa0760971622af64c3b7a3319291d997f2f0d53a5c90c17d25eaeba7f0371a
+SIZE (golang-crypto-34f69633bfdc_GH0.tar.gz) = 1708053
+SHA256 (golang-sync-cd5d95a43a6e_GH0.tar.gz) = 00a6dce4c1a9ca9edae6c3f1bedc0b15911c62681371ad9ed7738e182ba70393
+SIZE (golang-sync-cd5d95a43a6e_GH0.tar.gz) = 16956
+SHA256 (golang-sys-33540a1f6037_GH0.tar.gz) = 09ebdf007413c2eaddce123137443d08d1848be410c58896e772f0481ec385d5
+SIZE (golang-sys-33540a1f6037_GH0.tar.gz) = 1497659
+SHA256 (golang-xerrors-1b5146add898_GH0.tar.gz) = 57ba6cacc0a84a2ecbfda1169b5e9c184581dd009136f95d2fca9a5289e49ab1
+SIZE (golang-xerrors-1b5146add898_GH0.tar.gz) = 12200
+SHA256 (kr-pretty-v0.1.0_GH0.tar.gz) = 3aeb5d90b719765781befb9f156d0d0b8e5a7aafbcf15321e9eabbd35df31358
+SIZE (kr-pretty-v0.1.0_GH0.tar.gz) = 8550
+SHA256 (kr-text-v0.1.0_GH0.tar.gz) = b67f2744020b25f9298153af0992db252d195edd7ca5afa3b19d6ac300c2d14e
+SIZE (kr-text-v0.1.0_GH0.tar.gz) = 8686
+SHA256 (mvdan-editorconfig-890940e3f00e_GH0.tar.gz) = 0b8a49502948093f5528d40ab82800941f6ccbdff5002cf24a1e1895c619bcbe
+SIZE (mvdan-editorconfig-890940e3f00e_GH0.tar.gz) = 9254
+SHA256 (pkg-diff-531926345625_GH0.tar.gz) = 5ffa839187823adc53cc85a9f821a055f1827e276f1cc51cb17587dd80321bb0
+SIZE (pkg-diff-531926345625_GH0.tar.gz) = 11589
+SHA256 (rogpeppe-go-internal-v1.5.0_GH0.tar.gz) = a1db9f87696391f8451b2ea7c4325cf7e500c7cc24bead28f8c494dc3097ac5a
+SIZE (rogpeppe-go-internal-v1.5.0_GH0.tar.gz) = 120356
--- a/dns/bind9-devel/Makefile
+++ b/dns/bind9-devel/Makefile
@ -42,13 +42,13 @@ RUN_DEPENDS=	bind-tools>0:dns/bind-tools
 # XXX: remove tar:bz2
 USES=	compiler:c11 cpe libedit pkgconfig ssl tar:bz2
 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION=	9.15.6a0.2019.12.09
+ISCVERSION=	9.15.6a0.2019.12.13
 # XXX: Remove gitlab
 USE_GITLAB=	yes
 GL_SITE=	https://gitlab.isc.org
 GL_ACCOUNT=	isc-projects
 GL_PROJECT=	bind9
-GL_COMMIT=	edd6a084f0588f3512f48def223f54b6fe75cef0
+GL_COMMIT=	0b7339ac6e85555fa496ed72da121e403938cd40

 CPE_VENDOR=	isc
 CPE_VERSION=	${ISCVERSION:C/-.*//}
--- a/dns/bind9-devel/distinfo
+++ b/dns/bind9-devel/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1575887188
-SHA256 (isc-projects-bind9-edd6a084f0588f3512f48def223f54b6fe75cef0_GL0.tar.gz) = 9efb2e9a5113e792eb4a83633de0da5612a64f3ba86986b10df4c4c251f0de62
-SIZE (isc-projects-bind9-edd6a084f0588f3512f48def223f54b6fe75cef0_GL0.tar.gz) = 6472037
+TIMESTAMP = 1576489057
+SHA256 (isc-projects-bind9-0b7339ac6e85555fa496ed72da121e403938cd40_GL0.tar.gz) = eabd9536cb11fcdfdda9a6faed1e85900065978b69676d8e7e90a40421fd140c
+SIZE (isc-projects-bind9-0b7339ac6e85555fa496ed72da121e403938cd40_GL0.tar.gz) = 6336328
--- a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
+++ b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
@ -1,6 +1,6 @@
 Add the override-cache-ttl feature.

--- bin/named/config.c.orig	2019-12-09 08:22:56 UTC
+--- bin/named/config.c.orig	2019-12-13 08:58:14 UTC
 +++ bin/named/config.c
@@ -178,6 +178,7 @@ options {\n\
 	notify-source *;\n\
@ -10,7 +10,7 @@ Add the override-cache-ttl feature.
 	provide-ixfr true;\n\
 	qname-minimization relaxed;\n\
 	query-source address *;\n\
--- bin/named/server.c.orig	2019-12-09 08:22:56 UTC
+--- bin/named/server.c.orig	2019-12-13 08:58:14 UTC
 +++ bin/named/server.c
@@ -4354,6 +4354,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
 	}
@ -24,7 +24,7 @@ Add the override-cache-ttl feature.
 	result = named_config_get(maps, "max-cache-ttl", &obj);
 	INSIST(result == ISC_R_SUCCESS);
 	view->maxcachettl = cfg_obj_asduration(obj);
--- lib/dns/include/dns/view.h.orig	2019-12-09 08:22:56 UTC
+--- lib/dns/include/dns/view.h.orig	2019-12-13 08:58:14 UTC
 +++ lib/dns/include/dns/view.h
@@ -152,6 +152,7 @@ struct dns_view {
 	bool				requestnsid;
@ -34,9 +34,9 @@ Add the override-cache-ttl feature.
 	dns_ttl_t			maxncachettl;
 	dns_ttl_t			mincachettl;
 	dns_ttl_t			minncachettl;
--- lib/dns/resolver.c.orig	2019-12-09 08:22:56 UTC
+--- lib/dns/resolver.c.orig	2019-12-13 08:58:14 UTC
 +++ lib/dns/resolver.c
-@@ -6031,6 +6031,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb
+@@ -6032,6 +6032,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb
 		}
 
 		/*
@ -49,7 +49,7 @@ Add the override-cache-ttl feature.
 		 * Enforce the configure maximum cache TTL.
 		 */
 		if (rdataset->ttl > res->view->maxcachettl) {
--- lib/isccfg/namedconf.c.orig	2019-12-09 08:22:56 UTC
+--- lib/isccfg/namedconf.c.orig	2019-12-13 08:58:14 UTC
 +++ lib/isccfg/namedconf.c
@@ -1980,6 +1980,7 @@ view_clauses[] = {
 #endif
--- a/dns/bind9-devel/files/patch-configure
+++ b/dns/bind9-devel/files/patch-configure
@ -1,8 +1,8 @@
 Fixup gssapi and db detection.

--- configure.orig	2019-12-09 08:22:56 UTC
+--- configure.orig	2019-12-13 08:58:14 UTC
 +++ configure
-@@ -17422,27 +17422,9 @@ done
+@@ -17437,27 +17437,9 @@ done
 		# problems start to show up.
 		saved_libs="$LIBS"
 		for TRY_LIBS in \
@ -32,7 +32,7 @@ Fixup gssapi and db detection.
 		    { $as_echo "$as_me:${as_lineno-$LINENO}: checking linking as $TRY_LIBS" >&5
 $as_echo_n "checking linking as $TRY_LIBS... " >&6; }
 		    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -17485,47 +17467,7 @@ $as_echo "no" >&6; } ;;
+@@ -17500,47 +17482,7 @@ $as_echo "no" >&6; } ;;
 		no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;;
 		esac
 
@ -81,7 +81,7 @@ Fixup gssapi and db detection.
 		DNS_GSSAPI_LIBS="$LIBS"
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5
-@@ -23037,7 +22979,7 @@ $as_echo "" >&6; }
+@@ -23052,7 +22994,7 @@ $as_echo "" >&6; }
 			# Check other locations for includes.
 			# Order is important (sigh).
 
--- a/dns/subfinder/Makefile
+++ b/dns/subfinder/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	subfinder
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.2.2
+DISTVERSION=	2.2.4
 CATEGORIES=	dns

 MAINTAINER=	yuri@FreeBSD.org
--- a/dns/subfinder/distinfo
+++ b/dns/subfinder/distinfo
@ -1,6 +1,6 @@
-TIMESTAMP = 1576154384
-SHA256 (projectdiscovery-subfinder-v2.2.2_GH0.tar.gz) = bde501f51775114869784e199cde2f851358242c895fe31abf435363c7cca8b9
-SIZE (projectdiscovery-subfinder-v2.2.2_GH0.tar.gz) = 1057245
+TIMESTAMP = 1576478405
+SHA256 (projectdiscovery-subfinder-v2.2.4_GH0.tar.gz) = 358377e44b505ba07e1dc140545eb37bc93edea090541a937feda715f51740d7
+SIZE (projectdiscovery-subfinder-v2.2.4_GH0.tar.gz) = 1057282
 SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
 SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
 SHA256 (go-yaml-yaml-4206685974f2_GH0.tar.gz) = f4ede03105a42a61971a4329f26566de17c1c21a20cdb5e3c99eb8a0c827fbcc
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	emacs
-DISTVERSION=	27.0.50.20191201
+DISTVERSION=	27.0.50.20191215
 PORTEPOCH=	2
 CATEGORIES=	editors
 PKGNAMESUFFIX=	-devel
@ -30,7 +30,7 @@ USES=		autoreconf:build cpe gmake localbase:ldflags ncurses pkgconfig
 CPE_VENDOR=	gnu
 USE_GITHUB=	yes
 GH_ACCOUNT=	emacs-mirror
-GH_TAGNAME=	293eb32
+GH_TAGNAME=	9ee5af3
 .if ${FLAVOR:U} != nox
 USES+=		desktop-file-utils gnome xorg
 INSTALLS_ICONS=	yes
--- a/editors/emacs-devel/distinfo
+++ b/editors/emacs-devel/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1575181190
-SHA256 (emacs-mirror-emacs-27.0.50.20191201-293eb32_GH0.tar.gz) = 1b822f635e01d2fc07163b5dc2e2d52b69da429842d12e3e5dc6ba2d0509cec8
-SIZE (emacs-mirror-emacs-27.0.50.20191201-293eb32_GH0.tar.gz) = 40902300
+TIMESTAMP = 1576430847
+SHA256 (emacs-mirror-emacs-27.0.50.20191215-9ee5af3_GH0.tar.gz) = 40a4d63881504ff22b1fe8bcc5a6e89bfa90424132f31170175fe5ea58928e5a
+SIZE (emacs-mirror-emacs-27.0.50.20191215-9ee5af3_GH0.tar.gz) = 40984055
--- a/editors/emacs-devel/pkg-plist
+++ b/editors/emacs-devel/pkg-plist
@ -3007,6 +3007,8 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-ebnf.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-emacs-lisp.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-emacs-lisp.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-eshell.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-eshell.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-eval.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-eval.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-exp.el.gz
@ -3029,8 +3031,6 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-java.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-js.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-js.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-keys.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-keys.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-latex.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-latex.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-ledger.el.gz
@ -3097,16 +3097,46 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-vala.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ol-bbdb.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ol-bbdb.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ol-bibtex.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ol-bibtex.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ol-docview.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ol-docview.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ol-eshell.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ol-eshell.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ol-eww.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ol-eww.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ol-gnus.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ol-gnus.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ol-info.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ol-info.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ol-irc.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ol-irc.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ol-mhe.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ol-mhe.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ol-rmail.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ol-rmail.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ol-w3m.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ol-w3m.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ol.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ol.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-attach-git.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-attach-git.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-goto.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-goto.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-keys.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-keys.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-num.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-num.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-tempo.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-tempo.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-agenda.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-agenda.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-archive.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-archive.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-attach.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-attach.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-bbdb.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-bbdb.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-bibtex.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-bibtex.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-capture.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-capture.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-clock.el.gz
@ -3121,39 +3151,27 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-ctags.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-datetree.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-datetree.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-docview.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-docview.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-duration.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-duration.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-element.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-element.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-entities.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-entities.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-eshell.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-eshell.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-eww.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-eww.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-faces.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-faces.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-feed.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-feed.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-footnote.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-footnote.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-gnus.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-gnus.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-habit.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-habit.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-id.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-id.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-indent.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-indent.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-info.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-info.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-inlinetask.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-inlinetask.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-install.el
-%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-irc.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-irc.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-lint.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-lint.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-list.el.gz
@ -3163,8 +3181,6 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-macro.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-macs.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-macs.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-mhe.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-mhe.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-mobile.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-mobile.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-mouse.el.gz
@ -3175,8 +3191,6 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-plot.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-protocol.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-protocol.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-rmail.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-rmail.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-src.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-src.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-table.el.gz
@ -3184,8 +3198,6 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-timer.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-timer.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-version.el
-%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-w3m.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-w3m.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ox-ascii.el.gz
--- a/graphics/gdk-pixbuf2/Makefile
+++ b/graphics/gdk-pixbuf2/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	gdk-pixbuf
-PORTVERSION=	2.38.1
+PORTVERSION=	2.40.0
 CATEGORIES=	graphics
 MASTER_SITES=	GNOME
 PKGNAMESUFFIX=	2
--- a/graphics/gdk-pixbuf2/distinfo
+++ b/graphics/gdk-pixbuf2/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1552114855
-SHA256 (gnome/gdk-pixbuf-2.38.1.tar.xz) = f19ff836ba991031610dcc53774e8ca436160f7d981867c8c3a37acfe493ab3a
-SIZE (gnome/gdk-pixbuf-2.38.1.tar.xz) = 5509328
+TIMESTAMP = 1576500435
+SHA256 (gnome/gdk-pixbuf-2.40.0.tar.xz) = 1582595099537ca8ff3b99c6804350b4c058bb8ad67411bbaae024ee7cead4e6
+SIZE (gnome/gdk-pixbuf-2.40.0.tar.xz) = 5512160
--- a/graphics/gdk-pixbuf2/pkg-plist
+++ b/graphics/gdk-pixbuf2/pkg-plist
@ -35,10 +35,10 @@ lib/girepository-1.0/GdkPixbuf-2.0.typelib
 lib/girepository-1.0/GdkPixdata-2.0.typelib
 lib/libgdk_pixbuf-2.0.so
 lib/libgdk_pixbuf-2.0.so.0
-lib/libgdk_pixbuf-2.0.so.0.3800.1
+lib/libgdk_pixbuf-2.0.so.0.4000.0
 %%X11%%lib/libgdk_pixbuf_xlib-2.0.so
 %%X11%%lib/libgdk_pixbuf_xlib-2.0.so.0
-%%X11%%lib/libgdk_pixbuf_xlib-2.0.so.0.3800.1
+%%X11%%lib/libgdk_pixbuf_xlib-2.0.so.0.4000.0
 libdata/pkgconfig/gdk-pixbuf-2.0.pc
 %%X11%%libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc
 man/man1/gdk-pixbuf-csource.1.gz
--- a/graphics/geoserver/Makefile
+++ b/graphics/geoserver/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	geoserver
-PORTVERSION=	2.15.1
+PORTVERSION=	2.16.1
 CATEGORIES=	graphics geography java
 MASTER_SITES=	SF/${PORTNAME}/GeoServer/${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
@ -19,11 +19,12 @@ NO_BUILD=	yes

 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 GEOSERVERDIR=	${PREFIX}/${PORTNAME}
-GEODIRS=	data_dir etc lib logs resources webapps
+GEODIRS=	data_dir etc lib logs modules resources webapps

 USE_RC_SUBR=	${PORTNAME}
-PLIST_SUB=	G="${GEOSERVERDIR:S,^${PREFIX}/,,}" VER1=20.1 MVER=${PORTVERSION} \
-		VER2=1.14.1 VER3=1.1.3 VER4=1.10 VER5=1.1.27
+PLIST_SUB=	G="${GEOSERVERDIR:S,^${PREFIX}/,,}" VER1=22.1 MVER=${PORTVERSION} \
+		VER3=1.1.3 BATIK=1.10 GWC=1.16.1 \
+		JETTY=9.4.18.v20190429 IMAGEIO=1.3.2 JT=1.1.12 SPRINGS=5.1.5
 SUB_LIST=	GEOSERVERDIR="${GEOSERVERDIR}" JAVA="${JAVA}"
 SUB_FILES=	pkg-message
 NO_ARCH=	yes
@ -32,17 +33,19 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|$$GEOSERVER_HOME|${GEOSERVERDIR}|g' \
 		-e 's|%%JAVA%%|${JAVA}|g' \
 		${WRKSRC}/bin/startup.sh ${WRKSRC}/bin/shutdown.sh
+	@(cd ${WRKSRC}/etc;${FIND} -E . -type f -iregex ".*(keystore|\.(xml|properties))") \
+		| while read a; do \
+			${MV} ${WRKSRC}/etc/$$a ${WRKSRC}/etc/$$a.sample; \
+		done

 do-install:
 	@${MKDIR} ${STAGEDIR}${GEOSERVERDIR}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/*.sh ${STAGEDIR}${GEOSERVERDIR}/bin
-	(cd ${WRKSRC} && ${INSTALL_DATA} LICENSE.txt README.txt RUNNING.txt \
+	${INSTALL_SCRIPT} ${WRKSRC}/start.jar ${STAGEDIR}${GEOSERVERDIR}/
+	${INSTALL_DATA} ${WRKSRC}/start.ini ${STAGEDIR}${GEOSERVERDIR}/
+	(cd ${WRKSRC} && ${INSTALL_DATA} GPL.txt LICENSE.txt README.txt RUNNING.txt \
 		VERSION.txt start.jar ${STAGEDIR}${GEOSERVERDIR})
 .for dir in ${GEODIRS}
-	@(cd ${WRKSRC};${FIND} -E ${dir} -type f -iregex ".*(keystore|\.(xml|properties))") \
-		| while read a; do \
-			${MV} ${WRKSRC}/$$a ${WRKSRC}/$$a.sample; \
-		done
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} ${dir} ${STAGEDIR}${GEOSERVERDIR})
 .endfor

--- a/graphics/geoserver/distinfo
+++ b/graphics/geoserver/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1556647820
-SHA256 (geoserver-2.15.1-bin.zip) = eff6602bee2881d88181f9cabafc4f08558ca6dad3bbfe4cb53cd58cf38af22c
-SIZE (geoserver-2.15.1-bin.zip) = 101394327
+TIMESTAMP = 1576358818
+SHA256 (geoserver-2.16.1-bin.zip) = b74d85baddc18674ef8bcff6e9f9a0748cbef02f6e0f148568d90844361d1fd5
+SIZE (geoserver-2.16.1-bin.zip) = 106853686
--- a/graphics/geoserver/pkg-plist
+++ b/graphics/geoserver/pkg-plist
@ -1,3 +1,4 @@
+%%G%%/GPL.txt
 %%G%%/LICENSE.txt
 %%G%%/README.txt
 %%G%%/RUNNING.txt
@ -5,13 +6,13 @@
 %%G%%/bin/shutdown.sh
 %%G%%/bin/startup.sh
 %%G%%/data_dir/README.rst
-%%G%%/data_dir/coverages/arc_sample/info.xml.sample
+%%G%%/data_dir/coverages/arc_sample/info.xml
 %%G%%/data_dir/coverages/arc_sample/precip30min.asc
 %%G%%/data_dir/coverages/arc_sample/precip30min.prj
 %%G%%/data_dir/coverages/img_sample/Pk50095.prj
 %%G%%/data_dir/coverages/img_sample/Pk50095.tfw
 %%G%%/data_dir/coverages/img_sample/Pk50095.tif
-%%G%%/data_dir/coverages/img_sample/info.xml.sample
+%%G%%/data_dir/coverages/img_sample/info.xml
 %%G%%/data_dir/coverages/img_sample/usa.jpeg
 %%G%%/data_dir/coverages/img_sample/usa.meta
 %%G%%/data_dir/coverages/img_sample/usa.prj
@ -90,16 +91,16 @@
 %%G%%/data_dir/coverages/mosaic_sample/global_mosaic_9.pgw
 %%G%%/data_dir/coverages/mosaic_sample/global_mosaic_9.png
 %%G%%/data_dir/coverages/mosaic_sample/global_mosaic_9.prj
-%%G%%/data_dir/coverages/mosaic_sample/info.xml.sample
+%%G%%/data_dir/coverages/mosaic_sample/info.xml
 %%G%%/data_dir/coverages/mosaic_sample/mosaic.dbf
 %%G%%/data_dir/coverages/mosaic_sample/mosaic.fix
 %%G%%/data_dir/coverages/mosaic_sample/mosaic.prj
-%%G%%/data_dir/coverages/mosaic_sample/mosaic.properties.sample
+%%G%%/data_dir/coverages/mosaic_sample/mosaic.properties
 %%G%%/data_dir/coverages/mosaic_sample/mosaic.qix
 %%G%%/data_dir/coverages/mosaic_sample/mosaic.shp
 %%G%%/data_dir/coverages/mosaic_sample/mosaic.shx
-%%G%%/data_dir/coverages/sfdem_sfdem/info.xml.sample
-%%G%%/data_dir/csw.xml.sample
+%%G%%/data_dir/coverages/sfdem_sfdem/info.xml
+%%G%%/data_dir/csw.xml
 %%G%%/data_dir/data/nyc/giant_polygon.dbf
 %%G%%/data_dir/data/nyc/giant_polygon.prj
 %%G%%/data_dir/data/nyc/giant_polygon.qix
@ -161,55 +162,55 @@
 %%G%%/data_dir/data/taz_shapes/tasmania_water_bodies.prj
 %%G%%/data_dir/data/taz_shapes/tasmania_water_bodies.shp
 %%G%%/data_dir/data/taz_shapes/tasmania_water_bodies.shx
-%%G%%/data_dir/demo/WCS_describeCoverage.xml.sample
+%%G%%/data_dir/demo/WCS_describeCoverage.xml
 %%G%%/data_dir/demo/WCS_describeCoverage_2.0.1.url
-%%G%%/data_dir/demo/WCS_describeCoverage_2.0.1.xml.sample
-%%G%%/data_dir/demo/WCS_getCapabilities.xml.sample
+%%G%%/data_dir/demo/WCS_describeCoverage_2.0.1.xml
+%%G%%/data_dir/demo/WCS_getCapabilities.xml
 %%G%%/data_dir/demo/WCS_getCapabilities_2.0.1.url
-%%G%%/data_dir/demo/WCS_getCapabilities_2.0.1.xml.sample
-%%G%%/data_dir/demo/WCS_getCoverage.xml.sample
+%%G%%/data_dir/demo/WCS_getCapabilities_2.0.1.xml
+%%G%%/data_dir/demo/WCS_getCoverage.xml
 %%G%%/data_dir/demo/WCS_getCoverage_2.0.1_format_geotiff.url
-%%G%%/data_dir/demo/WCS_getCoverage_2.0.1_format_gmlcov.xml.sample
+%%G%%/data_dir/demo/WCS_getCoverage_2.0.1_format_gmlcov.xml
 %%G%%/data_dir/demo/WCS_getCoverage_2.0.1_scale_extent.url
 %%G%%/data_dir/demo/WCS_getCoverage_2.0.1_scale_factor.url
-%%G%%/data_dir/demo/WCS_getCoverage_2.0.1_scale_factor.xml.sample
+%%G%%/data_dir/demo/WCS_getCoverage_2.0.1_scale_factor.xml
 %%G%%/data_dir/demo/WCS_getCoverage_2.0.1_scale_size.url
 %%G%%/data_dir/demo/WCS_getCoverage_2.0.1_subset_epsg32632.url
-%%G%%/data_dir/demo/WCS_getCoverage_2.0.1_subset_epsg32632.xml.sample
+%%G%%/data_dir/demo/WCS_getCoverage_2.0.1_subset_epsg32632.xml
 %%G%%/data_dir/demo/WCS_getCoverage_2.0.1_subset_latlon.url
-%%G%%/data_dir/demo/WCS_getCoverage_2.0.1_subset_latlon.xml.sample
+%%G%%/data_dir/demo/WCS_getCoverage_2.0.1_subset_latlon.xml
 %%G%%/data_dir/demo/WCS_getCoverage_2.0.1_subset_range_component.url
 %%G%%/data_dir/demo/WCS_getCoverage_2.0.1_subset_range_falsecolor.url
 %%G%%/data_dir/demo/WCS_getCoverage_2.0.1_subset_range_interval.url
-%%G%%/data_dir/demo/WFS_describeFeatureType-1.0.xml.sample
-%%G%%/data_dir/demo/WFS_describeFeatureType-1.1.xml.sample
-%%G%%/data_dir/demo/WFS_getCapabilities-1.0.xml.sample
-%%G%%/data_dir/demo/WFS_getCapabilities-1.1.xml.sample
-%%G%%/data_dir/demo/WFS_getFeature-1.0.xml.sample
-%%G%%/data_dir/demo/WFS_getFeature-1.1.xml.sample
+%%G%%/data_dir/demo/WFS_describeFeatureType-1.0.xml
+%%G%%/data_dir/demo/WFS_describeFeatureType-1.1.xml
+%%G%%/data_dir/demo/WFS_getCapabilities-1.0.xml
+%%G%%/data_dir/demo/WFS_getCapabilities-1.1.xml
+%%G%%/data_dir/demo/WFS_getFeature-1.0.xml
+%%G%%/data_dir/demo/WFS_getFeature-1.1.xml
 %%G%%/data_dir/demo/WFS_getFeature-2.0.url
-%%G%%/data_dir/demo/WFS_getFeature-2.0.xml.sample
-%%G%%/data_dir/demo/WFS_getFeatureBBOX-1.0.xml.sample
-%%G%%/data_dir/demo/WFS_getFeatureBBOX-1.1.xml.sample
+%%G%%/data_dir/demo/WFS_getFeature-2.0.xml
+%%G%%/data_dir/demo/WFS_getFeatureBBOX-1.0.xml
+%%G%%/data_dir/demo/WFS_getFeatureBBOX-1.1.xml
 %%G%%/data_dir/demo/WFS_getFeatureBBOX.url
-%%G%%/data_dir/demo/WFS_getFeatureBetween-1.0.xml.sample
-%%G%%/data_dir/demo/WFS_getFeatureBetween-1.1.xml.sample
+%%G%%/data_dir/demo/WFS_getFeatureBetween-1.0.xml
+%%G%%/data_dir/demo/WFS_getFeatureBetween-1.1.xml
 %%G%%/data_dir/demo/WFS_getFeatureBetween.url
 %%G%%/data_dir/demo/WFS_getFeatureBetweenCQL.url
 %%G%%/data_dir/demo/WFS_getFeatureFid.url
 %%G%%/data_dir/demo/WFS_getFeatureFidFilter.url
-%%G%%/data_dir/demo/WFS_getFeatureIntersects-1.0.xml.sample
-%%G%%/data_dir/demo/WFS_getFeatureIntersects-1.1.xml.sample
+%%G%%/data_dir/demo/WFS_getFeatureIntersects-1.0.xml
+%%G%%/data_dir/demo/WFS_getFeatureIntersects-1.1.xml
 %%G%%/data_dir/demo/WFS_getFeatureIntersects.url
 %%G%%/data_dir/demo/WFS_getFeatureMultiFilter.url
 %%G%%/data_dir/demo/WFS_getFeatureNotDisjoint-2.0.url
-%%G%%/data_dir/demo/WFS_getFeatureNotDisjoint-2.0.xml.sample
+%%G%%/data_dir/demo/WFS_getFeatureNotDisjoint-2.0.xml
 %%G%%/data_dir/demo/WFS_mathGetFeature.url
-%%G%%/data_dir/demo/WFS_mathGetFeature.xml.sample
-%%G%%/data_dir/demo/WFS_transactionDelete.xml.sample
-%%G%%/data_dir/demo/WFS_transactionInsert.xml.sample
-%%G%%/data_dir/demo/WFS_transactionUpdate.xml.sample
-%%G%%/data_dir/demo/WFS_transactionUpdateGeom.xml.sample
+%%G%%/data_dir/demo/WFS_mathGetFeature.xml
+%%G%%/data_dir/demo/WFS_transactionDelete.xml
+%%G%%/data_dir/demo/WFS_transactionInsert.xml
+%%G%%/data_dir/demo/WFS_transactionUpdate.xml
+%%G%%/data_dir/demo/WFS_transactionUpdateGeom.xml
 %%G%%/data_dir/demo/WMS_GetLegendGraphic-SLD.url
 %%G%%/data_dir/demo/WMS_GetLegendGraphic-SLD_BODY.url
 %%G%%/data_dir/demo/WMS_GetLegendGraphic.url
@ -217,7 +218,7 @@
 %%G%%/data_dir/demo/WMS_featureInfo.url
 %%G%%/data_dir/demo/WMS_getCapabilities.url
 %%G%%/data_dir/demo/WMS_getMap.url
-%%G%%/data_dir/demo/WMS_getMap.xml.sample
+%%G%%/data_dir/demo/WMS_getMap.xml
 %%G%%/data_dir/demo/WMS_getMap_OpenLayers.url
 %%G%%/data_dir/demo/WMS_getMap_SLD_BODY_LiteralMode-1.3.url
 %%G%%/data_dir/demo/WMS_getMap_SLD_BODY_LiteralMode.url
@ -226,216 +227,216 @@
 %%G%%/data_dir/demo/WMS_getMap_fid.url
 %%G%%/data_dir/demo/WMS_getMap_fidfilter.url
 %%G%%/data_dir/demo/WMS_getMap_inlineFeature.url
-%%G%%/data_dir/demo/WMS_getMap_inlineFeatureSmile.xml.sample
+%%G%%/data_dir/demo/WMS_getMap_inlineFeatureSmile.xml
 %%G%%/data_dir/demo/WMS_getMap_multilayer.url
 %%G%%/data_dir/demo/WMS_getMap_multilayer_cql.url
 %%G%%/data_dir/demo/WMS_getMap_multilayer_filter.url
-%%G%%/data_dir/demo/WPS_aggregate_1.0.xml.sample
-%%G%%/data_dir/demo/WPS_aggregate_groupby_1.0.xml.sample
-%%G%%/data_dir/global.xml.sample
-%%G%%/data_dir/layergroups/spearfish.xml.sample
-%%G%%/data_dir/layergroups/tasmania.xml.sample
-%%G%%/data_dir/layergroups/tiger-ny.xml.sample
-%%G%%/data_dir/logging.xml.sample
+%%G%%/data_dir/demo/WPS_aggregate_1.0.xml
+%%G%%/data_dir/demo/WPS_aggregate_groupby_1.0.xml
+%%G%%/data_dir/global.xml
+%%G%%/data_dir/layergroups/spearfish.xml
+%%G%%/data_dir/layergroups/tasmania.xml
+%%G%%/data_dir/layergroups/tiger-ny.xml
+%%G%%/data_dir/logging.xml
 %%G%%/data_dir/palettes/dem31.pal
 %%G%%/data_dir/palettes/ita31.pal
 %%G%%/data_dir/palettes/ny31.pal
 %%G%%/data_dir/palettes/popshade.png
-%%G%%/data_dir/plugIns/AddressGap.xml.sample
-%%G%%/data_dir/plugIns/AddressOverlap.xml.sample
-%%G%%/data_dir/plugIns/AngleSize.xml.sample
-%%G%%/data_dir/plugIns/Attribute.xml.sample
-%%G%%/data_dir/plugIns/Constraint.xml.sample
-%%G%%/data_dir/plugIns/ContainsIntegrity.xml.sample
-%%G%%/data_dir/plugIns/CrossesIntegrity.xml.sample
-%%G%%/data_dir/plugIns/DisjointIntegrity.xml.sample
-%%G%%/data_dir/plugIns/Domain.xml.sample
-%%G%%/data_dir/plugIns/Equality.xml.sample
-%%G%%/data_dir/plugIns/GazetteerName.xml.sample
-%%G%%/data_dir/plugIns/IntersectsIntegrity.xml.sample
-%%G%%/data_dir/plugIns/IsValidGeometry.xml.sample
-%%G%%/data_dir/plugIns/LineCoveredByFeatureLine.xml.sample
-%%G%%/data_dir/plugIns/LineCoveredByPolygon.xml.sample
-%%G%%/data_dir/plugIns/LineCoveredByPolygonBoundary.xml.sample
-%%G%%/data_dir/plugIns/LineEndPointCoveredByLine.xml.sample
-%%G%%/data_dir/plugIns/LineIntersectsLineWithNode.xml.sample
-%%G%%/data_dir/plugIns/LineMustBeASinglePart.xml.sample
-%%G%%/data_dir/plugIns/LineNoDangles.xml.sample
-%%G%%/data_dir/plugIns/LineNoPseudoNode.xml.sample
-%%G%%/data_dir/plugIns/LineNoSelfIntersect.xml.sample
-%%G%%/data_dir/plugIns/LineNoSelfOverlapping.xml.sample
-%%G%%/data_dir/plugIns/LineNotTouchingPolygonInterior.xml.sample
-%%G%%/data_dir/plugIns/LinesNotIntersect.xml.sample
-%%G%%/data_dir/plugIns/LinesNotOverlap.xml.sample
-%%G%%/data_dir/plugIns/NameExists.xml.sample
-%%G%%/data_dir/plugIns/NameInList.xml.sample
-%%G%%/data_dir/plugIns/NullZero.xml.sample
-%%G%%/data_dir/plugIns/OverlapsIntegrity.xml.sample
-%%G%%/data_dir/plugIns/PointCoveredByEndPointOfLine.xml.sample
-%%G%%/data_dir/plugIns/PointCoveredByLine.xml.sample
-%%G%%/data_dir/plugIns/PointCoveredByPolygon.xml.sample
-%%G%%/data_dir/plugIns/PointCoveredByPolygonBoundary.xml.sample
-%%G%%/data_dir/plugIns/PointInsidePolygon.xml.sample
-%%G%%/data_dir/plugIns/PolygonBoundaryCoveredByPolygon.xml.sample
-%%G%%/data_dir/plugIns/PolygonCoveredByFeaturePolygon.xml.sample
-%%G%%/data_dir/plugIns/PolygonCoveredByPolygon.xml.sample
-%%G%%/data_dir/plugIns/PolygonNoGaps.xml.sample
-%%G%%/data_dir/plugIns/PolygonNotCoveredByPolygon.xml.sample
-%%G%%/data_dir/plugIns/PolygonNotOverlappingLine.xml.sample
-%%G%%/data_dir/plugIns/PolygonNotOverlappingPolygon.xml.sample
-%%G%%/data_dir/plugIns/Range.xml.sample
-%%G%%/data_dir/plugIns/RelateIntegrity.xml.sample
-%%G%%/data_dir/plugIns/SQL.xml.sample
-%%G%%/data_dir/plugIns/SingleValue.xml.sample
-%%G%%/data_dir/plugIns/StarNode.xml.sample
-%%G%%/data_dir/plugIns/TouchesIntegrity.xml.sample
-%%G%%/data_dir/plugIns/UniqueFID.xml.sample
-%%G%%/data_dir/plugIns/Uniquity.xml.sample
-%%G%%/data_dir/plugIns/WithinIntegrity.xml.sample
-%%G%%/data_dir/security/auth/default/config.xml.sample
-%%G%%/data_dir/security/config.xml.sample
-%%G%%/data_dir/security/filter/anonymous/config.xml.sample
-%%G%%/data_dir/security/filter/basic/config.xml.sample
-%%G%%/data_dir/security/filter/contextAsc/config.xml.sample
-%%G%%/data_dir/security/filter/contextNoAsc/config.xml.sample
-%%G%%/data_dir/security/filter/exception/config.xml.sample
-%%G%%/data_dir/security/filter/form/config.xml.sample
-%%G%%/data_dir/security/filter/formLogout/config.xml.sample
-%%G%%/data_dir/security/filter/interceptor/config.xml.sample
-%%G%%/data_dir/security/filter/rememberme/config.xml.sample
-%%G%%/data_dir/security/filter/restInterceptor/config.xml.sample
-%%G%%/data_dir/security/filter/roleFilter/config.xml.sample
-%%G%%/data_dir/security/filter/sslFilter/config.xml.sample
-%%G%%/data_dir/security/layers.properties.sample
-%%G%%/data_dir/security/masterpw.xml.sample
-%%G%%/data_dir/security/masterpw/default/config.xml.sample
+%%G%%/data_dir/plugIns/AddressGap.xml
+%%G%%/data_dir/plugIns/AddressOverlap.xml
+%%G%%/data_dir/plugIns/AngleSize.xml
+%%G%%/data_dir/plugIns/Attribute.xml
+%%G%%/data_dir/plugIns/Constraint.xml
+%%G%%/data_dir/plugIns/ContainsIntegrity.xml
+%%G%%/data_dir/plugIns/CrossesIntegrity.xml
+%%G%%/data_dir/plugIns/DisjointIntegrity.xml
+%%G%%/data_dir/plugIns/Domain.xml
+%%G%%/data_dir/plugIns/Equality.xml
+%%G%%/data_dir/plugIns/GazetteerName.xml
+%%G%%/data_dir/plugIns/IntersectsIntegrity.xml
+%%G%%/data_dir/plugIns/IsValidGeometry.xml
+%%G%%/data_dir/plugIns/LineCoveredByFeatureLine.xml
+%%G%%/data_dir/plugIns/LineCoveredByPolygon.xml
+%%G%%/data_dir/plugIns/LineCoveredByPolygonBoundary.xml
+%%G%%/data_dir/plugIns/LineEndPointCoveredByLine.xml
+%%G%%/data_dir/plugIns/LineIntersectsLineWithNode.xml
+%%G%%/data_dir/plugIns/LineMustBeASinglePart.xml
+%%G%%/data_dir/plugIns/LineNoDangles.xml
+%%G%%/data_dir/plugIns/LineNoPseudoNode.xml
+%%G%%/data_dir/plugIns/LineNoSelfIntersect.xml
+%%G%%/data_dir/plugIns/LineNoSelfOverlapping.xml
+%%G%%/data_dir/plugIns/LineNotTouchingPolygonInterior.xml
+%%G%%/data_dir/plugIns/LinesNotIntersect.xml
+%%G%%/data_dir/plugIns/LinesNotOverlap.xml
+%%G%%/data_dir/plugIns/NameExists.xml
+%%G%%/data_dir/plugIns/NameInList.xml
+%%G%%/data_dir/plugIns/NullZero.xml
+%%G%%/data_dir/plugIns/OverlapsIntegrity.xml
+%%G%%/data_dir/plugIns/PointCoveredByEndPointOfLine.xml
+%%G%%/data_dir/plugIns/PointCoveredByLine.xml
+%%G%%/data_dir/plugIns/PointCoveredByPolygon.xml
+%%G%%/data_dir/plugIns/PointCoveredByPolygonBoundary.xml
+%%G%%/data_dir/plugIns/PointInsidePolygon.xml
+%%G%%/data_dir/plugIns/PolygonBoundaryCoveredByPolygon.xml
+%%G%%/data_dir/plugIns/PolygonCoveredByFeaturePolygon.xml
+%%G%%/data_dir/plugIns/PolygonCoveredByPolygon.xml
+%%G%%/data_dir/plugIns/PolygonNoGaps.xml
+%%G%%/data_dir/plugIns/PolygonNotCoveredByPolygon.xml
+%%G%%/data_dir/plugIns/PolygonNotOverlappingLine.xml
+%%G%%/data_dir/plugIns/PolygonNotOverlappingPolygon.xml
+%%G%%/data_dir/plugIns/Range.xml
+%%G%%/data_dir/plugIns/RelateIntegrity.xml
+%%G%%/data_dir/plugIns/SQL.xml
+%%G%%/data_dir/plugIns/SingleValue.xml
+%%G%%/data_dir/plugIns/StarNode.xml
+%%G%%/data_dir/plugIns/TouchesIntegrity.xml
+%%G%%/data_dir/plugIns/UniqueFID.xml
+%%G%%/data_dir/plugIns/Uniquity.xml
+%%G%%/data_dir/plugIns/WithinIntegrity.xml
+%%G%%/data_dir/security/auth/default/config.xml
+%%G%%/data_dir/security/config.xml
+%%G%%/data_dir/security/filter/anonymous/config.xml
+%%G%%/data_dir/security/filter/basic/config.xml
+%%G%%/data_dir/security/filter/contextAsc/config.xml
+%%G%%/data_dir/security/filter/contextNoAsc/config.xml
+%%G%%/data_dir/security/filter/exception/config.xml
+%%G%%/data_dir/security/filter/form/config.xml
+%%G%%/data_dir/security/filter/formLogout/config.xml
+%%G%%/data_dir/security/filter/interceptor/config.xml
+%%G%%/data_dir/security/filter/rememberme/config.xml
+%%G%%/data_dir/security/filter/restInterceptor/config.xml
+%%G%%/data_dir/security/filter/roleFilter/config.xml
+%%G%%/data_dir/security/filter/sslFilter/config.xml
+%%G%%/data_dir/security/layers.properties
+%%G%%/data_dir/security/masterpw.xml
+%%G%%/data_dir/security/masterpw/default/config.xml
 %%G%%/data_dir/security/masterpw/default/passwd
-%%G%%/data_dir/security/pwpolicy/default/config.xml.sample
-%%G%%/data_dir/security/pwpolicy/master/config.xml.sample
-%%G%%/data_dir/security/rest.properties.sample
-%%G%%/data_dir/security/role/default/config.xml.sample
-%%G%%/data_dir/security/role/default/roles.xml.sample
+%%G%%/data_dir/security/pwpolicy/default/config.xml
+%%G%%/data_dir/security/pwpolicy/master/config.xml
+%%G%%/data_dir/security/rest.properties
+%%G%%/data_dir/security/role/default/config.xml
+%%G%%/data_dir/security/role/default/roles.xml
 %%G%%/data_dir/security/role/default/roles.xsd
-%%G%%/data_dir/security/services.properties.sample
-%%G%%/data_dir/security/usergroup/default/config.xml.sample
-%%G%%/data_dir/security/usergroup/default/users.xml.sample
+%%G%%/data_dir/security/services.properties
+%%G%%/data_dir/security/usergroup/default/config.xml
+%%G%%/data_dir/security/usergroup/default/users.xml
 %%G%%/data_dir/security/usergroup/default/users.xsd
 %%G%%/data_dir/styles/Lakes.sld
 %%G%%/data_dir/styles/NamedPlaces.sld
 %%G%%/data_dir/styles/burg.sld
-%%G%%/data_dir/styles/burg.xml.sample
+%%G%%/data_dir/styles/burg.xml
 %%G%%/data_dir/styles/burg02.svg
 %%G%%/data_dir/styles/capitals.sld
-%%G%%/data_dir/styles/capitals.xml.sample
-%%G%%/data_dir/styles/cite_lakes.xml.sample
+%%G%%/data_dir/styles/capitals.xml
+%%G%%/data_dir/styles/cite_lakes.xml
 %%G%%/data_dir/styles/default_generic.sld
 %%G%%/data_dir/styles/default_line.sld
 %%G%%/data_dir/styles/default_line2.sld
 %%G%%/data_dir/styles/default_point.sld
 %%G%%/data_dir/styles/default_polygon.sld
 %%G%%/data_dir/styles/dem.sld
-%%G%%/data_dir/styles/dem.xml.sample
-%%G%%/data_dir/styles/generic.xml.sample
+%%G%%/data_dir/styles/dem.xml
+%%G%%/data_dir/styles/generic.xml
 %%G%%/data_dir/styles/giant_polygon.sld
-%%G%%/data_dir/styles/giant_polygon.xml.sample
-%%G%%/data_dir/styles/grass.xml.sample
+%%G%%/data_dir/styles/giant_polygon.xml
+%%G%%/data_dir/styles/grass.xml
 %%G%%/data_dir/styles/grass_fill.png
 %%G%%/data_dir/styles/grass_poly.sld
 %%G%%/data_dir/styles/green.sld
-%%G%%/data_dir/styles/green.xml.sample
-%%G%%/data_dir/styles/line.xml.sample
+%%G%%/data_dir/styles/green.xml
+%%G%%/data_dir/styles/line.xml
 %%G%%/data_dir/styles/poi.sld
-%%G%%/data_dir/styles/poi.xml.sample
-%%G%%/data_dir/styles/point.xml.sample
+%%G%%/data_dir/styles/poi.xml
+%%G%%/data_dir/styles/point.xml
 %%G%%/data_dir/styles/poly_landmarks.sld
-%%G%%/data_dir/styles/poly_landmarks.xml.sample
-%%G%%/data_dir/styles/polygon.xml.sample
+%%G%%/data_dir/styles/poly_landmarks.xml
+%%G%%/data_dir/styles/polygon.xml
 %%G%%/data_dir/styles/pophatch.sld
-%%G%%/data_dir/styles/pophatch.xml.sample
+%%G%%/data_dir/styles/pophatch.xml
 %%G%%/data_dir/styles/popshade.sld
-%%G%%/data_dir/styles/population.xml.sample
+%%G%%/data_dir/styles/population.xml
 %%G%%/data_dir/styles/rain.sld
-%%G%%/data_dir/styles/rain.xml.sample
+%%G%%/data_dir/styles/rain.xml
 %%G%%/data_dir/styles/raster.sld
-%%G%%/data_dir/styles/raster.xml.sample
+%%G%%/data_dir/styles/raster.xml
 %%G%%/data_dir/styles/restricted.sld
-%%G%%/data_dir/styles/restricted.xml.sample
+%%G%%/data_dir/styles/restricted.xml
 %%G%%/data_dir/styles/simpleRoads.sld
-%%G%%/data_dir/styles/simple_roads.xml.sample
+%%G%%/data_dir/styles/simple_roads.xml
 %%G%%/data_dir/styles/simple_streams.sld
-%%G%%/data_dir/styles/simple_streams.xml.sample
+%%G%%/data_dir/styles/simple_streams.xml
 %%G%%/data_dir/styles/tiger_roads.sld
-%%G%%/data_dir/styles/tiger_roads.xml.sample
-%%G%%/data_dir/user_projections/epsg.properties.sample
-%%G%%/data_dir/validation/FeatureCheck.xml.sample
-%%G%%/data_dir/validation/IntegrityCheck.xml.sample
-%%G%%/data_dir/wcs.xml.sample
-%%G%%/data_dir/wfs.xml.sample
-%%G%%/data_dir/wms.xml.sample
-%%G%%/data_dir/workspaces/cite/namespace.xml.sample
-%%G%%/data_dir/workspaces/cite/workspace.xml.sample
-%%G%%/data_dir/workspaces/default.xml.sample
-%%G%%/data_dir/workspaces/it.geosolutions/namespace.xml.sample
-%%G%%/data_dir/workspaces/it.geosolutions/workspace.xml.sample
-%%G%%/data_dir/workspaces/nurc/arcGridSample/Arc_Sample/coverage.xml.sample
-%%G%%/data_dir/workspaces/nurc/arcGridSample/Arc_Sample/layer.xml.sample
-%%G%%/data_dir/workspaces/nurc/arcGridSample/coveragestore.xml.sample
-%%G%%/data_dir/workspaces/nurc/img_sample2/Pk50095/coverage.xml.sample
-%%G%%/data_dir/workspaces/nurc/img_sample2/Pk50095/layer.xml.sample
-%%G%%/data_dir/workspaces/nurc/img_sample2/coveragestore.xml.sample
-%%G%%/data_dir/workspaces/nurc/mosaic/coveragestore.xml.sample
-%%G%%/data_dir/workspaces/nurc/mosaic/mosaic/coverage.xml.sample
-%%G%%/data_dir/workspaces/nurc/mosaic/mosaic/layer.xml.sample
-%%G%%/data_dir/workspaces/nurc/namespace.xml.sample
-%%G%%/data_dir/workspaces/nurc/workspace.xml.sample
-%%G%%/data_dir/workspaces/nurc/worldImageSample/Img_Sample/coverage.xml.sample
-%%G%%/data_dir/workspaces/nurc/worldImageSample/Img_Sample/layer.xml.sample
-%%G%%/data_dir/workspaces/nurc/worldImageSample/coveragestore.xml.sample
-%%G%%/data_dir/workspaces/sde/namespace.xml.sample
-%%G%%/data_dir/workspaces/sde/workspace.xml.sample
-%%G%%/data_dir/workspaces/sf/namespace.xml.sample
-%%G%%/data_dir/workspaces/sf/sf/archsites/featuretype.xml.sample
-%%G%%/data_dir/workspaces/sf/sf/archsites/layer.xml.sample
-%%G%%/data_dir/workspaces/sf/sf/bugsites/featuretype.xml.sample
-%%G%%/data_dir/workspaces/sf/sf/bugsites/layer.xml.sample
-%%G%%/data_dir/workspaces/sf/sf/datastore.xml.sample
-%%G%%/data_dir/workspaces/sf/sf/restricted/featuretype.xml.sample
-%%G%%/data_dir/workspaces/sf/sf/restricted/layer.xml.sample
-%%G%%/data_dir/workspaces/sf/sf/roads/featuretype.xml.sample
-%%G%%/data_dir/workspaces/sf/sf/roads/layer.xml.sample
-%%G%%/data_dir/workspaces/sf/sf/streams/featuretype.xml.sample
-%%G%%/data_dir/workspaces/sf/sf/streams/layer.xml.sample
-%%G%%/data_dir/workspaces/sf/sfdem/coveragestore.xml.sample
-%%G%%/data_dir/workspaces/sf/sfdem/sfdem/coverage.xml.sample
-%%G%%/data_dir/workspaces/sf/sfdem/sfdem/layer.xml.sample
-%%G%%/data_dir/workspaces/sf/workspace.xml.sample
-%%G%%/data_dir/workspaces/tiger/namespace.xml.sample
-%%G%%/data_dir/workspaces/tiger/nyc/datastore.xml.sample
-%%G%%/data_dir/workspaces/tiger/nyc/giant_polygon/featuretype.xml.sample
-%%G%%/data_dir/workspaces/tiger/nyc/giant_polygon/layer.xml.sample
-%%G%%/data_dir/workspaces/tiger/nyc/poi/featuretype.xml.sample
-%%G%%/data_dir/workspaces/tiger/nyc/poi/layer.xml.sample
-%%G%%/data_dir/workspaces/tiger/nyc/poly_landmarks/featuretype.xml.sample
-%%G%%/data_dir/workspaces/tiger/nyc/poly_landmarks/layer.xml.sample
-%%G%%/data_dir/workspaces/tiger/nyc/tiger_roads/featuretype.xml.sample
-%%G%%/data_dir/workspaces/tiger/nyc/tiger_roads/layer.xml.sample
-%%G%%/data_dir/workspaces/tiger/workspace.xml.sample
-%%G%%/data_dir/workspaces/topp/namespace.xml.sample
-%%G%%/data_dir/workspaces/topp/states_shapefile/datastore.xml.sample
+%%G%%/data_dir/styles/tiger_roads.xml
+%%G%%/data_dir/user_projections/epsg.properties
+%%G%%/data_dir/validation/FeatureCheck.xml
+%%G%%/data_dir/validation/IntegrityCheck.xml
+%%G%%/data_dir/wcs.xml
+%%G%%/data_dir/wfs.xml
+%%G%%/data_dir/wms.xml
+%%G%%/data_dir/workspaces/cite/namespace.xml
+%%G%%/data_dir/workspaces/cite/workspace.xml
+%%G%%/data_dir/workspaces/default.xml
+%%G%%/data_dir/workspaces/it.geosolutions/namespace.xml
+%%G%%/data_dir/workspaces/it.geosolutions/workspace.xml
+%%G%%/data_dir/workspaces/nurc/arcGridSample/Arc_Sample/coverage.xml
+%%G%%/data_dir/workspaces/nurc/arcGridSample/Arc_Sample/layer.xml
+%%G%%/data_dir/workspaces/nurc/arcGridSample/coveragestore.xml
+%%G%%/data_dir/workspaces/nurc/img_sample2/Pk50095/coverage.xml
+%%G%%/data_dir/workspaces/nurc/img_sample2/Pk50095/layer.xml
+%%G%%/data_dir/workspaces/nurc/img_sample2/coveragestore.xml
+%%G%%/data_dir/workspaces/nurc/mosaic/coveragestore.xml
+%%G%%/data_dir/workspaces/nurc/mosaic/mosaic/coverage.xml
+%%G%%/data_dir/workspaces/nurc/mosaic/mosaic/layer.xml
+%%G%%/data_dir/workspaces/nurc/namespace.xml
+%%G%%/data_dir/workspaces/nurc/workspace.xml
+%%G%%/data_dir/workspaces/nurc/worldImageSample/Img_Sample/coverage.xml
+%%G%%/data_dir/workspaces/nurc/worldImageSample/Img_Sample/layer.xml
+%%G%%/data_dir/workspaces/nurc/worldImageSample/coveragestore.xml
+%%G%%/data_dir/workspaces/sde/namespace.xml
+%%G%%/data_dir/workspaces/sde/workspace.xml
+%%G%%/data_dir/workspaces/sf/namespace.xml
+%%G%%/data_dir/workspaces/sf/sf/archsites/featuretype.xml
+%%G%%/data_dir/workspaces/sf/sf/archsites/layer.xml
+%%G%%/data_dir/workspaces/sf/sf/bugsites/featuretype.xml
+%%G%%/data_dir/workspaces/sf/sf/bugsites/layer.xml
+%%G%%/data_dir/workspaces/sf/sf/datastore.xml
+%%G%%/data_dir/workspaces/sf/sf/restricted/featuretype.xml
+%%G%%/data_dir/workspaces/sf/sf/restricted/layer.xml
+%%G%%/data_dir/workspaces/sf/sf/roads/featuretype.xml
+%%G%%/data_dir/workspaces/sf/sf/roads/layer.xml
+%%G%%/data_dir/workspaces/sf/sf/streams/featuretype.xml
+%%G%%/data_dir/workspaces/sf/sf/streams/layer.xml
+%%G%%/data_dir/workspaces/sf/sfdem/coveragestore.xml
+%%G%%/data_dir/workspaces/sf/sfdem/sfdem/coverage.xml
+%%G%%/data_dir/workspaces/sf/sfdem/sfdem/layer.xml
+%%G%%/data_dir/workspaces/sf/workspace.xml
+%%G%%/data_dir/workspaces/tiger/namespace.xml
+%%G%%/data_dir/workspaces/tiger/nyc/datastore.xml
+%%G%%/data_dir/workspaces/tiger/nyc/giant_polygon/featuretype.xml
+%%G%%/data_dir/workspaces/tiger/nyc/giant_polygon/layer.xml
+%%G%%/data_dir/workspaces/tiger/nyc/poi/featuretype.xml
+%%G%%/data_dir/workspaces/tiger/nyc/poi/layer.xml
+%%G%%/data_dir/workspaces/tiger/nyc/poly_landmarks/featuretype.xml
+%%G%%/data_dir/workspaces/tiger/nyc/poly_landmarks/layer.xml
+%%G%%/data_dir/workspaces/tiger/nyc/tiger_roads/featuretype.xml
+%%G%%/data_dir/workspaces/tiger/nyc/tiger_roads/layer.xml
+%%G%%/data_dir/workspaces/tiger/workspace.xml
+%%G%%/data_dir/workspaces/topp/namespace.xml
+%%G%%/data_dir/workspaces/topp/states_shapefile/datastore.xml
 %%G%%/data_dir/workspaces/topp/states_shapefile/states/description.ftl
-%%G%%/data_dir/workspaces/topp/states_shapefile/states/featuretype.xml.sample
-%%G%%/data_dir/workspaces/topp/states_shapefile/states/layer.xml.sample
+%%G%%/data_dir/workspaces/topp/states_shapefile/states/featuretype.xml
+%%G%%/data_dir/workspaces/topp/states_shapefile/states/layer.xml
 %%G%%/data_dir/workspaces/topp/states_shapefile/states/title.ftl
-%%G%%/data_dir/workspaces/topp/taz_shapes/datastore.xml.sample
-%%G%%/data_dir/workspaces/topp/taz_shapes/tasmania_cities/featuretype.xml.sample
-%%G%%/data_dir/workspaces/topp/taz_shapes/tasmania_cities/layer.xml.sample
-%%G%%/data_dir/workspaces/topp/taz_shapes/tasmania_roads/featuretype.xml.sample
-%%G%%/data_dir/workspaces/topp/taz_shapes/tasmania_roads/layer.xml.sample
-%%G%%/data_dir/workspaces/topp/taz_shapes/tasmania_state_boundaries/featuretype.xml.sample
-%%G%%/data_dir/workspaces/topp/taz_shapes/tasmania_state_boundaries/layer.xml.sample
-%%G%%/data_dir/workspaces/topp/taz_shapes/tasmania_water_bodies/featuretype.xml.sample
-%%G%%/data_dir/workspaces/topp/taz_shapes/tasmania_water_bodies/layer.xml.sample
-%%G%%/data_dir/workspaces/topp/workspace.xml.sample
+%%G%%/data_dir/workspaces/topp/taz_shapes/datastore.xml
+%%G%%/data_dir/workspaces/topp/taz_shapes/tasmania_cities/featuretype.xml
+%%G%%/data_dir/workspaces/topp/taz_shapes/tasmania_cities/layer.xml
+%%G%%/data_dir/workspaces/topp/taz_shapes/tasmania_roads/featuretype.xml
+%%G%%/data_dir/workspaces/topp/taz_shapes/tasmania_roads/layer.xml
+%%G%%/data_dir/workspaces/topp/taz_shapes/tasmania_state_boundaries/featuretype.xml
+%%G%%/data_dir/workspaces/topp/taz_shapes/tasmania_state_boundaries/layer.xml
+%%G%%/data_dir/workspaces/topp/taz_shapes/tasmania_water_bodies/featuretype.xml
+%%G%%/data_dir/workspaces/topp/taz_shapes/tasmania_water_bodies/layer.xml
+%%G%%/data_dir/workspaces/topp/workspace.xml
 %%G%%/data_dir/www/ol-demo.html
 %%G%%/data_dir/www/openlayers/OpenLayers.js
 %%G%%/data_dir/www/openlayers/img/blank.gif
@ -496,18 +497,18 @@
 %%G%%/data_dir/www/styles/remoteOws.sld
 %%G%%/data_dir/www/styles/remoteTasmania.sld
 %%G%%/data_dir/www/wfs-t.html
-%%G%%/etc/jdbcRealm.properties.sample
-%%G%%/etc/jetty-deploy.xml.sample
-%%G%%/etc/jetty-http.xml.sample
-%%G%%/etc/jetty-https.xml.sample
-%%G%%/etc/jetty-jmx-platform.xml.sample
-%%G%%/etc/jetty-jmx.xml.sample
-%%G%%/etc/jetty-plus.xml.sample
-%%G%%/etc/jetty-ssl.xml.sample
-%%G%%/etc/jetty.xml.sample
-%%G%%/etc/keystore.sample
-%%G%%/etc/realm.properties.sample
-%%G%%/etc/webdefault.xml.sample
+@sample %%G%%/etc/jdbcRealm.properties.sample
+@sample %%G%%/etc/jetty-deploy.xml.sample
+@sample %%G%%/etc/jetty-http.xml.sample
+@sample %%G%%/etc/jetty-https.xml.sample
+@sample %%G%%/etc/jetty-jmx-platform.xml.sample
+@sample %%G%%/etc/jetty-jmx.xml.sample
+@sample %%G%%/etc/jetty-plus.xml.sample
+@sample %%G%%/etc/jetty-ssl.xml.sample
+@sample %%G%%/etc/jetty.xml.sample
+@sample %%G%%/etc/keystore.sample
+@sample %%G%%/etc/realm.properties.sample
+@sample %%G%%/etc/webdefault.xml.sample
 %%G%%/lib/ant-1.6.5.jar
 %%G%%/lib/ant-1.8.4.jar
 %%G%%/lib/ant-launcher-1.8.4.jar
@ -517,47 +518,57 @@
 %%G%%/lib/jasper-compiler-jdt-5.5.15.jar
 %%G%%/lib/jasper-runtime-5.5.15.jar
 %%G%%/lib/javax.servlet-api-3.1.0.jar
-%%G%%/lib/jetty-continuation-9.4.12.v20180830.jar
-%%G%%/lib/jetty-deploy-9.4.12.v20180830.jar
-%%G%%/lib/jetty-http-9.4.12.v20180830.jar
-%%G%%/lib/jetty-io-9.4.12.v20180830.jar
+%%G%%/lib/jetty-continuation-%%JETTY%%.jar
+%%G%%/lib/jetty-deploy-%%JETTY%%.jar
+%%G%%/lib/jetty-http-%%JETTY%%.jar
+%%G%%/lib/jetty-io-%%JETTY%%.jar
 %%G%%/lib/jetty-schemas-3.1.M0.jar
-%%G%%/lib/jetty-security-9.4.12.v20180830.jar
-%%G%%/lib/jetty-server-9.4.12.v20180830.jar
-%%G%%/lib/jetty-servlet-9.4.12.v20180830.jar
-%%G%%/lib/jetty-servlets-9.4.12.v20180830.jar
-%%G%%/lib/jetty-util-9.4.12.v20180830.jar
-%%G%%/lib/jetty-webapp-9.4.12.v20180830.jar
-%%G%%/lib/jetty-xml-9.4.12.v20180830.jar
+%%G%%/lib/jetty-security-%%JETTY%%.jar
+%%G%%/lib/jetty-server-%%JETTY%%.jar
+%%G%%/lib/jetty-servlet-%%JETTY%%.jar
+%%G%%/lib/jetty-servlets-%%JETTY%%.jar
+%%G%%/lib/jetty-util-%%JETTY%%.jar
+%%G%%/lib/jetty-webapp-%%JETTY%%.jar
+%%G%%/lib/jetty-xml-%%JETTY%%.jar
 %%G%%/lib/jsp-api-2.0.jar
 %%G%%/lib/log4j-1.2.17.jar
 %%G%%/lib/xmlParserAPIs-2.6.2.jar
 %%G%%/logs/keepme.txt
-%%G%%/resources/log4j.properties.sample
+%%G%%/modules/deploy.mod
+%%G%%/modules/http.mod
+%%G%%/modules/https.mod
+%%G%%/modules/resources.mod
+%%G%%/modules/security.mod
+%%G%%/modules/server.mod
+%%G%%/modules/servlet.mod
+%%G%%/modules/servlets.mod
+%%G%%/modules/webapp.mod
+%%G%%/resources/log4j.properties
+%%G%%/start.ini
 %%G%%/start.jar
-%%G%%/webapps/%%G%%/WEB-INF/dispatcher-servlet.xml.sample
+%%G%%/webapps/%%G%%/WEB-INF/dispatcher-servlet.xml
 %%G%%/webapps/%%G%%/WEB-INF/lib/FastInfoset-1.2.15.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/GeographicLib-Java-1.49.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/JavaAPIforKml-2.2.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/activation-1.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/animal-sniffer-annotations-1.17.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/antlr4-runtime-4.7.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/batik-anim-%%VER4%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/batik-awt-util-%%VER4%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/batik-bridge-%%VER4%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/batik-constants-%%VER4%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/batik-css-%%VER4%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/batik-dom-%%VER4%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/batik-ext-%%VER4%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/batik-gvt-%%VER4%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/batik-i18n-%%VER4%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/batik-parser-%%VER4%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/batik-script-%%VER4%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/batik-svg-dom-%%VER4%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/batik-svggen-%%VER4%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/batik-transcoder-%%VER4%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/batik-util-%%VER4%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/batik-xml-%%VER4%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/batik-anim-%%BATIK%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/batik-awt-util-%%BATIK%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/batik-bridge-%%BATIK%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/batik-constants-%%BATIK%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/batik-css-%%BATIK%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/batik-dom-%%BATIK%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/batik-ext-%%BATIK%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/batik-gvt-%%BATIK%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/batik-i18n-%%BATIK%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/batik-parser-%%BATIK%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/batik-script-%%BATIK%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/batik-svg-dom-%%BATIK%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/batik-svggen-%%BATIK%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/batik-transcoder-%%BATIK%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/batik-util-%%BATIK%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/batik-xml-%%BATIK%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/bcprov-jdk15on-1.60.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/bigint-0.7.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/checker-qual-2.5.2.jar
@ -613,151 +624,158 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/gs-web-wms-%%MVER%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/gs-wfs-%%MVER%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/gs-wms-%%MVER%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-app-schema-resolver-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-arcgrid-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-complex-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-coverage-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-cql-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-epsg-hsql-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-geojson-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-geopkg-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-geotiff-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-grid-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-image-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-imagemosaic-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-jdbc-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-jdbc-postgis-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-main-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-metadata-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-opengis-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-process-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-process-feature-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-process-raster-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-property-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-referencing-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-render-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-shapefile-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-svg-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-tile-client-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-transform-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-wfs-ng-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-wms-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-wmts-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xml-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-core-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-fes-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-filter-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-gml2-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-gml3-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-ows-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-sld-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-wcs-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-wfs-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-wmts-21.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-app-schema-resolver-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-arcgrid-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-complex-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-coverage-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-cql-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-epsg-hsql-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-geojson-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-geopkg-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-geotiff-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-grid-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-image-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-imagemosaic-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-jdbc-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-jdbc-postgis-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-main-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-metadata-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-opengis-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-process-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-process-feature-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-process-raster-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-property-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-referencing-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-render-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gs-restconfig-wmts-%%MVER%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-shapefile-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-svg-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-tile-client-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-transform-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-wfs-ng-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-wms-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-wmts-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xml-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-core-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-fes-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-filter-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-gml2-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-gml3-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-ows-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-sld-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-wcs-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-wfs-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-wmts-%%VER1%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/guava-27.0-jre.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-core-1.15.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-diskquota-core-1.15.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-diskquota-jdbc-1.15.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-georss-1.15.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-gmaps-1.15.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-kml-1.15.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-rest-1.15.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-tms-1.15.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-ve-1.15.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-wms-1.15.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-wmts-1.15.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-core-%%GWC%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-diskquota-core-%%GWC%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-diskquota-jdbc-%%GWC%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-georss-%%GWC%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-gmaps-%%GWC%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-kml-%%GWC%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-rest-%%GWC%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-tms-%%GWC%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-ve-%%GWC%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-wms-%%GWC%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-wmts-%%GWC%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/h2-1.1.119.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/hsqldb-2.4.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/httpclient-4.5.5.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/httpclient-cache-4.5.5.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/httpcore-4.4.10.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-arcgrid-1.2.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-geocore-1.2.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-png-1.2.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-streams-1.2.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-tiff-1.2.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-utilities-1.2.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-arcgrid-%%IMAGEIO%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-geocore-%%IMAGEIO%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-png-%%IMAGEIO%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-streams-%%IMAGEIO%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-tiff-%%IMAGEIO%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-utilities-%%IMAGEIO%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/istack-commons-runtime-3.0.7.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/itext-2.1.5.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/j2objc-annotations-1.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jackson-core-2.9.7.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jackson-core-2.10.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jai_codec-%%VER3%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jai_core-%%VER3%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jai_imageio-1.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/janino-3.0.8.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jasypt-1.9.2.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jasypt-springsecurity3-1.9.2.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/javaee-api-7.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/javax.activation-api-1.2.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/javax.mail-1.5.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jaxb-api-2.4.0-b180830.0359.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jaxb-runtime-2.4.0-b180830.0438.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jdom2-2.0.6.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jettison-1.0.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jgridshift-1.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/json-lib-2.4-jdk15.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jgridshift-core-1.2.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jna-5.3.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jna-platform-5.3.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/joda-time-2.8.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/json-lib-2.4.2-%%G%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/json-simple-1.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jsr305-2.0.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-affine-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-algebra-1.1.9.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-affine-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-algebra-%%JT%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jt-attributeop-1.5.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-bandcombine-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-bandmerge-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-bandselect-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-binarize-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-border-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-buffer-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-classbreaks-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-classifier-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-colorconvert-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-colorindexer-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-concurrent-tile-cache-1.1.9.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-bandcombine-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-bandmerge-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-bandselect-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-binarize-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-border-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-buffer-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-classbreaks-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-classifier-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-colorconvert-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-colorindexer-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-concurrent-tile-cache-%%JT%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jt-contour-1.5.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-crop-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-errordiffusion-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-format-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-imagefunction-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-iterators-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-jiffle-language-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-jiffle-op-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-lookup-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-mosaic-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-nullop-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-orderdither-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-piecewise-1.1.9.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-crop-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-errordiffusion-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-format-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-imagefunction-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-iterators-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-jiffle-language-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-jiffle-op-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-lookup-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-mosaic-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-nullop-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-orderdither-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-piecewise-%%JT%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jt-rangelookup-1.5.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-rescale-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-rlookup-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-scale-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-scale2-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-shadedrelief-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-stats-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-translate-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-utilities-1.1.9.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-rescale-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-rlookup-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-scale-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-scale2-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-shadedrelief-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-stats-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-translate-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-utilities-%%JT%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jt-utils-1.5.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-vectorbin-1.1.9.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-vectorbin-%%JT%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jt-vectorbinarize-1.5.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jt-vectorize-1.5.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-warp-1.1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-zonal-1.1.9.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-warp-%%JT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-zonal-%%JT%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jt-zonalstats-1.5.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jts-core-1.16.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jts-core-%%GWC%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/log4j-1.2.17.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/mail-1.4.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/marlin-0.9.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.fes-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.ows-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.wcs-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.wfs-21.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.wmts-21.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.fes-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.ows-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.wcs-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.wfs-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.wmts-%%VER1%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/org.eclipse.emf.common-2.12.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/org.eclipse.emf.ecore-2.12.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/org.eclipse.emf.ecore.xmi-2.12.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/org.eclipse.xsd-2.12.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/org.json-2.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/org.w3.xlink-21.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/org.w3.xlink-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/oshi-core-3.13.3.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/picocontainer-1.2.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/pngj-2.0.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/postgresql-42.1.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/postgresql-42.2.5.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/serializer-2.7.2.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/si-quantity-0.7.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/si-units-java8-0.7.1.jar
@ -772,14 +790,14 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/spring-jcl-5.1.1.RELEASE.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/spring-jdbc-5.1.1.RELEASE.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/spring-ldap-core-2.3.2.RELEASE.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/spring-security-config-5.1.1.RELEASE.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/spring-security-core-5.1.1.RELEASE.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/spring-security-ldap-5.1.1.RELEASE.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/spring-security-web-5.1.1.RELEASE.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/spring-security-config-%%SPRINGS%%.RELEASE.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/spring-security-core-%%SPRINGS%%.RELEASE.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/spring-security-ldap-%%SPRINGS%%.RELEASE.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/spring-security-web-%%SPRINGS%%.RELEASE.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/spring-tx-5.1.1.RELEASE.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/spring-web-5.1.1.RELEASE.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/spring-webmvc-5.1.1.RELEASE.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/sqlite-jdbc-3.23.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/sqlite-jdbc-3.27.2.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/stax-1.2.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/stax-api-1.0.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/stax-ex-1.8.jar
@ -789,6 +807,7 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/uom-lib-common-1.0.2.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/uom-se-1.0.8.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/wicket-core-7.6.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/wicket-datetime-7.6.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/wicket-dnd-0.7.3.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/wicket-extensions-7.6.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/wicket-request-7.6.0.jar
@ -803,7 +822,7 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/xmlpull-%%VER3%%.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/xpp3-%%VER3%%.4.O.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/xpp3_min-1.1.4c.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/xstream-1.4.10.jar
-%%G%%/webapps/%%G%%/WEB-INF/web.xml.sample
+%%G%%/webapps/%%G%%/WEB-INF/lib/xstream-1.4.11.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/web.xml
 %%G%%/webapps/%%G%%/index.html
@dir %%G%%/webapps/%%G%%/WEB-INF/classes
--- a/lang/gcc9/Makefile
+++ b/lang/gcc9/Makefile
@ -47,9 +47,7 @@ GRAPHITE_DESC=		Support for Graphite loop optimizations

 .if exists(/usr/lib32/libc.so)
 OPTIONS_DEFINE_amd64+=		MULTILIB
-OPTIONS_DEFAULT_amd64+=	MULTILIB
 OPTIONS_DEFINE_powerpc64+=	MULTILIB
-OPTIONS_DEFAULT_powerpc64+=	MULTILIB
 MULTILIB_DESC=		Build support for 32-bit and 64-bit targets
 MULTILIB_CONFIGURE_ENABLE=	multilib
 .else
--- a/lang/kotlin/Makefile
+++ b/lang/kotlin/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	kotlin
-PORTVERSION=	1.3.50
+PORTVERSION=	1.3.61
 CATEGORIES=	lang
 MASTER_SITES=	https://github.com/JetBrains/kotlin/releases/download/v${PORTVERSION}/
 DISTNAME=	kotlin-compiler-${PORTVERSION}
--- a/lang/kotlin/distinfo
+++ b/lang/kotlin/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1569378518
-SHA256 (kotlin-compiler-1.3.50.zip) = 69424091a6b7f52d93eed8bba2ace921b02b113dbb71388d704f8180a6bdc6ec
-SIZE (kotlin-compiler-1.3.50.zip) = 50555421
+TIMESTAMP = 1574844337
+SHA256 (kotlin-compiler-1.3.61.zip) = 3901151ad5d94798a268d1771c6c0b7e305a608c2889fc98a674802500597b1c
+SIZE (kotlin-compiler-1.3.61.zip) = 53125546
--- a/lang/ocaml/Makefile
+++ b/lang/ocaml/Makefile
@ -104,6 +104,11 @@ PLIST_SUB+=	PROF="@comment "
 PLIST_SUB+=	PROF=""
 .endif

+.if defined(PPC_ABI) && ${PPC_ABI} == ELFv2
+EXTRA_PATCHES=	${PATCHDIR}/extra-patch-asmcomp_power_arch.ml
+USE_GCC=	yes
+.endif
+
 post-extract:
 .if ${PORT_OPTIONS:MDOCS}
 	@if ! (cd ${WRKDIR} && \
--- a/lang/ocaml/files/extra-patch-asmcomp_power_arch.ml
+++ b/lang/ocaml/files/extra-patch-asmcomp_power_arch.ml
@ -0,0 +1,11 @@
+--- asmcomp/power/arch.ml.orig	2019-12-02 10:44:34 UTC
+++ asmcomp/power/arch.ml
+@@ -28,7 +28,7 @@ type abi = ELF32 | ELF64v1 | ELF64v2
+ let abi =
+   match Config.model with
+   | "ppc" -> ELF32
+-  | "ppc64" -> ELF64v1
+  | "ppc64" -> ELF64v2
+   | "ppc64le" -> ELF64v2
+   | _ -> assert false
+ 
--- a/lang/ocaml/files/patch-asmrun_power.S
+++ b/lang/ocaml/files/patch-asmrun_power.S
@ -0,0 +1,99 @@
+--- asmrun/power.S.orig	2019-12-02 12:34:04 UTC
+++ asmrun/power.S
+@@ -13,7 +13,7 @@
+ /*                                                                        */
+ /**************************************************************************/
+ 
+-#if defined(MODEL_ppc64le)
+#if _CALL_ELF == 2
+         .abiversion 2
+ #endif
+ 
+@@ -42,7 +42,7 @@
+ #define CALLBACK_LINK_SIZE 16
+ #define CALLBACK_LINK_OFFSET 0
+ #endif
+-#if defined(MODEL_ppc64)
+#if _CALL_ELF == 1
+ #define RESERVED_STACK 48
+ #define PARAM_SAVE_AREA (8*8)
+ #define LR_SAVE 16
+@@ -54,7 +54,7 @@
+ #define CALLBACK_LINK_SIZE 32
+ #define CALLBACK_LINK_OFFSET 48
+ #endif
+-#if defined(MODEL_ppc64le)
+#if _CALL_ELF == 2
+ #define RESERVED_STACK 32
+ #define PARAM_SAVE_AREA 0
+ #define LR_SAVE 16
+@@ -82,7 +82,7 @@
+ 
+ #endif
+ 
+-#if defined(MODEL_ppc64)
+#if _CALL_ELF == 1
+ #define FUNCTION(name) \
+   .section ".opd","aw"; \
+   .align 3; \
+@@ -98,7 +98,7 @@
+ 
+ #endif
+ 
+-#if defined(MODEL_ppc64le)
+#if _CALL_ELF == 2
+ #define FUNCTION(name) \
+   .section ".text"; \
+   .globl name; \
+@@ -157,7 +157,7 @@
+ 
+ #endif
+ 
+-#if defined(MODEL_ppc64)
+#if _CALL_ELF == 1
+         .section ".opd","aw"
+ #else
+         .section ".text"
+@@ -338,14 +338,14 @@ FUNCTION(caml_c_call)
+ #if defined(MODEL_ppc)
+         mtctr   28
+         bctrl
+-#elif defined(MODEL_ppc64)
+#elif _CALL_ELF == 1
+         ld      0, 0(28)
+         mr      26, 2   /* save current TOC in a callee-save register */
+         mtctr   0
+         ld      2, 8(28)
+         bctrl
+         mr      2, 26   /* restore current TOC */
+-#elif defined(MODEL_ppc64le)
+#elif _CALL_ELF == 2
+         mtctr   28
+         mr      12, 28
+         mr      26, 2   /* save current TOC in a callee-save register */
+@@ -514,14 +514,14 @@ FUNCTION(caml_start_program)
+ #if defined(MODEL_ppc)
+         mtctr   12
+ .L105:  bctrl
+-#elif defined(MODEL_ppc64)
+#elif _CALL_ELF == 1
+         ld      0, 0(12)
+         mtctr   0
+         std     2, TOC_SAVE(1)
+         ld      2, 8(12)
+ .L105:  bctrl
+         ld      2, TOC_SAVE(1)
+-#elif defined(MODEL_ppc64le)
+#elif _CALL_ELF == 2
+         mtctr   12
+         std     2, TOC_SAVE(1)
+ .L105:  bctrl
+@@ -634,7 +634,7 @@ FUNCTION(caml_callback3_exn)
+         b       .L102
+ ENDFUNCTION(caml_callback3_exn)
+ 
+-#if defined(MODEL_ppc64)
+#if _CALL_ELF == 1
+         .section ".opd","aw"
+ #else
+         .section ".text"
--- a/lang/ocaml/files/patch-byterun_caml_stack.h
+++ b/lang/ocaml/files/patch-byterun_caml_stack.h
@ -0,0 +1,15 @@
+--- byterun/caml/stack.h.orig	2017-07-13 08:56:44 UTC
+++ byterun/caml/stack.h
+@@ -40,10 +40,10 @@
+ #if defined(MODEL_ppc)
+ #define Saved_return_address(sp) *((intnat *)((sp) - 4))
+ #define Callback_link(sp) ((struct caml_context *)((sp) + 16))
+-#elif defined(MODEL_ppc64)
+#elif _CALL_ELF == 1
+ #define Saved_return_address(sp) *((intnat *)((sp) + 16))
+ #define Callback_link(sp) ((struct caml_context *)((sp) + (48 + 32)))
+-#elif defined(MODEL_ppc64le)
+#elif _CALL_ELF == 2
+ #define Saved_return_address(sp) *((intnat *)((sp) + 16))
+ #define Callback_link(sp) ((struct caml_context *)((sp) + (32 + 32)))
+ #else
--- a/lang/ocaml/files/patch-testsuite_tests_asmcomp_power.S
+++ b/lang/ocaml/files/patch-testsuite_tests_asmcomp_power.S
@ -0,0 +1,62 @@
+--- testsuite/tests/asmcomp/power.S.orig	2019-12-02 12:36:28 UTC
+++ testsuite/tests/asmcomp/power.S
+@@ -26,11 +26,11 @@
+ #define RESERVED_STACK 16
+ #define LR_SAVE_AREA 4
+ #endif
+-#if defined(MODEL_ppc64)
+#if _CALL_ELF == 1
+ #define RESERVED_STACK 48
+ #define LR_SAVE_AREA 16
+ #endif
+-#if defined(MODEL_ppc64le)
+#if _CALL_ELF == 2
+ #define RESERVED_STACK 32
+ #define LR_SAVE_AREA 16
+ #endif
+@@ -46,7 +46,7 @@
+   name:
+ #endif
+ 
+-#if defined(MODEL_ppc64)
+#if _CALL_ELF == 1
+ #define FUNCTION(name) \
+   .section ".opd","aw"; \
+   .align 3; \
+@@ -58,7 +58,7 @@
+   .L.name:
+ #endif
+ 
+-#if defined(MODEL_ppc64le)
+#if _CALL_ELF == 2
+ #define FUNCTION(name) \
+   .section ".text"; \
+   .globl name; \
+@@ -118,11 +118,11 @@ FUNCTION(call_gen_code)
+     /* Get function pointer in CTR */
+ #if defined(MODEL_ppc)
+         mtctr   3
+-#elif defined(MODEL_ppc64)
+#elif _CALL_ELF == 1
+         ld      0, 0(3)
+         mtctr   0
+         ld      2, 8(3)
+-#elif defined(MODEL_ppc64le)
+#elif _CALL_ELF == 2
+         mtctr   3
+         mr      12, 3
+ #else
+@@ -184,11 +184,11 @@ FUNCTION(caml_c_call)
+     /* Jump to C function (address in r28) */
+ #if defined(MODEL_ppc)
+         mtctr   28
+-#elif defined(MODEL_ppc64)
+#elif _CALL_ELF == 1
+         ld      0, 0(28)
+         mtctr   0
+         ld      2, 8(28)
+-#elif defined(MODEL_ppc64le)
+#elif _CALL_ELF == 2
+         mtctr   28
+         mr      12, 28
+ #else
--- a/lang/perl5-devel/Makefile
+++ b/lang/perl5-devel/Makefile
@ -35,7 +35,7 @@ USE_LDCONFIG=	${PREFIX}/${_ARCH_LIB}/CORE
 USE_GITHUB=	yes
 GH_ACCOUNT=	Perl
 GH_PROJECT=	perl5
-GH_TAGNAME=	v5.31.6-115-gd821b3b405
+GH_TAGNAME=	v5.31.6-149-g4eb6628cb1

 TEST_TARGET=	test_harness
 TEST_ENV=	${MAKE_ENV} TEST_JOBS=${MAKE_JOBS_NUMBER} \
--- a/lang/perl5-devel/distinfo
+++ b/lang/perl5-devel/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1575886890
-SHA256 (perl/Perl-perl5-v5.31.6-115-gd821b3b405_GH0.tar.gz) = 815ec272f1369358054f3742ffd0bc9f90bc4270bcee5e844dec1e9d45f5423b
-SIZE (perl/Perl-perl5-v5.31.6-115-gd821b3b405_GH0.tar.gz) = 19428389
+TIMESTAMP = 1576488943
+SHA256 (perl/Perl-perl5-v5.31.6-149-g4eb6628cb1_GH0.tar.gz) = 2c2a3330e8bc8bdb21e6d4efc00d0d8206b483beff731b47a44c2cf1c5668afb
+SIZE (perl/Perl-perl5-v5.31.6-149-g4eb6628cb1_GH0.tar.gz) = 19429004
--- a/mail/cyrus-imapd25/Makefile
+++ b/mail/cyrus-imapd25/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	cyrus-imapd
-PORTVERSION=	2.5.14
+PORTVERSION=	2.5.15
 #PORTREVISION=	0
 CATEGORIES=	mail
 MASTER_SITES=	https://www.cyrusimap.org/releases/ \
--- a/mail/cyrus-imapd25/distinfo
+++ b/mail/cyrus-imapd25/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1573826961
-SHA256 (cyrus-imapd-2.5.14.tar.gz) = 8eaecdaae0ec6e3952333852bedee449edbd443abac2266df2b6ffb91215a943
-SIZE (cyrus-imapd-2.5.14.tar.gz) = 3125549
+TIMESTAMP = 1576500372
+SHA256 (cyrus-imapd-2.5.15.tar.gz) = fd7771c0ebd1648935b7aaf445bfe9a69b9870b31eac1a03843af34b013791e2
+SIZE (cyrus-imapd-2.5.15.tar.gz) = 3125529
--- a/mail/cyrus-imapd30/Makefile
+++ b/mail/cyrus-imapd30/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	cyrus-imapd
-PORTVERSION=	3.0.12
+PORTVERSION=	3.0.13
 #PORTREVISION=	0
 CATEGORIES=	mail
 MASTER_SITES=	https://www.cyrusimap.org/releases/ \
--- a/mail/cyrus-imapd30/distinfo
+++ b/mail/cyrus-imapd30/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1573826780
-SHA256 (cyrus-imapd-3.0.12.tar.gz) = d4186462f1f16fd8b6bc592ed3126d2ca10f79a30485c0e169ca3b618c2f0bd3
-SIZE (cyrus-imapd-3.0.12.tar.gz) = 10812602
+TIMESTAMP = 1576499698
+SHA256 (cyrus-imapd-3.0.13.tar.gz) = 6965aafbd2fd8f621f6ed5a3df2f609eb2874951a25facd516f5774232ced3bd
+SIZE (cyrus-imapd-3.0.13.tar.gz) = 10840005
--- a/mail/dovecot-fts-xapian/Makefile
+++ b/mail/dovecot-fts-xapian/Makefile
@ -1,9 +1,7 @@
 # $FreeBSD$

 PORTNAME=	fts-xapian
-PORTVERSION=	1.2.2
-DISTVERSIONPREFIX=	${PORTNAME}-
-PORTREVISION=	2
+PORTVERSION=	1.2.5
 CATEGORIES=	mail
 PKGNAMEPREFIX=	dovecot-

--- a/mail/dovecot-fts-xapian/distinfo
+++ b/mail/dovecot-fts-xapian/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1574756401
-SHA256 (grosjo-fts-xapian-fts-xapian-1.2.2_GH0.tar.gz) = 3971fa7d7b7390c1ad4791d4162a07ecce8ded82a22251dd7e66f32b1b655491
-SIZE (grosjo-fts-xapian-fts-xapian-1.2.2_GH0.tar.gz) = 27327
+TIMESTAMP = 1576483410
+SHA256 (grosjo-fts-xapian-1.2.5_GH0.tar.gz) = 0e54557f7fdeb3b50d2099b19fd47c8371cfc640654f1675203599ec166e48d4
+SIZE (grosjo-fts-xapian-1.2.5_GH0.tar.gz) = 28042
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	mutt
-DISTVERSION=	1.12.2
+DISTVERSION=	1.13.1
 CATEGORIES+=	mail
 MASTER_SITES=	ftp://ftp.mutt.org/pub/mutt/ \
 		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
@ -49,11 +49,10 @@ GNU_CONFIGURE=	yes

 OPTIONS_SUB=	yes

-OPTIONS_DEFINE=	SASL DEBUG DOCS EXAMPLES FLOCK \
-		FORCEBASE64 GPGME GREETING_PATCH HTML ICONV IDN IFDEF_PATCH \
-		LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH \
-		NLS NNTP QUOTE_PATCH REVERSE_REPLY_PATCH SMART_DATE \
-		SMTP URLVIEW XML
+OPTIONS_DEFINE=	AUTOCRYPT DEBUG DOCS EXAMPLES FLOCK FORCEBASE64 GPGME \
+		GREETING_PATCH HTML ICONV IDN IFDEF_PATCH LOCALES_FIX \
+		MAILBOX_MANPAGES MAILDIR_MTIME_PATCH NLS QUOTE_PATCH NNTP \
+		REVERSE_REPLY_PATCH SASL SMART_DATE SMTP URLVIEW XML

 OPTIONS_SINGLE=	GSSAPI HCACHE SCREEN
 OPTIONS_RADIO=	SPELL
@ -62,12 +61,17 @@ OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
 OPTIONS_SINGLE_HCACHE=	HCACHE_BDB HCACHE_TOKYOCABINET HCACHE_KYOTOCABINET HCACHE_NONE
 OPTIONS_SINGLE_SCREEN=	NCURSES SLANG

-SASL_DESC=	SASL authentication
+AUTOCRYPT_DESC=	Convenient End-to-End Encryption
 DEBUG_DESC=	Debugging capabilities
 FLOCK_DESC=	flock() usage
 FORCEBASE64_DESC=	Option to force base64 encoding for compose
 GPGME_DESC=	Gpgme interface
 GREETING_PATCH_DESC=	Greeting support
+HCACHE_BDB_DESC=	Use Berkeley DB (BDB)
+HCACHE_DESC=	Header Cache support
+HCACHE_KYOTOCABINET_DESC=	Use Kyoto Cabinet
+HCACHE_NONE_DESC=	Disable Header Cache
+HCACHE_TOKYOCABINET_DESC=	Use Tokyo Cabinet
 HTML_DESC=	HTML documentation
 IDN_DESC=	International Domain Names (implies ICONV)
 IFDEF_PATCH_DESC=	ifdef feature
@ -78,21 +82,30 @@ NCURSES_DESC=	Ncurses support
 NLS_DESC=	Native language support (implies ICONV)
 QUOTE_PATCH_DESC=	Extended quoting
 REVERSE_REPLY_PATCH_DESC=	Reverse_reply
+SASL_DESC=	SASL authentication
 SLANG_DESC=	SLANG support
 SMART_DATE_DESC=	Dynamic date formatting with "%@"
 SMTP_DESC=	SMTP relay support
-HCACHE_DESC=	Header Cache support
-HCACHE_BDB_DESC=	Use Berkeley DB (BDB)
-HCACHE_TOKYOCABINET_DESC=	Use Tokyo Cabinet
-HCACHE_KYOTOCABINET_DESC=	Use Kyoto Cabinet
-HCACHE_NONE_DESC=	Disable Header Cache
 URLVIEW_DESC=	Use urlview for the URL selector menu
 XML_DESC=	Use XML tools for rebuilding documentation

-OPTIONS_DEFAULT=	GPGME HTML HCACHE_BDB ICONV IDN \
-		IFDEF_PATCH LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH \
-		NLS NCURSES QUOTE_PATCH REVERSE_REPLY_PATCH SMART_DATE \
-		SASL SMTP URLVIEW XML GSSAPI_NONE
+OPTIONS_DEFAULT=	AUTOCRYPT GPGME GSSAPI_NONE HCACHE_BDB HTML ICONV IDN \
+		IFDEF_PATCH LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH NCURSES \
+		NLS REVERSE_REPLY_PATCH SASL SMART_DATE SMTP URLVIEW XML
+
+.ifmake makesum # for optional distfiles patchfiles
+OPTIONS_OVERRIDE=	${OPTIONS_DEFINE} ${OPTIONS_DEFAULT}
+.MAKEOVERRIDES+=	OPTIONS_OVERRIDE
+.endif
+
+AUTOCRYPT_CONFIGURE_ENABLE=	autocrypt
+AUTOCRYPT_IMPLIES=		GPGME IDN
+AUTOCRYPT_USES=			sqlite:3
+AUTOCRYPT_CONFIGURE_WITH=	sqlite3=${LOCALBASE}
+AUTOCRYPT_DEPENDS=		gnupg>=2.1:security/gnupg \
+				gpgme>=1.8:security/gpgme
+AUTOCRYPT_BUILD_DEPENDS=	${AUTOCRYPT_DEPENDS}
+AUTOCRYPT_RUN_DEPENDS=		${AUTOCRYPT_DEPENDS}

 ASPELL_BUILD_DEPENDS=	aspell:textproc/aspell
 ASPELL_RUN_DEPENDS=	aspell:textproc/aspell
@ -100,11 +113,6 @@ ISPELL_BUILD_DEPENDS=	ispell:textproc/aspell-ispell
 ISPELL_RUN_DEPENDS=	ispell:textproc/aspell-ispell
 URLVIEW_RUN_DEPENDS=	urlview:textproc/urlview

-.ifmake makesum # for optional distfiles patchfiles
-PORT_DBDIR=		/dev/null
-OPTIONS_DEFAULT+=	${OPTIONS_DEFINE}
-.endif
-
 DEBUG_CONFIGURE_ON=	--enable-debug

 # Handle ncurses/ncurses-port/slang
@ -170,9 +178,11 @@ SMTP_CONFIGURE_ENABLE=	smtp

 GREETING_PATCH_PATCHFILES=	mutt-${GREETING_PATCH_VERSION}.vc.greeting:vc

+QUOTE_PATCH_BROKEN=	QUOTE_PATCH broken on 1.13.0
 QUOTE_PATCH_PATCHFILES=	patch-${VVV_PATCH_VERSION}.vvv.initials.xz:vvv \
 	patch-${VVV_PATCH_VERSION}.vvv.quote.xz:vvv

+NNTP_BROKEN=	NNTP_PATCH broken on 1.13.0
 NNTP_PATCHFILES=	patch-${VVV_PATCH_VERSION}.vvv.nntp.xz:-p1:vvv
 NNTP_EXTRA_PATCHES=	${PATCHDIR}/extra-nntp-depfiles
 NNTP_CONFIGURE_ON=	--enable-nntp
@ -186,31 +196,36 @@ DOCS_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-doc-ref

 # un/comment as each VERSION is created for PORTVERSION
 VVV_PATCH_VERSION=	1.12.1
-GREETING_PATCH_VERSION=	1.12.1
-
-.if !defined(VVV_PATCH_VERSION)
-VVV_PATCH_VERSION=	${PORTVERSION}
-.endif
-.if !defined(GREETING_PATCH_VERSION)
-GREETING_PATCH_VERSION=	${PORTVERSION}
-.endif
+GREETING_PATCH_VERSION=	1.13.0

 post-patch-NNTP-on:
 # Restore timestamps for autotools sources
 	@${TOUCH} -r ${WRKSRC}/configure.ac.orig ${WRKSRC}/configure.ac
 	@${TOUCH} -r ${WRKSRC}/Makefile.am.orig ${WRKSRC}/Makefile.am
 .if ${PORT_OPTIONS:MMAILDIR_MTIME_PATCH}
+.if 	defined(${PATCH_DEBUG})
+		@${ECHO} "===>  Applying ${.TARGET} extra-patch-maildir-mtime-nntp"
+.endif
 	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-maildir-mtime-nntp
 .endif
 .if ${PORT_OPTIONS:MFORCEBASE64}
+.if 	defined(PATCH_DEBUG)
+		@${ECHO} "===>  Applying ${.TARGET} extra-patch-forcebase64-nntp"
+.endif
 	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-forcebase64-nntp
 .endif

 post-patch-NNTP-off:
 .if ${PORT_OPTIONS:MMAILDIR_MTIME_PATCH}
+.if 	defined(PATCH_DEBUG)
+		@${ECHO} "===>  Applying ${.TARGET} extra-patch-maildir-mtime"
+.endif
 	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-maildir-mtime
 .endif
 .if ${PORT_OPTIONS:MFORCEBASE64}
+.if 	defined(PATCH_DEBUG)
+		@${ECHO} "===>  Applying ${.TARGET} extra-patch-forcebase64"
+.endif
 	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-forcebase64
 .endif

@ -220,8 +235,6 @@ post-install:
 post-install-NNTP-on:
 	${INSTALL_DATA} ${WRKSRC}/ChangeLog.nntp ${STAGEDIR}${DOCSDIR}

-WRKSRC=		${WRKDIR}/${DISTNAME:S/i$//}
-
 pre-configure::
 	@${REINPLACE_CMD} -e 's,?eimdal\*),?eimdal*|\"FreeBSD heimdal\"*),' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
@ -253,7 +266,7 @@ BUILD_DEPENDS+=	xsltproc:textproc/libxslt \
 .else
 pre-build::
 	@${REINPLACE_CMD} \
-		-e 's,manual.html stamp-doc-rc stamp-doc-chunked manual.txt,stamp-doc-rc,' \
+		-e '/^BUILD_DOC_TARGETS/s/=.*/=/' \
 		${WRKSRC}/doc/Makefile
 .endif

--- a/mail/mutt/distinfo
+++ b/mail/mutt/distinfo
@ -1,8 +1,8 @@
-TIMESTAMP = 1569099378
-SHA256 (mutt/mutt-1.12.2.tar.gz) = bc42750ce8237742b9382f2148fc547a8d8601aa4a7cd28c55fe7ca045196882
-SIZE (mutt/mutt-1.12.2.tar.gz) = 4675774
-SHA256 (mutt/mutt-1.12.1.vc.greeting) = 54d1267c1ac496662b47131f9761b5ab53f44c93498938dc93d0156c6578e378
-SIZE (mutt/mutt-1.12.1.vc.greeting) = 4559
+TIMESTAMP = 1576360229
+SHA256 (mutt/mutt-1.13.1.tar.gz) = 1fb5951292e57428974d1fd8e60ae83292743f74e440efea3659ae83593e875d
+SIZE (mutt/mutt-1.13.1.tar.gz) = 4895458
+SHA256 (mutt/mutt-1.13.0.vc.greeting) = b11fcfad1f53f16f89a8ecc334fba615698f5bcaa9373fd487a6c9d95c3872ad
+SIZE (mutt/mutt-1.13.0.vc.greeting) = 4573
 SHA256 (mutt/patch-1.12.1.vvv.nntp.xz) = 9c420584d549ac0bb49c52ddfd2ab5bee0f89e59cb938673444ec27ad7c782ad
 SIZE (mutt/patch-1.12.1.vvv.nntp.xz) = 49672
 SHA256 (mutt/patch-1.12.1.vvv.initials.xz) = 6c66fe6c23362b0f4970a5028a75a33454e1e53ba178e5801113939f1bc22920
--- a/mail/mutt/files/extra-patch-doc-ref
+++ b/mail/mutt/files/extra-patch-doc-ref
@ -1,6 +1,6 @@
--- doc/mutt.man.orig	2009-02-06 13:52:38.000000000 +0100
-+++ doc/mutt.man	2009-02-06 13:55:05.000000000 +0100
-@@ -67,7 +67,8 @@
+--- doc/mutt.man.orig	2019-05-25 16:22:39 UTC
+++ doc/mutt.man
+@@ -67,7 +67,8 @@ mutt \- The Mutt Mail User Agent
 .PP
 Mutt is a small but very powerful text based program for reading and sending electronic
 mail under unix operating systems, including support for color terminals, MIME,
--- a/mail/mutt/files/extra-patch-forcebase64
+++ b/mail/mutt/files/extra-patch-forcebase64
@ -1,20 +1,20 @@
--- init.h.orig	2017-04-12 23:01:17 UTC
+--- init.h.orig	2019-12-08 02:41:29 UTC
 +++ init.h
-@@ -871,6 +871,11 @@ struct option_t MuttVars[] = {
+@@ -1079,6 +1079,11 @@ struct option_t MuttVars[] = {
   ** sent to both the list and your address, resulting in two copies
   ** of the same email for you.
   */
-+  { "force_base64",   DT_BOOL, R_NONE, OPTFORCEBASE64, 0 },
+  { "force_base64",   DT_BOOL, R_NONE, {.l=OPTFORCEBASE64}, {.l=0} },
 +  /*
 +  ** .pp
 +  ** If you need to encode all text parts to base64, set this option.
 +  */
-   { "force_name",	DT_BOOL, R_NONE, OPTFORCENAME, 0 },
+   { "force_name",	DT_BOOL, R_NONE, {.l=OPTFORCENAME}, {.l=0} },
   /*
   ** .pp
--- mutt.h.orig	2017-04-12 23:01:17 UTC
+--- mutt.h.orig	2019-12-08 02:41:29 UTC
 +++ mutt.h
-@@ -355,6 +355,7 @@ enum
+@@ -423,6 +423,7 @@ enum
   OPTFCCCLEAR,
   OPTFLAGSAFE,
   OPTFOLLOWUPTO,
@ -22,9 +22,9 @@
   OPTFORCENAME,
   OPTFORWDECODE,
   OPTFORWQUOTE,
--- sendlib.c.orig	2017-04-12 23:01:08 UTC
+--- sendlib.c.orig	2019-12-08 02:41:29 UTC
 +++ sendlib.c
-@@ -1171,7 +1171,9 @@ static void mutt_set_encoding (BODY *b, 
+@@ -1218,7 +1218,9 @@ static void mutt_set_encoding (BODY *b, CONTENT *info)
   if (b->type == TYPETEXT)
   {
     char *chsname = mutt_get_body_charset (send_charset, sizeof (send_charset), b);
--- a/mail/mutt/files/extra-patch-ifdef
+++ b/mail/mutt/files/extra-patch-ifdef
@ -1,14 +1,14 @@
--- PATCHES.orig	2017-12-03 03:10:17 UTC
+--- PATCHES.orig	2019-12-14 21:57:56 UTC
 +++ PATCHES
@@ -0,0 +1 @@
 +patch-1.5.4.cd.ifdef.1
--- init.c.orig	2019-09-21 19:18:34 UTC
+--- init.c.orig	2019-11-30 21:59:38 UTC
 +++ init.c
@@ -651,6 +651,52 @@ static mbchar_table *parse_mbchar_table (const char *s
   return t;
 }
 
-+static int parse_ifdef (BUFFER *tmp, BUFFER *s, unsigned long data, BUFFER *err)
+static int parse_ifdef (BUFFER *tmp, BUFFER *s, union pointer_long_t data, BUFFER *err)
 +{
 +  int i, j, res = 0;
 +  BUFFER token;
@ -54,24 +54,24 @@
 +  return 0;
 +}
 +
- static int parse_unignore (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err)
+ static int parse_unignore (BUFFER *buf, BUFFER *s, union pointer_long_t udata, BUFFER *err)
 {
   do
--- init.h.orig	2019-09-21 19:18:34 UTC
+--- init.h.orig	2019-12-14 19:24:06 UTC
 +++ init.h
-@@ -4343,6 +4343,7 @@ static int parse_lists (BUFFER *, BUFFER *, unsigned l
- static int parse_unlists (BUFFER *, BUFFER *, unsigned long, BUFFER *);
- static int parse_alias (BUFFER *, BUFFER *, unsigned long, BUFFER *);
- static int parse_unalias (BUFFER *, BUFFER *, unsigned long, BUFFER *);
-+static int parse_ifdef (BUFFER *, BUFFER *, unsigned long, BUFFER *);
- static int parse_echo (BUFFER *, BUFFER *, unsigned long, BUFFER *);
- static int parse_ignore (BUFFER *, BUFFER *, unsigned long, BUFFER *);
- static int parse_unignore (BUFFER *, BUFFER *, unsigned long, BUFFER *);
-@@ -4407,6 +4407,7 @@ const struct command_t Commands[] = {
-   { "hdr_order",	parse_list,		UL &HeaderOrderList },
+@@ -4503,6 +4503,7 @@ static int parse_lists (BUFFER *, BUFFER *, union poin
+ static int parse_unlists (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *);
+ static int parse_alias (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *);
+ static int parse_unalias (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *);
+static int parse_ifdef (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *);
+ static int parse_echo (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *);
+ static int parse_ignore (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *);
+ static int parse_unignore (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *);
+@@ -4567,6 +4568,7 @@ const struct command_t Commands[] = {
+   { "hdr_order",	parse_list,		{.p=&HeaderOrderList} },
 #ifdef HAVE_ICONV
-   { "iconv-hook",	mutt_parse_hook,	MUTT_ICONVHOOK },
-+  { "ifdef",		parse_ifdef,		0 },
+   { "iconv-hook",	mutt_parse_hook,	{.l=MUTT_ICONVHOOK} },
+  { "ifdef",		parse_ifdef,		{.l=0} },
 #endif
-   { "ignore",		parse_ignore,		0 },
-   { "index-format-hook",mutt_parse_idxfmt_hook, MUTT_IDXFMTHOOK },
+   { "ignore",		parse_ignore,		{.l=0} },
+   { "index-format-hook",mutt_parse_idxfmt_hook, {.l=MUTT_IDXFMTHOOK} },
--- a/mail/mutt/files/extra-patch-maildir-mtime
+++ b/mail/mutt/files/extra-patch-maildir-mtime
@ -1,8 +1,8 @@
--- PATCHES.orig	2019-05-26 19:28:55 UTC
+--- PATCHES.orig	2019-12-06 03:42:13 UTC
 +++ PATCHES
@@ -0,0 +1 @@
 +patch-1.5.7.ust.maildir-mtime.2
--- browser.c.orig	2019-05-26 19:28:52 UTC
+--- browser.c.orig	2019-12-06 03:42:13 UTC
 +++ browser.c
@@ -32,6 +32,7 @@
 #ifdef USE_IMAP
@ -12,7 +12,7 @@
 
 #include <stdlib.h>
 #include <dirent.h>
-@@ -460,6 +461,21 @@ static void init_state (struct browser_state *state, M
+@@ -448,6 +449,21 @@ static void init_state (struct browser_state *state, M
     menu->data = state->entry;
 }
 
@ -34,19 +34,19 @@
 static int examine_directory (MUTTMENU *menu, struct browser_state *state,
 			      const char *d, const char *prefix)
 {
-@@ -526,6 +542,7 @@ static int examine_directory (MUTTMENU *menu, struct b
+@@ -514,6 +530,7 @@ static int examine_directory (MUTTMENU *menu, struct b
     tmp = Incoming;
-     while (tmp && mutt_strcmp (mutt_b2s (buffer), mutt_b2s (tmp->pathbuf)))
+     while (tmp && mutt_strcmp (mutt_b2s (full_path), mutt_b2s (tmp->pathbuf)))
       tmp = tmp->next;
 +    check_maildir_times (tmp, &s);
     if (tmp && Context &&
         !mutt_strcmp (tmp->realpath, Context->realpath))
     {
-@@ -604,6 +621,7 @@ static int examine_mailboxes (MUTTMENU *menu, struct b
+@@ -592,6 +609,7 @@ static int examine_mailboxes (MUTTMENU *menu, struct b
 	s.st_mtime = st2.st_mtime;
     }
 
 +    check_maildir_times (tmp, &s);
-     add_folder (menu, state, mutt_b2s (mailbox), &s, tmp);
+     add_folder (menu, state, mutt_b2s (mailbox), mutt_b2s (tmp->pathbuf), &s, tmp);
   }
   while ((tmp = tmp->next));
--- a/mail/mutt/files/extra-patch-reverse_reply
+++ b/mail/mutt/files/extra-patch-reverse_reply
@ -1,26 +1,26 @@
--- PATCHES.orig	2017-12-03 03:10:17 UTC
+--- PATCHES.orig	2019-12-06 03:41:41 UTC
 +++ PATCHES
@@ -0,0 +1 @@
 +patch-1.5.6.cb.reverse_reply.2
--- init.h.orig	2019-09-21 19:18:34 UTC
+--- init.h.orig	2019-12-06 03:41:41 UTC
 +++ init.h
-@@ -2966,6 +2966,13 @@ struct option_t MuttVars[] = {
+@@ -3021,6 +3021,13 @@ struct option_t MuttVars[] = {
   ** In either case, a missing real name will be filled in afterwards
   ** using the value of $$realname.
   */
-+  { "reverse_reply",	DT_BOOL, R_NONE, OPTREVREPLY, 0 },
+  { "reverse_reply",	DT_BOOL, R_NONE, {.l=OPTREVREPLY}, {.l=0} },
 +  /*
 +  ** .pp
 +  ** When set, this variable uses the name from your aliases in the To and Cc
 +  ** headers of reply mails you send, like $reverse_alias does in the index.
 +  ** When unset, the headers taken from the original mail are left unchanged.
 +  */
-   { "rfc2047_parameters", DT_BOOL, R_NONE, OPTRFC2047PARAMS, 0 },
+   { "rfc2047_parameters", DT_BOOL, R_NONE, {.l=OPTRFC2047PARAMS}, {.l=0} },
   /*
   ** .pp
--- mutt.h.orig	2019-09-21 19:18:34 UTC
+--- mutt.h.orig	2019-11-20 20:16:28 UTC
 +++ mutt.h
-@@ -491,6 +491,7 @@ enum
+@@ -505,6 +505,7 @@ enum
   OPTREVALIAS,
   OPTREVNAME,
   OPTREVREAL,
@ -28,9 +28,9 @@
   OPTRFC2047PARAMS,
   OPTSAVEADDRESS,
   OPTSAVEEMPTY,
--- protos.h.orig	2019-09-21 19:18:34 UTC
+--- protos.h.orig	2019-11-01 06:34:06 UTC
 +++ protos.h
-@@ -85,6 +85,7 @@ ADDRESS *mutt_get_address (ENVELOPE *, char **);
+@@ -88,6 +88,7 @@ ADDRESS *mutt_get_address (ENVELOPE *, char **);
 ADDRESS *mutt_lookup_alias (const char *s);
 ADDRESS *mutt_remove_duplicates (ADDRESS *);
 ADDRESS *mutt_remove_xrefs (ADDRESS *, ADDRESS *);
@ -38,9 +38,9 @@
 ADDRESS *mutt_expand_aliases (ADDRESS *);
 ADDRESS *mutt_parse_adrlist (ADDRESS *, const char *);
 
--- send.c.orig	2019-09-21 19:18:34 UTC
+--- send.c.orig	2019-11-19 02:15:41 UTC
 +++ send.c
-@@ -717,6 +717,10 @@ void mutt_fix_reply_recipients (ENVELOPE *env)
+@@ -723,6 +723,10 @@ void mutt_fix_reply_recipients (ENVELOPE *env)
   /* the CC field can get cluttered, especially with lists */
   env->to = mutt_remove_duplicates (env->to);
   env->cc = mutt_remove_duplicates (env->cc);
@ -51,9 +51,9 @@
   env->cc = mutt_remove_xrefs (env->to, env->cc);
 
   if (env->cc && !env->to)
--- sendlib.c.orig	2019-09-21 19:18:34 UTC
+--- sendlib.c.orig	2019-11-08 03:35:30 UTC
 +++ sendlib.c
-@@ -2765,6 +2765,35 @@ static void set_noconv_flags (BODY *b, short flag)
+@@ -2974,6 +2974,35 @@ static void set_noconv_flags (BODY *b, short flag)
   }
 }
 
@ -86,6 +86,6 @@
 +  return addr;
 +}
 +
- int mutt_write_fcc (const char *path, HEADER *hdr, const char *msgid, int post, char *fcc)
+ int mutt_write_fcc (const char *path, HEADER *hdr, const char *msgid, int post, const char *fcc)
 {
   CONTEXT f;
--- a/mail/mutt/files/extra-patch-smartdate
+++ b/mail/mutt/files/extra-patch-smartdate
@ -1,6 +1,6 @@
--- hdrline.c.orig	2019-05-26 19:28:51 UTC
+--- hdrline.c.orig	2019-11-11 04:00:36 UTC
 +++ hdrline.c
-@@ -249,6 +249,89 @@ static char *apply_subject_mods (ENVELOPE *env)
+@@ -248,6 +248,89 @@ static char *apply_subject_mods (ENVELOPE *env)
  * %Y = `x-label:' field (if present, tree unfolded, and != parent's x-label)
  * %Z = status flags	*/
 
@ -90,7 +90,7 @@
 static const char *
 hdr_format_str (char *dest,
 		size_t destlen,
-@@ -422,7 +505,13 @@ hdr_format_str (char *dest,
+@@ -421,7 +504,13 @@ hdr_format_str (char *dest,
 
       if (!do_locales)
         setlocale (LC_TIME, "C");
@ -105,9 +105,9 @@
       if (!do_locales)
         setlocale (LC_TIME, "");
 
--- mutt.h.orig	2019-05-26 19:28:51 UTC
+--- mutt.h.orig	2019-12-06 03:41:43 UTC
 +++ mutt.h
-@@ -164,6 +164,16 @@ typedef enum
+@@ -165,6 +165,16 @@ typedef enum
   MUTT_WRITE_HEADER_MIME
 } mutt_write_header_mode;
 
--- a/mail/mutt/files/patch-Makefile.in
+++ b/mail/mutt/files/patch-Makefile.in
@ -1,15 +1,15 @@
--- Makefile.in.orig	2019-06-15 16:07:04 UTC
+--- Makefile.in.orig	2019-11-30 18:14:23 UTC
 +++ Makefile.in
-@@ -537,7 +537,7 @@ AUTOMAKE_OPTIONS = 1.6 foreign
- @BUILD_DOC_TRUE@DOC_SUBDIR = doc
- @BUILD_IMAP_TRUE@IMAP_SUBDIR = imap
+@@ -540,7 +540,7 @@ AUTOMAKE_OPTIONS = 1.6 foreign
 @BUILD_IMAP_TRUE@IMAP_INCLUDES = -I$(top_srcdir)/imap
-SUBDIRS = m4 po intl $(DOC_SUBDIR) contrib $(IMAP_SUBDIR)
-+SUBDIRS = m4 po intl contrib $(IMAP_SUBDIR) . $(DOC_SUBDIR)
+ @BUILD_AUTOCRYPT_TRUE@AUTOCRYPT_SUBDIR = autocrypt
+ @BUILD_AUTOCRYPT_TRUE@AUTOCRYPT_INCLUDES = -I$(top_srcdir)/autocrypt
+-SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR) $(AUTOCRYPT_SUBDIR)
+SUBDIRS = m4 po intl contrib $(IMAP_SUBDIR) $(AUTOCRYPT_SUBDIR) . doc
 bin_SCRIPTS = muttbug flea $(SMIMEAUX_TARGET)
 @BUILD_HCACHE_TRUE@HCVERSION = hcversion.h
 BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h conststrings.c version.h $(HCVERSION)
-@@ -1676,18 +1676,9 @@ install-exec-hook:
+@@ -1690,18 +1690,9 @@ install-exec-hook:
 		rm -f $(DESTDIR)$(bindir)/mutt.dotlock ;		\
 		ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \
 	fi
--- a/mail/mutt/files/patch-browser.c
+++ b/mail/mutt/files/patch-browser.c
@ -1,16 +1,16 @@
--- browser.c.orig	2019-04-28 20:41:58 UTC
+--- browser.c.orig	2019-11-11 04:00:36 UTC
 +++ browser.c
@@ -86,6 +86,12 @@ static int browser_compare_subject (const void *a, con
   struct folder_file *pa = (struct folder_file *) a;
   struct folder_file *pb = (struct folder_file *) b;
 
 +  /* Always keep '..' in first menu position */
-+  if (!strncmp(pa->name, "..", 2))
+  if (!strncmp(pa->display_name, "..", 2))
 +	  return(-1);
-+  if (!strncmp(pb->name, "..", 2))
+  if (!strncmp(pb->display_name, "..", 2))
 +	  return(1);
 +
-   int r = mutt_strcoll (pa->name, pb->name);
+   int r = mutt_strcoll (pa->display_name, pb->display_name);
 
   return ((BrowserSort & SORT_REVERSE) ? -r : r);
@@ -96,6 +102,12 @@ static int browser_compare_date (const void *a, const 
@ -18,9 +18,9 @@
   struct folder_file *pb = (struct folder_file *) b;
 
 +  /* Always keep '..' in first menu position */
-+  if (!strncmp(pa->name, "..", 2))
+  if (!strncmp(pa->display_name, "..", 2))
 +	  return(-1);
-+  if (!strncmp(pb->name, "..", 2))
+  if (!strncmp(pb->display_name, "..", 2))
 +	  return(1);
 +
   int r = pa->mtime - pb->mtime;
@ -32,9 +32,9 @@
   struct folder_file *pb = (struct folder_file *) b;
 +
 +  /* Always keep '..' in first menu position */
-+  if (!strncmp(pa->name, "..", 2))
+  if (!strncmp(pa->display_name, "..", 2))
 +	  return(-1);
-+  if (!strncmp(pb->name, "..", 2))
+  if (!strncmp(pb->display_name, "..", 2))
 +	  return(1);
 
   int r = pa->size - pb->size;
--- a/mail/mutt/files/patch-contrib_Makefile.in
+++ b/mail/mutt/files/patch-contrib_Makefile.in
@ -1,6 +1,6 @@
--- contrib/Makefile.in.orig	2019-05-25 16:13:42 UTC
+--- contrib/Makefile.in.orig	2019-11-30 18:14:24 UTC
 +++ contrib/Makefile.in
-@@ -278,7 +278,7 @@ top_build_prefix = @top_build_prefix@
+@@ -280,7 +280,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 subdir = contrib
--- a/mail/mutt/files/patch-date-conditional
+++ b/mail/mutt/files/patch-date-conditional
@ -1,10 +1,10 @@
--- PATCHES.orig	2019-05-26 19:28:53 UTC
+--- PATCHES.orig	2019-12-06 03:41:54 UTC
 +++ PATCHES
@@ -0,0 +1 @@
 +patch-1.5.0.ats.date_conditional.1
--- hdrline.c.orig	2019-05-26 19:28:52 UTC
+--- hdrline.c.orig	2019-12-06 03:41:54 UTC
 +++ hdrline.c
-@@ -428,6 +428,53 @@ hdr_format_str (char *dest,
+@@ -427,6 +427,53 @@ hdr_format_str (char *dest,
       const char *cp;
       struct tm *tm;
       time_t T;
@ -58,9 +58,9 @@
 
       p = dest;
 
--- muttlib.c.orig	2019-04-28 20:41:58 UTC
+--- muttlib.c.orig	2019-10-17 08:01:01 UTC
 +++ muttlib.c
-@@ -1487,7 +1487,16 @@ void mutt_FormatString (char *dest,		/* output buffer 
+@@ -1563,7 +1563,16 @@ void mutt_FormatString (char *dest,		/* output buffer 
       if (*src == '?')
       {
 	flags |= MUTT_FORMAT_OPTIONAL;
@ -78,7 +78,7 @@
       }
       else
       {
-@@ -1503,12 +1512,12 @@ void mutt_FormatString (char *dest,		/* output buffer 
+@@ -1579,12 +1588,12 @@ void mutt_FormatString (char *dest,		/* output buffer 
 	  count++;
 	}
 	*cp = 0;
--- a/mail/mutt/files/patch-dgc-deepif
+++ b/mail/mutt/files/patch-dgc-deepif
@ -1,6 +1,6 @@
--- muttlib.c.orig	2019-05-26 19:28:53 UTC
+--- muttlib.c.orig	2019-12-06 03:41:57 UTC
 +++ muttlib.c
-@@ -1530,6 +1530,12 @@ void mutt_FormatString (char *dest,		/* output buffer 
+@@ -1606,6 +1606,12 @@ void mutt_FormatString (char *dest,		/* output buffer 
 	count = 0;
         while (count < sizeof (ifstring) && *src && *src != '?' && *src != '&')
 	{
@ -13,7 +13,7 @@
           *cp++ = *src++;
 	  count++;
 	}
-@@ -1542,7 +1548,13 @@ void mutt_FormatString (char *dest,		/* output buffer 
+@@ -1618,7 +1624,13 @@ void mutt_FormatString (char *dest,		/* output buffer 
 	count = 0;
 	while (count < sizeof (elsestring) && *src && *src != '?')
 	{
--- a/mail/mutt/files/patch-doc_Makefile.in
+++ b/mail/mutt/files/patch-doc_Makefile.in
@ -1,8 +1,8 @@
--- doc/Makefile.in.orig	2019-05-25 16:13:43 UTC
+--- doc/Makefile.in.orig	2019-11-30 18:14:24 UTC
 +++ doc/Makefile.in
-@@ -684,14 +684,7 @@ install-data-local: makedoc-all instdoc
- 	-for f in $(HTML_DOCFILES) ; do \
- 		$(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \
+@@ -691,14 +691,7 @@ install-data-local: makedoc-all instdoc
+ 	    $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \
+ 	  fi \
 	done
 -	$(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.dist
 -	-if [ -f $(DESTDIR)$(pkgdatadir)/Muttrc ] ; then \
@ -16,7 +16,7 @@
 	-if [ -f mutt.info ] ; then \
 	  $(MKDIR_P) $(DESTDIR)$(infodir) ; \
 	  $(INSTALL) -m 644 mutt.info $(DESTDIR)$(infodir) ; \
-@@ -727,9 +720,7 @@ uninstall-local:
+@@ -734,9 +727,7 @@ uninstall-local:
 
 check:
 manual.txt: manual.html
--- a/mail/mutt/files/patch-doc_Muttrc
+++ b/mail/mutt/files/patch-doc_Muttrc
@ -1,10 +0,0 @@
--- doc/Muttrc.orig	2019-05-25 16:14:02 UTC
-+++ doc/Muttrc
-@@ -723,6 +723,7 @@ attachments   -I message/external-body
- # will be saved for later references.  Also see $record,
- # $save_name, $force_name and ``fcc-hook''.
- # 
-+set followup_to=no
- # 
- # set crypt_autoencrypt=no
- #
--- a/mail/mutt/files/patch-doc_manual.xml.head
+++ b/mail/mutt/files/patch-doc_manual.xml.head
@ -1,4 +1,4 @@
--- doc/manual.xml.head.orig	2016-10-08 19:35:50 UTC
+--- doc/manual.xml.head.orig	2019-11-24 03:39:46 UTC
 +++ doc/manual.xml.head
@@ -1,6 +1,6 @@
 <?xml version="1.0" standalone="no"?>
--- a/mail/mutt/files/patch-muttlib.c
+++ b/mail/mutt/files/patch-muttlib.c
@ -1,6 +1,6 @@
--- muttlib.c.orig	2019-05-26 19:28:53 UTC
+--- muttlib.c.orig	2019-12-06 03:42:05 UTC
 +++ muttlib.c
-@@ -856,16 +856,15 @@ void _mutt_buffer_mktemp (BUFFER *buf, const char *pre
+@@ -877,16 +877,15 @@ void _mutt_buffer_mktemp (BUFFER *buf, const char *pre
 void _mutt_mktemp (char *s, size_t slen, const char *prefix, const char *suffix,
                    const char *src, int line)
 {
--- a/mail/mutt/files/patch-smime-sender
+++ b/mail/mutt/files/patch-smime-sender
@ -1,6 +1,6 @@
--- commands.c.orig	2019-05-25 16:22:39 UTC
+--- commands.c.orig	2019-11-30 21:59:38 UTC
 +++ commands.c
-@@ -266,7 +266,7 @@ int mutt_display_message (HEADER *cur)
+@@ -285,7 +285,7 @@ int mutt_display_message (HEADER *cur)
     {
       if (cur->security & GOODSIGN)
       {
@ -9,13 +9,13 @@
 	  mutt_message ( _("S/MIME signature successfully verified."));
 	else
 	  mutt_error ( _("S/MIME certificate owner does not match sender."));
--- init.h.orig	2019-06-15 21:17:02 UTC
+--- init.h.orig	2019-12-14 21:58:25 UTC
 +++ init.h
-@@ -3378,6 +3378,15 @@ struct option_t MuttVars[] = {
+@@ -3518,6 +3518,15 @@ struct option_t MuttVars[] = {
   ** to determine the key to use. It will ask you to supply a key, if it can't find one.
   ** (S/MIME only)
   */
-+  { "smime_dont_check_sender",	DT_BOOL, R_NONE, OPTSMIMENOSENDER, 0 },
+  { "smime_dont_check_sender",	DT_BOOL, R_NONE, {.l=OPTSMIMENOSENDER}, {.l=0} },
 +  /*
 +  ** .pp
 +  ** This flag controls wether you want the skip the check for the sender's
@ -24,12 +24,12 @@
 +  ** longer needs email-addresses as part of the certificates.
 +  ** It is not set by default.
 +  */
-   { "smime_self_encrypt_as",	DT_SYN,  R_NONE, UL "smime_default_key", 0 },
-   { "smime_default_key",		DT_STR,	 R_NONE, UL &SmimeDefaultKey, 0 },
+   { "smime_self_encrypt_as",	DT_SYN,  R_NONE, {.p="smime_default_key"}, {.p=0} },
+   { "smime_default_key",		DT_STR,	 R_NONE, {.p=&SmimeDefaultKey}, {.p=0} },
   /*
--- mutt.h.orig	2019-06-15 21:17:02 UTC
+--- mutt.h.orig	2019-12-14 21:58:25 UTC
 +++ mutt.h
-@@ -567,6 +567,7 @@ enum
+@@ -587,6 +587,7 @@ enum
   OPTSMIMEISDEFAULT,
   OPTSMIMESELFENCRYPT,
   OPTASKCERTLABEL,
--- a/mail/mutt/files/patch-threadcomplete
+++ b/mail/mutt/files/patch-threadcomplete
@ -1,6 +1,6 @@
--- mutt.h.orig	2019-05-26 19:28:54 UTC
+--- mutt.h.orig	2019-12-06 03:42:11 UTC
 +++ mutt.h
-@@ -242,6 +242,7 @@ enum
+@@ -243,6 +243,7 @@ enum
   MUTT_EXPIRED,
   MUTT_SUPERSEDED,
   MUTT_TRASH,
@ -8,7 +8,7 @@
 
   /* actions for mutt_pattern_comp/mutt_pattern_exec */
   MUTT_AND,
--- pattern.c.orig	2019-05-10 01:46:06 UTC
+--- pattern.c.orig	2019-11-16 21:07:54 UTC
 +++ pattern.c
@@ -57,6 +57,7 @@ static const struct pattern_flags
 }
@ -18,7 +18,7 @@
   { 'A', MUTT_ALL,			0,		NULL },
   { 'b', MUTT_BODY,		MUTT_FULL_MSG,	eat_regexp },
   { 'B', MUTT_WHOLE_MSG,		MUTT_FULL_MSG,	eat_regexp },
-@@ -1338,6 +1339,16 @@ mutt_pattern_exec (struct pattern_t *pat, pattern_exec
+@@ -1342,6 +1343,16 @@ mutt_pattern_exec (struct pattern_t *pat, pattern_exec
       else
         result = mutt_is_list_cc (pat->alladdr, h->env->to, h->env->cc);
       return (pat->not ^ result);
--- a/mail/mutt/pkg-plist
+++ b/mail/mutt/pkg-plist
@ -68,6 +68,7 @@ man/man5/muttrc.5.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.solaris-2.6-cjk.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.solaris-2.6.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.solaris-2.7.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/markdown2html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mutt_xtitle
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgp2.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgp6.rc
--- a/math/R/Makefile
+++ b/math/R/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	R
-DISTVERSION=	3.6.1
-PORTREVISION=	3
+DISTVERSION=	3.6.2
 CATEGORIES=	math lang
 MASTER_SITES=	CRAN/src/base/R-${PORTVERSION:C|\..*||}

@ -14,9 +13,9 @@ LICENSE=	GPLv2

 ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 i386 powerpc64

+BUILD_DEPENDS=	texi2any:print/texinfo
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libpcre.so:devel/pcre
-BUILD_DEPENDS=	texi2any:print/texinfo
 RUN_DEPENDS=	gmake:devel/gmake # R packages may require GNU make

 USE_HARDENING=	pie:off relro:off
@ -27,36 +26,37 @@ USE_HARDENING=	pie:off relro:off
 # - Create ports for each of the recommended packages
 # - Create a meta-port for the recommended packages

-USES=		compiler:c++11-lang gmake iconv libtool localbase pathfix \
-		perl5 readline:port
+USES=		compiler:c++11-lang gmake iconv libtool localbase pathfix perl5 \
+		readline:port
 USE_LDCONFIG=	${PREFIX}/lib/R/lib
 USE_PERL5=	build

+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-java \
 		--enable-R-shlib \
 		--with-readline \
 		rdocdir=${DOCSDIR}
-GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-PLIST_SUB=	LIBVER=${LIBVER}
+PLIST_SUB=	LIBVER=${_LIBVER}

 OPTIONS_DEFINE=		ICU INFO LDOUBLE LETTER MEMPROF NLS RPROF X11
 OPTIONS_DEFINE_amd64=	FLANG OPENMP
 OPTIONS_DEFINE_i386=	OPENMP
-OPTIONS_GROUP=		NEEDX11
-OPTIONS_GROUP_NEEDX11=	GHOSTSCRIPT JPEG CAIROPANGO PNG TCLTK TEXDOCS TIFF
-OPTIONS_SINGLE=		BLAS
-OPTIONS_SINGLE_BLAS=	ATLAS OPENBLAS NETLIB RBLAS
 OPTIONS_DEFAULT=	CAIROPANGO GHOSTSCRIPT ICU INFO JPEG LDOUBLE PNG RBLAS \
 			RPROF TCLTK TIFF X11
 OPTIONS_DEFAULT_amd64=	OPENMP
 OPTIONS_DEFAULT_i386=	OPENMP
+OPTIONS_GROUP=		NEEDX11
+OPTIONS_GROUP_NEEDX11=	CAIROPANGO GHOSTSCRIPT JPEG PNG TCLTK TEXDOCS TIFF
+OPTIONS_SINGLE=		BLAS
+OPTIONS_SINGLE_BLAS=	ATLAS NETLIB OPENBLAS RBLAS
+
 OPTIONS_SUB=		YES

 ATLAS_DESC=		ATLAS BLAS implementation
+CAIROPANGO_DESC=	Cairo graphics device and Pango multi-language text
 FLANG_DESC=		Use experimental flang instead of default Fortran compiler
 GHOSTSCRIPT_DESC=	Graphics device for bitmap files via Ghostscript
-CAIROPANGO_DESC=	Cairo graphics device and Pango multi-language text
 INFO_DESC=		GNU info manuals
 JPEG_DESC=		JPEG graphics device
 LDOUBLE_DESC=		Long double data type
@ -71,62 +71,63 @@ RPROF_DESC=		R profiling via Rprof()
 TEXDOCS_DESC=		Build/Install TeX-dependent documentation files
 X11_DESC=		X11 graphics device

-ATLAS_USES=		blaslapack:atlas
-ATLAS_CONFIGURE_ON=	--disable-BLAS-shlib
-CAIROPANGO_IMPLIES=	X11
+ATLAS_USES=			blaslapack:atlas
+ATLAS_CONFIGURE_ON=		--disable-BLAS-shlib
+CAIROPANGO_IMPLIES=		X11
+CAIROPANGO_USES=		gettext gnome jpeg pkgconfig
+CAIROPANGO_USE=			GNOME=cairo,pango
 CAIROPANGO_CONFIGURE_WITH=	cairo
-CAIROPANGO_USES=	gettext gnome jpeg pkgconfig
-CAIROPANGO_USE=		GNOME=pango,cairo
-FLANG_LIB_DEPENDS=	libpgmath.so:math/libpgmath
-FLANG_USES=		fortran:flang
-FLANG_PREVENTS=		ATLAS OPENBLAS NETLIB
-GHOSTSCRIPT_IMPLIES=	X11
-GHOSTSCRIPT_USES=	ghostscript
-ICU_CONFIGURE_WITH=	ICU
-ICU_LIB_DEPENDS=	libicui18n.so:devel/icu
-INFO_INSTALL_TARGET=	install-info
-INFO_INFO=		R-FAQ R-admin R-data R-exts R-ints R-intro R-lang
-JPEG_IMPLIES=		X11
-JPEG_CONFIGURE_WITH=	jpeglib
-JPEG_CONFIGURE_ENV=	r_cv_header_jpeglib_h=yes
-JPEG_USES=		jpeg pkgconfig
+FLANG_PREVENTS=			ATLAS NETLIB OPENBLAS
+FLANG_LIB_DEPENDS=		libpgmath.so:math/libpgmath
+FLANG_USES=			fortran:flang
+GHOSTSCRIPT_IMPLIES=		X11
+GHOSTSCRIPT_USES=		ghostscript
+ICU_LIB_DEPENDS=		libicui18n.so:devel/icu
+ICU_CONFIGURE_WITH=		ICU
+INFO_INSTALL_TARGET=		install-info
+INFO_INFO=			R-admin R-data R-exts R-FAQ R-intro R-ints \
+				R-lang
+JPEG_IMPLIES=			X11
+JPEG_USES=			jpeg pkgconfig
+JPEG_CONFIGURE_WITH=		jpeglib
+JPEG_CONFIGURE_ENV=		r_cv_header_jpeglib_h=yes
 LDOUBLE_CONFIGURE_ENABLE=	long-double
-LETTER_CONFIGURE_ENV=	R_PAPERSIZE=letter
+LETTER_CONFIGURE_ENV=		R_PAPERSIZE=letter
 MEMPROF_CONFIGURE_ENABLE=	memory-profiling
-NETLIB_USES=		blaslapack:netlib
-NETLIB_CONFIGURE_ON=	--disable-BLAS-shlib
-NLS_CONFIGURE_OFF=	--disable-nls
-NLS_USES=		gettext
-OPENBLAS_USES=		blaslapack:openblas
-OPENBLAS_CONFIGURE_ON=	--disable-BLAS-shlib
+NETLIB_USES=			blaslapack:netlib
+NETLIB_CONFIGURE_ON=		--disable-BLAS-shlib
+NLS_USES=			gettext
+NLS_CONFIGURE_OFF=		--disable-nls
+OPENBLAS_USES=			blaslapack:openblas
+OPENBLAS_CONFIGURE_ON=		--disable-BLAS-shlib
 OPENMP_CONFIGURE_ENABLE=	openmp
-PNG_IMPLIES=		X11
-PNG_LIB_DEPENDS=	libpng.so:graphics/png
-PNG_CONFIGURE_WITH=	libpng
-RBLAS_CONFIGURE_ON=	--without-blas \
-			--without-lapack \
-			--enable-BLAS-shlib
-RBLAS_CONFIGURE_OFF=	--with-blas="-L${LOCALBASE}/lib ${BLASLIB}" \
-			--with-lapack="${LAPACKLIB}"
-RBLAS_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src_extra_blas_Makefile.in \
-			${PATCHDIR}/extra-patch-src_modules_lapack_Makefile.in
-RPROF_CONFIGURE_ENABLE=	R-profiling
-TCLTK_IMPLIES=		X11
-TCLTK_USES=		tcl tk
-TCLTK_CONFIGURE_WITH=	tcltk
+PNG_IMPLIES=			X11
+PNG_LIB_DEPENDS=		libpng.so:graphics/png
+PNG_CONFIGURE_WITH=		libpng
+RBLAS_CONFIGURE_OFF=		--with-blas="-L${LOCALBASE}/lib ${BLASLIB}" \
+				--with-lapack="${LAPACKLIB}"
+RBLAS_CONFIGURE_ON=		--enable-BLAS-shlib \
+				--without-blas \
+				--without-lapack
+RBLAS_EXTRA_PATCHES=		${PATCHDIR}/extra-patch-src_extra_blas_Makefile.in \
+				${PATCHDIR}/extra-patch-src_modules_lapack_Makefile.in
+RPROF_CONFIGURE_ENABLE=		R-profiling
+TCLTK_IMPLIES=			X11
+TCLTK_USES=			tcl tk
+TCLTK_CONFIGURE_WITH=		tcltk
+TEXDOCS_USE=			TEX=dvipsk:build,kpathsea:build,pdftex:build
 .for i in KPSEWHICH MAKEINDEX PDFLATEX PDFTEX TEX TEXI2DVI
 TEXDOCS_CONFIGURE_ENV_OFF+=	ac_cv_path_${i}=""
 .endfor
-TEXDOCS_INSTALL_TARGET=	install-pdf
-TEXDOCS_USE=		tex=dvipsk:build,kpathsea:build,pdftex:build
-TIFF_IMPLIES=		X11
-TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
-TIFF_CONFIGURE_WITH=	libtiff
-X11_CONFIGURE_WITH=	x
-X11_USES=		xorg
-X11_USE=		xorg=ice,sm,x11,xext,xmu,xscrnsaver,xt
+TEXDOCS_INSTALL_TARGET=		install-pdf
+TIFF_IMPLIES=			X11
+TIFF_LIB_DEPENDS=		libtiff.so:graphics/tiff
+TIFF_CONFIGURE_WITH=		libtiff
+X11_USES=			xorg
+X11_USE=			XORG=ice,sm,x11,xext,xmu,xscrnsaver,xt
+X11_CONFIGURE_WITH=		x

-LIBVER=		${PORTVERSION:R}
+_LIBVER=	${PORTVERSION:R}

 .include <bsd.port.options.mk>

@ -145,7 +146,7 @@ LIBVER=		${PORTVERSION:R}
 #
 # This will be moot after 12.1 when openmp will be in base.
 .if ! ${PORT_OPTIONS:MFLANG}
-USES+=	fortran
+USES+=		fortran
 .if ${PORT_OPTIONS:MOPENMP}
 LIB_DEPENDS+=	libomp.so:devel/openmp
 .endif
@ -153,17 +154,17 @@ LIB_DEPENDS+=	libomp.so:devel/openmp

 post-patch:
 	@${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|g" ${WRKSRC}/configure
-	@${REINPLACE_CMD} "s|%%LIBVER%%|${LIBVER}|" \
+	@${REINPLACE_CMD} "s|%%LIBVER%%|${_LIBVER}|" \
 		${WRKSRC}/src/main/Makefile.in \
 		${WRKSRC}/src/extra/blas/Makefile.in \
 		${WRKSRC}/src/modules/lapack/Makefile.in

-post-install-RBLAS-on:
-	@${REINPLACE_CMD} -e "s| -lR| -lR -lRblas|" \
-		${STAGEDIR}${PREFIX}/libdata/pkgconfig/libR.pc
-
 post-install-RBLAS-off:
 	@${REINPLACE_CMD} -e "s| -lR| -lR ${BLASLIB}|" \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/libR.pc

+post-install-RBLAS-on:
+	@${REINPLACE_CMD} -e "s| -lR| -lR -lRblas|" \
+		${STAGEDIR}${PREFIX}/libdata/pkgconfig/libR.pc
+
 .include <bsd.port.mk>
--- a/math/R/distinfo
+++ b/math/R/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1563044763
-SHA256 (R-3.6.1.tar.gz) = 5baa9ebd3e71acecdcc3da31d9042fb174d55a42829f8315f2457080978b1389
-SIZE (R-3.6.1.tar.gz) = 30463021
+TIMESTAMP = 1576234084
+SHA256 (R-3.6.2.tar.gz) = bd65a45cddfb88f37370fbcee4ac8dd3f1aebeebe47c2f968fd9770ba2bbc954
+SIZE (R-3.6.2.tar.gz) = 33311930
--- a/math/R/pkg-plist
+++ b/math/R/pkg-plist
@ -1052,6 +1052,9 @@ lib/R/library/survival/data/Rdata.rdx
 lib/R/library/survival/doc/adjcurve.R
 lib/R/library/survival/doc/adjcurve.Rnw
 lib/R/library/survival/doc/adjcurve.pdf
+lib/R/library/survival/doc/approximate.R
+lib/R/library/survival/doc/approximate.Rnw
+lib/R/library/survival/doc/approximate.pdf
 lib/R/library/survival/doc/compete.R
 lib/R/library/survival/doc/compete.Rnw
 lib/R/library/survival/doc/compete.pdf
@ -1059,9 +1062,10 @@ lib/R/library/survival/doc/concordance.R
 lib/R/library/survival/doc/concordance.Rnw
 lib/R/library/survival/doc/concordance.pdf
 lib/R/library/survival/doc/index.html
-lib/R/library/survival/doc/multi.R
 lib/R/library/survival/doc/multi.Rnw
 lib/R/library/survival/doc/multi.pdf
+lib/R/library/survival/doc/other.Rnw
+lib/R/library/survival/doc/other.pdf
 lib/R/library/survival/doc/population.R
 lib/R/library/survival/doc/population.Rnw
 lib/R/library/survival/doc/population.pdf
@ -1071,9 +1075,6 @@ lib/R/library/survival/doc/splines.pdf
 lib/R/library/survival/doc/survival.R
 lib/R/library/survival/doc/survival.Rnw
 lib/R/library/survival/doc/survival.pdf
-lib/R/library/survival/doc/tests.R
-lib/R/library/survival/doc/tests.Rnw
-lib/R/library/survival/doc/tests.pdf
 lib/R/library/survival/doc/tiedtimes.R
 lib/R/library/survival/doc/tiedtimes.Rnw
 lib/R/library/survival/doc/tiedtimes.pdf
--- a/math/darknet/Makefile
+++ b/math/darknet/Makefile
@ -1,10 +1,11 @@
 # $FreeBSD$

 PORTNAME=	darknet
-PORTVERSION=	g20180914
-PORTREVISION=	1
+DISTVERSIONPREFIX=	darknet_yolo_v
+DISTVERSION=	3-446
+DISTVERSIONSUFFIX=	-gf2fc239
 PORTEPOCH=	1
-CATEGORIES=	math
+CATEGORIES=	math # machine-learning

 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Open source neural networks in C
@ -12,38 +13,36 @@ COMMENT=	Open source neural networks in C
 LICENSE=	PD
 LICENSE_FILE=	${WRKSRC}/LICENSE

-USES=		compiler:c11 gmake
+LIB_DEPENDS=	libomp.so:devel/openmp
+
+USES=		cmake compiler:c11
 USE_GITHUB=	yes
-GH_ACCOUNT=	pjreddie
-GH_TAGNAME=	61c9d02
+GH_ACCOUNT=	AlexeyAB
 USE_LDCONFIG=	yes

-MAKE_ARGS=	OPTS=-O3 CC=${CC} CPP=${CXX}
+CMAKE_OFF=	ENABLE_CUDA ENABLE_CUDNN ENABLE_CUDNN_HALF ENABLE_VCPKG_INTEGRATION

 PLIST_FILES=	bin/darknet \
 		include/darknet.h \
-		lib/libdarknet.a \
-		lib/libdarknet.so
+		include/yolo_v2_class.hpp \
+		lib/libdark.so

-OPTIONS_DEFINE=		OPENCV OPENMP
-OPTIONS_DEFAULT=	OPENCV OPENMP
+OPTIONS_DEFINE=		OPENCV
+OPTIONS_DEFAULT=	OPENCV
 # Many secondary functions in DarkNet depend on OpenCV which is a large dependency.
 # Build with OPENCV=off for a self-contained executable which would support
 # core NN computations but would not support many visualization, training and
 # other features.

-OPENCV_USES=	pkgconfig
-OPENCV_MAKE_ARGS=	OPENCV=1
+OPENCV_USES=		pkgconfig
+OPENCV_CMAKE_BOOL=	ENABLE_OPENCV
 OPENCV_LIB_DEPENDS=	libopencv_video.so:graphics/opencv \
 			libopencv_core.so:graphics/opencv-core

-OPENMP_MAKE_ARGS=	OPENMP=1
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/darknet ${STAGEDIR}${PREFIX}/bin
+do-install: # https://github.com/AlexeyAB/darknet/issues/4527
+	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/darknet ${STAGEDIR}${PREFIX}/bin
 	cd ${WRKSRC} && ${COPYTREE_SHARE} include ${STAGEDIR}${PREFIX}
-	${INSTALL_DATA} ${WRKSRC}/libdarknet.so ${STAGEDIR}${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/libdarknet.a ${STAGEDIR}${PREFIX}/lib
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libdarknet.so
+	${INSTALL_DATA} ${BUILD_WRKSRC}/libdark.so ${STAGEDIR}${PREFIX}/lib
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libdark.so

 .include <bsd.port.mk>
--- a/math/darknet/distinfo
+++ b/math/darknet/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1570389499
-SHA256 (pjreddie-darknet-g20180914-61c9d02_GH0.tar.gz) = 36ddd0271b8fa7dbd96829834d491971c88165c89369cfbb4f47daad15c10759
-SIZE (pjreddie-darknet-g20180914-61c9d02_GH0.tar.gz) = 3341016
+TIMESTAMP = 1576460707
+SHA256 (AlexeyAB-darknet-darknet_yolo_v3-446-gf2fc239_GH0.tar.gz) = db38891d52f8d664eeea63d8d4345b6d847a7e068f0e22c3ee9a486962e188dc
+SIZE (AlexeyAB-darknet-darknet_yolo_v3-446-gf2fc239_GH0.tar.gz) = 7376135
--- a/math/libRmath/Makefile
+++ b/math/libRmath/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	libRmath
-DISTVERSION=	3.6.1
-PORTREVISION=	1
+DISTVERSION=	3.6.2
 CATEGORIES=	math lang
 MASTER_SITES=	CRAN/src/base/R-${PORTVERSION:C|\..*||}
 DISTNAME=	R-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
@ -21,25 +20,35 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 USES=		localbase
 USE_LDCONFIG=	yes

-BUILD_WRKSRC=	${WRKSRC}/src/nmath/standalone
-CONFIGURE_ARGS=	--disable-nls --with-ICU=no --with-cairo=no \
-		--with-jpeglib=no --with-libpng=no --with-libtiff=no \
-		--with-readline=no --with-tcltk=no --with-x=no \
-		--without-libintl-prefix
-CONFIGURE_ENV+=	ac_cv_header_iconv_h=no FPICFLAGS=-fPIC
 GNU_CONFIGURE=	yes
-PLIST_SUB=	RMATH_SOVERSION="${RMATH_SOVERSION}"
-RMATH_SOVERSION=${DISTVERSION:R}
+CONFIGURE_ARGS=	--disable-nls \
+		--with-cairo=no \
+		--with-ICU=no \
+		--with-jpeglib=no \
+		--with-libpng=no \
+		--with-libtiff=no \
+		--with-readline=no \
+		--with-tcltk=no \
+		--with-x=no \
+		--without-libintl-prefix
+CONFIGURE_ENV+=	ac_cv_header_iconv_h=no \
+		FPICFLAGS=-fPIC

-OPTIONS_DEFINE=		FLANG
+BUILD_WRKSRC=	${WRKSRC}/src/nmath/standalone
+
+PLIST_SUB=	RMATH_SOVERSION="${_RMATH_SOVERSION}"
+
+OPTIONS_DEFINE=			FLANG
 OPTIONS_EXCLUDE_aarch64=	FLANG
-OPTIONS_EXCLUDE_armv6=	FLANG
-OPTIONS_EXCLUDE_armv7=	FLANG
-OPTIONS_EXCLUDE_i386=	FLANG
+OPTIONS_EXCLUDE_armv6=		FLANG
+OPTIONS_EXCLUDE_armv7=		FLANG
+OPTIONS_EXCLUDE_i386=		FLANG

-FLANG_DESC=		Use experimental flang instead of default Fortran compiler
-FLANG_USES=		fortran:flang
-FLANG_USES_OFF=		fortran
+FLANG_DESC=	Use experimental flang instead of default Fortran compiler
+FLANG_USES_OFF=	fortran
+FLANG_USES=	fortran:flang
+
+_RMATH_SOVERSION=	${DISTVERSION:R}

 post-patch:
 	@${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|g'\
@ -52,6 +61,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/src/include/Rmath.h ${STAGEDIR}${PREFIX}/include
 	${INSTALL_DATA} ${BUILD_WRKSRC}/libRmath.a ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_LIB} ${BUILD_WRKSRC}/libRmath.so ${STAGEDIR}${PREFIX}/lib/libRmath.so
-	(cd ${STAGEDIR}${PREFIX}/lib; ${LN} -sf libRmath.so libRmath.so.${RMATH_SOVERSION})
+	(cd ${STAGEDIR}${PREFIX}/lib; ${LN} -sf libRmath.so libRmath.so.${_RMATH_SOVERSION})

 .include <bsd.port.mk>
--- a/math/libRmath/distinfo
+++ b/math/libRmath/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1563155776
-SHA256 (R-3.6.1.tar.gz) = 5baa9ebd3e71acecdcc3da31d9042fb174d55a42829f8315f2457080978b1389
-SIZE (R-3.6.1.tar.gz) = 30463021
+TIMESTAMP = 1576449315
+SHA256 (R-3.6.2.tar.gz) = bd65a45cddfb88f37370fbcee4ac8dd3f1aebeebe47c2f968fd9770ba2bbc954
+SIZE (R-3.6.2.tar.gz) = 33311930
--- a/math/py-numpy/Makefile
+++ b/math/py-numpy/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	numpy
 PORTVERSION=	1.16.5
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	math python
 MASTER_SITES=	CHEESESHOP \
--- a/Show more
+++ b/Show more